vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Wed Aug 13 04:41:37 2014 +0200| [9e4bbb868d8c5d0c9498ce8f822a583b4d0e9299] | committer: Jean-Baptiste Kempf
Qt: resume only for files Close #11721 #11761 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9e4bbb868d8c5d0c9498ce8f822a583b4d0e9299 --- modules/gui/qt4/input_manager.cpp | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp index d76fdd5..3a77b1e 100644 --- a/modules/gui/qt4/input_manager.cpp +++ b/modules/gui/qt4/input_manager.cpp @@ -128,22 +128,25 @@ void InputManager::setInput( input_thread_t *_p_input ) emit rateChanged( var_GetFloat( p_input, "rate" ) ); /* Get Saved Time */ - int i_time = RecentsMRL::getInstance( p_intf )->time( p_item->psz_uri ); - if( i_time > 0 && - !var_GetFloat( p_input, "run-time" ) && - !var_GetFloat( p_input, "start-time" ) && - !var_GetFloat( p_input, "stop-time" ) ) + if( p_item->i_type ) { - playlist_Pause( THEPL ); + int i_time = RecentsMRL::getInstance( p_intf )->time( p_item->psz_uri ); + if( i_time > 0 && + !var_GetFloat( p_input, "run-time" ) && + !var_GetFloat( p_input, "start-time" ) && + !var_GetFloat( p_input, "stop-time" ) ) + { + playlist_Pause( THEPL ); - if( QMessageBox::question( NULL, - _("Continue playback?"), - _("Do you want to restart the playback where left off?"), - QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes ) - == QMessageBox::Yes ) - var_SetTime( p_input, "time", (int64_t)i_time * 1000 ); + if( QMessageBox::question( NULL, + _("Continue playback?"), + _("Do you want to restart the playback where left off?"), + QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes ) + == QMessageBox::Yes ) + var_SetTime( p_input, "time", (int64_t)i_time * 1000 ); - playlist_Play( THEPL ); + playlist_Play( THEPL ); + } } } else _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
