plugin work, page navigation, reticks

Line 40: Replaced [JsonProperty(PropertyName = index)] with [JsonPropertyName(index)] to use the correct attribute from System.Text.Json.Serialization.
Line 42: Replaced [JsonProperty(PropertyName = playtype)] with [JsonPropertyName(playtype)] to use the correct attribute from System.Text.Json.Serialization.
Line 45: Replaced [JsonProperty(PropertyName = volume)] with [JsonPropertyName(volume)] to use the correct attribute from System.Text.Json.Serialization.
Line 5: Replaced the using directive for Newtonsoft.Json with System.Text.Json.Serialization, as the project does not reference Newtonsoft.Json and should use System.Text.Json.Serialization.JsonPropertyNameAttribute instead.' in file 'stream_deck_plugin\ClipTrimDotNet\Player.cs'

.github/upgrades/dotnet-upgrade-plan.md

@@ -0,0 +1,70 @@
+# .NET 8.0 Upgrade Plan
+
+## Execution Steps
+
+Execute steps below sequentially one by one in the order they are listed.
+
+1. Validate that an .NET 8.0 SDK required for this upgrade is installed on the machine and if not, help to get it installed.
+2. Ensure that the SDK version specified in global.json files is compatible with the .NET 8.0 upgrade.
+3. Upgrade ClipTrimDotNet\ClipTrimDotNet.csproj
+4. Run unit tests to validate upgrade in the projects listed below:
+  - ClientTest\ClientTest.csproj
+
+## Settings
+
+This section contains settings and data used by execution steps.
+
+### Excluded projects
+
+| Project name                                   | Description                 |
+|:-----------------------------------------------|:---------------------------:|
+
+### Aggregate NuGet packages modifications across all projects
+
+NuGet packages used across all selected projects or their dependencies that need version update in projects that reference them.
+
+| Package Name                        | Current Version | New Version | Description                                   |
+|:------------------------------------|:---------------:|:-----------:|:----------------------------------------------|
+| Microsoft.Bcl.AsyncInterfaces       |   10.0.2        |  8.0.0      | Recommended for .NET 8.0                      |
+| Microsoft.Extensions.DependencyInjection | 10.0.2   |  8.0.1      | Recommended for .NET 8.0                      |
+| Microsoft.Extensions.DependencyInjection.Abstractions | 10.0.2 | 8.0.2 | Recommended for .NET 8.0                      |
+| Microsoft.Extensions.Logging        |   10.0.2        |  8.0.1      | Recommended for .NET 8.0                      |
+| Microsoft.Extensions.Logging.Abstractions | 10.0.2   |  8.0.3      | Recommended for .NET 8.0                      |
+| Microsoft.Extensions.Options        |   10.0.2        |  8.0.2      | Recommended for .NET 8.0                      |
+| Microsoft.Extensions.Primitives     |   10.0.2        |  8.0.0      | Recommended for .NET 8.0                      |
+| System.Diagnostics.DiagnosticSource |   10.0.2        |  8.0.1      | Recommended for .NET 8.0                      |
+| System.Drawing.Common               |   9.0.10        |  8.0.24     | Recommended for .NET 8.0                      |
+| System.IO.Pipelines                 |   10.0.2        |  8.0.0      | Recommended for .NET 8.0                      |
+| System.Security.AccessControl       |   4.7.0         |  6.0.1      | Recommended for .NET 8.0                      |
+| System.Text.Encodings.Web           |   10.0.2        |  8.0.0      | Recommended for .NET 8.0                      |
+| System.Text.Json                    |   10.0.2        |  8.0.6      | Recommended for .NET 8.0                      |
+| Microsoft.Win32.Registry            |   4.7.0         |             | Functionality included with framework         |
+| System.Buffers                      |   4.6.1         |             | Functionality included with framework         |
+| System.IO                           |   4.3.0         |             | Functionality included with framework         |
+| System.Memory                       |   4.6.3         |             | Functionality included with framework         |
+| System.Net.Http                     |   4.3.4         |             | Functionality included with framework         |
+| System.Numerics.Vectors             |   4.6.1         |             | Functionality included with framework         |
+| System.Runtime                      |   4.3.0         |             | Functionality included with framework         |
+| System.Security.Cryptography.Algorithms | 4.3.0     |             | Functionality included with framework         |
+| System.Security.Cryptography.Encoding | 4.3.0        |             | Functionality included with framework         |
+| System.Security.Cryptography.Primitives | 4.3.0     |             | Functionality included with framework         |
+| System.Security.Cryptography.X509Certificates | 4.3.0 |         | Functionality included with framework         |
+| System.Security.Principal.Windows   |   4.7.0         |             | Functionality included with framework         |
+| System.Threading.Tasks.Extensions   |   4.6.3         |             | Functionality included with framework         |
+| System.ValueTuple                   |   4.6.1         |             | Functionality included with framework         |
+
+### Project upgrade details
+
+#### ClipTrimDotNet\ClipTrimDotNet.csproj modifications
+
+Project properties changes:
+  - Target framework should be changed from `.NETFramework,Version=v4.8` to `net8.0`
+  - Project file should be converted to SDK-style
+
+NuGet packages changes:
+  - Update all packages listed in the NuGet packages table above as recommended
+  - Remove packages whose functionality is now included with the framework
+
+Other changes:
+  - Ensure compatibility with .NET 8.0 APIs and features
+  - Update code as needed for breaking changes

audio-service/metadata.json

@@ -2,12 +2,94 @@
     {
         "name": "Uncategorized",
         "id": 0,
-        "clips": []
+        "clips": [
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_195932.wav",
+                "name": "Clip 20260226_195932",
+                "playbackType": "playOverlap",
+                "volume": 1
+            }
+        ]
     },
     {
         "name": "Test",
         "id": 1,
-        "clips": []
+        "clips": [
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_183607.wav",
+                "name": "Clip 20260226_183607",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_183812.wav",
+                "name": "Clip 20260226_183812",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_183822.wav",
+                "name": "Clip 20260226_183822",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_184028.wav",
+                "name": "Clip 20260226_184028",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_184030.wav",
+                "name": "Clip 20260226_184030",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_184032.wav",
+                "name": "Clip 20260226_184032",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_184037.wav",
+                "name": "Clip 20260226_184037",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_184040.wav",
+                "name": "Clip 20260226_184040",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_184041.wav",
+                "name": "Clip 20260226_184041",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_184042.wav",
+                "name": "Clip 20260226_184042",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_184043.wav",
+                "name": "Clip 20260226_184043",
+                "playbackType": "playStop",
+                "volume": 1
+            },
+            {
+                "endTime": 14.772566995768694,
+                "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260226_194441.wav",
+                "name": "Test",
+                "playbackType": "playStop",
+                "startTime": 9.8548571932299,
+                "volume": 0.6
+            }
+        ]
     },
     {
         "name": "New",
@@ -17,17 +99,17 @@
                 "endTime": 30,
                 "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260220_193822.wav",
                 "name": "Pee pee\npoo poo",
-                "playbackType": "playStop",
+                "playbackType": "playOverlap",
-                "startTime": 27.756510985786615,
+                "startTime": 27.64044943820222,
-                "volume": 1
+                "volume": 0.31
             },
             {
-                "endTime": 28.597210828548004,
+                "endTime": 30,
                 "filename": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings\\audio_capture_20260220_200442.wav",
-                "name": "Clip 20260220_200442",
+                "name": "Test",
-                "playbackType": "playStop",
+                "playbackType": "playOverlap",
-                "startTime": 26.1853978671042,
+                "startTime": 26.14685314685314,
-                "volume": 1
+                "volume": 0.64
             }
         ]
     }

audio-service/requirements.txt

@@ -1,7 +1,6 @@
-sounddevice==0.5.1
+Flask==3.1.3
-numpy==1.22.3
+flask_cors==6.0.2
-python-osc==1.9.3
+flask_socketio==5.6.1
-scipy==1.10.1
+numpy==2.4.2
-comtypes==1.4.8
+scipy==1.17.1
-pycaw==20240210
+sounddevice==0.5.5
-Flask==3.1.2

audio-service/settings.json

@@ -1,10 +1,17 @@
 {
     "input_device": {
-        "default_samplerate": 44100.0,
+        "channels": 2,
-        "index": 1,
+        "default_samplerate": 48000,
-        "max_input_channels": 8,
+        "index": 55,
-        "name": "VM Mic mix (VB-Audio Voicemeete"
+        "name": "VM Mic mix (VB-Audio Voicemeeter VAIO)"
     },
     "save_path": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\audio-service\\recordings",
-    "recording_length": 30
+    "recording_length": 30,
+    "output_device": {
+        "channels": 2,
+        "default_samplerate": 48000,
+        "index": 45,
+        "name": "VM to Discord (VB-Audio Voicemeeter VAIO)"
+    },
+    "http_port": 5010
 }

audio-service/src/audio_clip.py

@@ -0,0 +1,64 @@
+import scipy.signal
+import scipy.io.wavfile as wavfile
+import numpy as np
+import os
+
+class AudioClip:
+    def __init__(self, metadata, target_sample_rate=44100):
+        """
+        metadata: dict with keys 'filename', 'start', 'end' (seconds)
+        target_sample_rate: sample rate for playback
+        """
+        self.metadata = metadata
+        self.file_path = metadata['filename']
+        self.start = metadata.get('startTime', 0)
+        self.end = metadata.get('endTime', None)
+        self.target_sample_rate = target_sample_rate
+        self.volume = metadata.get('volume', 1.0)
+        self.finished = False
+        self.audio_data, self.sample_rate = self._load_and_process_audio()
+        print(f"AudioClip created for {self.file_path} with start={self.start}s, end={self.end}s, sample_rate={self.sample_rate}Hz, length={len(self.audio_data)/self.sample_rate:.2f}s")
+        self.position = 0  # sample index for playback
+
+    def _load_and_process_audio(self):
+        # Load audio file
+        sample_rate, data = wavfile.read(self.file_path)
+        # Convert to float32
+        if data.dtype != np.float32:
+            data = data.astype(np.float32) / np.max(np.abs(data))
+        # Convert to mono if needed
+        if len(data.shape) > 1:
+            data = np.mean(data, axis=1)
+        # Resample if needed
+        if sample_rate != self.target_sample_rate:
+            num_samples = int(len(data) * self.target_sample_rate / sample_rate)
+            data = scipy.signal.resample(data, num_samples)
+            sample_rate = self.target_sample_rate
+        # Cache only the clip region
+        start_sample = int(self.start * sample_rate)
+        end_sample = int(self.end * sample_rate) if self.end else len(data)
+        cached = data[start_sample:end_sample]
+        cached *= self.volume  # Apply volume
+        return cached, sample_rate
+
+    def get_samples(self, num_samples):
+        # Return next chunk for playback
+        if self.position >= len(self.audio_data):
+            self.finished = True
+            return np.zeros(num_samples, dtype=np.float32)
+        end_pos = min(self.position + num_samples, len(self.audio_data))
+        chunk = self.audio_data[self.position:end_pos]
+        self.position = end_pos
+        if self.position >= len(self.audio_data):
+            self.finished = True
+        # Pad if chunk is short
+        if len(chunk) < num_samples:
+            chunk = np.pad(chunk, (0, num_samples - len(chunk)), mode='constant')
+        return chunk
+
+    def is_finished(self):
+        return self.finished
+
+    def reset(self):
+        self.position = 0
+        self.finished = False

audio-service/src/audio_io.py

@@ -0,0 +1,168 @@
+import sounddevice as sd
+import numpy as np
+import os
+from datetime import datetime
+import scipy.io.wavfile as wavfile
+from metadata_manager import MetaDataManager
+from audio_clip import AudioClip
+
+
+# AudioClip class for clip playback
+
+
+class AudioIO:
+    _instance = None
+
+    def __new__(cls, *args, **kwargs):
+        if cls._instance is None:
+            # print("Creating new AudioRecorder instance")
+            cls._instance = super().__new__(cls)
+            cls._instance.init()
+        return cls._instance
+    def init(self):
+        self.duration = 30
+        self.channels = 2
+        self.input_sample_rate = 44100
+        self.output_sample_rate = 44100
+        self.buffer = np.zeros((int(self.duration * self.input_sample_rate), self.channels), dtype=np.float32)
+        self.recordings_dir = "recordings"
+
+        sd.default.latency = 'low'
+
+        self.socket = None
+        
+        self.in_stream = sd.InputStream(
+            callback=self.record_callback
+        )
+
+        self.out_stream = sd.OutputStream(
+            callback=self.playback_callback,
+            latency=3
+        )
+
+        self.clip_map = {}
+
+
+    def refresh_streams(self):
+        was_active = self.in_stream.active 
+        if was_active:
+            self.in_stream.stop()
+            self.out_stream.stop()
+        
+        self.buffer = np.zeros((int(self.duration * self.input_sample_rate), self.channels), dtype=np.float32)
+        # print(f"AudioRecorder initialized with duration={self.duration}s, sample_rate={self.sample_rate}Hz, channels={self.channels}")
+        self.in_stream = sd.InputStream(
+            callback=self.record_callback
+        )
+
+        self.out_stream = sd.OutputStream(
+            callback=self.playback_callback
+        )
+
+        if was_active:
+            self.in_stream.start()
+            self.out_stream.start()
+
+        
+    
+    def record_callback(self, indata, frames, time, status):
+        if status:
+            # print(f"Recording status: {status}")
+            pass
+        
+        # Circular buffer implementation
+        self.buffer = np.roll(self.buffer, -frames, axis=0)
+        self.buffer[-frames:] = indata
+    
+    def playback_callback(self, outdata, frames, time, status):
+        if status:
+            # print(f"Playback status: {status}")
+            pass
+
+        outdata.fill(0)
+        
+        # Iterate over a copy of the items to avoid modifying the dictionary during iteration
+        for clip_id, clip_list in list(self.clip_map.items()):
+            for clip in clip_list[:]:  # Iterate over a copy of the list
+                if not clip.is_finished():
+                    samples = clip.get_samples(frames)
+                    outdata[:] += samples.reshape(-1, 1)  # Mix into output
+                if clip.is_finished():
+                    self.clip_map[clip_id].remove(clip)
+                    if len(self.clip_map[clip_id]) == 0:
+                        del self.clip_map[clip_id]
+                        break  # Exit inner loop since the key is deleted
+        
+    
+    def save_last_n_seconds(self):
+        # Create output directory if it doesn't exist
+        os.makedirs(self.recordings_dir, exist_ok=True)
+        
+        # Generate filename with timestamp
+        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+        filename = os.path.join(self.recordings_dir, f"audio_capture_{timestamp}.wav")
+        
+        # Normalize audio to prevent clipping
+        audio_data = self.buffer / np.max(np.abs(self.buffer)) * .5
+        
+        # Convert float32 to int16 for WAV file
+        audio_data_int16 = (audio_data * 32767).astype(np.int16)
+        
+        # Write buffer to file
+        wavfile.write(filename, int(self.input_sample_rate), audio_data_int16)
+
+        meta = MetaDataManager()
+
+        clip_metadata = {
+            "filename": filename,
+            "name": f"Clip {timestamp}",
+            "playbackType":"playStop",
+            "volume": 1.0,  
+        }
+        
+        meta.add_clip_to_collection("Uncategorized",  clip_metadata )
+
+        
+        return clip_metadata
+    
+    def set_buffer_duration(self, duration):
+        self.duration = duration
+        self.buffer = np.zeros((int(duration * self.input_sample_rate), self.channels), dtype=np.float32)
+
+    def set_recording_directory(self, directory):
+        self.recordings_dir = directory
+    
+    def start_recording(self):
+        if(self.in_stream.active):
+            # print("Already recording")
+            return
+        # print('number of channels', self.channels)
+        
+        self.in_stream.start()
+        self.out_stream.start()
+        self.output_sample_rate = self.out_stream.samplerate
+        self.input_sample_rate = self.in_stream.samplerate  
+
+    def stop_recording(self):
+        if(not self.in_stream.active):
+            # print("Already stopped")
+            return
+        
+        self.in_stream.stop()
+        self.out_stream.stop()
+
+    def is_recording(self):
+        return self.in_stream.active
+    
+    def play_clip(self, clip_metadata):
+        print(f"Playing clip: {clip_metadata}")
+        clip_id = clip_metadata.get("filename")
+        if clip_metadata.get("playbackType") == "playStop":
+            if clip_id in self.clip_map:
+                del self.clip_map[clip_id]
+                return
+            else:
+                self.clip_map[clip_id] = []
+        if clip_id not in self.clip_map:
+            self.clip_map[clip_id] = []
+        self.clip_map[clip_id].append(AudioClip(clip_metadata, target_sample_rate=self.output_sample_rate))

