From fd88d5f5e9fb29bd42140446ba438c65da975565 Mon Sep 17 00:00:00 2001 From: nebojsa Date: Tue, 29 Sep 2009 15:15:16 +0000 Subject: [PATCH] display info now correct when files are skipped --- .../src/modules/playlistExecutor/src/GstreamerPlayer.cxx | 5 +++-- campcaster/src/products/gLiveSupport/src/NowPlaying.cxx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/campcaster/src/modules/playlistExecutor/src/GstreamerPlayer.cxx b/campcaster/src/modules/playlistExecutor/src/GstreamerPlayer.cxx index a60c95b29..c5c955d32 100644 --- a/campcaster/src/modules/playlistExecutor/src/GstreamerPlayer.cxx +++ b/campcaster/src/modules/playlistExecutor/src/GstreamerPlayer.cxx @@ -303,7 +303,7 @@ GstreamerPlayer :: playNextSmil(void) throw ( { 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(); if(m_smilHandler == NULL){ return false; @@ -326,7 +326,8 @@ GstreamerPlayer :: playNextSmil(void) throw ( m_Id = audioDescription->m_Id; m_url = (const char*) audioDescription->m_src; g_idle_add(GstreamerPlayer::fireOnStartEvent, this); - m_smilOffset += m_currentPlayLength; + m_smilOffset = audioDescription->m_begin; +// m_smilOffset += m_currentPlayLength; m_playContext->playContext(); return true; } diff --git a/campcaster/src/products/gLiveSupport/src/NowPlaying.cxx b/campcaster/src/products/gLiveSupport/src/NowPlaying.cxx index dbd08fae5..96b6e4f7a 100644 --- a/campcaster/src/products/gLiveSupport/src/NowPlaying.cxx +++ b/campcaster/src/products/gLiveSupport/src/NowPlaying.cxx @@ -145,13 +145,14 @@ void NowPlaying :: setCurrentInnerPlayable (gint64 id) throw () { playableMutex.lock(); + //keep this for future use if((gint64)currentInnerPlayable->getId()->getId() != id) { //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{ -std::cout << "NowPlaying :: setCurrentInnerPlayable CORRECT!" << std::endl; +//std::cout << "NowPlaying :: setCurrentInnerPlayable CORRECT!" << std::endl; } playableMutex.unlock(); }