From 2deaa22e719b1829b679e36dc420989c139c0b45 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sun, 1 May 2022 16:45:46 +0700
Subject: [PATCH] fix some stuffs

---
 src/main/base/browserwindow.ts |  4 ++++
 src/main/plugins/chromecast.ts | 12 ++++++++++--
 src/main/plugins/raop.ts       | 22 +++++++++++-----------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 56d847be..2089686c 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -898,6 +898,10 @@ export class BrowserWindow {
             event.returnValue = process.platform;
         });
 
+        ipcMain.on("get-port", (event) => {
+            event.returnValue = this.clientPort;
+        });
+
         ipcMain.on("is-dev", (event) => {
             event.returnValue = this.devMode;
         });
diff --git a/src/main/plugins/chromecast.ts b/src/main/plugins/chromecast.ts
index 5702fefc..0cac3506 100644
--- a/src/main/plugins/chromecast.ts
+++ b/src/main/plugins/chromecast.ts
@@ -28,7 +28,7 @@ export default class ChromecastPlugin {
     // private GCstream = new Stream.PassThrough(),
     private connectedHosts: any = {};
     private connectedPlayer: any;
-    // private port = false;
+    private ciderPort :any = 9000;
     // private server = false;
     // private  bufcount = 0;
     // private bufcount2 = 0;
@@ -148,7 +148,7 @@ export default class ChromecastPlugin {
             }
             let media = {
                 // Here you can plug an URL to any mp4, webm, mp3 or jpg file with the proper contentType.
-                contentId: 'http://' + this.getIp() + ':9000/audio.wav',
+                contentId: 'http://' + this.getIp() + ':'+ this.ciderPort +'/audio.wav',
                 contentType: 'audio/wav',
                 streamType: 'LIVE', // or LIVE
 
@@ -361,4 +361,12 @@ export default class ChromecastPlugin {
 
     }
 
+    onRendererReady(): void {
+        this._win.webContents.executeJavaScript(
+            `ipcRenderer.sendSync('get-port')`
+        ).then((result: any) => { 
+            this.ciderPort = result;       
+        });
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts
index a7de1854..77f9f8d1 100644
--- a/src/main/plugins/raop.ts
+++ b/src/main/plugins/raop.ts
@@ -156,18 +156,18 @@ export default class RAOP {
              }
             });
             
-            const browser2 = this.mdns.createBrowser(this.mdns.tcp('airplay'));
-            browser2.on('ready', browser2.discover);
+            // 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('_raop._tcp') ||  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);
-             }
-            });
+            // browser2.on('update', (service: any) => {
+            //      if (service.addresses && service.fullname && (service.fullname.includes('_raop._tcp') ||  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);
+            //  }
+            // });
     
         });