audio-service/src/audio_recorder.py

@@ -1,156 +0,0 @@
-import sounddevice as sd
-import numpy as np
-import os
-from datetime import datetime
-import scipy.io.wavfile as wavfile
-from metadata_manager import MetaDataManager
-
-class AudioRecorder:
-    _instance = None
-
-    def __new__(cls, *args, **kwargs):
-        if cls._instance is None:
-            print("Creating new AudioRecorder instance")
-            cls._instance = super().__new__(cls)
-            cls._instance.init()
-        return cls._instance
-    def init(self):
-        """
-        Initialize audio recorder with configurable parameters.
-        
-        :param duration: Length of audio buffer in seconds
-        :param sample_rate: Audio sample rate (if None, use default device sample rate)
-        :param channels: Number of audio channels
-        """
-        print(f"Initializing AudioRecorder")
-        self.duration = 30
-        self.sample_rate = 44100
-        self.channels = 2
-        self.buffer = np.zeros((int(self.duration * self.sample_rate), self.channels), dtype=np.float32)
-        self.recordings_dir = "recordings"
-        self.stream = sd.InputStream(
-            samplerate=self.sample_rate, 
-            channels=self.channels,
-            callback=self.record_callback
-        )
-
-    def refresh_stream(self):
-        """
-        Refresh the audio stream with updated parameters.
-        """
-        was_active = self.stream.active 
-        if was_active:
-            self.stream.stop()
-        
-        self.buffer = np.zeros((int(self.duration * self.sample_rate), self.channels), dtype=np.float32)
-        
-        self.stream = sd.InputStream(
-            samplerate=self.sample_rate, 
-            channels=self.channels,
-            callback=self.record_callback
-        )
-
-        if was_active:
-            self.stream.start()
-
-
-        
-    
-    def record_callback(self, indata, frames, time, status):
-        """
-        Circular buffer callback for continuous recording.
-        
-        :param indata: Input audio data
-        :param frames: Number of frames
-        :param time: Timestamp
-        :param status: Recording status
-        """
-        if status:
-            print(f"Recording status: {status}")
-        
-        # Circular buffer implementation
-        self.buffer = np.roll(self.buffer, -frames, axis=0)
-        self.buffer[-frames:] = indata
-    
-    def save_last_n_seconds(self):
-        """
-        Save the last n seconds of audio to a file.
-        
-        :param output_dir: Directory to save recordings
-        :return: Path to saved audio file
-        """
-        # Create output directory if it doesn't exist
-        os.makedirs(self.recordings_dir, exist_ok=True)
-        
-        # Generate filename with timestamp
-        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-        filename = os.path.join(self.recordings_dir, f"audio_capture_{timestamp}.wav")
-        
-        # Normalize audio to prevent clipping
-        audio_data = self.buffer / np.max(np.abs(self.buffer)) * .5
-        
-        # Convert float32 to int16 for WAV file
-        audio_data_int16 = (audio_data * 32767).astype(np.int16)
-        
-        # Write buffer to file
-        wavfile.write(filename, int(self.sample_rate), audio_data_int16)
-
-        meta = MetaDataManager()
-
-        clip_metadata = {
-            "filename": filename,
-            "name": f"Clip {timestamp}",
-            "playbackType":"playStop",
-            "volume": 1.0,  
-        }
-        
-        meta.add_clip_to_collection("Uncategorized",  clip_metadata )
-
-        
-        return clip_metadata
-    
-    def set_buffer_duration(self, duration):
-        """
-        Set the duration of the audio buffer.
-        
-        :param duration: New buffer duration in seconds
-        """
-        self.duration = duration
-        self.buffer = np.zeros((int(duration * self.sample_rate), self.channels), dtype=np.float32)
-
-    def set_recording_directory(self, directory):
-        """
-        Set the directory where recordings will be saved.
-        
-        :param directory: Path to the recordings directory
-        """
-        self.recordings_dir = directory
-    
-    def start_recording(self):
-        """
-        Start continuous audio recording with circular buffer.
-        """
-        if(self.stream.active):
-            print("Already recording")
-            return
-        print('number of channels', self.channels)
-        
-        self.stream.start()
-
-    def stop_recording(self):
-        """
-        Stop continuous audio recording with circular buffer.
-        """
-        if(not self.stream.active):
-            print("Already stopped")
-            return
-        
-        self.stream.stop()
-
-    def is_recording(self):
-        """
-        Check if the audio stream is currently active.
-        
-        :return: True if recording, False otherwise
-        """
-        return self.stream.active

audio-service/src/main.py

@@ -1,7 +1,7 @@
 import argparse
 import os
 import sys
-from audio_recorder import AudioRecorder
+from audio_io import AudioIO
 from windows_audio import WindowsAudioManager
 import sounddevice as sd
 from metadata_manager import MetaDataManager
@@ -14,13 +14,30 @@ from routes.recording import recording_bp
 from routes.device import device_bp
 from routes.metadata import metadata_bp
 from routes.settings import settings_bp
-from flask_socketio import SocketIO
+from flask_socketio import SocketIO, emit
 import threading
 
 app = Flask(__name__)
 CORS(app)
-# socketio = SocketIO(app, cors_allowed_origins="*")
+socketio = SocketIO(app, cors_allowed_origins="*", logger=True, engineio_logger=True, async_mode='eventlet')
-# CORS(socketio)
+
+@socketio.on('connect')
+def handle_connect():
+    print("Client connected")
+    emit('full_data', MetaDataManager().collections)
+
+@socketio.on('record_clip')
+def record_clip():
+    io = AudioIO()
+    io.save_last_n_seconds();
+
+@socketio.on('play_clip')
+def play_clip(data):
+    io = AudioIO()
+    print(f"Received play_clip event with data: {data}")
+    if data:
+        io.play_clip(data)
+
 
 def main():
     # Create argument parser
@@ -36,33 +53,41 @@ def main():
     args = parser.parse_args()
     audio_manager = WindowsAudioManager()
     settings = SettingsManager()
+    meta = MetaDataManager()
+
+    
     
     # Ensure save path exists
     os.makedirs(settings.get_settings('save_path'), exist_ok=True)
 
 
+    io = AudioIO()
+    io.start_recording()
+
+    # settings.socket = socketio
+    io.socket = socketio
+    meta.socket = socketio
+    
     # Register blueprints
     app.register_blueprint(recording_bp)
     app.register_blueprint(device_bp)
     app.register_blueprint(metadata_bp)
     app.register_blueprint(settings_bp)
-    app.run(host='127.0.0.1', port=args.osc_port, debug=False, use_reloader=True)
+    print(f"Starting Flask server on port {settings.get_settings('http_port')}")
-    # socketio.run(app, host='127.0.0.1', port=args.osc_port, debug=False, use_reloader=True)
+    # app.run(host='127.0.0.1', port=settings.get_settings('http_port'), debug=False, use_reloader=True)
+    socketio.run(app, host='127.0.0.1', port=settings.get_settings('http_port'), debug=False, use_reloader=True, allow_unsafe_werkzeug=True)
 
 
     
     # Run the OSC server
-    try:
+    # try:
-        print(f"Starting OSC Recording Server on port {args.osc_port}")
+    #     print(f"Starting OSC Recording Server on port {args.osc_port}")
-            
+    #     # osc_server.run_server()
-        
+    # except KeyboardInterrupt:
-
+    #     print("\nServer stopped by user.")
-        # osc_server.run_server()
+    # except Exception as e:
-    except KeyboardInterrupt:
+    #     print(f"Error starting server: {e}")
-        print("\nServer stopped by user.")
+    #     sys.exit(1)
-    except Exception as e:
-        print(f"Error starting server: {e}")
-        sys.exit(1)
 
 
 if __name__ == "__main__":

audio-service/src/metadata_manager.py

@@ -10,6 +10,7 @@ class MetaDataManager:
             cls._instance.init()
         return cls._instance
     def init(self):
+        self.socket = None
         # read metadata file from executing directory
         self.metadata_file = os.path.join(os.getcwd(), "metadata.json")
         if os.path.exists(self.metadata_file):
@@ -40,6 +41,8 @@ class MetaDataManager:
         if collection is None:
             raise ValueError(f"Collection '{collection_name}' does not exist.")
         collection["clips"].append(clip_metadata)
+        if not self.socket is None:
+            self.socket.emit('collection_updated', collection)
         self.save_metadata()
 
     def remove_clip_from_collection(self, collection_name, clip_metadata):
@@ -55,11 +58,18 @@ class MetaDataManager:
             clip for clip in collection["clips"]
             if clip.get("filename") != clip_metadata.get("filename")
         ]
+        if not self.socket is None:
+            self.socket.emit('collection_updated', collection)
         self.save_metadata()
        
+    
     def move_clip_to_collection(self, source_collection, target_collection, clip_metadata):
         self.remove_clip_from_collection(source_collection, clip_metadata)
         self.add_clip_to_collection(target_collection, clip_metadata)
+        if not self.socket is None:
+            self.socket.emit('collection_updated', source_collection)
+            self.socket.emit('collection_updated', target_collection)
+
 
     def edit_clip_in_collection(self, collection_name, new_clip_metadata):
         collection = next((c for c in self.collections if c.get("name") == collection_name), None)
@@ -71,6 +81,8 @@ class MetaDataManager:
             raise ValueError(f"Clip with filename '{new_clip_metadata.get('filename')}' not found in collection '{collection_name}'.")
         
         collection["clips"][index] = new_clip_metadata
+        if not self.socket is None:
+            self.socket.emit('collection_updated', collection)
         self.save_metadata()
     
     def get_collections(self):
@@ -93,6 +105,8 @@ class MetaDataManager:
             raise ValueError("New order contains clips that do not exist in the collection.")
         
         collection["clips"] = new_order
+        if not self.socket is None:
+            self.socket.emit('collection_updated', collection)
         self.save_metadata()
     
     def save_metadata(self):

audio-service/src/routes/device.py

@@ -1,11 +1,11 @@
 from flask import Blueprint, request, jsonify
 from windows_audio import WindowsAudioManager
-from audio_recorder import AudioRecorder
+from audio_io import AudioIO
 
 device_bp = Blueprint('device', __name__)
 
 audio_manager = WindowsAudioManager()
-recorder = AudioRecorder()
+recorder = AudioIO()
 
 # @device_bp.route('/device/set', methods=['POST'])
 # def set_audio_device():
@@ -19,13 +19,13 @@ recorder = AudioRecorder()
 #     except Exception as e:
 #         return jsonify({'status': 'error', 'message': str(e)}), 400
 
-@device_bp.route('/device/get', methods=['GET'])
+# @device_bp.route('/device/get', methods=['GET'])
-def get_audio_device():
+# def get_audio_device():
-    try:
+#     try:
-        device_info = audio_manager.get_default_device('input')
+#         device_info = audio_manager.get_default_device('input')
-        return jsonify({'status': 'success', 'device_info': device_info})
+#         return jsonify({'status': 'success', 'device_info': device_info})
-    except Exception as e:
+#     except Exception as e:
-        return jsonify({'status': 'error', 'message': str(e)}), 400 
+#         return jsonify({'status': 'error', 'message': str(e)}), 400 
 
 @device_bp.route('/device/list', methods=['GET'])
 def list_audio_devices():

audio-service/src/routes/metadata.py

@@ -91,10 +91,16 @@ def edit_clip_in_collection():
     meta_manager = MetaDataManager()
     collection_name = request.json.get('name')
     clip_metadata = request.json.get('clip')
-    print(f"Received request to edit clip in collection '{collection_name}': {clip_metadata}")
+    # print(f"Received request to edit clip in collection '{collection_name}': {clip_metadata}")
     try:
         meta_manager.edit_clip_in_collection(collection_name, clip_metadata)
         collections = meta_manager.collections
         return jsonify({'status': 'success', 'collections': collections})
     except ValueError as e:
         return jsonify({'status': 'error', 'message': str(e)}), 400
+
+
+@metadata_bp.route('/ws/test', methods=['POST'])
+def test_websocket():
+    MetaDataManager().socket.emit('test_event', {'data': 'Test message from metadata route'})
+    return jsonify({'status': 'success'})

audio-service/src/routes/recording.py

@@ -1,36 +1,36 @@
 
 from flask import Blueprint, request, jsonify
-from audio_recorder import AudioRecorder
+from audio_io import AudioIO
 import os
 
 recording_bp = Blueprint('recording', __name__)
 
 @recording_bp.route('/record/start', methods=['POST'])
 def start_recording():
-    recorder = AudioRecorder()
+    recorder = AudioIO()
     print('HTTP: Starting audio recording')
     recorder.start_recording()
     return jsonify({'status': 'recording started'})
 
 @recording_bp.route('/record/stop', methods=['POST'])
 def stop_recording():
-    recorder = AudioRecorder()
+    recorder = AudioIO()
-    print('HTTP: Stopping audio recording')
+    # print('HTTP: Stopping audio recording')
     recorder.stop_recording()
     return jsonify({'status': 'recording stopped'})
 
 @recording_bp.route('/record/save', methods=['POST'])
 def save_recording():
-    recorder = AudioRecorder()
+    recorder = AudioIO()
-    print('HTTP: Saving audio recording')
+    # print('HTTP: Saving audio recording')
     saved_file = recorder.save_last_n_seconds()
     return jsonify({'status': 'recording saved', 'file': saved_file})
 
 
 @recording_bp.route('/record/status', methods=['GET'])
 def recording_status():
-    recorder = AudioRecorder()
+    recorder = AudioIO()
-    print('HTTP: Checking recording status')
+    # print('HTTP: Checking recording status')
     status = 'recording' if recorder.is_recording() else 'stopped'
     return jsonify({'status': status})
 
@@ -45,8 +45,12 @@ def recording_delete():
     
 @recording_bp.route('/playback/start', methods=['POST'])
 def playback_start():
-    print('HTTP: Starting audio playback')
+    print(f"Playing clip")
+    # print('HTTP: Starting audio playback')
+    clip = request.json
     try:
+        io = AudioIO()
+        io.play_clip(clip)
         # os.remove(filename)
         return jsonify({'status': 'success'})
     except Exception as e:        

audio-service/src/routes/settings.py

@@ -16,10 +16,17 @@ def get_setting(name):
     else:
         return jsonify({'status': 'error', 'message': f'Setting "{name}" not found'}), 404
 
-@settings_bp.route('/settings/<name>', methods=['POST'])
+@settings_bp.route('/settings/update', methods=['POST'])
-def set_setting(name):
+def set_all_settings():
-    value = request.json.get('value')
+    settings = request.json.get('settings')
-    if value is None:
+    print (f"Received settings update: {settings}")
-        return jsonify({'status': 'error', 'message': 'Value is required'}), 400
+    if settings is None:
+        return jsonify({'status': 'error', 'message': 'Settings are required'}), 400
+    try:
+        for name, value in settings.items():
+            print(f"Updating setting '{name}' to '{value}'")
             SettingsManager().set_settings(name, value)
-    return jsonify({'status': 'success', 'name': name, 'value': value})
+        return jsonify({'status': 'success', 'settings': settings})
+    except ValueError as e:
+        return jsonify({'status': 'error', 'message': str(e)}), 400
+    

audio-service/src/settings.py

@@ -1,6 +1,6 @@
 import os
 import json
-from audio_recorder import AudioRecorder
+from audio_io import AudioIO
 from windows_audio import WindowsAudioManager
 
 class SettingsManager:
@@ -13,6 +13,7 @@ class SettingsManager:
         return cls._instance
     def init(self):
         # read settings file from executing directory
+        print("Initializing SettingsManager", os.getcwd())
         self.settings_file = os.path.join(os.getcwd(), "settings.json")
         if os.path.exists(self.settings_file):
             with open(self.settings_file, "r") as f:
@@ -20,21 +21,49 @@ class SettingsManager:
         else:
             self.settings = {
                 "input_device": None,
+                "output_device": None,
                 "save_path": os.path.join(os.getcwd(), "recordings"),
                 "recording_length": 15
             }
         audio_manager = WindowsAudioManager()
 
-        devices = audio_manager.list_audio_devices('input') 
+        input_devices = audio_manager.list_audio_devices('input') 
-        print(f"Available input devices: {self.settings}")
+        output_devices = audio_manager.list_audio_devices('output')
-        input = self.settings["input_device"]
+        # print("Available input devices:")
+        # for i, dev in enumerate(input_devices):
+        #     print(i, dev['name'])
+        # print("Available output devices:")
+        # for i, dev in enumerate(output_devices):
+        #     print(i, dev['name'])
+        # print(f"Available input devices: {input_devices}")
+        # print(f"Available output devices: {output_devices}")
+        input = None
+        output = None
 
+        if("input_device" in self.settings):
+            input = self.settings["input_device"]
+        if("output_device" in self.settings):
+            output = self.settings["output_device"]
         #see if input device is in "devices", if not set to the first index
-        if input is not None and any(d['name'] == input["name"] for d in devices):
+        if input is not None and any(d['name'] == input["name"] for d in input_devices):
-            print(f"Using saved input device index: {input}")
+            # print(f"Using saved input device index: {input}")
+            pass
         else:
-            input = devices[0] if devices else None
+            input = input_devices[0] if input_devices else None
             self.settings["input_device"] = input
+
+        #see if output device is in "devices", if not set to the first index
+        if output is not None and any(d['name'] == output["name"] for d in output_devices):
+            # print(f"Using saved output device index: {output}")
+            pass
+        else:
+            output = output_devices[0] if output_devices else None
+            self.settings["output_device"] = output
+
+        if not "http_port" in self.settings:
+            self.settings["http_port"] = 5010
+
+
         self.save_settings()
         
 
@@ -48,6 +77,8 @@ class SettingsManager:
         return self.settings
     
     def set_settings(self, name, value):
+        if(name not in self.settings):
+            raise ValueError(f"Setting '{name}' not found.")
         self.settings[name] = value
         self.save_settings()
     
@@ -57,13 +88,14 @@ class SettingsManager:
             json.dump(self.settings, f, indent=4)
 
     def refresh_settings(self):
-        recorder = AudioRecorder()
+        recorder = AudioIO()
         # Update recorder parameters based on new setting
         recorder.set_buffer_duration(self.get_settings('recording_length'))
         recorder.recordings_dir = self.get_settings('save_path')
         
         audio_manager = WindowsAudioManager()
         audio_manager.set_default_input_device(self.get_settings('input_device')['index'])
+        audio_manager.set_default_output_device(self.get_settings('output_device')['index'])
 
-        recorder.refresh_stream()
+        recorder.refresh_streams()
 

audio-service/src/windows_audio.py

@@ -1,9 +1,5 @@
 import sounddevice as sd
 import numpy as np
-import comtypes
-import comtypes.client
-from comtypes import CLSCTX_ALL
-from pycaw.pycaw import AudioUtilities, IAudioEndpointVolume
 import json
 
 class WindowsAudioManager:
@@ -18,7 +14,19 @@ class WindowsAudioManager:
         """
         Initialize Windows audio device and volume management.
         """
-        self.devices = sd.query_devices()
+        host_apis = sd.query_hostapis()
+        wasapi_device_indexes = None
+        for api in host_apis:
+            if api['name'].lower() == 'Windows WASAPI'.lower():
+                wasapi_device_indexes = api['devices']
+                break
+        # print(f"Host APIs: {host_apis}")
+        # print(f"WASAPI Device Indexes: {wasapi_device_indexes}")
+        wasapi_device_indexes = set(wasapi_device_indexes) if wasapi_device_indexes is not None else set()
+        self.devices = [dev for dev in sd.query_devices() if dev['index'] in wasapi_device_indexes]
+        # self.devices = sd.query_devices()
+        # print(f"devices: {self.devices}")
+
         self.default_input = sd.default.device[0]
         self.default_output = sd.default.device[1]
     
@@ -34,7 +42,7 @@ class WindowsAudioManager:
                 {
                     'index': dev['index'], 
                     'name': dev['name'], 
-                    'max_input_channels': dev['max_input_channels'],
+                    'channels': dev['max_input_channels'],
                     'default_samplerate': dev['default_samplerate']
                 } 
                 for dev in self.devices if dev['max_input_channels'] > 0
@@ -44,7 +52,7 @@ class WindowsAudioManager:
                 {
                     'index': dev['index'], 
                     'name': dev['name'], 
-                    'max_output_channels': dev['max_output_channels'],
+                    'channels': dev['max_output_channels'],
                     'default_samplerate': dev['default_samplerate']
                 } 
                 for dev in self.devices if dev['max_output_channels'] > 0
@@ -69,7 +77,7 @@ class WindowsAudioManager:
         
     def set_default_input_device(self, device_index):
         if(device_index is None):
-            return self.get_current_input_device_sample_rate()
+            return 0
         """
         Set the default input audio device.
         
@@ -83,41 +91,18 @@ class WindowsAudioManager:
         device_info = sd.query_devices(device_index)
         return device_info['default_samplerate']
     
-    def get_current_input_device_sample_rate(self):
+    def set_default_output_device(self, device_index):
+        if(device_index is None):
+            return self.get_current_output_device_sample_rate()
         """
-        Get the sample rate of the current input device.
+        Set the default output audio device.
         
