Merge remote-tracking branch 'origin/main'

.circleci/config.yml

@@ -15,6 +15,9 @@ jobs:
     executor: cider-ci
     steps:
       - checkout
+      - run:
+          name: Install buildtools
+          command: apt-get install autoconf automake g++ libtool || true
       - run:
           name: Update Version Number of App
           command: sudo chmod +x resources/version.sh && ./resources/version.sh || true

.github/workflows/build-macos.yml

@@ -91,6 +91,7 @@ jobs:
       run: |
         rm cider-yarn.lock || true
         xcodebuild -version
+        brew install autoconf automake libtool
         yarn install
         cp resources/verror-types node_modules/@types/verror/index.d.ts
         cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js 

src/main/plugins/raop.ts

@@ -88,14 +88,16 @@ export default class RAOP {
 
 `;
 
-    private ondeviceup(name: any, host: any, port: any, addresses: any, text: any) {
+    private ondeviceup(name: any, host: any, port: any, addresses: any, text: any, airplay2: any = null) {
-        if (this.castDevices.findIndex((item: any) => item.name == host.replace(".local","") && item.port == port && item.addresses == addresses) === -1) {
+        console.log(this.castDevices.findIndex((item: any) => {return (item.name == host.replace(".local","") && item.port == port )}))
+        if (this.castDevices.findIndex((item: any) => {return (item.name == host.replace(".local","") && item.port == port )}) == -1) {
             this.castDevices.push({
                 name: host.replace(".local",""),
                 host: addresses ? addresses[0] : '',
                 port: port,
                 addresses: addresses,
-                txt: text
+                txt: text,
+                airplay2: airplay2
             });
             if (this.devices.indexOf(host) === -1) {
                 this.devices.push(host);
@@ -147,7 +149,7 @@ export default class RAOP {
             browser.on('ready', browser.discover);
 
             browser.on('update', (service: any) => {
-                 if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  service.fullname.includes('_airplay._tcp'))) {
+                 if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp'))) {
                     // console.log(service.txt)
                 this._win.webContents.executeJavaScript(`console.log(
                     "${service.name} ${service.host}:${service.port} ${service.addresses}"
@@ -155,6 +157,19 @@ export default class RAOP {
                 this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);
              }
             });
+
+            const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
+            browser2.on('ready', browser2.discover);
+
+            browser2.on('update', (service: any) => {
+                 if (service.addresses && service.fullname && (service.fullname.includes('_airplay._tcp'))) {
+                    // console.log(service.txt)
+                this._win.webContents.executeJavaScript(`console.log(
+                    "${service.name} ${service.host}:${service.port} ${service.addresses}"
+                )`);
+                this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt, true);
+             }
+            });
             
             // const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
             // browser2.on('ready', browser2.discover);
@@ -173,7 +188,7 @@ export default class RAOP {
 
 
 
-        electron.ipcMain.on("performAirplayPCM", (event, ipv4, ipport, sepassword, title, artist, album, artworkURL,txt) => {
+        electron.ipcMain.on("performAirplayPCM", (event, ipv4, ipport, sepassword, title, artist, album, artworkURL,txt,airplay2dv) => {
 
             if (ipv4 != this.ipairplay || ipport != this.portairplay) {
                 if (this.airtunes == null) { this.airtunes = new this.u()}
@@ -183,7 +198,9 @@ export default class RAOP {
                     port: ipport,
                     volume: 50,
                     password: sepassword,
-                    txt: txt
+                    txt: txt,
+                    airplay2: airplay2dv,
+                    debug: true
                 });
                 // console.log('lol',txt)
                 this.device.on('status', (status: any) => {

src/main/providers/local/index.ts

@@ -48,7 +48,8 @@ export class LocalFiles {
         let metadatalist = []
         let metadatalistart = []
         let numid = 0;
-
+        mmQueue = mmQueue.concat(parseFileQueue)
+        parseFileQueue = []
         // Music Metadata fallback
         for (var audio of mmQueue) {
             try {

src/renderer/views/components/airplay-modal.ejs

@@ -3,7 +3,7 @@
     <div class="modal-window airplay-modal">
         <div class="modal-header">
             <div class="modal-title">{{'Enter password'}}</div>
-            <button class="close-btn" @click="close()" :aria-label="app.getLz('action.close')"></button>
+            <button class="close-btn" @click="close()" :aria-label="this.$root.getLz('action.close')"></button>
         </div>
     <div class="modal-content" style="overflow-y: overlay; padding: 3%">
         <input type="text" v-model="passcode"/>

src/renderer/views/components/castmenu.ejs

@@ -116,7 +116,7 @@
             },
             setAirPlayCast(device) {
                 this.activeCasts.push(device);
-                ipcRenderer.send("performAirplayPCM",device.host,device.port,null,"","","","",device.txt)
+                ipcRenderer.send("performAirplayPCM",device.host,device.port,null,"","","","",device.txt,device.airplay2)
             },
             stopCasting() {
                 CiderAudio.stopAudio();