mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-01 17:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed detection of end of song (closes #16)

Browse Source
This commit is contained in:
bjorn.olievier 2008-03-29 09:09:53 +00:00
parent 10d0ece3cb
commit f376961b6a
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/audio/AudioStream.cpp
View File

@ -51,8 +51,6 @@ bool AudioStream::GetBuffer(float * pAudioBuffer, unsigned long NumSamples)
if(this->packetizer.IsFinished()) if(this->packetizer.IsFinished())
{ {
// OLD: set date played in playlist entry + notify view of play progress
if(!this->mixNotify) if(!this->mixNotify)
{ {
transport->MixpointReached(); transport->MixpointReached();
@ -112,25 +110,12 @@ bool AudioStream::GetBuffer(float * pAudioBuffer, unsigned long NumSamples)
unsigned long pos = this->GetPosition(); unsigned long pos = this->GetPosition();
unsigned long len = this->GetLength(); unsigned long len = this->GetLength();
unsigned long cft = GetCrossfadeTime() * 1000; unsigned long cft = this->GetCrossfadeTime() * 1000;
// OLD: set date played in playlist entry + notify view of play progress
if(!this->mixNotify) if(!this->mixNotify)
{ {
if(len > cft) if (len <= cft || pos >= (len - cft))
{ {
if(pos >= (len - cft))
{
//crossfade all bar last song covered(it gets called but wont do reset at this point)
this->isLast = !GetActivePlaylistCheckNext();
transport->MixpointReached();
this->mixNotify = true;
}
}
else
{
//len is shorter then crossfade, start crossfade already
this->isLast = !GetActivePlaylistCheckNext(); this->isLast = !GetActivePlaylistCheckNext();
transport->MixpointReached(); transport->MixpointReached();
this->mixNotify = true; this->mixNotify = true;
@ -138,19 +123,19 @@ bool AudioStream::GetBuffer(float * pAudioBuffer, unsigned long NumSamples)
} }
else else
{ {
//CheckNext() will fail as its called when the last song has started already
//due to crossfade, if we simply call now without check of last song, last
//song will finish seconds in.
//if at end of last song in playlist but crossfade was the call n seconds ago //if at end of last song in playlist but crossfade was the call n seconds ago
//used for repeatnone where this is the end of line. //used for repeatnone where this is the end of line.
if(pos >= len && cft != 0 && this->isLast) if(pos >= len && this->isLast)
{ {
transport->PlaybackStoppedOk(); transport->PlaybackStoppedOk();
this->playState = PlayStateStopped;
} }
} }
return true; return true;
} }
return false; return false;
} }
/* /*