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

tidies

Browse Source
This commit is contained in:
Jonathan Corwin 2011-03-19 22:52:56 +00:00
parent 2fa2888112
commit 55d9e85840
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/ui/maindisplay.py
View File

@ -110,7 +110,7 @@ class MainDisplay(DisplayWidget):
Phonon.createPath(self.mediaObject, self.audio) Phonon.createPath(self.mediaObject, self.audio)
QtCore.QObject.connect(self.mediaObject, QtCore.QObject.connect(self.mediaObject,
QtCore.SIGNAL(u'stateChanged(Phonon::State, Phonon::State)'), QtCore.SIGNAL(u'stateChanged(Phonon::State, Phonon::State)'),
self.videoStart) self.videoState)
QtCore.QObject.connect(self.mediaObject, QtCore.QObject.connect(self.mediaObject,
QtCore.SIGNAL(u'finished()'), QtCore.SIGNAL(u'finished()'),
self.videoFinished) self.videoFinished)
@ -378,7 +378,7 @@ class MainDisplay(DisplayWidget):
Receiver.send_message(u'maindisplay_active') Receiver.send_message(u'maindisplay_active')
return self.preview() return self.preview()
def videoStart(self, newState, oldState): def videoState(self, newState, oldState):
""" """
Start the video at a predetermined point. Start the video at a predetermined point.
""" """

1
openlp/plugins/media/lib/mediaitem.py
View File

@ -148,6 +148,7 @@ class MediaMediaItem(MediaManagerItem):
== Phonon.MediaSource.Invalid: == Phonon.MediaSource.Invalid:
# Due to string freeze, borrow a message from presentations # Due to string freeze, borrow a message from presentations
# This will be corrected in 1.9.6 # This will be corrected in 1.9.6
self.mediaObject.stop()
critical_error_message_box( critical_error_message_box(
translate('PresentationPlugin.MediaItem', translate('PresentationPlugin.MediaItem',
'Unsupported File'), 'Unsupported File'),