-        :return: Sample rate of the current input device
+        :param device_index: Index of the audio device
+        :return: Sample rate of the selected device
         """
-        device_info = sd.query_devices(self.default_input)
+        sd.default.device[1] = device_index
+        self.default_output = device_index
+        
+        # Get the sample rate of the selected device
+        device_info = sd.query_devices(device_index)
         return device_info['default_samplerate']
-    
-    def get_system_volume(self):
-        """
-        Get the system master volume.
-        
-        :return: Current system volume (0.0 to 1.0)
-        """
-        devices = AudioUtilities.GetSpeakers()
-        interface = devices.Activate(
-            IAudioEndpointVolume._iid_, 
-            CLSCTX_ALL, 
-            None
-        )
-        volume = interface.QueryInterface(IAudioEndpointVolume)
-        return volume.GetMasterVolumeLevelScalar()
-    
-    def set_system_volume(self, volume_level):
-        """
-        Set the system master volume.
-        
-        :param volume_level: Volume level (0.0 to 1.0)
-        """
-        devices = AudioUtilities.GetSpeakers()
-        interface = devices.Activate(
-            IAudioEndpointVolume._iid_, 
-            CLSCTX_ALL, 
-            None
-        )
-        volume = interface.QueryInterface(IAudioEndpointVolume)
-        volume.SetMasterVolumeLevelScalar(volume_level, None)

electron-ui/settings.json

@@ -0,0 +1,16 @@
+{
+    "input_device": {
+        "index": 49,
+        "name": "Microphone (Logi C615 HD WebCam)",
+        "channels": 1,
+        "default_samplerate": 48000.0
+    },
+    "output_device": {
+        "index": 40,
+        "name": "Speakers (Realtek(R) Audio)",
+        "channels": 2,
+        "default_samplerate": 48000.0
+    },
+    "save_path": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\electron-ui\\recordings",
+    "recording_length": 15
+}

electron-ui/src/ipc/audio/channels.ts

@@ -1,5 +1,7 @@
 const AudioChannels = {
   LOAD_AUDIO_BUFFER: 'audio:loadAudioBuffer',
+  GET_PORT: 'audio:getPort',
+  RESTART_SERVICE: 'audio:restartService',
 } as const;
 
 export default AudioChannels;

electron-ui/src/ipc/audio/main.ts

@@ -2,6 +2,7 @@ import { ipcMain } from 'electron';
 import fs from 'fs';
 import AudioChannels from './channels';
 import { LoadAudioBufferArgs, LoadAudioBufferResult } from './types';
+import PythonSubprocessManager from '../../main/service';
 
 export default function registerAudioIpcHandlers() {
   ipcMain.handle(
@@ -15,4 +16,25 @@ export default function registerAudioIpcHandlers() {
       }
     },
   );
+
+  ipcMain.handle(AudioChannels.GET_PORT, async () => {
+    try {
+      if (PythonSubprocessManager.instance?.portNumber) {
+        return { port: PythonSubprocessManager.instance.portNumber };
+      }
+
+      return { error: 'Port number not available yet.' };
+    } catch (err: any) {
+      return { error: err.message };
+    }
+  });
+
+  ipcMain.handle(AudioChannels.RESTART_SERVICE, async () => {
+    try {
+      PythonSubprocessManager.instance?.restart();
+      return { success: true };
+    } catch (err: any) {
+      return { success: false, error: err.message };
+    }
+  });
 }

electron-ui/src/ipc/audio/types.ts

@@ -6,3 +6,22 @@ export interface LoadAudioBufferResult {
   buffer?: Buffer;
   error?: string;
 }
+
+export interface GetPortResult {
+  port?: number;
+  error?: string;
+}
+
+export interface SetPortArgs {
+  port: number;
+}
+
+export interface SetPortResult {
+  success: boolean;
+  error?: string;
+}
+
+export interface RestartServiceResult {
+  success: boolean;
+  error?: string;
+}

electron-ui/src/main/main.ts

@@ -16,6 +16,7 @@ import log from 'electron-log';
 import MenuBuilder from './menu';
 import { resolveHtmlPath } from './util';
 import registerFileIpcHandlers from '../ipc/audio/main';
+import PythonSubprocessManager from './service';
 
 class AppUpdater {
   constructor() {
@@ -110,6 +111,7 @@ const createWindow = async () => {
   });
 
   registerFileIpcHandlers();
+
   // Remove this if your app does not use auto updates
   // eslint-disable-next-line
   new AppUpdater();
@@ -130,6 +132,8 @@ app.on('window-all-closed', () => {
 app
   .whenReady()
   .then(() => {
+    const pythonManager = new PythonSubprocessManager('src/main.py');
+    pythonManager.start();
     createWindow();
     app.on('activate', () => {
       // On macOS it's common to re-create a window in the app when the

electron-ui/src/main/preload.ts

@@ -1,8 +1,7 @@
 // Disable no-unused-vars, broken for spread args
 /* eslint no-unused-vars: off */
 import { contextBridge, ipcRenderer, IpcRendererEvent } from 'electron';
-import FileChannels from '../ipc/audio/channels';
+import { LoadAudioBufferArgs } from '../ipc/audio/types';
-import { LoadAudioBufferArgs, ReadTextArgs } from '../ipc/audio/types';
 import AudioChannels from '../ipc/audio/channels';
 // import '../ipc/file/preload'; // Import file API preload to ensure it runs and exposes the API
 
@@ -41,10 +40,8 @@ const audioHandler = {
       filePath,
     } satisfies LoadAudioBufferArgs),
 
-  readText: (filePath: string) =>
+  getPort: () => ipcRenderer.invoke(AudioChannels.GET_PORT),
-    ipcRenderer.invoke(AudioChannels.READ_TEXT, {
+  restartService: () => ipcRenderer.invoke(AudioChannels.RESTART_SERVICE),
-      filePath,
-    } satisfies ReadTextArgs),
 };
 
 contextBridge.exposeInMainWorld('audio', audioHandler);

electron-ui/src/main/service.ts

@@ -0,0 +1,79 @@
+import { spawn, ChildProcessWithoutNullStreams } from 'child_process';
+import path from 'path';
+
+export default class PythonSubprocessManager {
+  // eslint-disable-next-line no-use-before-define
+  public static instance: PythonSubprocessManager | null = null;
+
+  private process: ChildProcessWithoutNullStreams | null = null;
+
+  private scriptPath: string;
+
+  private working_dir: string = path.join(
+    __dirname,
+    '..',
+    '..',
+    '..',
+    'audio-service',
+  );
+
+  public portNumber: number | null = null;
+
+  constructor(scriptPath: string) {
+    this.scriptPath = scriptPath;
+    PythonSubprocessManager.instance = this;
+  }
+
+  start(args: string[] = []): void {
+    if (this.process) {
+      throw new Error('Process already running.');
+    }
+    console.log(`Using Python working directory at: ${this.working_dir}`);
+    console.log(`Starting Python subprocess with script: ${this.scriptPath}`);
+    this.process = spawn(
+      'venv/Scripts/python.exe',
+      [this.scriptPath, ...args],
+      {
+        cwd: this.working_dir,
+        detached: false,
+        stdio: 'pipe',
+      },
+    );
+    this.process.stdout.on('data', (data: Buffer) => {
+      // console.log(`Python stdout: ${data.toString()}`);
+    });
+    this.process.stderr.on('data', (data: Buffer) => {
+      // console.error(`Python stderr: ${data.toString()}`);
+      const lines = data.toString().split('\n');
+      // eslint-disable-next-line no-restricted-syntax
+      for (const line of lines) {
+        const match = line.match(/Running on .*:(\d+)/);
+        if (match) {
+          const port = parseInt(match[1], 10);
+          console.log(`Detected port: ${port}`);
+          this.portNumber = port;
+        }
+      }
+    });
+    this.process.on('exit', () => {
+      console.log('Python subprocess exited.');
+      this.process = null;
+    });
+  }
+
+  stop(): void {
+    if (this.process) {
+      this.process.kill();
+      this.process = null;
+    }
+  }
+
+  restart(args: string[] = []): void {
+    this.stop();
+    this.start(args);
+  }
+
+  isHealthy(): boolean {
+    return !!this.process && !this.process.killed;
+  }
+}

electron-ui/src/renderer/App.tsx

@@ -2,6 +2,8 @@ import { MemoryRouter as Router, Routes, Route } from 'react-router-dom';
 import { useEffect, useState } from 'react';
 import { Provider } from 'react-redux';
 import Dialog from '@mui/material/Dialog';
+
+import { ThemeProvider, createTheme } from '@mui/material/styles';
 import DialogTitle from '@mui/material/DialogTitle';
 import DialogContent from '@mui/material/DialogContent';
 import DialogActions from '@mui/material/DialogActions';
@@ -10,6 +12,9 @@ import './App.css';
 import ClipList from './components/ClipList';
 import { useAppDispatch, useAppSelector } from './hooks';
 import { store } from '../redux/main';
+import { useNavigate } from 'react-router-dom';
+import SettingsPage from './Settings';
+import apiFetch from './api';
 
 function MainPage() {
   const dispatch = useAppDispatch();
@@ -21,11 +26,12 @@ function MainPage() {
   );
   const [newCollectionOpen, setNewCollectionOpen] = useState(false);
   const [newCollectionName, setNewCollectionName] = useState<string>('');
+  const navigate = useNavigate();
 
   useEffect(() => {
     const fetchMetadata = async () => {
       try {
-        const response = await fetch('http://localhost:5010/meta');
+        const response = await apiFetch('meta');
         const data = await response.json();
         dispatch({ type: 'metadata/setAllData', payload: data });
       } catch (error) {
@@ -137,6 +143,22 @@ function MainPage() {
             </li>
           ))}
         </ul>
+        {/* Settings Button at Bottom Left */}
+        <div className="mt-auto mb-2">
+          <button
+            type="button"
+            className="w-full rounded px-4 py-2 bg-neutral-800 text-offwhite hover:bg-plumDark text-left"
+            style={{
+              position: 'absolute',
+              bottom: 16,
+              left: 8,
+              width: 'calc(100% - 16px)',
+            }}
+            onClick={() => navigate('/settings')}
+          >
+            ⚙️ Settings
+          </button>
+        </div>
       </nav>
       {/* Main Content */}
       <div
@@ -150,13 +172,39 @@ function MainPage() {
 }
 
 export default function App() {
+  const theme = createTheme({
+    colorSchemes: {
+      light: false,
+      dark: {
+        palette: {
+          primary: {
+            main: '#6e44ba', // plum
+            dark: '#6e44ba', // plum
+            contrastText: '#ffffff',
+          },
+          secondary: {
+            main: '#4f3186', // plumDark
+            dark: '#4f3186', // plumDark
+            contrastText: '#ffffff',
+          },
+        },
+      },
+    },
+    // colorSchemes: {
+    //   light: false,
+    //   dark: true,
+    // },
+  });
   return (
     <Provider store={store}>
+      <ThemeProvider theme={theme}>
         <Router>
           <Routes>
             <Route path="/" element={<MainPage />} />
+            <Route path="/settings" element={<SettingsPage />} />
           </Routes>
         </Router>
+      </ThemeProvider>
     </Provider>
   );
 }

electron-ui/src/renderer/Settings.tsx

@@ -0,0 +1,274 @@
+import React, { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+import './App.css';
+import TextField from '@mui/material/TextField';
+import Select from '@mui/material/Select';
+import MenuItem from '@mui/material/MenuItem';
+import apiFetch from './api';
+
+type AudioDevice = {
+  index: number;
+  name: string;
+  default_sample_rate: number;
+  channels: number;
+};
+
+type Settings = {
+  http_port: number;
+  input_device: AudioDevice;
+  output_device: AudioDevice;
+  recording_length: number;
+  save_path: string;
+};
+
+const defaultSettings: Settings = {
+  http_port: 0,
+  input_device: { index: 0, name: '', default_sample_rate: 0, channels: 0 },
+  output_device: { index: 0, name: '', default_sample_rate: 0, channels: 0 },
+  recording_length: 0,
+  save_path: '',
+};
+
+async function fetchAudioDevices(
+  type: 'input' | 'output',
+): Promise<AudioDevice[]> {
+  // Replace with actual backend call
+  // Example: return window.api.getAudioDevices();
+  return apiFetch(`device/list?device_type=${type}`)
+    .then((res) => res.json())
+    .then((data) => data.devices as AudioDevice[])
+    .catch((error) => {
+      console.error('Error fetching audio devices:', error);
+      return [];
+    });
+}
+
+async function fetchSettings(): Promise<Settings> {
+  // Replace with actual backend call
+  // Example: return window.api.getAudioDevices();
+  console.log('Fetching settings from backend...');
+  return apiFetch('settings')
+    .then((res) => res.json())
+    .then((data) => data.settings as Settings)
+    .catch((error) => {
+      console.error('Error fetching settings:', error);
+      return defaultSettings;
+    });
+}
+
+const sendSettingsToBackend = async (settings: Settings) => {
+  // Replace with actual backend call
+  // Example: window.api.updateSettings(settings);
+  console.log('Settings updated:', settings);
+  await apiFetch('settings/update', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ settings }),
+  })
+    .then((res) => res.json())
+    .then((data) => {
+      console.log('Settings update response:', data);
+      if (data.status === 'success') {
+        window.audio.restartService();
+      }
+      return data;
+    })
+    .catch((error) => {
+      console.error('Error updating settings:', error);
+    });
+};
+
+export default function SettingsPage() {
+  const [settings, setSettings] = useState<Settings>(defaultSettings);
+  const [inputDevices, setInputDevices] = useState<AudioDevice[]>([]);
+  const [outputDevices, setOutputDevices] = useState<AudioDevice[]>([]);
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    fetchSettings()
+      .then((fetchedSettings) => {
+        console.log('Fetched settings:', fetchedSettings);
+        setSettings(fetchedSettings);
+        return null;
+      })
+      .then(() => {
+        return fetchAudioDevices('input');
+      })
+      .then((devices) => {
+        setInputDevices(devices);
+        // console.log('Input devices:', devices);
+        return fetchAudioDevices('output');
+      })
+      .then((devices) => {
+        setOutputDevices(devices);
+
+        // console.log('Output devices:', devices);
+        return devices;
+      })
+      .catch((error) => {
+        console.error('Error fetching audio devices:', error);
+      });
+  }, []);
+
+  useEffect(() => {}, [settings]);
+
+  const handleChange = () => {
+    sendSettingsToBackend(settings);
+    // const { name, value } = e.target;
+    // setSettings((prev) => ({
+    //   ...prev,
+    //   [name]: value,
+    // }));
+  };
+
+  const handleFolderChange = async () => {
+    // Replace with actual folder picker
+    // Example: const folder = await window.api.selectFolder();
+    // const folder = window.prompt(
+    //   'Enter output folder path:',
+    //   settings.outputFolder,
+    // );
+    // if (folder !== null) {
+    //   setSettings((prev) => ({
+    //     ...prev,
+    //     outputFolder: folder,
+    //   }));
+    // }
+  };
+
+  return (
+    <div className="min-w-screen min-h-screen bg-midnight text-offwhite flex items-center justify-center relative">
+      <div className="w-3/4 min-w-[600px] max-w-[800px] self-start flex flex-col font-sans bg-midnight text-offwhite p-6 rounded-lg relative">
+        {/* X Close Button */}
+        <button
+          type="button"
+          className="absolute top-6 right-6 text-3xl font-bold text-offwhite bg-transparent hover:text-plumDark"
+          aria-label="Close settings"
+          onClick={() => navigate('/')}
+        >
+          ×
+        </button>
+        <span className="text-2xl font-bold mb-4">Settings</span>
+        <div className="mb-4 flex justify-between">
+          <span>HTTP Port:</span>
+          <TextField
+            variant="standard"
+            type="text"
+            name="httpPort"
+            value={settings.http_port}
+            onBlur={() => handleChange()}
+            onChange={(e) => {
+              if (!Number.isNaN(Number(e.target.value))) {
+                setSettings((prev) => ({
+                  ...prev,
+                  http_port: Number(e.target.value),
+                }));
+              }
+            }}
+            className="ml-2 text-white w-[150px]"
+          />
+        </div>
+        <div className="mb-4 flex justify-between">
+          <span>Input Audio Device:</span>
+          <Select
+            variant="standard"
+            name="inputDevice"
+            value={settings.input_device.index}
+            onChange={(e) => {
+              const newDevice = inputDevices.find(
+                (dev) => dev.index === Number(e.target.value),
+              );
+              console.log('Selected input device index:', newDevice);
+              if (newDevice) {
+                setSettings((prev) => ({
+                  ...prev,
+                  input_device: newDevice,
+                }));
+                sendSettingsToBackend({
+                  ...settings,
+                  input_device: newDevice,
+                });
+              }
+            }}
+            className="ml-2 w-64"
+          >
+            {inputDevices.map((dev) => (
+              <MenuItem key={dev.index} value={dev.index}>
+                {dev.name}
+              </MenuItem>
+            ))}
+          </Select>
+        </div>
+        <div className="mb-4 flex justify-between">
+          <span>Output Audio Device:</span>
+          <Select
+            variant="standard"
+            name="outputDevice"
+            value={settings.output_device.index}
+            onChange={(e) => {
+              const newDevice = outputDevices.find(
+                (dev) => dev.index === Number(e.target.value),
+              );
+              if (newDevice) {
+                setSettings((prev) => ({
+                  ...prev,
+                  output_device: newDevice,
+                }));
+                sendSettingsToBackend({
+                  ...settings,
+                  output_device: newDevice,
+                });
+              }
+            }}
+            className="ml-2 w-64"
+          >
+            {outputDevices.map((dev) => (
+              <MenuItem key={dev.index} value={dev.index}>
+                {dev.name}
+              </MenuItem>
+            ))}
+          </Select>
+        </div>
+        <div className="mb-4 flex justify-between">
+          <span>Recording Length (seconds):</span>
+          <TextField
+            variant="standard"
+            type="text"
+            name="recordingLength"
+            value={settings.recording_length}
+            onChange={(e) => {
+              if (!Number.isNaN(Number(e.target.value))) {
+                setSettings((prev) => ({
+                  ...prev,
+                  recording_length: Number(e.target.value),
+                }));
+              }
+            }}
+            onBlur={() => handleChange()}
+            className="ml-2 w-[150px]"
+          />
+        </div>
+        <div className="mb-4 flex justify-between">
+          <span>Clip Output Folder:</span>
+          <div className="flex justify-end">
+            <TextField
+              variant="standard"
+              type="text"
+              name="savePath"
+              value={settings.save_path}
+              className="ml-2 w-[300px]"
+            />
+            <button
+              type="button"
+              onClick={handleFolderChange}
+              className="ml-2 px-3 py-1 rounded bg-plumDark text-offwhite hover:bg-plum"
+            >
+              ...
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

electron-ui/src/renderer/api.ts

@@ -0,0 +1,13 @@
+const getBaseUrl = async () => {
+  const port = await window.audio.getPort();
+  if (port.error || !port.port) {
+    return `http://localhost:5010`;
+  }
+  // You can store the base URL in localStorage, a config file, or state
+  return `http://localhost:${port.port}`;
+};
+
+export default async function apiFetch(endpoint: string, options = {}) {
+  const url = `${await getBaseUrl()}/${endpoint}`;
+  return fetch(url, options);
+}

electron-ui/src/renderer/components/AudioTrimer.tsx

@@ -9,6 +9,9 @@ import Dialog from '@mui/material/Dialog';
 import DialogTitle from '@mui/material/DialogTitle';
 import DialogContent from '@mui/material/DialogContent';
 import DialogActions from '@mui/material/DialogActions';
+import Slider from '@mui/material/Slider';
+import ToggleButton from '@mui/material/ToggleButton';
+import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
 import { useWavesurfer } from '@wavesurfer/react';
 import RegionsPlugin from 'wavesurfer.js/dist/plugins/regions.esm.js';
 import ZoomPlugin from 'wavesurfer.js/dist/plugins/zoom.esm.js';
@@ -19,8 +22,10 @@ import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward';
 import DeleteIcon from '@mui/icons-material/Delete';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { ClipMetadata } from '../../redux/types';
+import { ClipMetadata, PlaybackType } from '../../redux/types';
 import { useAppSelector } from '../hooks';
+import PlayStopIcon from './playStopIcon';
+import PlayOverlapIcon from './playOverlapIcon';
 
 export interface AudioTrimmerProps {
   metadata: ClipMetadata;
@@ -43,6 +48,7 @@ export default function AudioTrimmer({
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [dropdownOpen, setDropdownOpen] = useState(false);
   const [nameInput, setNameInput] = useState<string>(metadata.name);
+  const [volumeInput, setVolumeInput] = useState<number>(metadata.volume ?? 1);
   const collectionNames = useAppSelector((state) =>
     state.collections.map((col) => col.name),
   );
@@ -223,6 +229,7 @@ export default function AudioTrimmer({
     } else {
       const allRegions = (plugins[0] as RegionsPlugin).getRegions();
       if (allRegions.length > 0) {
+        wavesurfer.setVolume(metadata.volume ?? 1);
         wavesurfer.play(allRegions[0].start, allRegions[0].end);
       } else {
         wavesurfer.play();
@@ -401,12 +408,74 @@ export default function AudioTrimmer({
         <div className="m-1 wavesurfer-scroll-container">
           <div ref={containerRef} className="wavesurfer-inner" />
         </div>
-        <div className="grid justify-items-stretch grid-cols-2 text-neutral-500">
+        <div className="flex justify-between mt-2">
-          <div className="m-1 flex justify-start">
+          <span className="w-1/5 flex-none text-sm text-neutral-500 self-center">
-            <text className="text-sm ">
             Clip: {formatTime(metadata.startTime ?? 0)} -{' '}
             {formatTime(metadata.endTime ?? 0)}
-            </text>
+          </span>
+          <div className="w-3/5 flex-1 flex justify-center items-center">
+            <Slider
+              value={volumeInput}
+              min={0}
+              max={1}
+              step={0.01}
+              onChange={(e, newValue) => setVolumeInput(newValue as number)}
+              onChangeCommitted={(e, newValue) => {
+                const newVolume = newValue as number;
+                console.log('Volume change:', newVolume);
+                if (onSave) onSave({ ...metadata, volume: newVolume });
+              }}
+              color="secondary"
+              className="p-0 m-0"
+            />
+            {/* <input
+              type="range"
+              min={0}
+              max={1}
+              step={0.01}
+              value={volumeInput}
+              onChange={(e) => {
+                const newVolume = parseFloat(e.target.value);
+                setVolumeInput(newVolume);
+              }}
+              onDragEnd={(e) => {
+                console.log('Volume change:');
+                // const newVolume = parseFloat(e.target.value);
+                // if (onSave) onSave({ ...metadata, volume: newVolume });
+              }}
+              className="mx-2 w-full accent-plum"
+              aria-label="Volume slider"
+            /> */}
+          </div>
+          <div className="w-1/5 flex justify-end text-sm text-neutral-500">
+            <ToggleButtonGroup value={metadata.playbackType}>
+              <ToggleButton
+                value="playStop"
+                color="primary"
+                onClick={() => {
+                  if (onSave)
+                    onSave({
+                      ...metadata,
+                      playbackType: PlaybackType.PlayStop,
+                    });
+                }}
+              >
+                <PlayStopIcon />
+              </ToggleButton>
+              <ToggleButton
+                value="playOverlap"
+                color="primary"
+                onClick={() => {
+                  if (onSave)
+                    onSave({
+                      ...metadata,
+                      playbackType: PlaybackType.PlayOverlap,
+                    });
+                }}
+              >
+                <PlayOverlapIcon />
+              </ToggleButton>
+            </ToggleButtonGroup>
           </div>
         </div>
       </div>

electron-ui/src/renderer/components/ClipList.tsx

@@ -15,6 +15,7 @@ import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
 import AudioTrimmer from './AudioTrimer';
 import { ClipMetadata } from '../../redux/types';
 import { useAppDispatch, useAppSelector } from '../hooks';
+import apiFetch from '../api';
 
 export interface ClipListProps {
   collection: string;
@@ -31,6 +32,33 @@ export default function ClipList({ collection }: ClipListProps) {
     useSensor(PointerSensor, { activationConstraint: { distance: 5 } }),
   );
 
+  const handleDrop = (event: React.DragEvent<HTMLDivElement>) => {
+    event.preventDefault();
+    console.log('Files dropped:', event.dataTransfer.files);
+    const files = Array.from(event.dataTransfer.files).filter((file) =>
+      file.type.startsWith('audio/'),
+    );
+    if (files.length > 0) {
+      const formData = new FormData();
+      files.forEach((file) => formData.append('files', file));
+
+      // todo send the file to the backend and add to the collection
+
+      // fetch('http://localhost:5010/file/upload', {
+      //   method: 'POST',
+      //   body: formData,
+      // })
+      //   .then((res) => res.json())
+      //   .catch((err) => console.error('Error uploading files:', err));
+      // Implement your onDrop logic here
+      // onDrop(files, selectedCollection);
+    }
+  };
+
+  const handleDragOver = (event: React.DragEvent<HTMLDivElement>) => {
+    event.preventDefault();
+  };
+
   async function handleDragEnd(event: any) {
     const { active, over } = event;
     if (active.id !== over?.id) {
@@ -50,9 +78,7 @@ export default function ClipList({ collection }: ClipListProps) {
         payload: { collection, newMetadata },
       });
       try {
-        const response = await fetch(
+        const response = await apiFetch('meta/collection/clips/reorder', {
-          'http://localhost:5010/meta/collection/clips/reorder',
-          {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
@@ -61,8 +87,7 @@ export default function ClipList({ collection }: ClipListProps) {
             name: collection,
             clips: newMetadata.clips,
           }),
-          },
+        });
-        );
         const data = await response.json();
         console.log('handle reorder return:', data.collections);
         dispatch({ type: 'metadata/setAllData', payload: data });
@@ -78,7 +103,7 @@ export default function ClipList({ collection }: ClipListProps) {
       type: 'metadata/deleteClip',
       payload: { collection, clip: meta },
     });
-    fetch('http://localhost:5010/meta/collection/clips/remove', {
+    apiFetch('meta/collection/clips/remove', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -99,7 +124,7 @@ export default function ClipList({ collection }: ClipListProps) {
       type: 'metadata/moveClip',
       payload: { sourceCollection: collection, targetCollection, clip: meta },
     });
-    fetch('http://localhost:5010/meta/collection/clips/move', {
+    apiFetch('meta/collection/clips/move', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -120,9 +145,7 @@ export default function ClipList({ collection }: ClipListProps) {
         type: 'metadata/editClip',
         payload: { collection, clip: meta },
       });
-      const response = await fetch(
+      const response = await apiFetch('meta/collection/clips/edit', {
-        'http://localhost:5010/meta/collection/clips/edit',
-        {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
@@ -131,8 +154,7 @@ export default function ClipList({ collection }: ClipListProps) {
           name: collection,
           clip: meta,
         }),
-        },
+      });
-      );
       await response.json();
       // console.log('handle clip save return:', data.collections);
       dispatch({
@@ -145,7 +167,11 @@ export default function ClipList({ collection }: ClipListProps) {
   }
 
   return (
-    <div className="min-h-full flex flex-col justify-start bg-midnight text-offwhite">
+    <div
+      className="min-h-full flex flex-col justify-start bg-midnight text-offwhite"
+      onDrop={handleDrop}
+      onDragOver={handleDragOver}
+    >
       <DndContext
         sensors={sensors}
         collisionDetection={closestCenter}

electron-ui/src/renderer/components/playOverlapIcon.tsx

@@ -0,0 +1,29 @@
+import React from 'react';
+
+export default function PlayOverlapIcon({
+  size = 24,
+  color = 'currentColor',
+}: {
+  size?: number;
+  color?: string;
+}) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      viewBox="0 0 32 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      {/* Filled play arrow */}
+      <polygon points="4,4 4,20 16,12" fill={color} />
+      {/* Outlined play arrow (underneath and to the right) */}
+      <polygon
+        points="12,4 12,20 24,12"
+        fill="none"
+        stroke={color}
+        strokeWidth={1}
+      />
+    </svg>
+  );
+}

electron-ui/src/renderer/components/playStopIcon.tsx

@@ -0,0 +1,23 @@
+export default function PlayStopIcon({
+  size = 24,
+  color = 'currentColor',
+}: {
+  size?: number;
+  color?: string;
+}) {
+  return (
+    <svg
+      width={size}
+      height={size}
+      viewBox="0 0 48 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-label="Play/Stop Icon"
+    >
+      {/* Play Arrow */}
+      <polygon points="4,4 20,12 4,20" fill={color} />
+      {/* Stop Square */}
+      <rect x="28" y="4" width="16" height="16" rx="2" fill={color} />
+    </svg>
+  );
+}

electron-ui/src/renderer/preload.d.ts

@@ -1,10 +1,10 @@
-import { ElectronHandler, FileHandler } from '../main/preload';
+import { ElectronHandler, AudioHandler } from '../main/preload';
 
 declare global {
   // eslint-disable-next-line no-unused-vars
   interface Window {
     electron: ElectronHandler;
-    audio: FileHandler;
+    audio: AudioHandler;
   }
 }
 

stream_deck_plugin/.gitignore

@@ -5,3 +5,4 @@ ClipTrimDotNet/bin/
 ClipTrimDotNet/obj/
 ClipTrimDotNet/dist/
 ClipTrimDotNet/node_modules/
+.vs/

stream_deck_plugin/.vs/ClipTrimDotNet/v17/DocumentLayout.backup.json

@@ -1,96 +0,0 @@
-{
-  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\",
-  "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|c:\\users\\mickl\\desktop\\cliptrim-ui\\cliptrimapp\\stream_deck_plugin\\cliptrimdotnet\\client\\cliptrimclient.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|solutionrelative:cliptrimdotnet\\client\\cliptrimclient.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|c:\\users\\mickl\\desktop\\cliptrim-ui\\cliptrimapp\\stream_deck_plugin\\cliptrimdotnet\\player.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|solutionrelative:cliptrimdotnet\\player.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|c:\\users\\mickl\\desktop\\cliptrim-ui\\cliptrimapp\\stream_deck_plugin\\cliptrimdotnet\\profileswitcher.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|solutionrelative:cliptrimdotnet\\profileswitcher.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|c:\\users\\mickl\\desktop\\cliptrim-ui\\cliptrimapp\\stream_deck_plugin\\cliptrimdotnet\\client\\collectionmetadata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|solutionrelative:cliptrimdotnet\\client\\collectionmetadata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    }
-  ],
-  "DocumentGroupContainers": [
-    {
-      "Orientation": 0,
-      "VerticalTabListWidth": 256,
-      "DocumentGroups": [
-        {
-          "DockedWidth": 297,
-          "SelectedChildIndex": 2,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{57d563b6-44a5-47df-85be-f4199ad6b651}"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "ProfileSwitcher.cs",
-              "DocumentMoniker": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\ProfileSwitcher.cs",
-              "RelativeDocumentMoniker": "ClipTrimDotNet\\ProfileSwitcher.cs",
-              "ToolTip": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\ProfileSwitcher.cs",
-              "RelativeToolTip": "ClipTrimDotNet\\ProfileSwitcher.cs",
-              "ViewState": "AgIAAFkAAAAAAAAAAAAlwG8AAABKAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2026-02-21T15:06:24.045Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "ClipTrimClient.cs",
-              "DocumentMoniker": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Client\\ClipTrimClient.cs",
-              "RelativeDocumentMoniker": "ClipTrimDotNet\\Client\\ClipTrimClient.cs",
-              "ToolTip": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Client\\ClipTrimClient.cs",
-              "RelativeToolTip": "ClipTrimDotNet\\Client\\ClipTrimClient.cs",
-              "ViewState": "AgIAAEgAAAAAAAAAAAAuwGMAAAAJAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2026-02-21T15:03:49.814Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "CollectionMetaData.cs",
-              "DocumentMoniker": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Client\\CollectionMetaData.cs",
-              "RelativeDocumentMoniker": "ClipTrimDotNet\\Client\\CollectionMetaData.cs",
-              "ToolTip": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Client\\CollectionMetaData.cs",
-              "RelativeToolTip": "ClipTrimDotNet\\Client\\CollectionMetaData.cs",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2026-02-21T15:03:47.862Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "Player.cs",
-              "DocumentMoniker": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Player.cs",
-              "RelativeDocumentMoniker": "ClipTrimDotNet\\Player.cs",
-              "ToolTip": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Player.cs*",
-              "RelativeToolTip": "ClipTrimDotNet\\Player.cs*",
-              "ViewState": "AgIAAHIAAAAAAAAAAAA3wIYAAABMAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2026-02-21T15:00:23.762Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

stream_deck_plugin/.vs/ClipTrimDotNet/v17/DocumentLayout.json

@@ -1,113 +0,0 @@
-{
-  "Version": 1,
-  "WorkspaceRootPath": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\",
-  "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|c:\\users\\mickl\\desktop\\cliptrim-ui\\cliptrimapp\\stream_deck_plugin\\cliptrimdotnet\\wavplayer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|solutionrelative:cliptrimdotnet\\wavplayer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|c:\\users\\mickl\\desktop\\cliptrim-ui\\cliptrimapp\\stream_deck_plugin\\cliptrimdotnet\\player.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|solutionrelative:cliptrimdotnet\\player.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|c:\\users\\mickl\\desktop\\cliptrim-ui\\cliptrimapp\\stream_deck_plugin\\cliptrimdotnet\\profileswitcher.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|solutionrelative:cliptrimdotnet\\profileswitcher.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|c:\\users\\mickl\\desktop\\cliptrim-ui\\cliptrimapp\\stream_deck_plugin\\cliptrimdotnet\\client\\cliptrimclient.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|solutionrelative:cliptrimdotnet\\client\\cliptrimclient.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|c:\\users\\mickl\\desktop\\cliptrim-ui\\cliptrimapp\\stream_deck_plugin\\cliptrimdotnet\\client\\collectionmetadata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{4635D874-69C0-4010-BE46-77EF92EB1553}|ClipTrimDotNet\\ClipTrimDotNet.csproj|solutionrelative:cliptrimdotnet\\client\\collectionmetadata.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    }
-  ],
-  "DocumentGroupContainers": [
-    {
-      "Orientation": 0,
-      "VerticalTabListWidth": 256,
-      "DocumentGroups": [
-        {
-          "DockedWidth": 297,
-          "SelectedChildIndex": 1,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{57d563b6-44a5-47df-85be-f4199ad6b651}"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "WavPlayer.cs",
-              "DocumentMoniker": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\WavPlayer.cs",
-              "RelativeDocumentMoniker": "ClipTrimDotNet\\WavPlayer.cs",
-              "ToolTip": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\WavPlayer.cs",
-              "RelativeToolTip": "ClipTrimDotNet\\WavPlayer.cs",
-              "ViewState": "AgIAALYAAAAAAAAAAAAAALsAAAANAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2026-02-21T15:16:26.477Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "ProfileSwitcher.cs",
-              "DocumentMoniker": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\ProfileSwitcher.cs",
-              "RelativeDocumentMoniker": "ClipTrimDotNet\\ProfileSwitcher.cs",
-              "ToolTip": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\ProfileSwitcher.cs",
-              "RelativeToolTip": "ClipTrimDotNet\\ProfileSwitcher.cs",
-              "ViewState": "AgIAAG8AAAAAAAAAAAAWwG8AAABKAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2026-02-21T15:06:24.045Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "ClipTrimClient.cs",
-              "DocumentMoniker": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Client\\ClipTrimClient.cs",
-              "RelativeDocumentMoniker": "ClipTrimDotNet\\Client\\ClipTrimClient.cs",
-              "ToolTip": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Client\\ClipTrimClient.cs",
-              "RelativeToolTip": "ClipTrimDotNet\\Client\\ClipTrimClient.cs",
-              "ViewState": "AgIAAEgAAAAAAAAAAAAuwGIAAAApAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2026-02-21T15:03:49.814Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 4,
-              "Title": "CollectionMetaData.cs",
-              "DocumentMoniker": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Client\\CollectionMetaData.cs",
-              "RelativeDocumentMoniker": "ClipTrimDotNet\\Client\\CollectionMetaData.cs",
-              "ToolTip": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Client\\CollectionMetaData.cs",
-              "RelativeToolTip": "ClipTrimDotNet\\Client\\CollectionMetaData.cs",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2026-02-21T15:03:47.862Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "Player.cs",
-              "DocumentMoniker": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Player.cs",
-              "RelativeDocumentMoniker": "ClipTrimDotNet\\Player.cs",
-              "ToolTip": "C:\\Users\\mickl\\Desktop\\cliptrim-ui\\ClipTrimApp\\stream_deck_plugin\\ClipTrimDotNet\\Player.cs",
-              "RelativeToolTip": "ClipTrimDotNet\\Player.cs",
-              "ViewState": "AgIAAHoAAAAAAAAAAAAswIwAAAAbAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2026-02-21T15:00:23.762Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

stream_deck_plugin/ClipTrimDotNet/App.config

@@ -1,21 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="CommandLine" publicKeyToken="5a870481e358d379" culture="neutral"/>
+        <assemblyIdentity name="CommandLine" publicKeyToken="5a870481e358d379" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.2" newVersion="10.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.2" newVersion="10.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.2" newVersion="10.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.2" newVersion="10.0.0.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.2" newVersion="10.0.0.2" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

stream_deck_plugin/ClipTrimDotNet/Client/ClipMetadata.cs

@@ -1,10 +1,13 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 using Newtonsoft.Json.Converters;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Text.Json.Serialization;
 
 namespace ClipTrimDotNet.Client
 {
@@ -16,27 +19,35 @@ namespace ClipTrimDotNet.Client
     public class ClipMetadata
     {
         [JsonProperty(PropertyName = "filename")]
+        [JsonPropertyName("filename")]
+
         public string Filename { get; set; }
 
 
         [JsonProperty(PropertyName = "name")]
+        [JsonPropertyName("name")]
         public string Name { get; set; }
 
 
         [JsonProperty(PropertyName = "volume")]
+        [JsonPropertyName("volume")]
         public double Volume { get; set; } = 1.0;
 
 
         [JsonProperty(PropertyName = "startTime")]
+        [JsonPropertyName("startTime")]
         public double StartTime { get; set; } = 0.0;
 
 
         [JsonProperty(PropertyName = "endTime")]
+        [JsonPropertyName("endTime")]
         public double EndTime { get; set; } = 0.0;
 
 
         [JsonProperty(PropertyName = "playbackType")]
-        [JsonConverter(typeof(StringEnumConverter))]
+        [Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))]
+        [System.Text.Json.Serialization.JsonConverter(typeof(JsonStringEnumConverter))]
+        [JsonPropertyName("playbackType")]
         public PlaybackType PlaybackType { get; set; } = PlaybackType.playStop;
     }
 }

stream_deck_plugin/ClipTrimDotNet/Client/ClipTrimClient.cs

@@ -1,10 +1,16 @@
-using System;
+using BarRaider.SdTools;
+using ClipTrimDotNet.Keys;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Newtonsoft.Json;
+using SocketIOClient;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace ClipTrimDotNet.Client
 {
@@ -23,88 +29,209 @@ namespace ClipTrimDotNet.Client
             }
         }
 
-        private HttpClient httpClient;
+        //private HttpClient httpClient;
+        private SocketIO socket;
+
+        public int PortNumber { get; set; } = 5010;
 
         public ClipTrimClient()
         {
-            httpClient = new HttpClient()
+            //httpClient = new HttpClient()
+            //{
+            //    BaseAddress = new Uri("http://localhost:5010/"),
+            //    Timeout = TimeSpan.FromSeconds(10)
+            //};
+            Logger.Instance.LogMessage(TracingLevel.INFO, $"Starting ClipTrimClient on port {PortNumber}");
+            socket = new SocketIO(new Uri($"http://localhost:5010/"));
+            socket.Options.AutoUpgrade = false;
+            socket.Options.ConnectionTimeout = TimeSpan.FromSeconds(10);
+            socket.Options.Reconnection = true;
+            socket.On("full_data", ctx =>
             {
-                BaseAddress = new Uri("http://localhost:5010/"),
+                try
-                Timeout = TimeSpan.FromSeconds(10)
+                {
-            };
+                    var response = ctx.GetValue<List<CollectionMetaData>>(0);
-            Task.Run(ShortPoll);
+                    Logger.Instance.LogMessage(TracingLevel.INFO, $"full_data event {JsonConvert.SerializeObject(response)}");
+                    Collections = response!;
+                    //Logger.Instance.LogMessage(TracingLevel.INFO, $"Collections {JsonConvert.SerializeObject(Collections)}");
+                }
+                catch (Exception ex)
+                {
+                    Logger.Instance.LogMessage(TracingLevel.INFO, $"full_data error {ex.ToString()}");
+                }
+                return Task.CompletedTask;
+            });
+            socket.On("collection_updated", ctx =>
+            {
+                try
+                {
+                    var response = ctx.GetValue<CollectionMetaData>(0)!;
+                    Logger.Instance.LogMessage(TracingLevel.INFO, $"collection_updated event {JsonConvert.SerializeObject(response)}");
+                    int index = Collections.FindIndex(x => x.Id == response.Id);
+                    if (index != -1)
+                    {
+                        Collections[index] = response;
+                    }
+                }
+                catch
+                {
+
                 }
 
-        public async Task ShortPoll()
+                return Task.CompletedTask;
-        {
+            });
-           while (true)
-            {  
-                await GetMetadata();
-                await Task.Delay(TimeSpan.FromSeconds(5)); await Task.Delay(TimeSpan.FromSeconds(5));
 
+            socket.OnDisconnected += (sender, e) =>
+            {
+                Logger.Instance.LogMessage(TracingLevel.INFO, $"Socket disconnected: {e}");
+                Task.Run(async () => await Connect());
+            };
+            Task.Run(async () => await Connect());
+        }
+
+        public async Task Connect()
+        {
+            while (!socket.Connected)
+            {
+                try
+                {
+                    await socket.ConnectAsync();
+                }
+                catch
+                {
+
+                }
             }
         }
 
         public List<CollectionMetaData> Collections { get; private set; } = new List<CollectionMetaData>();
-        public CollectionMetaData? SelectedCollection { get; private set; }
+        public int SelectedCollection { get; private set; } = -1;
-        public int PageIndex { get; private set; } = 0;
+
-        private async Task GetMetadata()
+        public Dictionary<int, int> CollectionIndexes { get; private set; } = new();
+        public int PageIndex
         {
-            try
+            get
             {
-                var response = await httpClient.GetAsync("meta");
+                if (SelectedCollection == -1) return 0;
-                if (response.IsSuccessStatusCode)
+                if (!CollectionIndexes.ContainsKey(SelectedCollection))
                 {
-                    var json = await response.Content.ReadAsStringAsync();
+                    CollectionIndexes[SelectedCollection] = 0;
-                    dynamic collections = JsonConvert.DeserializeObject(json);
+                }
-                    collections = collections.collections;
+                return CollectionIndexes[SelectedCollection];
-                    Collections = JsonConvert.DeserializeObject<List<CollectionMetaData>>(collections.ToString());
+            }
+            set
+            {
+                if (SelectedCollection == -1) return;
+                CollectionIndexes[SelectedCollection] = value;
             }
         }
-            catch (Exception ex)
+        public bool PageMode { get; set; } = false;
+
+        public int PageCount
         {
-                //Logger.Instance.LogMessage(TracingLevel.INFO, $"Error pinging ClipTrim API: {ex.Message}");
+            get
-                return;
+            {
+                if (SelectedCollection == -1) return 0;
+                var collection = Collections[SelectedCollection];
+                return (collection.Clips.Count - 1) / 10 + 1;
+            }
+        }
+        public bool CanPageUp
+        {
+            get
+            {
+                if(PageMode) return false;
+                if (SelectedCollection == -1) return false;
+                return PageCount - PageIndex > 1;
+            }
         }
 
+        public bool CanPageDown
+        {
+            get
+            {
+                if (PageMode) return false;
+                return PageIndex > 0;
+            }
         }
 
+        public void PageDown()
+        {
+            if (CanPageDown)
+            {
+                PageIndex--;
+            }
+        }
+
+        public void PageUp()
+        {
+            if (CanPageUp)
+            {
+                PageIndex++;
+            }
+        }
         public List<string> GetCollectionNames()
         {
             //await GetMetadata();
-            return Collections.Select(x => x.Name).ToList();
+            return Collections.Where(x => x.Name != "Uncategorized").Select(x => x.Name).ToList();
         }
 
-        public void SetSelectedCollectionByName(string name)
+        public string GetPlayerStringByCoordinateIndex(int index)
         {
-            var collection = Collections.FirstOrDefault(x => x.Name == name);
+            if (PageMode)
-            if (collection != null)
             {
-                SelectedCollection = collection;
+                int pageNumber = index + 1;
-                PageIndex = 0;
+                if(pageNumber <= PageCount)
+                {
+                    return pageNumber.ToString();
+                }
+                return "";
+            }
+            else
+            {
+                var collection = GetClipByPagedIndex(index);
+                return collection?.Name ?? "";
             }
         }
 
+
+
         public ClipMetadata? GetClipByPagedIndex(int index)
         {
-            if (SelectedCollection == null) return null;
+            SelectedCollection = Collections.FindIndex(x => x.Name == GlobalSettings.Instance.ProfileName);
+            if (SelectedCollection == -1) return null;
             int clipIndex = PageIndex * 10 + index;
-            if (clipIndex >= 0 && clipIndex < SelectedCollection.Clips.Count)
+            var collection = Collections[SelectedCollection];
+            if (clipIndex >= 0 && clipIndex < collection.Clips.Count)
             {
-                return SelectedCollection.Clips[clipIndex];
+                return collection.Clips[clipIndex];
             }
             return null;
         }
 
-        public async void PlayClip(ClipMetadata? metadata)
+        public async void PlayClip(int index)
         {
-           if (metadata == null) return;
+            if (PageMode)
-
-            var response = await httpClient.PostAsync("playback/start", new StringContent(JsonConvert.SerializeObject(metadata), Encoding.UTF8, "application/json"));
-            if (!response.IsSuccessStatusCode)
             {
-                //Logger.Instance.LogMessage(TracingLevel.INFO, $"Error playing clip: {response.ReasonPhrase}");
+                if(index < 0 || index >= PageCount) return;
+                PageIndex = index;
+                PageMode = false;
+                Player.TickAll();
+                PageNavigator.TickAll();
             }
+            else
+            {
+                var metadata = GetClipByPagedIndex(index);
+                if (metadata == null) return;
+                Logger.Instance.LogMessage(TracingLevel.INFO, $"playing clip:");
+                await socket.EmitAsync("play_clip", new List<object>() { metadata });
+            }
+                
+        }
+
+        public async void SaveClip()
+        {
+            await socket.EmitAsync("record_clip", new List<object>() { });
         }
     }
 }

stream_deck_plugin/ClipTrimDotNet/Client/CollectionMetaData.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace ClipTrimDotNet.Client
@@ -10,14 +11,17 @@ namespace ClipTrimDotNet.Client
     public class CollectionMetaData
     {
         [JsonProperty(PropertyName = "name")]
+        [JsonPropertyName("name")]
         public string Name { get; set; }
 
 
         [JsonProperty(PropertyName = "clips")]
+        [JsonPropertyName("clips")]
         public List<ClipMetadata> Clips { get; set; } = new List<ClipMetadata>();
 
 
         [JsonProperty(PropertyName = "id")]
+        [JsonPropertyName("id")]
         public int Id { get; set; }
     }
 }

stream_deck_plugin/ClipTrimDotNet/ClipTrimDotNet.csproj

@@ -1,122 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net8.0-windows</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+	<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <ProjectGuid>{4635D874-69C0-4010-BE46-77EF92EB1553}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>ClipTrimDotNet</RootNamespace>
+    <LangVersion>10</LangVersion>
-    <AssemblyName>ClipTrimDotNet</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>8</LangVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
     <Nullable>enable</Nullable>
-    <TargetFrameworkProfile />
+    <ImplicitUsings>enable</ImplicitUsings>
+    <PreBuildEvent>npm run stop</PreBuildEvent>
+    <PostBuildEvent>npm run start</PostBuildEvent>
+    <AssemblyTitle>ClipTrimDotNet</AssemblyTitle>
+    <Product>ClipTrimDotNet</Product>
+    <Copyright>Copyright ©  2020</Copyright>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\com.michal-courson.cliptrim.sdPlugin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
     <OutputPath>bin\Release\ClipTrimDotNet.sdPlugin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommandLine, Version=2.9.1.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-      <HintPath>..\packages\CommandLineParser.2.9.1\lib\net461\CommandLine.dll</HintPath>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    </Reference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
-    <Reference Include="Microsoft.Win32.Registry, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
-      <HintPath>..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.2" />
-    </Reference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
-    <Reference Include="NAudio, Version=2.2.1.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
+    <PackageReference Include="Microsoft.Extensions.Options" Version="10.0.2" />
-      <HintPath>..\packages\NAudio.2.2.1\lib\net472\NAudio.dll</HintPath>
+    <PackageReference Include="Microsoft.Extensions.Primitives" Version="10.0.2" />
-    </Reference>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-    <Reference Include="NAudio.Asio, Version=2.2.1.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
+    <PackageReference Include="NLog" Version="6.0.5" />
-      <HintPath>..\packages\NAudio.Asio.2.2.1\lib\netstandard2.0\NAudio.Asio.dll</HintPath>
+    <PackageReference Include="SocketIOClient" Version="4.0.0.2" />
-    </Reference>
+    <PackageReference Include="SocketIOClient.Common" Version="4.0.0" />
-    <Reference Include="NAudio.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
+    <PackageReference Include="SocketIOClient.Serializer" Version="4.0.0.1" />
-      <HintPath>..\packages\NAudio.Core.2.2.1\lib\netstandard2.0\NAudio.Core.dll</HintPath>
+    <PackageReference Include="SocketIOClient.Serializer.NewtonsoftJson" Version="4.0.0.1" />
-    </Reference>
+    <PackageReference Include="StreamDeck-Tools" Version="6.3.2" />
-    <Reference Include="NAudio.Midi, Version=2.2.1.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="10.0.2" />
-      <HintPath>..\packages\NAudio.Midi.2.2.1\lib\netstandard2.0\NAudio.Midi.dll</HintPath>
+    <PackageReference Include="System.Drawing.Common" Version="9.0.10" />
-    </Reference>
+    <PackageReference Include="System.IO.Pipelines" Version="10.0.2" />
-    <Reference Include="NAudio.Wasapi, Version=2.2.1.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
-      <HintPath>..\packages\NAudio.Wasapi.2.2.1\lib\netstandard2.0\NAudio.Wasapi.dll</HintPath>
+    <PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
-    </Reference>
+    <PackageReference Include="System.Text.Encodings.Web" Version="10.0.2" />
-    <Reference Include="NAudio.WinForms, Version=2.2.1.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
+    <PackageReference Include="System.Text.Json" Version="10.0.2" />
-      <HintPath>..\packages\NAudio.WinForms.2.2.1\lib\net472\NAudio.WinForms.dll</HintPath>
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.3" />
-    </Reference>
+    <PackageReference Include="CoreWCF.Primitives" Version="1.8.0" />
-    <Reference Include="NAudio.WinMM, Version=2.2.1.0, Culture=neutral, PublicKeyToken=e279aa5131008a41, processorArchitecture=MSIL">
+    <PackageReference Include="CoreWCF.ConfigurationManager" Version="1.8.0" />
-      <HintPath>..\packages\NAudio.WinMM.2.2.1\lib\netstandard2.0\NAudio.WinMM.dll</HintPath>
+    <PackageReference Include="CoreWCF.Http" Version="1.8.0" />
-    </Reference>
+    <PackageReference Include="CoreWCF.WebHttp" Version="1.8.0" />
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <PackageReference Include="CoreWCF.NetTcp" Version="1.8.0" />
-      <HintPath>..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=6.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.6.0.5\lib\net46\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="StreamDeckTools, Version=6.3.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\StreamDeck-Tools.6.3.2\lib\netstandard2.0\StreamDeckTools.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Drawing.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Drawing.Common.9.0.10\lib\net462\System.Drawing.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security.AccessControl, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Principal.Windows, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BaseTest.cs" />
+    <None Update="DialLayout.json">
-    <Compile Include="Client\ClipMetadata.cs" />
-    <Compile Include="Client\ClipTrimClient.cs" />
-    <Compile Include="Client\CollectionMetaData.cs" />
-    <Compile Include="GlobalSettings.cs" />
-    <Compile Include="Player.cs" />
-    <Compile Include="ProfileSwitcher.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WavPlayer.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="DialLayout.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="manifest.json">
+    <None Update="manifest.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="!!README!!.txt" />
@@ -152,11 +92,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>npm run stop</PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>npm run start</PostBuildEvent>
-  </PropertyGroup>
 </Project>

stream_deck_plugin/ClipTrimDotNet/GlobalSettings.cs

@@ -7,32 +7,9 @@ using System.Text;
 using System.Threading.Tasks;
 using BarRaider.SdTools.Wrappers;
 using Newtonsoft.Json.Linq;
-using NAudio.MediaFoundation;
 
 namespace ClipTrimDotNet
 {
-    public class FileEntry
-    {
-        public FileEntry()
-        {
-            Volume = 1.0;
-            Playtype = "Play/Overlap";
-        }
-        [JsonProperty(PropertyName = "Volume")]
-        public double Volume { get; set; }
-        [JsonProperty(PropertyName = "Playtype")]
-        public string Playtype { get; set; }
-    }
-    public class CollectionEntry
-    {
-        public CollectionEntry()
-        {
-            Files = new Dictionary<string, FileEntry>();
-        }
-        [JsonProperty(PropertyName = "Files")]
-        public Dictionary<string, FileEntry> Files { get; set; }
-    }
-
     public class GlobalSettings
     {
         public static GlobalSettings? _inst;
@@ -51,59 +28,18 @@ namespace ClipTrimDotNet
         public static GlobalSettings CreateDefaultSettings()
         {
             GlobalSettings instance = new GlobalSettings();
-            instance.BasePath = null;
             instance.ProfileName = null;
-            instance.Collections = new Dictionary<string, CollectionEntry>();
             return instance;
         }
 
 
-        [FilenameProperty]
-        [JsonProperty(PropertyName = "basePath")]
-        public string? BasePath { get; set; }
-
         [JsonProperty(PropertyName = "profileName")]
         public string? ProfileName { get; set; }
 
-        [JsonProperty(PropertyName = "outputDevice")]
-        public string? OutputDevice { get; set; }
-
-        [JsonProperty(PropertyName = "collections")]
-        public Dictionary<string, CollectionEntry> Collections { get; set; }
 
         public void SetCurrentProfile(string profile)
         {
             ProfileName = profile;
-            if(!Collections.ContainsKey(profile))
-            {
-                Collections.Add(profile, new CollectionEntry());
-            }
-        }
-
-        public FileEntry GetFileOptionsInCurrentProfile(string filename)
-        {
-            if(!Collections.TryGetValue(ProfileName, out CollectionEntry collection))
-            {
-                return new FileEntry();
-            }
-            if(!collection.Files.TryGetValue(filename, out FileEntry file))
-            {
-                return new FileEntry();
-            }
-            Logger.Instance.LogMessage(TracingLevel.INFO, "fetched file settings " + filename + JsonConvert.SerializeObject(file));
-            return file;
-        }
-
-        public void SetFileOptionsCurrentProfile(string filename, FileEntry file)
-        {
-            Logger.Instance.LogMessage(TracingLevel.INFO, "SetFileOptionsCurrentProfile ");
-            if (!Collections.TryGetValue(ProfileName, out CollectionEntry collection))
-            {
-                return;
-            }
-            Logger.Instance.LogMessage(TracingLevel.INFO, "SetFileOptionsCurrentProfile 2");
-            //collection.Files[filename] = file;
-            Collections[ProfileName].Files[filename] = file;
         }
     }
 }

stream_deck_plugin/ClipTrimDotNet/Keys/ClipSave.cs

@@ -0,0 +1,49 @@
+using BarRaider.SdTools;
+using ClipTrimDotNet.Client;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ClipTrimDotNet.Keys
+{
+    [PluginActionId("com.michal-courson.cliptrim.clip-save")]
+    public class ClipSave : KeypadBase
+    {
+        public ClipSave(SDConnection connection, InitialPayload payload) : base(connection, payload)
+        {
+            GlobalSettingsManager.Instance.RequestGlobalSettings();
+        }
+        public void Instance_OnReceivedGlobalSettings(object sender, ReceivedGlobalSettingsPayload e)
+        {
+            Tools.AutoPopulateSettings(GlobalSettings.Instance, e.Settings);
+        }
+        public override void Dispose()
+        {
+        }
+        public override void KeyPressed(KeyPayload payload)
+        {
+            ClipTrimClient.Instance.SaveClip();
+        }
+
+
+        public override void OnTick()
+        { 
+        }
+
+        public override void KeyReleased(KeyPayload payload)
+        {
+
+        }
+
+        public override void ReceivedSettings(ReceivedSettingsPayload payload)
+        {
+
+        }
+        public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload)
+        {
+            Tools.AutoPopulateSettings(GlobalSettings.Instance, payload.Settings);
+        }
+    }
+}

stream_deck_plugin/ClipTrimDotNet/Keys/PageNavigator.cs

@@ -0,0 +1,107 @@
+using BarRaider.SdTools;
+using ClipTrimDotNet.Client;
+using Microsoft.AspNetCore.Authentication;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ClipTrimDotNet.Keys
+{
+    [PluginActionId("com.michal-courson.cliptrim.page-navigator")]
+    public class PageNavigator : KeypadBase
+    {
+        static List<PageNavigator> instances = new();
+        private KeyCoordinates coordinates;
+        public PageNavigator(SDConnection connection, InitialPayload payload) : base(connection, payload)
+        {
+            coordinates = payload.Coordinates;
+            GlobalSettingsManager.Instance.RequestGlobalSettings();
+            instances.Add(this);
+            OnTick();
+        }
+        public void Instance_OnReceivedGlobalSettings(object sender, ReceivedGlobalSettingsPayload e)
+        {
+            Tools.AutoPopulateSettings(GlobalSettings.Instance, e.Settings);
+        }
+        public int GetIndex()
+        {
+            int index = Math.Min(Math.Max(coordinates.Column - 1, 0), 2);
+            return index;
+        }
+        public override void Dispose()
+        {
+        }
+        public override void KeyPressed(KeyPayload payload)
+        {
+            switch (GetIndex())
+            {
+                case 0:
+                    ClipTrimClient.Instance.PageDown();
+                    break;
+                case 1:
+                    ClipTrimClient.Instance.PageMode = !ClipTrimClient.Instance.PageMode;
+                    break;
+                case 2:
+                    ClipTrimClient.Instance.PageUp();
+                    break;
+            }
+            Player.TickAll();
+            TickAll();
+        }
+
+        public static void TickAll()
+        {
+            foreach (var instance in instances)
+            {
+                instance.OnTick();
+            }
+            instances.RemoveAll(i => i == null);
+        }   
+
+        private async void SetTitle()
+        {
+            switch (GetIndex())
+            {
+                case 0:
+                    await Connection.SetTitleAsync(ClipTrimClient.Instance.CanPageDown ? "<" : "");
+                    break;
+                case 1:
+                    await Connection.SetTitleAsync((ClipTrimClient.Instance.PageIndex + 1).ToString());
+                    break;
+                case 2:
+                    await Connection.SetTitleAsync(ClipTrimClient.Instance.CanPageUp ? ">" : "");
+                    break;
+            }
+        }
+
+        public override void OnTick()
+        {
+            SetTitle();
+        }
+
+        public override void KeyReleased(KeyPayload payload)
+        {
+
+        }
+
+        public override void ReceivedSettings(ReceivedSettingsPayload payload)
+        {
+
+        }
+        public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload)
+        {
+            Tools.AutoPopulateSettings(GlobalSettings.Instance, payload.Settings);
+            //if (payload.Settings == null || payload.Settings.Count == 0)
+            //{
+            //    var inst = GlobalSettings.Instance;
+            //    //GlobalSettingsManager.Instance.SetGlobalSettings(JObject.FromObject(inst));
+            //}
+            //else
+            //{ 
+            //    GlobalSettings.Instance = payload.Settings.ToObject<GlobalSettings>();
+            //}
+        }
+    }
+}

stream_deck_plugin/ClipTrimDotNet/Keys/Player.cs

@@ -0,0 +1,87 @@
+using BarRaider.SdTools;
+using BarRaider.SdTools.Wrappers;
+using ClipTrimDotNet.Client;
+using System.Text.Json.Serialization;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Dynamic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ClipTrimDotNet.Keys
+{
+    [PluginActionId("com.michal-courson.cliptrim.player")]
+    public class Player : KeypadBase
+    {
+
+        private int coordIndex;
+        private string? current_text = null;
+        private KeyCoordinates coordinates;
+
+        static List<Player> instances = new();
+
+        public Player(SDConnection connection, InitialPayload payload) : base(connection, payload)
+        {
+            coordinates = payload.Coordinates;
+            GlobalSettingsManager.Instance.RequestGlobalSettings();
+            instances.Add(this);
+            coordIndex = Math.Max((coordinates.Row - 1) * 5 + coordinates.Column, 0);
+            OnTick();
+        }
+
+        public static void TickAll()
+        {
+            Logger.Instance.LogMessage(TracingLevel.INFO, "Ticking all Player instances" + instances.Count);
+            foreach (var instance in instances)
+            {
+                instance.OnTick();
+            }
+            instances.RemoveAll(i => i == null);
+        }
+
+        private async void CheckFile()
+        {
+            var next_text = ClipTrimClient.Instance.GetPlayerStringByCoordinateIndex(coordIndex);
+            if(next_text != current_text)
+            {
+                current_text = next_text;
+                await Connection.SetTitleAsync($"{current_text ?? ""}");
+            }
+            current_text = next_text;
+        }
+
+        public override void Dispose()
+        {
+        }
+
+        public override void KeyPressed(KeyPayload payload)
+        {
+            ClipTrimClient.Instance.PlayClip(coordIndex);
+        }
+
+
+        public override void OnTick() {
+            CheckFile();
+        }
+
+
+        public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload) {
+            Tools.AutoPopulateSettings(GlobalSettings.Instance, payload.Settings);
+        }
+
+        public override void KeyReleased(KeyPayload payload)
+        {
+            
+        }
+
+        public override void ReceivedSettings(ReceivedSettingsPayload payload)
+        {
+
+        }
+
+    }
+}

stream_deck_plugin/ClipTrimDotNet/Keys/ProfileSwitcher.cs

@@ -0,0 +1,136 @@
+using BarRaider.SdTools;
+using BarRaider.SdTools.Wrappers;
+using ClipTrimDotNet.Client;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Dynamic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ClipTrimDotNet.Keys
+{
+    public class DataSourceItem
+    {
+        public string label { get; set; } = "";
+        public string value { get; set; } = "";
+    }
+    [PluginActionId("com.michal-courson.cliptrim.profile-switcher")]
+    public class ProfileSwitcher : KeypadBase
+    {
+        private class PluginSettings
+        {
+            public static PluginSettings CreateDefaultSettings()
+            {
+                PluginSettings instance = new PluginSettings();
+                instance.ProfileName = null;
+                return instance;
+            }
+
+            [JsonProperty(PropertyName = "profileName")]
+            public string? ProfileName { get; set; }
+        }
+
+        #region Private Members
+
+        private PluginSettings settings;
+
+        #endregion
+        public ProfileSwitcher(SDConnection connection, InitialPayload payload) : base(connection, payload)
+        {
+            if (payload.Settings == null || payload.Settings.Count == 0)
+            {
+                settings = PluginSettings.CreateDefaultSettings();
+                SaveSettings();
+            }
+            else
+            {
+                settings = payload.Settings.ToObject<PluginSettings>()!;
+            }
+            Logger.Instance.LogMessage(TracingLevel.INFO, $"ProfileSwitcher initialized with payload {JsonConvert.SerializeObject(payload)}");
+            GlobalSettingsManager.Instance.RequestGlobalSettings();
+            Connection.OnSendToPlugin += Connection_OnSendToPlugin;
+            SetTitle();
+        }
+
+        private async void SetTitle()
+        {
+
+            await Connection.SetTitleAsync(settings.ProfileName + " B");
+        }
+
+        private async void Connection_OnSendToPlugin(object? sender, SDEventReceivedEventArgs<BarRaider.SdTools.Events.SendToPlugin> e)
+        {
+            //Logger.Instance.LogMessage(TracingLevel.INFO, "get profiles");
+            if (e.Event.Payload["event"] is null) return;
+
+            if (e.Event.Payload["event"]!.ToString() == "getProfiles")
+            {
+                var files = ClipTrimClient.Instance.GetCollectionNames();
+                var items = files.Select(x => new DataSourceItem { label = x, value = x});
+                var obj = new JObject
+                {
+                    ["event"] = "getProfiles",
+                    ["items"] = JArray.FromObject(items)
+                };
+                await Connection.SendToPropertyInspectorAsync(obj);
+            }
+            
+        }
+
+
+        public override void Dispose()
+        {
+        }
+
+        public override async void KeyPressed(KeyPayload payload)
+        {
+            GlobalSettings.Instance.SetCurrentProfile(settings.ProfileName??"");
+
+            await Connection.SetGlobalSettingsAsync(JObject.FromObject(GlobalSettings.Instance));
+            await Connection.SwitchProfileAsync("ClipTrim");
+        }
+
+        public override void KeyReleased(KeyPayload payload)
+        {
+
+        }
+
+        public override void OnTick()
+        {
+            SetTitle();
+        }
+
+        public override void ReceivedSettings(ReceivedSettingsPayload payload)
+        {
+            Tools.AutoPopulateSettings(settings, payload.Settings);
+            SaveSettings();
+        }
+
+        public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload)
+        {
+            Tools.AutoPopulateSettings(GlobalSettings.Instance, payload.Settings);
+            //if (payload.Settings == null || payload.Settings.Count == 0)
+            //{
+            //    var inst = GlobalSettings.Instance;
+            //}
+            //else
+            //{
+            //    GlobalSettings.Instance = payload.Settings.ToObject<GlobalSettings>();
+            //}
+        }
+
+        #region Private Methods
+
+        private Task SaveSettings()
+        {
+            return Connection.SetSettingsAsync(JObject.FromObject(settings));
+        }
+
+        #endregion
+    }
+}

stream_deck_plugin/ClipTrimDotNet/Player.cs

@@ -1,193 +0,0 @@
-using BarRaider.SdTools;
-using BarRaider.SdTools.Wrappers;
-using ClipTrimDotNet.Client;
-using NAudio.CoreAudioApi.Interfaces;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Dynamic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ClipTrimDotNet
-{
-    [PluginActionId("com.michal-courson.cliptrim.player")]
-    public class Player : KeypadBase
-    {
-
-        private ClipMetadata? metadata;
-        private KeyCoordinates coordinates;
-        private class PluginSettings
-        {
-            public static PluginSettings CreateDefaultSettings()
-            {
-                PluginSettings instance = new PluginSettings();
-                instance.Path = null;
-                instance.PlayType = "Play/Overlap";
-                instance.Index = 0;
-                instance.Volume = 1;
-                return instance;
-            }
-
-            [FilenameProperty]
-            [JsonProperty(PropertyName = "path")]
-            public string? Path { get; set; }
-
-            [JsonProperty(PropertyName = "index")]
-            public int? Index { get; set; }
-            [JsonProperty(PropertyName = "playtype")]
-            public string PlayType { get; set; }
-
-            [JsonProperty(PropertyName = "volume")]
-            public double Volume { get; set; }
-        }
-
-        #region Private Members
-
-        private PluginSettings settings;
-
-        #endregion
-        public Player(SDConnection connection, InitialPayload payload) : base(connection, payload)
-        {
-            if (payload.Settings == null || payload.Settings.Count == 0)
-            {
-                this.settings = PluginSettings.CreateDefaultSettings();
-                SaveSettings();
-            }
-            else
-            {
-                this.settings = payload.Settings.ToObject<PluginSettings>();
-            }
-            this.coordinates = payload.Coordinates;
-            GlobalSettingsManager.Instance.RequestGlobalSettings();
-            CheckFile();
-        }
-
-        private void Instance_OnReceivedGlobalSettings(object sender, ReceivedGlobalSettingsPayload e)
-        {
-            Tools.AutoPopulateSettings(GlobalSettings.Instance, e.Settings);
-        }
-
-        public int GetIndex()
-        {
-            return Math.Max((coordinates.Row - 1) * 5 + coordinates.Column, 0);
-        }   
-
-        private async void CheckFile()
-        {
-            
-            //if (settings == null || GlobalSettings.Instance.ProfileName ==null) return;
-            metadata = ClipTrimClient.Instance.GetClipByPagedIndex(GetIndex());
-            await Connection.SetTitleAsync($"{metadata?.Name ?? ""}");
-            
-            return;
-
-            //var files = Directory.GetFiles(Path.Combine(Path.GetDirectoryName(GlobalSettings.Instance.BasePath), GlobalSettings.Instance.ProfileName), "*.wav", SearchOption.TopDirectoryOnly)
-            //                .OrderBy(file => File.GetCreationTime(file))
-            //                .ToArray();
-            //int? i = this.settings.Index;
-            //string new_path = "";
-            //if (i != null && i >= 0 && i < files.Length)
-            //{
-            //    new_path = files[i ?? 0];
-            //}
-
-
-            //await Connection.SetTitleAsync(Path.GetFileNameWithoutExtension(new_path));
-            //if (new_path != settings.Path)
-            //{
-            //    settings.Path = new_path;
-            //    if(new_path != "")
-            //    {
-            //        FileEntry opts = GlobalSettings.Instance.GetFileOptionsInCurrentProfile(new_path);
-            //        settings.Volume = opts.Volume;
-            //        settings.PlayType = opts.Playtype;
-            //    }
-            //    await SaveSettings();
-            //}
-        }
-
-
-        private async void Connection_OnApplicationDidLaunch(object sender, BarRaider.SdTools.Wrappers.SDEventReceivedEventArgs<BarRaider.SdTools.Events.ApplicationDidLaunch> e)
-        {
-         
-        }
-
-        private void Connection_OnTitleParametersDidChange(object sender, SDEventReceivedEventArgs<BarRaider.SdTools.Events.TitleParametersDidChange> e)
-        {
-            //titleParameters = e.Event?.Payload?.TitleParameters;
-            //userTitle = e.Event?.Payload?.Title;
-        }
-
-        public override void Dispose()
-        {
-            Connection.OnTitleParametersDidChange -= Connection_OnTitleParametersDidChange;
-            Connection.OnApplicationDidLaunch -= Connection_OnApplicationDidLaunch;
-            //Logger.Instance.LogMessage(TracingLevel.INFO, $"Destructor called");
-        }
-
-        public override void KeyPressed(KeyPayload payload)
-        {
-            //Logger.Instance.LogMessage(TracingLevel.INFO, "Key Pressedd");
-            Tools.AutoPopulateSettings(settings, payload.Settings);
-            // Logger.Instance.LogMessage(TracingLevel.INFO, JsonConvert.SerializeObject(settings));
-            ClipTrimClient.Instance.PlayClip(metadata);
-            //try
-            //{
-            //    WavPlayer.Instance.Play(settings.Path, GlobalSettings.Instance.OutputDevice, settings.Volume, settings.PlayType == "Play/Overlap" ? WavPlayer.PlayMode.PlayOverlap : WavPlayer.PlayMode.PlayStop);
-            //}
-            //catch
-            //{
-
-            //}
-            
-        }
-
-        public override void KeyReleased(KeyPayload payload) { 
-            
-        }
-
-        public override void OnTick() {
-            CheckFile();
-        }
-
-        public override async void ReceivedSettings(ReceivedSettingsPayload payload)
-        {
-            Logger.Instance.LogMessage(TracingLevel.INFO, "Player rec settings");
-            Tools.AutoPopulateSettings(settings, payload.Settings);
-            GlobalSettings.Instance.SetFileOptionsCurrentProfile(settings.Path, new FileEntry() { Playtype = settings.PlayType, Volume = settings.Volume });
-            await Connection.SetGlobalSettingsAsync(JObject.FromObject(GlobalSettings.Instance));
-            //SaveSettings();
-            //CheckFile();
-        }
-
-        public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload) {
-            //Logger.Instance.LogMessage(TracingLevel.INFO, "ReceivedGlobalSettings");
-
-            if (payload.Settings == null || payload.Settings.Count == 0)
-            {
-                var inst = GlobalSettings.Instance;
-                //GlobalSettingsManager.Instance.SetGlobalSettings(JObject.FromObject(inst));
-            }
-            else
-            {
-                GlobalSettings.Instance = payload.Settings.ToObject<GlobalSettings>();
-            }
-            
-            //CheckFile();
-        }
-
-        #region Private Methods
-
-        private Task SaveSettings()
-        {
-            return Connection.SetSettingsAsync(JObject.FromObject(settings));
-        }
-
-        #endregion
-    }
-}

stream_deck_plugin/ClipTrimDotNet/ProfileSwitcher.cs

@@ -1,167 +0,0 @@
-using BarRaider.SdTools;
-using BarRaider.SdTools.Wrappers;
-using ClipTrimDotNet.Client;
-using NAudio.CoreAudioApi.Interfaces;
-using NAudio.Wave;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Dynamic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ClipTrimDotNet
-{
-    public class DataSourceItem
-    {
-        public string label { get; set; }
-        public string value { get; set; }
-    }
-    [PluginActionId("com.michal-courson.cliptrim.profile-switcher")]
-    public class ProfileSwitcher : KeypadBase
-    {
-        private class PluginSettings
-        {
-            public static PluginSettings CreateDefaultSettings()
-            {
-                PluginSettings instance = new PluginSettings();
-                instance.ProfileName = null;
-                return instance;
-            }
-
-            [JsonProperty(PropertyName = "profileName")]
-            public string? ProfileName { get; set; }
-        }
-
-        #region Private Members
-
-        private PluginSettings settings;
-
-        #endregion
-        public ProfileSwitcher(SDConnection connection, InitialPayload payload) : base(connection, payload)
-        {
-            if (payload.Settings == null || payload.Settings.Count == 0)
-            {
-                this.settings = PluginSettings.CreateDefaultSettings();
-                SaveSettings();
-            }
-            else
-            {
-                this.settings = payload.Settings.ToObject<PluginSettings>();
-            }
-            GlobalSettingsManager.Instance.RequestGlobalSettings();
-            Connection.OnSendToPlugin += Connection_OnSendToPlugin;
-            SetTitle();
-        }
-
-        private async void SetTitle()
-        {
-
-            await Connection.SetTitleAsync(settings.ProfileName + " A");
-        }
-
-        private async void Connection_OnSendToPlugin(object sender, SDEventReceivedEventArgs<BarRaider.SdTools.Events.SendToPlugin> e)
-        {
-            //Logger.Instance.LogMessage(TracingLevel.INFO, "get profiles");
-            if (e.Event.Payload["event"].ToString() == "getProfiles")
-            {
-                //string basePath = "C:\\Users\\mickl\\Music\\clips";
-                //var files = Directory.GetDirectories(basePath, "*", SearchOption.TopDirectoryOnly).Select(x => Path.GetFileNameWithoutExtension(x)).Where(x => x != "original");
-                var files = ClipTrimClient.Instance.GetCollectionNames();
-                var items = files.Select(x => new DataSourceItem { label = x, value = x});
-                var obj = new JObject();
-                obj["event"] = "getProfiles";
-                obj["items"] = JArray.FromObject(items);
-                //Logger.Instance.LogMessage(TracingLevel.INFO, "get profiles return " + JsonConvert.SerializeObject(obj));
-                await Connection.SendToPropertyInspectorAsync(obj);
-            }
-            if (e.Event.Payload["event"].ToString() == "getOutputDevices")
-            {
-                List<WaveOutCapabilities> devices = new List<WaveOutCapabilities>();
-                for (int n = -1; n < WaveOut.DeviceCount; n++)
-                {
-                    var caps = WaveOut.GetCapabilities(n);
-                    devices.Add(caps);
-                }
-                var items = devices.Select(x => new DataSourceItem { label = x.ProductName, value = x.ProductName });
-                var obj = new JObject();
-                obj["event"] = "getOutputDevices";
-                obj["items"] = JArray.FromObject(items);
-                //Logger.Instance.LogMessage(TracingLevel.INFO, "get devices return " + JsonConvert.SerializeObject(obj));
-                await Connection.SendToPropertyInspectorAsync(obj);
-            }
-            
-        }
-
-        private void Connection_OnTitleParametersDidChange(object sender, SDEventReceivedEventArgs<BarRaider.SdTools.Events.TitleParametersDidChange> e)
-        {
-        }
-
-        public override void Dispose()
-        {
-            Connection.OnTitleParametersDidChange -= Connection_OnTitleParametersDidChange;
-            //Logger.Instance.LogMessage(TracingLevel.INFO, $"Destructor called");
-        }
-
-        public override async void KeyPressed(KeyPayload payload)
-        {
-            //Logger.Instance.LogMessage(TracingLevel.INFO, "KeyPressed");
-            //Logger.Instance.LogMessage(TracingLevel.INFO, JsonConvert.SerializeObject(settings));
-            //Logger.Instance.LogMessage(TracingLevel.INFO, JsonConvert.SerializeObject(GlobalSettings.Instance));
-            ClipTrimClient.Instance.SetSelectedCollectionByName(settings.ProfileName);
-            GlobalSettings.Instance.SetCurrentProfile(settings.ProfileName);
-            Logger.Instance.LogMessage(TracingLevel.INFO, JsonConvert.SerializeObject(GlobalSettings.Instance));
-
-            await Connection.SetGlobalSettingsAsync(JObject.FromObject(GlobalSettings.Instance));
-            await Connection.SwitchProfileAsync("ClipTrim");
-        }
-
-        public override void KeyReleased(KeyPayload payload)
-        {
-
-        }
-
-        public override void OnTick()
-        {
-            SetTitle();
-        }
-
-        public override void ReceivedSettings(ReceivedSettingsPayload payload)
-        {
-            Tools.AutoPopulateSettings(settings, payload.Settings);
-            SaveSettings();
-            //tTitle();
-            //CheckFile();
-        }
-
-        public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload)
-        {
-            //Logger.Instance.LogMessage(TracingLevel.INFO, "ReceivedGlobalSettings");
-
-            if (payload.Settings == null || payload.Settings.Count == 0)
-            {
-                var inst = GlobalSettings.Instance;
-                //GlobalSettingsManager.Instance.SetGlobalSettings(JObject.FromObject(inst));
-            }
-            else
-            {
-                GlobalSettings.Instance = payload.Settings.ToObject<GlobalSettings>();
-            }
-
-            //CheckFile();
-        }
-
-        #region Private Methods
-
-        private Task SaveSettings()
-        {
-            return Connection.SetSettingsAsync(JObject.FromObject(settings));
-        }
-
-        #endregion
-    }
-}

stream_deck_plugin/ClipTrimDotNet/Program.cs

@@ -13,6 +13,7 @@ namespace ClipTrimDotNet
         {
             // Uncomment this line of code to allow for debugging
             //while (!System.Diagnostics.Debugger.IsAttached) { System.Threading.Thread.Sleep(100); }
+            Client.ClipTrimClient.Instance.PortNumber = 5010;
             SDWrapper.Run(args);
         }
     }

stream_deck_plugin/ClipTrimDotNet/Properties/AssemblyInfo.cs

@@ -1,16 +1,6 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClipTrimDotNet")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ClipTrimDotNet")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -21,16 +11,3 @@ using System.Runtime.InteropServices;
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("1bb90885-9d98-46ef-b983-4a4ef3aea890")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

stream_deck_plugin/ClipTrimDotNet/PropertyInspector/file_player.html

@@ -11,7 +11,7 @@
     <!--
         Learn more about property inspector components at https://sdpi-components.dev/docs/components
     -->
-    <sdpi-item label="Index">
+    <!--<sdpi-item label="Index">
         <sdpi-select setting="index" placeholder="file index">
             <option value="0">0</option>
             <option value="1">1</option>
@@ -39,7 +39,7 @@
     </sdpi-item>
     <sdpi-item label="Volume">
         <sdpi-range setting="volume" min=".1" max="1" , step="0.05"></sdpi-range>
-    </sdpi-item>
+    </sdpi-item>-->
 </body>
 
 </html>

stream_deck_plugin/ClipTrimDotNet/PropertyInspector/profile_swticher.html

@@ -16,7 +16,7 @@
                      show-refresh="true"
                      placeholder="Select a ClipTrim page"></sdpi-select>
     </sdpi-item>
-    <sdpi-item label="Base Path">
+    <!--<sdpi-item label="Base Path">
         <sdpi-file setting="basePath"
                    global="true"
                    webkitdirectory
@@ -29,6 +29,6 @@
                      datasource="getOutputDevices"
                      show-refresh="true"
                      placeholder="Select an Ouput Device"></sdpi-select>
-    </sdpi-item>
+    </sdpi-item>-->
 </body>
 </html>

stream_deck_plugin/ClipTrimDotNet/WavPlayer.cs

@@ -1,225 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.ServiceModel.Security;
-using System.Threading.Tasks;
-using BarRaider.SdTools;
-using NAudio.Wave;
-using NAudio.Wave.SampleProviders;
-using Newtonsoft.Json;
-
-class CachedSound
-{
-    public byte[] AudioData { get; private set; }
-    public WaveFormat WaveFormat { get; private set; }
-    public CachedSound(string audioFileName)
-    {
-        using (var audioFileReader = new AudioFileReader(audioFileName))
-        {
-            // TODO: could add resampling in here if required
-            WaveFormat = audioFileReader.WaveFormat;
-            var wholeFile = new List<byte>((int)(audioFileReader.Length));
-            var readBuffer = new byte[audioFileReader.WaveFormat.SampleRate * audioFileReader.WaveFormat.Channels*4];
-            int samplesRead;
-            while ((samplesRead = audioFileReader.Read(readBuffer, 0, readBuffer.Length)) > 0)
-            {
-                wholeFile.AddRange(readBuffer.Take(samplesRead));
-            }
-            AudioData = wholeFile.ToArray();
-        }
-        //Logger.Instance.LogMessage(TracingLevel.INFO, $"AudioData Length {AudioData.Length}");
-
-    }
-}
-class CachedSoundSampleProvider : IWaveProvider
-{
-    private readonly CachedSound cachedSound;
-    private long position;
-
-    ~CachedSoundSampleProvider() {
-        //Logger.Instance.LogMessage(TracingLevel.INFO, $"Cache destructor");
-    }    
-
-    public CachedSoundSampleProvider(CachedSound cachedSound)
-    {
-        this.cachedSound = cachedSound;
-        position = 0;
-    }
-
-    public int Read(byte[] buffer, int offset, int count)
-    {
-        //Logger.Instance.LogMessage(TracingLevel.INFO, $"Read1 byte");
-        var availableSamples = cachedSound.AudioData.Length - position;
-        var samplesToCopy = Math.Min(availableSamples, count);
-        try
-        {
-            //Logger.Instance.LogMessage(TracingLevel.INFO, $"{cachedSound.AudioData.GetType()} {buffer.GetType()}");
-            Array.Copy(cachedSound.AudioData, position, buffer, offset, samplesToCopy);
-        }
-        catch (Exception ex)
-        {
-            //Logger.Instance.LogMessage(TracingLevel.INFO, $"{ex.ToString()}");
-        }
-        //Logger.Instance.LogMessage(TracingLevel.INFO, $"Read3");
-        position += samplesToCopy;
-        //Logger.Instance.LogMessage(TracingLevel.INFO, $"Sending {samplesToCopy} samples");
-        return (int)samplesToCopy;
-    }
-
-    public WaveFormat WaveFormat => cachedSound.WaveFormat;
-}
-
-public class WavPlayer
-{
-    private static WavPlayer? instance;
-    public static WavPlayer Instance
-    {
-        get
-        {
-            instance ??= new WavPlayer();
-            return instance;
-        }
-
-    }
-    public enum PlayMode
-    {
-        PlayOverlap,
-        PlayStop
-    }
-
-    private readonly ConcurrentDictionary<string, List<Tuple<WaveOutEvent, IWaveProvider>>> _activePlayers;
-
-    public WavPlayer()
-    {
-        _activePlayers = new ConcurrentDictionary<string, List<Tuple<WaveOutEvent, IWaveProvider>>>();
-    }
-
-    public void Play(string filePath, string id, double volume, PlayMode mode)
-    {
-        if (string.IsNullOrWhiteSpace(filePath))
-            throw new ArgumentException("File path cannot be null or empty.", nameof(filePath));
-
-        if (mode == PlayMode.PlayOverlap)
-        {
-            PlayWithOverlap(filePath, id, volume);
-        }
-        else if (mode == PlayMode.PlayStop)
-        {
-            PlayWithStop(filePath, id, volume);
-        }
-        else
-        {
-            throw new ArgumentOutOfRangeException(nameof(mode), "Invalid play mode specified.");
-        }
-    }
-
-    private void PlayWithOverlap(string filePath, string id, double volume)
-    {
-
-        try
-        {
-            //Logger.Instance.LogMessage(TracingLevel.INFO, "Play overlap");
-            var player = CreatePlayer(filePath, id);
-
-            if (!_activePlayers.ContainsKey(filePath))
-            {
-                _activePlayers[filePath] = new List<Tuple<WaveOutEvent, IWaveProvider>>();
-            }
-
-            _activePlayers[filePath].Add(player);
-            player.Item1.Volume = (float)volume;
-            player.Item1.Play();
-        }
-        catch(Exception ex) 
-        {
-            //Logger.Instance.LogMessage(TracingLevel.INFO, ex.ToString());
-        }
-       
-        //var playersToDispose = _activePlayers[filePath].Where(x => x.Item1.PlaybackState == PlaybackState.Stopped).ToList();
-        //foreach (var p in playersToDispose)
-        //{
-        //    p.Item1.Stop();
-        //    p.Item1.Dispose();
-        //}
-        //_activePlayers[filePath].RemoveAll(x => x.Item1.PlaybackState == PlaybackState.Stopped);
-    }
-
-    private void PlayWithStop(string filePath, string id, double volume)
-    {
-        if (_activePlayers.TryGetValue(filePath, out var players))
-        {
-
-            // Stop and dispose all current players for this file
-            if (players.Any(x => x.Item1.PlaybackState == PlaybackState.Playing))
-            {
-                var playersToDispose = players.ToList();
-                foreach (var player in playersToDispose)
-                {
-                    player.Item1.Stop();
-                    player.Item1.Dispose();
-                }
-            }
-            else
-            {
-                PlayWithOverlap(filePath, id, volume);
-            }
-
-        }
-        else
-        {
-            // Start a new player
-            PlayWithOverlap(filePath, id, volume);
-        }
-
-        _activePlayers[filePath].RemoveAll(x => x.Item1.PlaybackState == PlaybackState.Stopped);
-    }
-
-    private Tuple<WaveOutEvent, IWaveProvider> CreatePlayer(string filePath, string name)
-    {
-        var reader = new CachedSoundSampleProvider(new CachedSound(filePath));
-        //var reader = new AudioFileReader(filePath);
-        int number = -1;
-        for (int i = 0; i < WaveOut.DeviceCount; ++i)
-        {
-            if (WaveOut.GetCapabilities(i).ProductName == name)
-            {
-                number = i;
-            }
-        }
-        var player = new WaveOutEvent() { DeviceNumber = number };
-        player.Init(reader);
-        return new Tuple<WaveOutEvent, IWaveProvider>(player, reader);
-    }
-
-    private void CleanupPlayer(string filePath)
-    {
-        if (_activePlayers.TryGetValue(filePath, out var players))
-        {
-            var playersToDispose = players.ToList();
-            foreach (var p in playersToDispose)
-            {
-                p.Item1.Stop();
-                p.Item1.Dispose();
-            }
-        }
-        _activePlayers[filePath].RemoveAll(x => x.Item1.PlaybackState == PlaybackState.Stopped);
-
-    }
-
-    public void StopAll()
-    {
-        foreach (var players in _activePlayers.Values)
-        {
-            var playersToDispose = players.ToList();
-            foreach (var player in playersToDispose)
-            {
-                player.Item1.Stop();
-                player.Item1.Dispose();
-            }
-            players.Clear();
-        }
-
-        _activePlayers.Clear();
-    }
-}

stream_deck_plugin/ClipTrimDotNet/manifest.json

@@ -30,6 +30,36 @@
       "Tooltip": "Selects which sub folder to use and opens effect profile",
       "UUID": "com.michal-courson.cliptrim.profile-switcher",
       "PropertyInspectorPath": "PropertyInspector/profile_swticher.html"
+    },
+    {
+      "Icon": "Images/icon",
+      "Name": "Page Navigator",
+      "States": [
+        {
+          "Image": "Images/pluginAction",
+          "TitleAlignment": "middle",
+          "FontSize": 16
+        }
+      ],
+      "SupportedInMultiActions": false,
+      "Tooltip": "Navigates pages",
+      "UUID": "com.michal-courson.cliptrim.page-navigator",
+      "PropertyInspectorPath": "PropertyInspector/file_player.html"
+    },
+    {
+      "Icon": "Images/icon",
+      "Name": "Save Clip",
+      "States": [
+        {
+          "Image": "Images/pluginAction",
+          "TitleAlignment": "middle",
+          "FontSize": 16
+        }
+      ],
+      "SupportedInMultiActions": false,
+      "Tooltip": "Saves the current clip",
+      "UUID": "com.michal-courson.cliptrim.clip-save",
+      "PropertyInspectorPath": "PropertyInspector/file_player.html"
     }
   ],
   "Author": "Michal Courson",

stream_deck_plugin/ClipTrimDotNet/package.json

@@ -1,12 +1,12 @@
 {
   "scripts": {
     "stop": "streamdeck stop com.michal-courson.cliptrim",
-    "copy": "@powershell robocopy bin/Debug/ClipTrimDotNet.sdPlugin bin/Debug/com.michal-courson.cliptrim.sdPlugin",
+    "copy": "@powershell robocopy bin/Debug/ClipTrimDotNet.sdPlugin bin/Debug/com.michal-courson.cliptrim.sdPlugin/net8.0-windows",
     "link": "streamdeck link bin/Debug/com.michal-courson.cliptrim.sdPlugin",
     "restart": "streamdeck restart com.michal-courson.cliptrim",
     "start": "npm run link && npm run restart",
     "all": "npm run stop && npm run copy && npm run link && npm run restart",
-    "pack": "streamdeck pack bin/Debug/com.michal-courson.cliptrim.sdPlugin/"
+    "pack": "streamdeck pack bin/Debug/com.michal-courson.cliptrim.sdPlugin/net8.0-windows/"
   },
   "devDependencies": {
     "shx": "^0.3.4"

stream_deck_plugin/ClipTrimDotNet/packages.config

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommandLineParser" version="2.9.1" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="10.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="10.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="10.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging" version="10.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="10.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Options" version="10.0.2" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Primitives" version="10.0.2" targetFramework="net48" />
   <package id="Microsoft.Win32.Registry" version="4.7.0" targetFramework="net48" />
   <package id="NAudio" version="2.2.1" targetFramework="net48" />
   <package id="NAudio.Asio" version="2.2.1" targetFramework="net48" />
@@ -11,8 +18,29 @@
   <package id="NAudio.WinMM" version="2.2.1" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
   <package id="NLog" version="6.0.5" targetFramework="net48" />
+  <package id="SocketIOClient" version="4.0.0.2" targetFramework="net48" />
+  <package id="SocketIOClient.Common" version="4.0.0" targetFramework="net48" />
+  <package id="SocketIOClient.Serializer" version="4.0.0.1" targetFramework="net48" />
+  <package id="SocketIOClient.Serializer.NewtonsoftJson" version="4.0.0.1" targetFramework="net48" />
   <package id="StreamDeck-Tools" version="6.3.2" targetFramework="net48" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="10.0.2" targetFramework="net48" />
   <package id="System.Drawing.Common" version="9.0.10" targetFramework="net48" />
+  <package id="System.IO" version="4.3.0" targetFramework="net48" />
+  <package id="System.IO.Pipelines" version="10.0.2" targetFramework="net48" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net48" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net48" />
   <package id="System.Security.AccessControl" version="4.7.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net48" />
   <package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net48" />
+  <package id="System.Text.Encodings.Web" version="10.0.2" targetFramework="net48" />
+  <package id="System.Text.Json" version="10.0.2" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
 </packages>