Cleanup from latest commit (wpf build).

oddbear · Feb 22, 2022 · e927f7d · e927f7d
1 parent 8e76c29
commit e927f7d
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 127 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ This way we can have **automations** and **plugins** for Stream Deck, Touch Port
 
 ## Progress
 
-- API: Still early, but man features are implemented. Try the Windows App.
+- API: Still early, but many features are implemented. Try the Windows App to see what is possible.
 - Stream Deck plugin: Fat Channel Toggle, Routing, presets and headphone sources, with status.
 - Touch Portal plugin: Volume control, Fat Channel Toggle, Routing, presets and headphone sources, with status.
 - Loupedeck plugin: not started.

diff --git a/Revelator.io24.Api/Configuration/ServiceProviderExtension.cs b/Revelator.io24.Api/Configuration/ServiceProviderExtension.cs
@@ -1,8 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
-using Revelator.io24.Api.Models;
 using Revelator.io24.Api.Models.Monitor;
 using Revelator.io24.Api.Services;
-using System;
 
 namespace Revelator.io24.Api.Configuration
 {
@@ -16,7 +14,6 @@ public static void AddRevelatorAPI(this IServiceCollection serviceCollection)
             serviceCollection.AddSingleton<MonitorService>();
 
             //Models:
-            serviceCollection.AddSingleton<MicrophoneModel>();
             serviceCollection.AddSingleton<FatChannelMonitorModel>();
             serviceCollection.AddSingleton<ValuesMonitorModel>();
 

diff --git a/Revelator.io24.Api/Enums/MicrophoneChannel.cs b/Revelator.io24.Api/Enums/MicrophoneChannel.cs
@@ -0,0 +1,8 @@
+namespace Revelator.io24.Api.Enums
+{
+    public enum MicrophoneChannel
+    {
+        Left,
+        Right
+    }
+}
diff --git a/Revelator.io24.Api/Models/MicrophoneModel.cs b/Revelator.io24.Api/Models/MicrophoneModel.cs
diff --git a/Revelator.io24.Api/Models/Outputs/Main.cs b/Revelator.io24.Api/Models/Outputs/Main.cs
@@ -10,5 +10,12 @@ public Main(RawService rawService)
         {
             //
         }
+
+        [RouteValue("hardwareMute")]
+        public bool HardwareMute
+        {
+            get => GetBoolean();
+            //set => SetBoolean(value);
+        }
     }
 }
diff --git a/Revelator.io24.Api/RoutingTable.cs b/Revelator.io24.Api/RoutingTable.cs
@@ -131,7 +131,6 @@ private void ValueStateUpdated(string route, float value)
 
             if (route == routes.volume)
             {
-                Console.WriteLine($"{route} : {value}");
                 VolumeUpdated?.Invoke(this, key);
                 return;
             }

diff --git a/Revelator.io24.Api/Services/BroadcastService.cs b/Revelator.io24.Api/Services/BroadcastService.cs
@@ -48,7 +48,6 @@ private void Listener()
 
                     var messageType = PackageHelper.GetMessageType(data);
                     Log.Debug("[{className}] {messageType}", nameof(BroadcastService), messageType);
-                    //Console.WriteLine($"{DateTime.Now} [{nameof(BroadcastService)}]: {messageType}");
 
                     //DA is udp broadcast message from PreSonusHardwareAccessService.exe
                     //NO is udp broadcast message sent from the UC Surface App

diff --git a/Revelator.io24.Api/Services/MonitorService.cs b/Revelator.io24.Api/Services/MonitorService.cs
@@ -146,6 +146,9 @@ private void Analyze(byte[] data)
                     "FFFFFFFFFFFFFFFFFFFFF9FFFFFFFFFF0600010000040000020400040000040800040000000C000400040010000400070014000200",
                     "FFFFFFFFF9FFF9FFF9FFF9FFFFFFFFFF0600010000040000020400040000040800040000000C000400040010000400070014000200"
                 };
+
+                //This FF->something->FF changes a lot if I clip the output channels. Ex. playing music at 100% percent and run +10db on Input and Output
+                // WARNING: (be carefull on this test).
                 if (!prevValues.Contains(unknown4Val))
                     Log.Information("Something 3: {val1}", unknown4Val);
 

diff --git a/Revelator.io24.StreamDeck/Actions/PresetChangeAction.cs b/Revelator.io24.StreamDeck/Actions/PresetChangeAction.cs
@@ -1,4 +1,5 @@
 using Revelator.io24.Api;
+using Revelator.io24.Api.Enums;
 using Revelator.io24.Api.Models.Inputs;
 using Revelator.io24.StreamDeck.Settings;
 using SharpDeck;

