Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display info now correct when files are skipped

This commit is contained in:
nebojsa 2009-09-29 15:15:16 +00:00
parent 9cc4389052
commit fd88d5f5e9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
campcaster/src/modules/playlistExecutor/src/GstreamerPlayer.cxx
View File

@ -303,7 +303,7 @@ GstreamerPlayer :: playNextSmil(void) throw (
{ {
return false; return false;
} }
m_currentPlayLength = m_playContext->getPosition();//this gets the length of the stream that just completed // m_currentPlayLength = m_playContext->getPosition();//this gets the length of the stream that just completed
m_playContext->closeContext(); m_playContext->closeContext();
if(m_smilHandler == NULL){ if(m_smilHandler == NULL){
return false; return false;
@ -326,7 +326,8 @@ GstreamerPlayer :: playNextSmil(void) throw (
m_Id = audioDescription->m_Id; m_Id = audioDescription->m_Id;
m_url = (const char*) audioDescription->m_src; m_url = (const char*) audioDescription->m_src;
g_idle_add(GstreamerPlayer::fireOnStartEvent, this); g_idle_add(GstreamerPlayer::fireOnStartEvent, this);
m_smilOffset += m_currentPlayLength; m_smilOffset = audioDescription->m_begin;
// m_smilOffset += m_currentPlayLength;
m_playContext->playContext(); m_playContext->playContext();
return true; return true;
} }

5
campcaster/src/products/gLiveSupport/src/NowPlaying.cxx
View File

@ -145,13 +145,14 @@ void
NowPlaying :: setCurrentInnerPlayable (gint64 id) throw () NowPlaying :: setCurrentInnerPlayable (gint64 id) throw ()
{ {
playableMutex.lock(); playableMutex.lock();
//keep this for future use
if((gint64)currentInnerPlayable->getId()->getId() != id) if((gint64)currentInnerPlayable->getId()->getId() != id)
{ {
//we are not playing a correct file, must have had an error - adjust the playlist //we are not playing a correct file, must have had an error - adjust the playlist
std::cout << "NowPlaying :: setCurrentInnerPlayable ERROR DETECTED! called = " << id << ", current = " << (gint64)currentInnerPlayable->getId()->getId() << std::endl; //std::cout << "NowPlaying :: setCurrentInnerPlayable ERROR DETECTED! called = " << id << ", current = " << (gint64)currentInnerPlayable->getId()->getId() << std::endl;
} }
else{ else{
std::cout << "NowPlaying :: setCurrentInnerPlayable CORRECT!" << std::endl; //std::cout << "NowPlaying :: setCurrentInnerPlayable CORRECT!" << std::endl;
} }
playableMutex.unlock(); playableMutex.unlock();
} }