From 9a01b9e8709b8e52d66f113eba9bf2fd9a7be1c4 Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Fri, 30 Oct 2015 17:37:53 +0100
Subject: [PATCH] Attempt fix seeking (Again)

---
 MusicPlayer/MusicPlayer/AudioHandler.cs      | 17 ++++++++++-------
 MusicPlayer/MusicPlayer/MainForm.Designer.cs |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/MusicPlayer/MusicPlayer/AudioHandler.cs b/MusicPlayer/MusicPlayer/AudioHandler.cs
index b20b580..b9ccf9e 100755
--- a/MusicPlayer/MusicPlayer/AudioHandler.cs
+++ b/MusicPlayer/MusicPlayer/AudioHandler.cs
@@ -106,14 +106,14 @@ namespace MusicPlayer
         private void PlayAudio()
         {
             AState = AudioState.WAITING;
-            while (ms.Length < 65536 * 10 && BState != BufferState.DONE)
-                Thread.Sleep(1000);
+            while (ms.Length < 65536 * 4 * 10 && BState != BufferState.DONE)
+                Thread.Sleep(75);
             AState = AudioState.PLAYING;
 
             long position = 0;
 
-            ms.Position = position;
             Mp3FileReader mp3fr = new Mp3FileReader(ms);
+            
             using (WaveStream blockAlignedStream = new BlockAlignReductionStream(WaveFormatConversionStream.CreatePcmStream(mp3fr)))
             {
 
@@ -141,15 +141,17 @@ namespace MusicPlayer
                         }
                         if (AState == AudioState.SEEKING)
                         {
-                            blockAlignedStream.Position = seek - (seek % blockAlignedStream.WaveFormat.BlockAlign);
+                            blockAlignedStream.Seek(seek - (seek % blockAlignedStream.WaveFormat.BlockAlign), SeekOrigin.Begin);
                             AState = AudioState.PLAYING;
-                            waveOut.Play();
+                            //waveOut.Play();
                         }
                         if (AState == AudioState.STOPPED)
                         {
                             waveOut.Stop();
                         }
 
+                        Console.WriteLine(waveOut.PlaybackState + " | " + blockAlignedStream.Position + " | " + ms.Position);
+
                         playpos = blockAlignedStream.Position;
                         CurrentTime = (int)(playpos / waveOut.OutputWaveFormat.AverageBytesPerSecond);
 
@@ -183,7 +185,8 @@ namespace MusicPlayer
             LengthBuffer = response.ContentLength;
             using (var stream = response.GetResponseStream())
             {
-                byte[] buffer = new byte[65536]; // 64KB chunks
+                //byte[] buffer = new byte[65536]; // 64KB chunks
+                byte[] buffer = new byte[65536*4]; // 256KB chunks
                 int read;
                 BState = BufferState.BUFFERING;
                 AState = AudioState.WAITING;
@@ -196,7 +199,7 @@ namespace MusicPlayer
                     ms.Position = pos;
 
 
-                    this.bufpos += buffer.Length;
+                    this.bufpos = ms.Length;
                 }
             }
 
diff --git a/MusicPlayer/MusicPlayer/MainForm.Designer.cs b/MusicPlayer/MusicPlayer/MainForm.Designer.cs
index 48fcc18..549953e 100644
--- a/MusicPlayer/MusicPlayer/MainForm.Designer.cs
+++ b/MusicPlayer/MusicPlayer/MainForm.Designer.cs
@@ -280,7 +280,7 @@
             // 
             // UpdateTimer
             // 
-            this.UpdateTimer.Interval = 600;
+            this.UpdateTimer.Interval = 150;
             this.UpdateTimer.Tick += new System.EventHandler(this.UpdateTimer_Tick);
             // 
             // notifyIcon1