merged with new master

1 files changed, 19 insertions, 17 deletions

diff --git a/src/server/SharedMediaTypes.ts b/src/server/SharedMediaTypes.ts
index 7db1c2dae..8ae13454e 100644
--- a/src/server/SharedMediaTypes.ts
+++ b/src/server/SharedMediaTypes.ts
@@ -13,6 +13,11 @@ export namespace AcceptableMedia {
     export const audioFormats = ['.wav', '.mp3', '.mpeg', '.flac', '.au', '.aiff', '.m4a', '.webm'];
 }
 
+export enum AudioAnnoState {
+    stopped = 'stopped',
+    playing = 'playing',
+}
+
 export namespace Upload {
     export function isImageInformation(uploadResponse: Upload.FileInformation): uploadResponse is Upload.ImageInformation {
         return 'nativeWidth' in uploadResponse;
@@ -22,24 +27,17 @@ export namespace Upload {
         return 'duration' in uploadResponse;
     }
 
+    export interface AccessPathInfo {
+        [suffix: string]: { client: string; server: string };
+    }
     export interface FileInformation {
         accessPaths: AccessPathInfo;
         rawText?: string;
         duration?: number;
     }
-
-    export type FileResponse<T extends FileInformation = FileInformation> = { source: File; result: T | Error };
-
-    export type ImageInformation = FileInformation & InspectionResults;
-
-    export type VideoInformation = FileInformation & VideoResults;
-
-    export interface AccessPathInfo {
-        [suffix: string]: { client: string; server: string };
-    }
-
-    export interface VideoResults {
-        duration: number;
+    export interface EnrichedExifData {
+        data: ExifData & ExifData['gps'];
+        error?: string;
     }
     export interface InspectionResults {
         source: string;
@@ -51,9 +49,13 @@ export namespace Upload {
         nativeHeight: number;
         filename?: string;
     }
-
-    export interface EnrichedExifData {
-        data: ExifData & ExifData['gps'];
-        error?: string;
+    export interface VideoResults {
+        duration: number;
     }
+
+    export type FileResponse<T extends FileInformation = FileInformation> = { source: File; result: T | Error };
+
+    export type ImageInformation = FileInformation & InspectionResults;
+
+    export type VideoInformation = FileInformation & VideoResults;
 }