raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed seeking when playing mediaclip

Browse Source
This commit is contained in:
Tomas Groth 2014-07-01 22:06:55 +02:00
parent 154334a332
commit 3c91a6bbfd
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openlp/core/ui/media/vlcplayer.py
View File

@ -246,10 +246,12 @@ class VlcPlayer(MediaPlayer):
if controller.media_info.start_time > 0: if controller.media_info.start_time > 0:
log.debug('vlc play, starttime set: ' + str(controller.media_info.start_time)) log.debug('vlc play, starttime set: ' + str(controller.media_info.start_time))
start_time = controller.media_info.start_time start_time = controller.media_info.start_time
self.volume(display, controller.media_info.volume) controller.media_info.length = controller.media_info.end_time - controller.media_info.start_time
if start_time > 0: else:
self.seek(display, int(start_time * 1000))
controller.media_info.length = int(display.vlc_media_player.get_media().get_duration() / 1000) controller.media_info.length = int(display.vlc_media_player.get_media().get_duration() / 1000)
self.volume(display, controller.media_info.volume)
if start_time > 0 and display.vlc_media_player.is_seekable():
display.vlc_media_player.set_time(int(start_time * 1000))
controller.seek_slider.setMaximum(controller.media_info.length * 1000) controller.seek_slider.setMaximum(controller.media_info.length * 1000)
self.state = MediaState.Playing self.state = MediaState.Playing
display.vlc_widget.raise_() display.vlc_widget.raise_()
@ -283,6 +285,9 @@ class VlcPlayer(MediaPlayer):
""" """
Go to a particular position Go to a particular position
""" """
if display.controller.media_info.media_type == MediaType.CD \
or display.controller.media_info.media_type == MediaType.DVD:
seek_value += int(display.controller.media_info.start_time * 1000)
if display.vlc_media_player.is_seekable(): if display.vlc_media_player.is_seekable():
display.vlc_media_player.set_time(seek_value) display.vlc_media_player.set_time(seek_value)
@ -315,6 +320,11 @@ class VlcPlayer(MediaPlayer):
self.set_visible(display, False) self.set_visible(display, False)
if not controller.seek_slider.isSliderDown(): if not controller.seek_slider.isSliderDown():
controller.seek_slider.blockSignals(True) controller.seek_slider.blockSignals(True)
if display.controller.media_info.media_type == MediaType.CD \
or display.controller.media_info.media_type == MediaType.DVD:
controller.seek_slider.setSliderPosition(display.vlc_media_player.get_time() -
int(display.controller.media_info.start_time * 1000))
else:
controller.seek_slider.setSliderPosition(display.vlc_media_player.get_time()) controller.seek_slider.setSliderPosition(display.vlc_media_player.get_time())
controller.seek_slider.blockSignals(False) controller.seek_slider.blockSignals(False)

1
openlp/plugins/media/forms/mediaclipselectordialog.py
View File

@ -166,7 +166,6 @@ class Ui_MediaClipSelector(object):
self.position_horizontalslider.setInvertedAppearance(False) self.position_horizontalslider.setInvertedAppearance(False)
self.position_horizontalslider.setObjectName("position_horizontalslider") self.position_horizontalslider.setObjectName("position_horizontalslider")
self.gridLayout.addWidget(self.position_horizontalslider, 6, 1, 1, 3) self.gridLayout.addWidget(self.position_horizontalslider, 6, 1, 1, 3)
self.retranslateUi(MediaClipSelector) self.retranslateUi(MediaClipSelector)
QtCore.QMetaObject.connectSlotsByName(MediaClipSelector) QtCore.QMetaObject.connectSlotsByName(MediaClipSelector)
MediaClipSelector.setTabOrder(self.media_path_combobox, self.load_disc_pushbutton) MediaClipSelector.setTabOrder(self.media_path_combobox, self.load_disc_pushbutton)