feat: List mixer presets in storage prepared

olzzon · Jun 4, 2020 · 67b6435 · 67b6435
1 parent 5bedab5
commit 67b6435
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/client/components/RoutingStorage.tsx b/client/components/RoutingStorage.tsx
@@ -31,6 +31,7 @@ class Storage extends React.PureComponent<IStorageProps & Store> {
         //Bindings:
         this.ListSnapshotFiles = this.ListSnapshotFiles.bind(this)
         this.ListCcgFiles = this.ListCcgFiles.bind(this)
+        this.ListPresetFiles = this.ListPresetFiles.bind(this)
         this.loadFile = this.loadFile.bind(this)
         this.saveFile = this.saveFile.bind(this)
     }
@@ -122,7 +123,7 @@ class Storage extends React.PureComponent<IStorageProps & Store> {
         const listItems = window.mixerPresetList.map(
             (file: string, index: number) => {
                 return (
-                    <li key={index} onClick={this.loadCcgFile} className="item">
+                    <li key={index} onClick={this.loadMixerPreset} className="item">
                         {file}
                     </li>
                 )
@@ -146,6 +147,13 @@ class Storage extends React.PureComponent<IStorageProps & Store> {
                 <hr />
                 <h3>LOAD ROUTING :</h3>
                 <this.ListSnapshotFiles />
+                {window.mixerPresetList.length > 0 ? (
+                    <div>
+                        <hr />
+                        <h3>LOAD MIXER PRESET :</h3>
+                        <this.ListPresetFiles />
+                    </div>
+                ) : null}
                 {window.ccgFileList.length > 0 ? (
                     <div>
                         <hr />

diff --git a/server/MainThreadHandler.ts b/server/MainThreadHandler.ts
@@ -173,7 +173,9 @@ export class MainThreadHandlers {
                 logger.info('Get Preset list', {})
                 socketServer.emit(
                     SOCKET_RETURN_MIXER_PRESET_LIST,
-                    getMixerPresetList()
+                    getMixerPresetList(
+                        mixerGenericConnection.getPresetFileExtention()
+                    )
                 )
             })
             .on(SOCKET_SAVE_CCG_FILE, (payload: any) => {

diff --git a/server/utils/MixerConnection.ts b/server/utils/MixerConnection.ts
@@ -83,6 +83,11 @@ export class MixerGenericConnection {
         this.fadeActiveTimer = new Array(state.channels[0].channel.length)
     }
 
+    getPresetFileExtention(): string {
+        console.log('TODO: File extension should be handled pr. mixer type')
+        return 'x32'
+    }
+
     loadMixerPreset(presetName: string) {
         logger.info('Loading Preset :' + presetName)
     }