Remove experimental media overlay

ext/bin/build.js

@@ -74,8 +74,6 @@ const buildOpts = {
         `${srcPath}/background/background.ts`,
         // Media sender
         `${srcPath}/senders/media/index.ts`,
-        `${srcPath}/senders/media/overlay/overlayContent.ts`,
-        `${srcPath}/senders/media/overlay/overlayContentLoader.ts`,
         // Mirroring sender
         `${srcPath}/senders/mirroring.ts`,
         // Cast

ext/src/_locales/de/messages.json

@@ -92,18 +92,6 @@
         }
     }
 
-
-  , "mediaOverlayTitle": {
-        "message": "Wiedergabe auf $receiverName$"
-      , "description": "Main title for overlay displayed on media elements whilst casting."
-      , "placeholders": {
-            "receiverName": {
-                "content": "$1"
-              , "example": "Living Room TV"
-            }
-        }
-    }
-
   , "optionsBridgeLoading": {
         "message": "Lade Bridge-Informationen..."
       , "description": "Loading placeholder text for bridge section on options page."
@@ -226,18 +214,6 @@
         "message": "Streamen von Medien aktivieren"
       , "description": "Media casting enabled checkbox label."
     }
-  , "optionsMediaOverlayEnabled": {
-        "message": "Aktiviere Medien-Overlay"
-      , "description": "Media element overlay checkbox label."
-    }
-  , "optionsMediaOverlayEnabledTemp": {
-        "message": "Aktiviere Medien-Overlay (experimentell)"
-      , "description": "Experimental-labelled version of above."
-    }
-  , "optionsMediaOverlayEnabledDescription": {
-        "message": "Overlay auf Medien, das, wenn verbunden, Informationen über die aktuelle Sitzung anzeigt."
-      , "description": "Media element overlay option description."
-    }
   , "optionsMediaSyncElement": {
         "message": "Empfängerstatus mit Media-Element synchronisieren"
       , "description": "Media casting sync checkbox label."

ext/src/_locales/en/messages.json

@@ -97,18 +97,6 @@
     }
 
 
-  , "mediaOverlayTitle": {
-        "message": "Playing on $receiverName$"
-      , "description": "Main title for overlay displayed on media elements whilst casting."
-      , "placeholders": {
-            "receiverName": {
-                "content": "$1"
-              , "example": "Living Room TV"
-            }
-        }
-    }
-
-
   , "optionsBridgeLoading": {
         "message": "Loading bridge info..."
       , "description": "Loading placeholder text for bridge section on options page."
@@ -231,18 +219,6 @@
         "message": "Enable media casting"
       , "description": "Media casting enabled checkbox label."
     }
-  , "optionsMediaOverlayEnabled": {
-        "message": "Enable media element overlay"
-      , "description": "Media element overlay checkbox label."
-    }
-  , "optionsMediaOverlayEnabledTemp": {
-        "message": "Enable media element overlay (experimental)"
-      , "description": "Experimental-labelled version of above."
-    }
-  , "optionsMediaOverlayEnabledDescription": {
-        "message": "Overlay on media elements displaying information about the current session if connected."
-      , "description": "Media element overlay option description."
-    }
   , "optionsMediaSyncElement": {
         "message": "Sync receiver state with media element"
       , "description": "Media casting sync checkbox label."

ext/src/_locales/es/messages.json

@@ -97,18 +97,6 @@
     }
 
 
-  , "mediaOverlayTitle": {
-        "message": "Reproduciendo en $receiverName$"
-      , "description": "Main title for overlay displayed on media elements whilst casting."
-      , "placeholders": {
-            "receiverName": {
-                "content": "$1"
-              , "example": "Living Room TV"
-            }
-        }
-    }
-
-
   , "optionsBridgeLoading": {
         "message": "Cargando información de la aplicación puente..."
       , "description": "Loading placeholder text for bridge section on options page."
@@ -231,18 +219,6 @@
         "message": "Activar transmisión de contenidos"
       , "description": "Media casting enabled checkbox label."
     }
-  , "optionsMediaOverlayEnabled": {
-        "message": "Activar sobreposición en el elemento de medios"
-      , "description": "Media element overlay checkbox label."
-    }
-  , "optionsMediaOverlayEnabledTemp": {
-        "message": "Activar sobreposición en el elemento de medios (experimental)"
-      , "description": "Experimental-labelled version of above."
-    }
-  , "optionsMediaOverlayEnabledDescription": {
-        "message": "Sobreposición en elementos de medios mostrando información acerca de la sesión actual si está conectado."
-      , "description": "Media element overlay option description."
-    }
   , "optionsMediaSyncElement": {
         "message": "Sincronizar estado del receptor con el contenido"
       , "description": "Media casting sync checkbox label."

ext/src/_locales/nl/messages.json

@@ -85,16 +85,6 @@
             }
         }
     },
-    "mediaOverlayTitle": {
-        "message": "Speelt af op $receiverName$",
-        "description": "Main title for overlay displayed on media elements whilst casting.",
-        "placeholders": {
-            "receiverName": {
-                "content": "$1",
-                "example": "Living Room TV"
-            }
-        }
-    },
     "optionsBridgeLoading": {
         "message": "Bezig met laden van bridge-informatie...",
         "description": "Loading placeholder text for bridge section on options page."
@@ -209,18 +199,6 @@
         "message": "Mediacasten ingeschakeld",
         "description": "Media casting enabled checkbox label."
     },
