Merge pull request #6 from assaron/linux-support

WIP: Linux support
aolsenjazz · Sep 4, 2023 · b30d3d5 · b30d3d5
2 parents c2a5235 + 67e427a
commit b30d3d5
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest]
+        os: [macos-latest, ubuntu-latest]
 
     steps:
       - name: Check out Git repository
@@ -19,6 +19,11 @@ jobs:
         with:
           node-version: 16
 
+      - name: install Linux dependencies
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get install -y libasound2-dev
+
       - name: run post-clone
         run: |
           npm run post-clone

diff --git a/src/main/main.ts b/src/main/main.ts
@@ -74,7 +74,7 @@ const createWindow = async () => {
     width: 1024,
     height: 600,
     transparent: true,
-    frame: false,
+    frame: os.platform() !== 'darwin',
     minHeight: 312,
     minWidth: 850,
     titleBarStyle: os.platform() === 'darwin' ? 'hiddenInset' : 'default',

diff --git a/src/main/menu.ts b/src/main/menu.ts
@@ -36,7 +36,7 @@ export default class MenuBuilder {
     const template =
       process.platform === 'darwin'
         ? this.buildDarwinTemplate(createWindow)
-        : this.buildDefaultTemplate();
+        : this.buildDefaultTemplate(createWindow);
 
     const menu = Menu.buildFromTemplate(template);
     Menu.setApplicationMenu(menu);
@@ -246,14 +246,44 @@ export default class MenuBuilder {
     ];
   }
 
-  buildDefaultTemplate() {
+  buildDefaultTemplate(createWindow: () => void): MenuItemConstructorOptions[] {
     const templateDefault = [
       {
         label: '&File',
         submenu: [
+          {
+            label: '&New',
+            accelerator: 'Ctrl+N',
+            click: () => {
+              this.background
+                .onNew()
+                .then(createWindow)
+                .catch(() => {});
+            },
+          },
+          {
+            label: '&Save',
+            accelerator: 'Ctrl+S',
+            click: () => {
+              this.background.onSave().catch(() => {}); // ignore cancels
+            },
+          },
+          {
+            label: 'Save &As',
+            accelerator: 'Shift+Ctrl+S',
+            click: () => {
+              this.background.onSaveAs().catch(() => {}); // ignore cancels
+            },
+          },
           {
             label: '&Open',
             accelerator: 'Ctrl+O',
+            click: () => {
+              this.background
+                .onOpen()
+                .then(createWindow)
+                .catch(() => {});
+            },
           },
           {
             label: '&Close',

diff --git a/src/main/port-service/port-manager.ts b/src/main/port-service/port-manager.ts
@@ -72,7 +72,7 @@ export function all(omitSCPorts = true) {
 
   if (omitSCPorts) {
     portMap.forEach((_value, key, map) => {
-      if (key.startsWith('SC ')) map.delete(key);
+      if (key.startsWith('SC ') || key.startsWith('RtMidi ')) map.delete(key);
     });
   }
 

diff --git a/src/main/port-service/port.ts b/src/main/port-service/port.ts
@@ -9,7 +9,7 @@ export class Port {
 
   name: string;
 
-  port: midi.Input | midi.Output;
+  port: midi.Input | midi.Output | null;
 
   constructor(
     index: number,
@@ -21,14 +21,21 @@ export class Port {
     this.siblingIndex = siblingIndex;
     this.type = type;
     this.name = name;
-    this.port = type === 'input' ? new midi.Input() : new midi.Output();
+    this.port = null;
   }
 
   open() {
+    if (this.port === null) {
+      this.port = this.type === 'input' ? new midi.Input() : new midi.Output();
+    }
     this.port.openPort(this.index);
   }
 
   close() {
+    if (this.port === null) {
+      // closing unopened port
+      return;
+    }
     this.port.closePort();
   }
 
@@ -45,6 +52,9 @@ export class Port {
   }
 
   isPortOpen() {
+    if (this.port === null) {
+      return false;
+    }
     return this.port.isPortOpen();
   }
 }