From a70f02f9a7729501b105cabc5bc28ccc77fdeeb9 Mon Sep 17 00:00:00 2001
From: hensm <m@matt.tf>
Date: Thu, 29 Apr 2021 04:16:25 +0100
Subject: [PATCH] Simplify session definitions

---
 ext/src/shim/cast/Session.ts |  2 +-
 ext/src/types.ts             | 29 +++++++++++------------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/ext/src/shim/cast/Session.ts b/ext/src/shim/cast/Session.ts
index 93e5492..fe5f59a 100644
--- a/ext/src/shim/cast/Session.ts
+++ b/ext/src/shim/cast/Session.ts
@@ -3,7 +3,7 @@
 import { v4 as uuid } from "uuid";
 
 import logger from "../../lib/logger";
-import { SessionMediaMessage, SessionReceiverMessage } from "../../types";
+import { SessionReceiverMessage } from "../../types";
 
 import { onMessage
        , sendMessageResponse } from "../eventMessageChannel";
diff --git a/ext/src/types.ts b/ext/src/types.ts
index 2e07c3c..cf55283 100644
--- a/ext/src/types.ts
+++ b/ext/src/types.ts
@@ -2,9 +2,11 @@
 
 import { Volume } from "./shim/cast/dataClasses";
 
-import { LoadRequest, QueueInsertItemsRequest, QueueJumpRequest
+import { EditTracksInfoRequest, GetStatusRequest, LoadRequest, PauseRequest
+       , PlayRequest, QueueInsertItemsRequest, QueueJumpRequest
        , QueueLoadRequest, QueueRemoveItemsRequest, QueueReorderItemsRequest
-       , QueueSetPropertiesRequest, QueueUpdateItemsRequest } from "./shim/cast/media";
+       , QueueSetPropertiesRequest, QueueUpdateItemsRequest, SeekRequest
+       , StopRequest, VolumeRequest } from "./shim/cast/media";
 
 
 export interface ReceiverDevice {
@@ -37,23 +39,14 @@ export interface ReceiverStatus {
 
 
 export type SessionMediaMessage =
-        { type: "PLAY", customData: (any | null) }
-      | { type: "PAUSE", customData: (any | null) }
-      | { type: "SEEK", customData: (any | null) }
-      | { type: "STOP", customData: (any | null) }
-      | { type: "MEDIA_GET_STATUS", customData: (any | null) }
+        { type: "PLAY" } & PlayRequest
+      | { type: "PAUSE" } & PauseRequest
+      | { type: "SEEK" } & SeekRequest
+      | { type: "STOP" } & StopRequest
+      | { type: "MEDIA_GET_STATUS" } & GetStatusRequest
+      | { type: "MEDIA_SET_VOLUME" } & VolumeRequest
+      | { type: "EDIT_TRACKS_INFO" } & EditTracksInfoRequest
       | { type: "SET_PLAYBACK_RATE", playbackRate: number }
-      | {
-            type: "MEDIA_SET_VOLUME"
-          , volume: Partial<Volume>
-          , customData: (any | null)
-        }
-      | {
-            type: "EDIT_TRACKS_INFO"
-          , requestId: number
-          , activeTrackIds?: (number[] | null)
-          , textTrackStyle?: (string | null)
-        }
       | LoadRequest
       | QueueLoadRequest
       | QueueInsertItemsRequest