From e53b220cfc7c8223a8c7541e5a80cfa9d51e659a Mon Sep 17 00:00:00 2001
From: hensm <m+github@matt.tf>
Date: Fri, 14 Jun 2019 18:46:42 +0100
Subject: [PATCH] Remove unnecessary timeouts module

---
 ext/src/shim/cast/classes/SessionRequest.ts |  6 ++++--
 ext/src/shim/cast/classes/Timeout.ts        | 10 +++++-----
 ext/src/shim/cast/index.ts                  |  1 -
 ext/src/shim/timeout.ts                     |  7 -------
 4 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100755 ext/src/shim/timeout.ts

diff --git a/ext/src/shim/cast/classes/SessionRequest.ts b/ext/src/shim/cast/classes/SessionRequest.ts
index 140f529..8959b3e 100755
--- a/ext/src/shim/cast/classes/SessionRequest.ts
+++ b/ext/src/shim/cast/classes/SessionRequest.ts
@@ -1,8 +1,9 @@
 "use strict";
 
-import { requestSession } from "../../timeout";
+import Timeout from "./Timeout";
 import { Capability } from "../enums";
 
+
 // https://developers.google.com/cast/docs/reference/chrome/chrome.cast.SessionRequest
 export default class SessionRequest {
     public language: string = null;
@@ -13,5 +14,6 @@ export default class SessionRequest {
           , public capabilities = [
                 Capability.VIDEO_OUT
               , Capability.AUDIO_OUT ]
-          , public requestSessionTimeout: number = requestSession) {}
+          , public requestSessionTimeout: number
+                    = (new Timeout).requestSession) {}
 }
diff --git a/ext/src/shim/cast/classes/Timeout.ts b/ext/src/shim/cast/classes/Timeout.ts
index bc1ec69..8dfb5d6 100755
--- a/ext/src/shim/cast/classes/Timeout.ts
+++ b/ext/src/shim/cast/classes/Timeout.ts
@@ -1,10 +1,10 @@
 "use strict";
 
-import * as timeouts from "../../timeout";
-
 // https://developers.google.com/cast/docs/reference/chrome/chrome.cast.Timeout
 export default class Timeout {
-    constructor () {
-        Object.assign(this, timeouts);
-    }
+    leaveSession = 3000;
+    requestSession = 60000;
+    sendCustomMessage = 3000;
+    setReceiverVolume = 3000;
+    stopSession = 3000;
 }
diff --git a/ext/src/shim/cast/index.ts b/ext/src/shim/cast/index.ts
index 220a6a6..0d5f5db 100755
--- a/ext/src/shim/cast/index.ts
+++ b/ext/src/shim/cast/index.ts
@@ -29,7 +29,6 @@ import * as media from "./media";
 import { ReceiverSelectorMediaType }
         from "../../receiver_selectors/ReceiverSelector";
 import { onMessage, sendMessageResponse } from "../messageBridge";
-import { requestSession as requestSessionTimeout } from "../timeout";
 
 
 type ReceiverActionListener = (
diff --git a/ext/src/shim/timeout.ts b/ext/src/shim/timeout.ts
deleted file mode 100755
index b66c437..0000000
--- a/ext/src/shim/timeout.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-export const leaveSession = 3000;
-export const requestSession = 60000;
-export const sendCustomMessage = 3000;
-export const setReceiverVolume = 3000;
-export const stopSession = 3000;