Merge pull request #6 from andrew-mi/master

Fixed #2

Author: Simber1

CSediaPlayer/MainWindow.xaml

@@ -12,7 +12,7 @@
 		<Button x:Name="pause" Content="Pause" HorizontalAlignment="Left" Height="51" Margin="523,0,0,315" VerticalAlignment="Bottom" Width="146" Click="Pause"/>
 		<Button x:Name="stop" Content="Stop" HorizontalAlignment="Right" Height="51" Margin="0,0,574,315" VerticalAlignment="Bottom" Width="136" Click="Stop"/>
 		<Button x:Name="select" Content="Song Select" HorizontalAlignment="Right" Height="51" Margin="0,0,422,315" VerticalAlignment="Bottom" Width="147" Click="Select"/>
-		<Slider x:Name="Progress_Slider" Height="30" Margin="0,275,123,0" VerticalAlignment="Top" Value="0.1" HorizontalAlignment="Right" Width="587"/>
+		<Slider x:Name="Progress_Slider" Height="30" Margin="0,275,123,0" VerticalAlignment="Top" Value="0.1" HorizontalAlignment="Right" Width="587" Thumb.DragStarted="Progress_Slider_DragStarted" Thumb.DragCompleted="Progress_Slider_DragCompleted" Thumb.DragDelta="Progress_Slider_DragDelta"/>
 		<TextBlock x:Name="Current_Playing" HorizontalAlignment="Right" Height="56" Margin="0,173,10,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="601"><Run Text="Now Playing"/><LineBreak/><Run/></TextBlock>
 		<TextBlock x:Name="Current_Time" HorizontalAlignment="Left" Margin="55,275,0,0" TextWrapping="Wrap" Text="0:00" VerticalAlignment="Top"/>
 		<TextBlock x:Name="Max_Time" HorizontalAlignment="Right" Margin="0,275,96,0" TextWrapping="Wrap" Text="0:00" VerticalAlignment="Top"/>

CSediaPlayer/MainWindow.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Threading;
 using System.Windows;
 using System.Windows.Threading;
@@ -16,7 +17,10 @@ public partial class MainWindow : Window
 
 		double volume;
 		double prevVolume;
-		string path;
+        bool ProgressSliderChanging = false;
+        double LastProgressSliderThumbDeltaValue = 0;
+        Stopwatch LastProgressSliderDeltaEvent = new Stopwatch();
+        string path;
 		Thread LoopingThread;
 
 
@@ -66,7 +70,7 @@ private void Looper()
 
 				this.Dispatcher.Invoke(() =>
 				{
-					if (player.currentMedia.duration > 1 && player.controls.currentPosition > 1)
+					if (player.currentMedia.duration > 1 && player.controls.currentPosition > 1 && !ProgressSliderChanging)
 					{
 
 						UpdateSongPosition();
@@ -144,7 +148,42 @@ private void Close(object sender, System.ComponentModel.CancelEventArgs e)
 		{
 			LoopingThread.Abort();
 		}
-	}
+
+        private void Progress_Slider_DragStarted(object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e)
+        {
+            ProgressSliderChanging = true;
+            double NewPosition = Progress_Slider.Value;
+            player.controls.currentPosition = NewPosition;
+            LastProgressSliderThumbDeltaValue = NewPosition;
+            LastProgressSliderDeltaEvent.Start();
+        }
+
+        private void Progress_Slider_DragCompleted(object sender, System.Windows.Controls.Primitives.DragCompletedEventArgs e)
+        {
+            ProgressSliderChanging = false;
+            double NewPosition = Progress_Slider.Value;
+            player.controls.currentPosition = NewPosition;
+            LastProgressSliderThumbDeltaValue = NewPosition;
+            LastProgressSliderDeltaEvent.Stop();
+        }
+
+        private void Progress_Slider_DragDelta(object sender, System.Windows.Controls.Primitives.DragDeltaEventArgs e)
+        {
+            //DragDelta runs very often - to prevent lag we throw most of these events out
+            if (LastProgressSliderDeltaEvent.ElapsedMilliseconds<300)
+            {
+                return;
+            }
+
+            double NewPosition = Progress_Slider.Value;
+            if (Math.Abs(LastProgressSliderThumbDeltaValue-NewPosition) > 1)
+            {
+                player.controls.currentPosition = NewPosition;
+                LastProgressSliderThumbDeltaValue = NewPosition;
+                LastProgressSliderDeltaEvent.Restart();
+            }
+        }
+    }
 }