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

Fix playback of videos with vlc in preview window on OSX.

Browse Source
This commit is contained in:
Martin Zibricky 2012-08-18 19:26:54 +02:00
parent 39f249647c
commit 15d031eec1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +136,9 @@ class VlcPlayer(MediaPlayer):
if sys.platform == "win32": if sys.platform == "win32":
display.vlcMediaPlayer.set_hwnd(int(display.vlcWidget.winId())) display.vlcMediaPlayer.set_hwnd(int(display.vlcWidget.winId()))
elif sys.platform == "darwin": elif sys.platform == "darwin":
display.vlcMediaPlayer.set_agl(int(display.vlcWidget.winId())) # We have to use 'set_nsobject' since Qt4 on OSX uses Cocoa
# framework and not the old Carbon.
display.vlcMediaPlayer.set_nsobject(int(display.vlcWidget.winId()))
else: else:
# for Linux using the X Server # for Linux using the X Server
display.vlcMediaPlayer.set_xwindow(int(display.vlcWidget.winId())) display.vlcMediaPlayer.set_xwindow(int(display.vlcWidget.winId()))
@ -215,9 +217,11 @@ class VlcPlayer(MediaPlayer):
display.vlcMediaPlayer.set_time(seekVal) display.vlcMediaPlayer.set_time(seekVal)
def reset(self, display): def reset(self, display):
display.vlcMediaPlayer.stop() # FIXME Reset causes that OpenLP stops responding on OS X.
display.vlcWidget.setVisible(False) #display.vlcMediaPlayer.stop()
self.state = MediaState.Off #display.vlcWidget.setVisible(False)
#self.state = MediaState.Off
pass
def set_visible(self, display, status): def set_visible(self, display, status):
if self.hasOwnWidget: if self.hasOwnWidget: