Skip to content

Commit

Permalink
Mode added
Browse files Browse the repository at this point in the history
  • Loading branch information
Josh Glenen committed Sep 24, 2018
1 parent c24404a commit 52828f6
Show file tree
Hide file tree
Showing 7 changed files with 188 additions and 130 deletions.
43 changes: 22 additions & 21 deletions AdvancedControls.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,23 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="131*"/>
<ColumnDefinition Width="269*"/>
<ColumnDefinition Width="9*"/>
<ColumnDefinition Width="260*"/>
</Grid.ColumnDefinitions>
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="10,77,0,0" TextWrapping="Wrap" Text="Attack (ms):" VerticalAlignment="Top" Height="16" Width="95"/>
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="10,109,0,0" TextWrapping="Wrap" Text="Release (ms):" VerticalAlignment="Top" Height="16" Width="95"/>
<TextBlock Foreground ="#E6FFFF" x:Name="AT" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="10" VerticalAlignment="Top" Width="28" Margin="0,77,0,0" Grid.Column="1"/>
<TextBlock Foreground ="#E6FFFF" x:Name="RE" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="100" VerticalAlignment="Top" Width="28" Margin="0,109,0,0" Grid.Column="1"/>
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="10,139,0,0" TextWrapping="Wrap" Text="Interval (ms):" VerticalAlignment="Top" Height="16" Width="94"/>
<TextBlock Foreground ="#E6FFFF" x:Name="IN" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="50" VerticalAlignment="Top" Width="28" Margin="0,139,0,0" Grid.Column="1"/>
<TextBlock Foreground ="#E6FFFF" Name = "aText" HorizontalAlignment="Left" Margin="10,108,0,0" TextWrapping="Wrap" Text="Attack (ms):" VerticalAlignment="Top" Height="16" Width="95"/>
<TextBlock Foreground ="#E6FFFF" Name = "rText" HorizontalAlignment="Left" Margin="10,140,0,0" TextWrapping="Wrap" Text="Release (ms):" VerticalAlignment="Top" Height="16" Width="95"/>
<TextBlock Foreground ="#E6FFFF" x:Name="AT" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="10" VerticalAlignment="Top" Width="28" Margin="0,108,0,0" Grid.Column="1" Grid.ColumnSpan="2"/>
<TextBlock Foreground ="#E6FFFF" x:Name="RE" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="10" VerticalAlignment="Top" Width="28" Margin="0,140,0,0" Grid.Column="1" Grid.ColumnSpan="2"/>
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="10,75,0,0" TextWrapping="Wrap" Text="Interval (ms):" VerticalAlignment="Top" Height="16" Width="94"/>
<TextBlock Foreground ="#E6FFFF" x:Name="IN" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="5" VerticalAlignment="Top" Width="28" Margin="0,75,0,0" Grid.Column="1" Grid.ColumnSpan="2"/>
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="10,14,0,0" TextWrapping="Wrap" Text="Upper threshold (%):" VerticalAlignment="Top" Height="16" Width="114"/>
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="10,46,0,0" TextWrapping="Wrap" Text="Lower threshold (%):" VerticalAlignment="Top" Height="16" Width="109"/>
<TextBlock Foreground ="#E6FFFF" x:Name="UP" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="80" VerticalAlignment="Top" Width="28" Margin="0,14,0,0" Grid.Column="1"/>
<TextBlock Foreground ="#E6FFFF" x:Name="LO" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="40" VerticalAlignment="Top" Width="28" Margin="0,46,0,0" RenderTransformOrigin="0.5,0.5" Grid.Column="1"/>
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="10,170,0,0" TextWrapping="Wrap" Text="Hold (ms):" VerticalAlignment="Top" Height="16" Width="94"/>
<TextBlock Foreground ="#E6FFFF" x:Name="Hold" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="100" VerticalAlignment="Top" Width="28" Margin="0,170,0,0" Grid.Column="1"/>
<TextBlock Foreground ="#E6FFFF" x:Name="UP" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="40" VerticalAlignment="Top" Width="28" Margin="0,14,0,0" Grid.Column="1" Grid.ColumnSpan="2"/>
<TextBlock Foreground ="#E6FFFF" x:Name="LO" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="20" VerticalAlignment="Top" Width="28" Margin="0,46,0,0" RenderTransformOrigin="0.5,0.5" Grid.Column="1" Grid.ColumnSpan="2"/>
<TextBlock Foreground ="#E6FFFF" Name = "hText" HorizontalAlignment="Left" Margin="10,170,0,0" TextWrapping="Wrap" Text="Hold (ms):" VerticalAlignment="Top" Height="16" Width="94"/>
<TextBlock Foreground ="#E6FFFF" x:Name="Hold" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="100" VerticalAlignment="Top" Width="28" Margin="0,170,0,0" Grid.Column="1" Grid.ColumnSpan="2"/>
<Button Background="#6FC3DF" Content="Done" HorizontalAlignment="Left" Margin="10,199,0,0" VerticalAlignment="Top" Width="75" Height="20" Click="Button_Click"/>
<Slider Name="upperthreshold" Margin="42,14,24,226" IsSnapToTickEnabled="True" Value="80" Minimum="0" Maximum="100" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="0.01" ValueChanged="ut_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="1">
<Slider Name="upperthreshold" Margin="33,14,24,226" IsSnapToTickEnabled="True" Value="40" Minimum="0" Maximum="100" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="0.01" ValueChanged="ut_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="2">
<Slider.RenderTransform>
<TransformGroup>
<ScaleTransform/>
Expand All @@ -39,7 +40,7 @@
</TransformGroup>
</Slider.RenderTransform>
</Slider>
<Slider x:Name="lowthresh" Margin="42,46,24,194" IsSnapToTickEnabled="True" Value="40" Minimum="0" Maximum="100" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="0.01" ValueChanged="lt_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="1">
<Slider x:Name="lowthresh" Margin="33,46,24,194" IsSnapToTickEnabled="True" Value="20" Minimum="0" Maximum="100" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="0.01" ValueChanged="lt_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="2">
<Slider.RenderTransform>
<TransformGroup>
<ScaleTransform/>
Expand All @@ -49,7 +50,7 @@
</TransformGroup>
</Slider.RenderTransform>
</Slider>
<Slider x:Name="attack" Margin="42,77,24,164" IsSnapToTickEnabled="True" Value="10" Minimum="1" Maximum="100" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="1" ValueChanged="at_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="1">
<Slider x:Name="attack" Margin="33,108,24,133" IsSnapToTickEnabled="True" Value="10" Minimum="1" Maximum="200" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="1" ValueChanged="at_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="2">
<Slider.RenderTransform>
<TransformGroup>
<ScaleTransform/>
Expand All @@ -59,7 +60,7 @@
</TransformGroup>
</Slider.RenderTransform>
</Slider>
<Slider x:Name="release" Margin="42,109,24,134" IsSnapToTickEnabled="True" Value="100" Minimum="1" Maximum="100" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="1" ValueChanged="re_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="1">
<Slider x:Name="release" Margin="33,140,24,103" IsSnapToTickEnabled="True" Value="10" Minimum="1" Maximum="200" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="1" ValueChanged="re_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="2">
<Slider.RenderTransform>
<TransformGroup>
<ScaleTransform/>
Expand All @@ -69,7 +70,7 @@
</TransformGroup>
</Slider.RenderTransform>
</Slider>
<Slider x:Name="interval" Margin="42,139,24,103" IsSnapToTickEnabled="True" Value="50" Minimum="1" Maximum="100" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="1" ValueChanged="in_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="1">
<Slider x:Name="interval" Margin="33,75,24,167" IsSnapToTickEnabled="True" Value="5" Minimum="1" Maximum="100" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="1" ValueChanged="in_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="2">
<Slider.RenderTransform>
<TransformGroup>
<ScaleTransform/>
Expand All @@ -79,7 +80,7 @@
</TransformGroup>
</Slider.RenderTransform>
</Slider>
<Slider x:Name="hold" Margin="42,170,24,70" IsSnapToTickEnabled="True" Value="100" Minimum="1" Maximum="1000" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="1" ValueChanged="ho_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="1">
<Slider x:Name="hold" Margin="33,170,24,70" IsSnapToTickEnabled="True" Value="100" Minimum="1" Maximum="1000" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="1" ValueChanged="ho_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="2">
<Slider.RenderTransform>
<TransformGroup>
<ScaleTransform/>
Expand All @@ -89,9 +90,9 @@
</TransformGroup>
</Slider.RenderTransform>
</Slider>
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="103,204,0,0" TextWrapping="Wrap" Text="Averaging samples:" VerticalAlignment="Top" Height="16" Width="104" Grid.ColumnSpan="2"/>
<TextBlock Foreground ="#E6FFFF" x:Name="samps" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="10" VerticalAlignment="Top" Width="28" Margin="94,204,0,0" Grid.Column="1"/>
<Slider x:Name="sampsslid" Margin="130,204,25,36" IsSnapToTickEnabled="True" Value="10" Minimum="1" Maximum="100" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="1" ValueChanged="sa_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="1">
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="103,204,0,0" TextWrapping="Wrap" Text="Averaging samples:" VerticalAlignment="Top" Height="16" Width="104" Grid.ColumnSpan="3"/>
<TextBlock Foreground ="#E6FFFF" x:Name="samps" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="10" VerticalAlignment="Top" Width="28" Margin="85,204,0,0" Grid.Column="2"/>
<Slider x:Name="sampsslid" Margin="121,204,25,36" IsSnapToTickEnabled="True" Value="10" Minimum="1" Maximum="100" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="1" ValueChanged="sa_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.Column="2">
<Slider.RenderTransform>
<TransformGroup>
<ScaleTransform/>
Expand All @@ -101,6 +102,6 @@
</TransformGroup>
</Slider.RenderTransform>
</Slider>
<CheckBox Foreground ="#E6FFFF" Content="Unity Mode" HorizontalAlignment="Left" Margin="103,225,0,0" VerticalAlignment="Top" Width="117" Grid.ColumnSpan="2" Unchecked="notCheckBox_Checked" Checked="CheckBox_Checked"/>
<CheckBox Foreground ="#E6FFFF" Content="True Gain" HorizontalAlignment="Left" Margin="103,225,0,0" VerticalAlignment="Top" Width="117" IsChecked="False" Grid.ColumnSpan="3" Unchecked="TRUEGAIN_notCheckBox_Checked" Checked="TRUEGAIN_CheckBox_Checked"/>
</Grid>
</Window>
29 changes: 23 additions & 6 deletions AdvancedControls.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public partial class AdvancedControls : Window
public double aholdTime;
public double aattackVal;
public double areleaseVal;
public bool unityMode;
public bool trueGain;

