diff --git po/guayadeque.pot po/guayadeque.pot index 734d89f..858b008 100644 --- po/guayadeque.pot +++ po/guayadeque.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-22 08:36+0100\n" +"POT-Creation-Date: 2015-01-20 20:54+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git src/MediaCtrl.cpp src/MediaCtrl.cpp index 27fcdf5..3385429 100644 --- src/MediaCtrl.cpp +++ src/MediaCtrl.cpp @@ -2584,20 +2584,8 @@ void guFaderTimeLine::ValueChanged( float value ) void guFaderTimeLine::Finished( void ) { m_FaderPlayBin->SetFaderVolume( m_VolEnd ); - m_FaderPlayBin->EndFade(); -} - -// -------------------------------------------------------------------------------- // -static bool TimerUpdated( guFaderTimeLine * timeline ) -{ - timeline->TimerEvent(); - return true; -} -// -------------------------------------------------------------------------------- // -int guFaderTimeLine::TimerCreate( void ) -{ - return g_timeout_add( m_UpdateInterval, GSourceFunc( TimerUpdated ), this ); + m_FaderPlayBin->EndFade(); } diff --git src/MediaCtrl.h src/MediaCtrl.h index 0d92ac3..62692ee 100644 --- src/MediaCtrl.h +++ src/MediaCtrl.h @@ -209,7 +209,7 @@ class guFaderTimeLine : public guTimeLine virtual void ValueChanged( float value ); virtual void Finished( void ); - virtual int TimerCreate( void ); +// virtual int TimerCreate( void ); }; // -------------------------------------------------------------------------------- // diff --git src/TimeLine.cpp src/TimeLine.cpp index 2c6753f..e78c2cb 100644 --- src/TimeLine.cpp +++ src/TimeLine.cpp @@ -109,8 +109,8 @@ void guTimeLine::ChangeCurrentTime( const int msecs ) if( Ended ) { - Finished(); Stop(); + Finished(); } }