Avans/MusicPlayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Timestamps. Attempt to fix seeking

Browse Source
This commit is contained in:
kennyboy55
2015-10-30 00:46:11 +01:00
parent 2d0b38e2d1
commit 52903849f2
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MusicPlayer/MusicPlayer/AudioHandler.cs
+18 -4
View File
@@ -17,9 +17,12 @@ namespace MusicPlayer
public AudioState AState { get; set; } public AudioState AState { get; set; }
public BufferState BState { get; set; } public BufferState BState { get; set; }
public int Buffered { get { return Math.Min((int)((bufpos / (double)Length) * 100), 100); } } public int Buffered { get { return Math.Min((int)((bufpos / (double)LengthBuffer) * 100), 100); } }
public int Position { get { return Math.Min((int)((playpos / (double)Length) * 100), 100); } } public int Position { get { return Math.Min((int)((playpos / (double)Length) * 100), 100); } }
public long Length { get; set; } public string CurrentTime { get; set; }
public string TotalTime { get; set; }
private long LengthBuffer { get; set; }
private long Length { get; set; }
private long bufpos = 0; private long bufpos = 0;
private long playpos = 0; private long playpos = 0;
private long seek = 0; private long seek = 0;
@@ -41,6 +44,8 @@ namespace MusicPlayer
AState = AudioState.STOPPED; AState = AudioState.STOPPED;
BState = BufferState.EMPTY; BState = BufferState.EMPTY;
Thread.Sleep(11);
ms = new MemoryStream(); ms = new MemoryStream();
network = new Thread(LoadAudio); network = new Thread(LoadAudio);
@@ -50,6 +55,7 @@ namespace MusicPlayer
audio.IsBackground = true; audio.IsBackground = true;
Length = 1; Length = 1;
LengthBuffer = 1;
bufpos = 0; bufpos = 0;
playpos = 0; playpos = 0;
} }
@@ -98,8 +104,13 @@ namespace MusicPlayer
long position = 0; long position = 0;
ms.Position = position; ms.Position = position;
using (WaveStream blockAlignedStream = new BlockAlignReductionStream(WaveFormatConversionStream.CreatePcmStream(new Mp3FileReader(ms)))) Mp3FileReader mp3fr = new Mp3FileReader(ms);
Length = mp3fr.Length;
CurrentTime = mp3fr.CurrentTime + "";
TotalTime = mp3fr.TotalTime + "";
using (WaveStream blockAlignedStream = new BlockAlignReductionStream(WaveFormatConversionStream.CreatePcmStream(mp3fr)))
{ {
using (WaveOut waveOut = new WaveOut(WaveCallbackInfo.FunctionCallback())) using (WaveOut waveOut = new WaveOut(WaveCallbackInfo.FunctionCallback()))
{ {
waveOut.Init(blockAlignedStream); waveOut.Init(blockAlignedStream);
@@ -131,6 +142,9 @@ namespace MusicPlayer
} }
playpos = blockAlignedStream.Position; playpos = blockAlignedStream.Position;
Length = mp3fr.Length;
CurrentTime = mp3fr.CurrentTime + "";
TotalTime = mp3fr.TotalTime + "";
} }
AState = AudioState.STOPPED; AState = AudioState.STOPPED;
@@ -145,7 +159,7 @@ namespace MusicPlayer
var response = WebRequest.Create(s.Url).GetResponse(); var response = WebRequest.Create(s.Url).GetResponse();
BState = BufferState.EMPTY; BState = BufferState.EMPTY;
Length = response.ContentLength; LengthBuffer = response.ContentLength;
using (var stream = response.GetResponseStream()) using (var stream = response.GetResponseStream())
{ {
byte[] buffer = new byte[65536]; // 64KB chunks byte[] buffer = new byte[65536]; // 64KB chunks