public AdvancedControls()
{
Expand Down Expand Up @@ -85,15 +85,32 @@ private void sa_ValueChanged(object sender, RoutedPropertyChangedEventArgs<doubl
samps.Text = Math.Floor(sampsslid.Value).ToString();
}

private void CheckBox_Checked(object sender, RoutedEventArgs e)
private void TRUEGAIN_CheckBox_Checked(object sender, RoutedEventArgs e)
{
unityMode = true;
trueGain = true;
hold.Visibility = Visibility.Collapsed;
Hold.Visibility = Visibility.Collapsed;
AT.Visibility = Visibility.Collapsed;
attack.Visibility = Visibility.Collapsed;
RE.Visibility = Visibility.Collapsed;
release.Visibility = Visibility.Collapsed;
aText.Visibility = Visibility.Collapsed;
rText.Visibility = Visibility.Collapsed;
hText.Visibility = Visibility.Collapsed;
}

private void notCheckBox_Checked(object sender, RoutedEventArgs e)
private void TRUEGAIN_notCheckBox_Checked(object sender, RoutedEventArgs e)
{
unityMode = false;

trueGain = false;
hold.Visibility = Visibility.Visible;
Hold.Visibility = Visibility.Visible;
AT.Visibility = Visibility.Visible;
attack.Visibility = Visibility.Visible;
RE.Visibility = Visibility.Visible;
release.Visibility = Visibility.Visible;
aText.Visibility = Visibility.Visible;
rText.Visibility = Visibility.Visible;
hText.Visibility = Visibility.Visible;
}
}