-    "optionsMediaOverlayEnabled": {
-        "message": "Inschakelen overlay media element",
-        "description": "Media element overlay checkbox label."
-    },
-    "optionsMediaOverlayEnabledTemp": {
-        "message": "Inschakelen overlay media element (Experimenteel)",
-        "description": "Experimental-labelled version of above."
-    },
-    "optionsMediaOverlayEnabledDescription": {
-        "message": "Een overlay over media elementen die informatie weergeeft over de huidige sessie indien verbonden.",
-        "description": "Media element overlay option description."
-    },
     "optionsMediaSyncElement": {
         "message": "Ontvangerstatus synchroniseren met media-element",
         "description": "Media casting sync checkbox label."

ext/src/_locales/no/messages.json

@@ -97,17 +97,6 @@
     }
 
 
-  , "mediaOverlayTitle": {
-        "message": "Spiller på $receiverName$"
-      , "description": "Main title for overlay displayed on media elements whilst casting."
-      , "placeholders": {
-            "receiverName": {
-                "content": "$1"
-              , "example": "Living Room TV"
-            }
-        }
-    }
-
   , "optionsBridgeLoading": {
         "message": "Laster bro-info"
       , "description": "Loading placeholder text for bridge section on options page."
@@ -230,18 +219,6 @@
         "message": "Skru på media-casting"
       , "description": "Media casting enabled checkbox label."
     }
-  , "optionsMediaOverlayEnabled": {
-        "message": "Skru på element-overlegg (eksperimentell)"
-      , "description": "Media element overlay checkbox label."
-    }
-  , "optionsMediaOverlayEnabledTemp": {
-        "message": "Skru på element-overlegg (eksperimentell)"
-      , "description": "Experimental-labelled version of above."
-    }
-  , "optionsMediaOverlayEnabledDescription": {
-        "message": "mediaelementer "
-      , "description": "Media element overlay option description."
-    }
   , "optionsMediaSyncElement": {
         "message": "Synkroniser mottager med mediaelement"
       , "description": "Media casting sync checkbox label."

ext/src/background/background.ts

@@ -41,48 +41,6 @@ browser.runtime.onInstalled.addListener(async details => {
     }
 });
 
-/**
- * Sets up media overlay content script and handles toggling
- * on options change.
- */
-async function initMediaOverlay() {
-    logger.info("init (media overlay)");
-
-    let contentScript: browser.contentScripts.RegisteredContentScript;
-
-    async function registerMediaOverlayContentScript() {
-        if (!(await options.get("mediaOverlayEnabled"))) {
-            return;
-        }
-
-        try {
-            contentScript = await browser.contentScripts.register({
-                allFrames: true,
-                js: [{ file: "senders/media/overlay/overlayContentLoader.js" }],
-                matches: ["<all_urls>"],
-                runAt: "document_start"
-            });
-        } catch (err) {
-            logger.error("Failed to register media overlay");
-        }
-    }
-
-    async function unregisterMediaOverlayContentScript() {
-        await contentScript?.unregister();
-    }
-
-    registerMediaOverlayContentScript();
-
-    // Update if toggled
-    options.addEventListener("changed", async ev => {
-        const alteredOpts = ev.detail;
-
-        if (alteredOpts.includes("mediaOverlayEnabled")) {
-            await unregisterMediaOverlayContentScript();
-            await registerMediaOverlayContentScript();
-        }
-    });
-}
 
 /**
  * Checks whether the bridge can be reached and is compatible
@@ -153,7 +111,6 @@ async function init() {
 
     await initMenus();
     await initWhitelist();
-    await initMediaOverlay();
 
     /**
      * When the browser action is clicked, open a receiver

ext/src/defaultOptions.ts

@@ -8,7 +8,6 @@ export default {
     bridgeBackupHost: "localhost",
     bridgeBackupPort: 9556,
     mediaEnabled: true,
-    mediaOverlayEnabled: false,
     mediaSyncElement: false,
     mediaStopOnUnload: false,
     localMediaEnabled: true,

ext/src/lib/options.ts

@@ -17,7 +17,6 @@ export interface Options {
     bridgeBackupHost: string;
     bridgeBackupPort: number;
     mediaEnabled: boolean;
-    mediaOverlayEnabled: boolean;
     mediaSyncElement: boolean;
     mediaStopOnUnload: boolean;
     localMediaEnabled: boolean;

ext/src/manifest.json

@@ -66,8 +66,5 @@
     ]
   , "web_accessible_resources": [
         "cast/index.js"
-      , "senders/media/overlay/overlayContent.js"
-      , "senders/media/overlay/AirPlay_Audio.svg"
-      , "senders/media/overlay/AirPlay_Video.svg"
     ]
 }

ext/src/senders/media/index.ts

@@ -362,10 +362,6 @@ export async function init(opts: InitOptions) {
 
     if (targetElement instanceof HTMLMediaElement) {
         registerMediaElementListeners(targetElement);
-
-        if (await options.get("mediaOverlayEnabled")) {
-            // TODO: Un-hide overlay here
-        }
     }
 
     window.addEventListener("beforeunload", async () => {