From b339b86a321b0fdeccf2fa760553ed51cabd5f74 Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Thu, 13 May 2021 09:44:01 +0100 Subject: [PATCH] added device support for scrcpy --- desktop-app/src/app/app.service.ts | 6 ++++-- desktop-app/src/app/header/header.component.ts | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/desktop-app/src/app/app.service.ts b/desktop-app/src/app/app.service.ts index 3e5afb5..b239a56 100644 --- a/desktop-app/src/app/app.service.ts +++ b/desktop-app/src/app/app.service.ts @@ -334,7 +334,9 @@ export class AppService { (options.fullscreen ? '-f' : '') + ' ' + (options.no_control ? '-n' : '') + - ' --window-title "SideQuest Stream"'; + ' --window-title "SideQuest Stream"' + + ' ' + + (options.device ? '-s ' + options.device : ''); console.log(command); this.exec(command, function(err, stdout, stderr) { if (err) { @@ -393,7 +395,7 @@ export class AppService { resolve(path.split('.')[0]); }); }; - + this.extract(path, { dir: this.path.join(this.appData, 'scrcpy') }, callback); this.scrcpyBinaryPath = downloadPath; }); diff --git a/desktop-app/src/app/header/header.component.ts b/desktop-app/src/app/header/header.component.ts index c5be521..a81317b 100644 --- a/desktop-app/src/app/header/header.component.ts +++ b/desktop-app/src/app/header/header.component.ts @@ -85,6 +85,7 @@ export class HeaderComponent implements OnInit { fullscreen: false, max_size: '0', max_fps: '0', + device: '', }; currentLogCat: LogCatEntry[] = []; isStarted: boolean; @@ -148,6 +149,7 @@ export class HeaderComponent implements OnInit { } } runscrcpy() { + this.scrcpy_options.device = this.adbService.deviceSerial; this.appService .runScrCpy(this.scrcpy_options) .then(() => this.statusService.showStatus('Stream closed.'))