port to SCRCPY v2

Frontesque · Apr 6, 2023 · 0b56494 · 0b56494
1 parent 87fcf5f
commit 0b56494
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 6 deletions.
diff --git a/resources/scrcpy/SDL2.dll b/resources/scrcpy/SDL2.dll
diff --git a/resources/scrcpy/adb.exe b/resources/scrcpy/adb.exe
diff --git a/resources/scrcpy/avcodec-60.dll b/resources/scrcpy/avcodec-60.dll
diff --git a/resources/scrcpy/avformat-60.dll b/resources/scrcpy/avformat-60.dll
diff --git a/resources/scrcpy/avutil-58.dll b/resources/scrcpy/avutil-58.dll
diff --git a/resources/scrcpy/scrcpy-console.bat b/resources/scrcpy/scrcpy-console.bat
@@ -0,0 +1,4 @@
+@echo off
+scrcpy.exe %*
+:: if the exit code is >= 1, then pause
+if errorlevel 1 pause
diff --git a/resources/scrcpy/scrcpy-noconsole.vbs b/resources/scrcpy/scrcpy-noconsole.vbs
@@ -0,0 +1,7 @@
+strCommand = "cmd /c scrcpy.exe"
+
+For Each Arg In WScript.Arguments
+    strCommand = strCommand & " """ & replace(Arg, """", """""""""") & """"
+Next
+
+CreateObject("Wscript.Shell").Run strCommand, 0, false
diff --git a/resources/scrcpy/scrcpy-server b/resources/scrcpy/scrcpy-server
diff --git a/resources/scrcpy/scrcpy.exe b/resources/scrcpy/scrcpy.exe
diff --git a/resources/scrcpy/swresample-4.dll b/resources/scrcpy/swresample-4.dll
diff --git a/resources/scrcpy/zlib1.dll b/resources/scrcpy/zlib1.dll
diff --git a/src/renderer/components/scrcpy.vue b/src/renderer/components/scrcpy.vue
@@ -35,7 +35,7 @@
 
 
             <!--   Sliders   -->
-            <div>Bitrate {{ bitrate }}M</div>
+            <div>Video Bitrate {{ bitrate }}M</div>
             <v-slider v-model="bitrate" max="64" min="1" hint="A higher bitrate creates a clearer image but may increase lag"      dense persistent-hint />
             <!--   End Sliders   -->
 
@@ -81,7 +81,7 @@
         <v-divider />
         <v-card-actions>
           <v-spacer />
-          <v-btn class="primaryButton" text @click="dialog = false">Close</v-btn>
+          <v-btn rounded class="primaryButton" text @click="dialog = false">Close</v-btn>
         </v-card-actions>
       </v-card>
     </v-dialog>
@@ -104,9 +104,11 @@ export default {
         }
         //console.log("scrcpy"+flags);
 
-        this.$execute(`scrcpy --bit-rate ${this.bitrate}M`+flags)
-          .catch((err) => {
-            if (typeof err != "object" && err.startsWith("INFO:")) return; // Catch information outputs
+        this.$execute(`scrcpy --video-bit-rate ${this.bitrate}M`+flags)
+          .catch(err => {
+            //if (typeof err != "object" && err.startsWith("INFO:")) return; // Catch information outputs
+            if (err.startsWith("WARN:")) return; // Catch default close
+            console.log(err)
             this.dialog = true;
             this.dialogText = err;
           })

diff --git a/src/renderer/components/scrcpyPlusInfo.vue b/src/renderer/components/scrcpyPlusInfo.vue
@@ -20,11 +20,12 @@
             <v-icon>mdi-script-text</v-icon>
             SCRCPY+ Changelog
           </v-btn>
-
+          <!--
           <v-btn rounded to="/settings" class="primaryButton">
             <v-icon>mdi-cog</v-icon>
             Settings
           </v-btn>
+          -->
         </v-card-actions>
       </section>
 

diff --git a/src/renderer/pages/changelog.vue b/src/renderer/pages/changelog.vue
@@ -25,6 +25,8 @@
                 <li>Fix MacOS window options displaying over title bar</li>
                 <li>Rework "Device" section</li>
                 <li>Remove "ADB Quick Actions" section</li>
+                <li>Port to SCRCPY v2</li>
+                <li>Due to SCRCPY v2, audio is now supported</li>
             </ul>
         </section>