Expand Down
12 changes: 0 additions & 12 deletions KnobControl.cs
View file

This file was deleted.

8 changes: 4 additions & 4 deletions MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
<Button Background="#6FC3DF" Name="RunProg" Content="Run" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="75" Click="RunProg_Click" Height="20"/>
<StatusBar HorizontalAlignment="Left" Height="100" Margin="-331,89,0,-29" VerticalAlignment="Top" Width="100"/>
<ProgressBar Background="#E6FFFF" Foreground="Silver" Name ="Emu" Height="20" Margin="2,10,6,0" VerticalAlignment="Top" Grid.Column="1" />
<Button Background="#6FC3DF" Content="Advanced" HorizontalAlignment="Left" Margin="10,35,0,0" VerticalAlignment="Top" Width="75" Height="20" Click="Button_Click"/>
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="10,110,0,0" TextWrapping="Wrap" Text="Gain (db):" VerticalAlignment="Top" Height="16" Width="56"/>
<Button Name ="adv" Background="#6FC3DF" Content="Advanced" HorizontalAlignment="Left" Margin="10,35,0,0" VerticalAlignment="Top" Width="75" Height="20" Click="Button_Click"/>
<TextBlock Foreground ="#E6FFFF" HorizontalAlignment="Left" Margin="10,110,0,0" TextWrapping="Wrap" Text="Ratio:" VerticalAlignment="Top" Height="16" Width="56"/>
<TextBlock Foreground ="#E6FFFF" Text="Preamp Volume:" HorizontalAlignment="Left" Margin="10,76,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="16" Width="95"/>
<TextBlock Foreground ="#E6FFFF" Name="DV" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="2" VerticalAlignment="Top" Width="28" Margin="105,76,0,0"/>
<TextBlock Foreground ="#E6FFFF" Name="PR" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="-3" VerticalAlignment="Top" Width="34" Margin="71,110,0,0" RenderTransformOrigin="-1.318,0.5"/>
<TextBlock Foreground ="#E6FFFF" Name="PR" HorizontalAlignment="Left" Height="16" TextWrapping="Wrap" Text="-3" VerticalAlignment="Top" Width="34" Margin="51,110,0,0" RenderTransformOrigin="-1.318,0.5"/>
<ProgressBar x:Name ="Emu_Copy" Background="#E6FFFF" Foreground="Gray" Height="20" Margin="2,35,6,0" VerticalAlignment="Top" Grid.Column="1" />
<TextBlock Foreground ="#E6FFFF" Text="Peak Volume:" HorizontalAlignment="Left" Margin="97,14,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="16" Width="74"/>
<TextBlock Foreground ="#E6FFFF" Text="Average Volume:" HorizontalAlignment="Left" Margin="97,39,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="16" Width="94"/>
Expand All @@ -36,7 +36,7 @@
</TransformGroup>
</Slider.RenderTransform>
</Slider>
<Slider x:Name="gain" Margin="171,110,24,42" IsSnapToTickEnabled="True" Value="0.5" Minimum="0" Maximum="1" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="0.01" ValueChanged="g_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.ColumnSpan="2">
<Slider x:Name="ratio" Margin="171,110,24,42" IsSnapToTickEnabled="True" Value="0.5" Minimum="0" Maximum="1" TickPlacement="BottomRight" IsMoveToPointEnabled="True" TickFrequency="0.01" LargeChange="0.01" ValueChanged="attenuation_ValueChanged" RenderTransformOrigin="0.5,0.5" Grid.ColumnSpan="2">
<Slider.RenderTransform>
<TransformGroup>
<ScaleTransform/>
Expand Down
Loading

0 comments on commit 52828f6

Please sign in to comment.