diff --git a/Desktop.Win/Services/AudioCapturerWin.cs b/Desktop.Win/Services/AudioCapturerWin.cs index 28ec6010..8bfa32c6 100644 --- a/Desktop.Win/Services/AudioCapturerWin.cs +++ b/Desktop.Win/Services/AudioCapturerWin.cs @@ -40,6 +40,11 @@ namespace Remotely.Desktop.Win.Services { try { + if (args.Buffer.All(x => x == 0)) + { + return; + } + if (args.BytesRecorded > 0) { lock (_tempBuffer) @@ -51,8 +56,8 @@ namespace Remotely.Desktop.Win.Services _tempBuffer.AddRange(args.Buffer.Take(args.BytesRecorded)); - if (_tempBuffer.Count > 5_000 || - _sendTimer.Elapsed.TotalMilliseconds > 100) + if (_tempBuffer.Count > 50_000 || + _sendTimer.Elapsed.TotalMilliseconds > 1000) { _sendTimer.Reset(); SendTempBuffer(); diff --git a/Server/wwwroot/src/RemoteControl/Sound.js b/Server/wwwroot/src/RemoteControl/Sound.js index 3ab00c91..b57d5ab6 100644 --- a/Server/wwwroot/src/RemoteControl/Sound.js +++ b/Server/wwwroot/src/RemoteControl/Sound.js @@ -1,7 +1,4 @@ export const Sound = new class { - constructor() { - this.SourceNodes = new Array(); - } Init() { if (this.Context) { // Already initialized. @@ -16,9 +13,6 @@ export const Sound = new class { else { return; } - this.BackgroundAudio = new Audio(); - this.BackgroundNode = this.Context.createMediaElementSource(this.BackgroundAudio); - this.BackgroundNode.connect(this.Context.destination); } Play(buffer) { if (!this.Context) { diff --git a/Server/wwwroot/src/RemoteControl/Sound.js.map b/Server/wwwroot/src/RemoteControl/Sound.js.map index e8cab5df..4ecc5082 100644 --- a/Server/wwwroot/src/RemoteControl/Sound.js.map +++ b/Server/wwwroot/src/RemoteControl/Sound.js.map @@ -1 +1 @@ -{"version":3,"file":"Sound.js","sourceRoot":"","sources":["Sound.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI;IAAA;QAErB,gBAAW,GAAuC,IAAI,KAAK,EAA+B,CAAC;IAyC/F,CAAC;IApCG,IAAI;QACA,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,uBAAuB;YACvB,OAAO;SACV;QAED,IAAI,YAAY,EAAE;YACd,IAAI,CAAC,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;SACrC;aACI,IAAI,MAAM,CAAC,oBAAoB,CAAC,EAAE;YACnC,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,oBAAoB,CAAC,CAAC;SACnD;aACI;YACD,OAAO;SACV;QACD,IAAI,CAAC,eAAe,GAAG,IAAI,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAClF,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,CAAC,MAAkB;QACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAO;SACV;QAED,IAAI,EAAE,GAAG,IAAI,UAAU,EAAE,CAAC;QAC1B,EAAE,CAAC,MAAM,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE;YACrB,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,MAAqB,CAAC,CAAC;YAC/E,IAAI,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YACrD,YAAY,CAAC,MAAM,GAAG,WAAW,CAAC;YAClC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC/C,YAAY,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC,CAAA;QAED,EAAE,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAAA,CAAC;CACL,CAAA"} \ No newline at end of file +{"version":3,"file":"Sound.js","sourceRoot":"","sources":["Sound.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI;IAGrB,IAAI;QACA,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,uBAAuB;YACvB,OAAO;SACV;QAED,IAAI,YAAY,EAAE;YACd,IAAI,CAAC,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;SACrC;aACI,IAAI,MAAM,CAAC,oBAAoB,CAAC,EAAE;YACnC,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,oBAAoB,CAAC,CAAC;SACnD;aACI;YACD,OAAO;SACV;IACL,CAAC;IAED,IAAI,CAAC,MAAkB;QACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAO;SACV;QAED,IAAI,EAAE,GAAG,IAAI,UAAU,EAAE,CAAC;QAC1B,EAAE,CAAC,MAAM,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE;YACrB,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,MAAqB,CAAC,CAAC;YAC/E,IAAI,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YACrD,YAAY,CAAC,MAAM,GAAG,WAAW,CAAC;YAClC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC/C,YAAY,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC,CAAA;QAED,EAAE,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAAA,CAAC;CACL,CAAA"} \ No newline at end of file diff --git a/Server/wwwroot/src/RemoteControl/Sound.ts b/Server/wwwroot/src/RemoteControl/Sound.ts index 48d75d06..8aadab31 100644 --- a/Server/wwwroot/src/RemoteControl/Sound.ts +++ b/Server/wwwroot/src/RemoteControl/Sound.ts @@ -1,9 +1,5 @@ export const Sound = new class { Context: AudioContext; - SourceNodes: Array = new Array(); - - BackgroundAudio: HTMLAudioElement; - BackgroundNode: MediaElementAudioSourceNode; Init() { if (this.Context) { @@ -20,9 +16,6 @@ else { return; } - this.BackgroundAudio = new Audio(); - this.BackgroundNode = this.Context.createMediaElementSource(this.BackgroundAudio); - this.BackgroundNode.connect(this.Context.destination); } Play(buffer: Uint8Array) { diff --git a/sipsorcery b/sipsorcery deleted file mode 160000 index 8e25c4e5..00000000 --- a/sipsorcery +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8e25c4e53c37173583768ad3b160e20f67be8f2d