Changes

MiklosPathy · Feb 10, 2018 · a423995 · a423995
1 parent 3ebdb30
commit a423995
Show file tree

Hide file tree

Showing 26 changed files with 846 additions and 191 deletions.
diff --git a/PunkOrgan/App.config b/PunkOrgan/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/PunkOrgan/MainWindow.xaml b/PunkOrgan/MainWindow.xaml
@@ -16,10 +16,10 @@
         <Slider x:Name="slider_DrawBar7" Value="{Binding Drawbars[7].Volume}" HorizontalAlignment="Left" Height="148" Margin="291,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical"/>
         <Slider x:Name="slider_DrawBar8" Value="{Binding Drawbars[8].Volume}" HorizontalAlignment="Left" Height="148" Margin="316,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical"/>
         <Slider x:Name="slider_DrawBar9" Value="{Binding Drawbars[9].Volume}" HorizontalAlignment="Left" Height="148" Margin="341,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical"/>
-        <Slider x:Name="slider_Freq" Value="{Binding Freq}" HorizontalAlignment="Left" Margin="10,277,0,0" VerticalAlignment="Top" Width="581" Maximum="1000" Minimum="20" SmallChange="1"/>
+        <Slider x:Name="slider_Bending" Value="{Binding Bending}" HorizontalAlignment="Left" Margin="10,277,0,0" VerticalAlignment="Top" Width="581" Maximum="200" Minimum="-200" SmallChange="1" MouseLeftButtonUp="slider_Bending_MouseLeftButtonUp"/>
         <Slider x:Name="slider_Leslie_Freq" Value="{Binding Leslie_Freq}" HorizontalAlignment="Left" Height="148" Margin="460,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical"/>
         <Slider x:Name="slider_Leslie_Rate" Value="{Binding Leslie_Rate}" HorizontalAlignment="Left" Height="148" Margin="485,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical" Maximum="50"/>
-        <Slider x:Name="slider_OverDrive" Value="{Binding OverDrive}" HorizontalAlignment="Left" Height="148" Margin="412,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical" Maximum="9"/>
+        <Slider x:Name="slider_OverDrive" Value="{Binding OverDrive}" HorizontalAlignment="Left" Height="148" Margin="412,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical" SmallChange="1" Maximum="100"/>
         <Label x:Name="label" Content="Overdrive" HorizontalAlignment="Left" Margin="368,136,0,0" VerticalAlignment="Top" Height="26" RenderTransformOrigin="1.054,0.904">
             <Label.RenderTransform>
                 <TransformGroup>

diff --git a/PunkOrgan/MainWindow.xaml.cs b/PunkOrgan/MainWindow.xaml.cs
@@ -7,15 +7,20 @@ namespace PunkOrgan
     /// </summary>
     public partial class MainWindow : Window
     {
+        private PunkHammond synth = new PunkHammond();
+
         public MainWindow()
         {
-            var synth = new PunkHammond();
             DataContext = synth;
             Closing += synth.Window_Closed;
             KeyDown += synth.Window_KeyDown;
             KeyUp += synth.Window_KeyUp;
             InitializeComponent();
         }
 
+        private void slider_Bending_MouseLeftButtonUp(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            slider_Bending.Value = 0;
+        }
     }
 }
diff --git a/PunkOrgan/Properties/Resources.Designer.cs b/PunkOrgan/Properties/Resources.Designer.cs
diff --git a/PunkOrgan/Properties/Settings.Designer.cs b/PunkOrgan/Properties/Settings.Designer.cs