From 5dd91f3ee0fd3524f22f72a9ae6dee2a28fcf2cc Mon Sep 17 00:00:00 2001
From: hensm <m+github@matt.tf>
Date: Fri, 12 Apr 2019 10:59:57 +0100
Subject: [PATCH] ReceiverSelectorManager naming changes

---
 .../ReceiverSelectorManager.ts                | 21 ++++++++++++-------
 .../NativeMacReceiverSelectorManager.ts       |  4 ++--
 .../PopupReceiverSelectorManager.ts           | 10 ++++-----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ext/src/receiverSelectorManager/ReceiverSelectorManager.ts b/ext/src/receiverSelectorManager/ReceiverSelectorManager.ts
index 53ea50b..3f1a6c1 100644
--- a/ext/src/receiverSelectorManager/ReceiverSelectorManager.ts
+++ b/ext/src/receiverSelectorManager/ReceiverSelectorManager.ts
@@ -3,20 +3,25 @@
 import { Receiver } from "../types";
 
 
-export type ReceiverSelectorSelectedEvent = CustomEvent<Receiver>;
-export type ReceiverSelectorErrorEvent = CustomEvent;
-export type ReceiverSelectorCancelledEvent = CustomEvent;
-
-export enum ReceiverSelectorCastType {
+export enum ReceiverSelectorMediaType {
     App
   , Tab
   , Screen
 }
 
+export interface ReceiverSelection {
+    receiver: Receiver;
+    castMethod: ReceiverSelectorMediaType;
+}
+
+export type ReceiverSelectorSelectedEvent = CustomEvent<ReceiverSelection>;
+export type ReceiverSelectorErrorEvent = CustomEvent;
+export type ReceiverSelectorCancelledEvent = CustomEvent;
+
+
 export default interface ReceiverSelectorManager extends EventTarget {
-    open (
-            receivers: Receiver[]
-          , defaultCastType: ReceiverSelectorCastType): void;
+    open (receivers: Receiver[]
+        , defaultMediaType: ReceiverSelectorMediaType): void;
 
     close (): void;
 }
diff --git a/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts b/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts
index 5861a2f..d01f6c5 100644
--- a/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts
+++ b/ext/src/receiverSelectorManager/selectorManagers/NativeMacReceiverSelectorManager.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import ReceiverSelectorManager, {
-        ReceiverSelectorCastType } from "../ReceiverSelectorManager";
+        ReceiverSelectorMediaType } from "../ReceiverSelectorManager";
 
 import { Message, Receiver } from "../../types";
 
@@ -12,7 +12,7 @@ class NativeMacReceiverSelectorManager
 
     public async open (
             receivers: Receiver[]
-          , defaultCastType: ReceiverSelectorCastType): Promise<void> {
+          , defaultMediaType: ReceiverSelectorMediaType): Promise<void> {
         console.info("STUB :: NativeMacReceiverSelectorManager.open");
     }
 
diff --git a/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts b/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts
index 8eafada..6518c6a 100644
--- a/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts
+++ b/ext/src/receiverSelectorManager/selectorManagers/PopupReceiverSelectorManager.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import ReceiverSelectorManager, {
-        ReceiverSelectorCastType } from "../ReceiverSelectorManager";
+        ReceiverSelectorMediaType } from "../ReceiverSelectorManager";
 
 import { getWindowCenteredProps } from "../../lib/utils";
 import { Message, Receiver } from "../../types";
@@ -16,7 +16,7 @@ class PopupReceiverSelectorManager
     private messagePort: browser.runtime.Port;
 
     private receivers: Receiver[];
-    private defaultCastType: ReceiverSelectorCastType;
+    private defaultMediaType: ReceiverSelectorMediaType;
 
     private wasReceiverSelected: boolean = false;
 
@@ -55,7 +55,7 @@ class PopupReceiverSelectorManager
 
     public async open (
             receivers: Receiver[]
-          , defaultCastType: ReceiverSelectorCastType): Promise<void> {
+          , defaultMediaType: ReceiverSelectorMediaType): Promise<void> {
 
         // If popup already exists, close it
         if (this.windowId) {
@@ -63,7 +63,7 @@ class PopupReceiverSelectorManager
         }
 
         this.receivers = receivers;
-        this.defaultCastType = defaultCastType;
+        this.defaultMediaType = defaultMediaType;
 
         // Current window to base centered position on
         const openerWindow = await browser.windows.getCurrent();
@@ -126,7 +126,7 @@ class PopupReceiverSelectorManager
         this.openerWindowId = null;
         this.messagePort = null;
         this.receivers = null;
-        this.defaultCastType = null;
+        this.defaultMediaType = null;
         this.wasReceiverSelected = false;
     }