From 822978b2c24d3ff0c1c0e6a4afde59841675aa2b Mon Sep 17 00:00:00 2001 From: hensm Date: Thu, 2 May 2019 06:16:26 +0100 Subject: [PATCH] Fix mirror casting --- ext/src/main.ts | 8 ++++---- ext/src/mirroringCast.js | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ext/src/main.ts b/ext/src/main.ts index 826274a..915999a 100755 --- a/ext/src/main.ts +++ b/ext/src/main.ts @@ -440,7 +440,9 @@ browser.menus.onClicked.addListener(async (info, tab) => { await browser.tabs.executeScript(tab.id, { code: ` - var selectedMedia = "${info.pageUrl ? "tab" : "screen"}"; + var selectedMedia = ${info.pageUrl + ? ReceiverSelectorMediaType.Tab + : ReceiverSelectorMediaType.Screen}; var FX_CAST_RECEIVER_APP_ID = "${options.mirroringAppId}"; ` , frameId @@ -595,9 +597,7 @@ async function onConnectShim (port: browser.runtime.Port) { port.postMessage({ subject: "shim:/selectReceiverEnd" - , data: { - receiver: ev.detail.receiver - } + , data: ev.detail }); } diff --git a/ext/src/mirroringCast.js b/ext/src/mirroringCast.js index f85ade8..874411e 100644 --- a/ext/src/mirroringCast.js +++ b/ext/src/mirroringCast.js @@ -1,5 +1,8 @@ "use strict"; +import { ReceiverSelectorMediaType } + from "./receiverSelectorManager/ReceiverSelectorManager": + let chrome; let logMessage; @@ -70,7 +73,7 @@ async function onRequestSessionSuccess (session_, selectedMedia) { }); switch (selectedMedia) { - case "tab": + case ReceiverSelectorMediaType.Tab: interval = setInterval(() => { ctx.clearRect(0, 0, canvas.width, canvas.height); ctx.drawWindow( @@ -85,7 +88,7 @@ async function onRequestSessionSuccess (session_, selectedMedia) { pc.addStream(canvas.captureStream()); break; - case "screen": + case ReceiverSelectorMediaType.Screen: const stream = await navigator.mediaDevices.getUserMedia({ video: { mediaSource: "window" } });