diff --git a/Revelator.io24.StreamDeck/Settings/PresetChangeSettings.cs b/Revelator.io24.StreamDeck/Settings/PresetChangeSettings.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-using Revelator.io24.Api;
+using Revelator.io24.Api.Enums;
 
 namespace Revelator.io24.StreamDeck.Settings
 {

diff --git a/Revelator.io24.TouchPortal/Converters/MicrophoneChannelConverter.cs b/Revelator.io24.TouchPortal/Converters/MicrophoneChannelConverter.cs
@@ -1,4 +1,4 @@
-using Revelator.io24.Api;
+using Revelator.io24.Api.Enums;
 
 namespace Revelator.io24.TouchPortal.Converters
 {

diff --git a/Revelator.io24.Wpf/MainWindow.xaml b/Revelator.io24.Wpf/MainWindow.xaml
@@ -56,7 +56,20 @@
                     <Label Grid.Row="0" Grid.Column="0">Main Out</Label>
                     <Label Grid.Row="1" Grid.Column="0">Phones</Label>
                     <Label Grid.Row="2" Grid.Column="0">Blend</Label>
-                    <Slider Grid.Row="0" Grid.Column="1" Value="{Binding Path=Device.Global.MainOutVolume, Mode=TwoWay}" Maximum="100" Width="100" />
+                    <Slider Grid.Row="0" Grid.Column="1" Value="{Binding Path=Device.Global.MainOutVolume, Mode=TwoWay}" Maximum="100" Width="100">
+                        <Slider.Style>
+                            <Style TargetType="{x:Type Slider}">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Path=Device.Main.HardwareMute}" Value="False">
+                                        <Setter Property="Background" Value="LightGreen"/>
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding Path=Device.Main.HardwareMute}" Value="True">
+                                        <Setter Property="Background" Value="Red"/>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Slider.Style>
+                    </Slider>
                     <Slider Grid.Row="1" Grid.Column="1" Value="{Binding Path=Device.Global.HeadphonesVolume, Mode=TwoWay}" Maximum="100" Width="100" />
                     <Slider Grid.Row="2" Grid.Column="1" Value="{Binding Path=Device.Global.MonitorBlend, Mode=TwoWay}" Maximum="1" Width="100" />
                 </Grid>
@@ -216,7 +229,19 @@
                     </StackPanel>
                 </GroupBox>
 
-                <GroupBox Header="Main" Width="90" Background="LightGray">
+                <GroupBox Header="{Binding Path=Device.Main.UserDefinedName}" Width="90">
+                    <GroupBox.Style>
+                        <Style TargetType="{x:Type GroupBox}">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Path=Device.Main.Clip}" Value="False">
+                                    <Setter Property="Background" Value="LightGreen"/>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Path=Device.Main.Clip}" Value="True">
+                                    <Setter Property="Background" Value="Red"/>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </GroupBox.Style>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                         <Slider Orientation="Vertical" Margin="10" Maximum="100"
                                 Value="{Binding Path=VolumeMap.Main_Mix}"/>
@@ -226,7 +251,19 @@
                                      Value="{Binding Path=MonitorValues.Main_R, Converter={StaticResource decibelConverter}}" />
                     </StackPanel>
                 </GroupBox>
-                <GroupBox Header="Stream Mix 1" Width="90" Background="LightGray">
+                <GroupBox Header="{Binding Path=Device.StreamMixA.UserDefinedName}" Width="90">
+                    <GroupBox.Style>
+                        <Style TargetType="{x:Type GroupBox}">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Path=Device.StreamMixA.Clip}" Value="False">
+                                    <Setter Property="Background" Value="LightGreen"/>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Path=Device.StreamMixA.Clip}" Value="True">
+                                    <Setter Property="Background" Value="Red"/>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </GroupBox.Style>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                         <Slider Orientation="Vertical" Margin="10" Maximum="100"
                                 Value="{Binding Path=VolumeMap.MixA_Mix}"/>
@@ -236,7 +273,19 @@
                                      Value="{Binding Path=MonitorValues.StreamMix1_R, Converter={StaticResource decibelConverter}}" />
                     </StackPanel>
                 </GroupBox>
-                <GroupBox Header="Stream Mix 2" Width="90" Background="LightGray">
+                <GroupBox Header="{Binding Path=Device.StreamMixB.UserDefinedName}" Width="90">
+                    <GroupBox.Style>
+                        <Style TargetType="{x:Type GroupBox}">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Path=Device.StreamMixB.Clip}" Value="False">
+                                    <Setter Property="Background" Value="LightGreen"/>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding Path=Device.StreamMixB.Clip}" Value="True">
+                                    <Setter Property="Background" Value="Red"/>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </GroupBox.Style>
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                         <Slider Orientation="Vertical" Margin="10" Maximum="100"
                                 Value="{Binding Path=VolumeMap.MixB_Mix}"/>

diff --git a/Revelator.io24.Wpf/Models/RoutingMapper.cs b/Revelator.io24.Wpf/Models/RoutingMapper.cs
@@ -7,12 +7,6 @@ public class RoutingMapper
     {
         private readonly RoutingTable _routingTable;
 
-        public Headphones HeadphonesSource
-        {
-            get => _routingTable.GetHeadphoneSource();
-            set => _routingTable.SetHeadphoneSource(value);
-        }
-
         public bool Main_MicL
         {
             get => GetValue(Input.Mic_L, Output.Main);
-Original file line number
+Diff line change
@@ Expand Up / @@ -131,7 +131,6 @@ private void ValueStateUpdated(string route, float value) @@
                 if (route == routes.volume)
                 {
-                    Console.WriteLine($"{route} : {value}");
                     VolumeUpdated?.Invoke(this, key);
                     return;
                 }
@@ Expand Down @@