Skip to content

V
vlc-2-2
Commit 1971e071 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: resume only for files 

Close #11721 #11761

(cherry picked from commit 528a16ff6499c782635a167e93b8031c9f090519)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent a8831b7b
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 13 deletions
modules/gui/qt4/input_manager.cpp
View file @ 1971e071
...@@ -128,22 +128,25 @@ void InputManager::setInput( input_thread_t *_p_input ) ...@@ -128,22 +128,25 @@ void InputManager::setInput( input_thread_t *_p_input )
emit rateChanged( var_GetFloat( p_input, "rate" ) ); emit rateChanged( var_GetFloat( p_input, "rate" ) );
/* Get Saved Time */ /* Get Saved Time */
int i_time = RecentsMRL::getInstance( p_intf )->time( p_item->psz_uri ); if( p_item->i_type == ITEM_TYPE_FILE )
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 ); 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, if( QMessageBox::question( NULL,
_("Continue playback?"), _("Continue playback?"),
_("Do you want to restart the playback where left off?"), _("Do you want to restart the playback where left off?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes ) QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes )
== QMessageBox::Yes ) == QMessageBox::Yes )
var_SetTime( p_input, "time", (int64_t)i_time * 1000 ); var_SetTime( p_input, "time", (int64_t)i_time * 1000 );
playlist_Play( THEPL ); playlist_Play( THEPL );
}
} }
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment