Kaydet (Commit) 1eac5fa2 authored tarafından Katarina Behrens's avatar Katarina Behrens

tdf#101524: seeking position shouldn't pause video playback

Change-Id: I846043815cdd41620f96c31843a77bea3d2db82f
Reviewed-on: https://gerrit.libreoffice.org/71596
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 4729385a
...@@ -163,7 +163,7 @@ void MediaControlBase::UpdateToolBoxes(MediaItem aMediaItem) ...@@ -163,7 +163,7 @@ void MediaControlBase::UpdateToolBoxes(MediaItem aMediaItem)
mpPlayToolBox->CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, false ); mpPlayToolBox->CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, false );
mpPlayToolBox->CheckItem( AVMEDIA_TOOLBOXITEM_STOP, false ); mpPlayToolBox->CheckItem( AVMEDIA_TOOLBOXITEM_STOP, false );
} }
else if( aMediaItem.getTime() > 0.0 && ( aMediaItem.getTime() < aMediaItem.getDuration() ) ) else if( aMediaItem.getState() == MediaState::Pause )
{ {
mpPlayToolBox->CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, false ); mpPlayToolBox->CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, false );
mpPlayToolBox->CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE ); mpPlayToolBox->CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE );
......
...@@ -274,6 +274,8 @@ IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p, void ) ...@@ -274,6 +274,8 @@ IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p, void )
MediaItem aExecItem; MediaItem aExecItem;
aExecItem.setTime( p->GetThumbPos() * maItem.getDuration() / AVMEDIA_TIME_RANGE ); aExecItem.setTime( p->GetThumbPos() * maItem.getDuration() / AVMEDIA_TIME_RANGE );
// keep state (if the media was playing, keep it playing)
aExecItem.setState(maItem.getState());
execute( aExecItem ); execute( aExecItem );
update(); update();
maIdle.Start(); maIdle.Start();
......
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