diff options
Diffstat (limited to 'ui.py')
| -rw-r--r-- | ui.py | 31 |
1 files changed, 15 insertions, 16 deletions
@@ -50,6 +50,7 @@ from p5_button import P5Button from p5_button import Polygon from p5_button import Button from glive import LiveVideoWindow +from glivex import SlowLiveVideoWindow from gplay import PlayVideoWindow from recorded import Recorded from button import RecdButton @@ -401,12 +402,13 @@ class UI: self.liveVideoWindow.add_events(gtk.gdk.VISIBILITY_NOTIFY_MASK) self.liveVideoWindow.connect("visibility-notify-event", self._visibleNotifyCb) - self.returnToLiveWindow = ReturnToLiveWindow() - self.addToWindowStack( self.returnToLiveWindow, self.windowStack[len(self.windowStack)-1] ) - self.returnToLiveWindow.set_events(gtk.gdk.BUTTON_RELEASE_MASK) - self.returnToLiveWindow.connect("button_release_event", self._returnButtonReleaseCb) - self.returnToLiveWindow.add_events(gtk.gdk.VISIBILITY_NOTIFY_MASK) - self.returnToLiveWindow.connect("visibility-notify-event", self._visibleNotifyCb) + self.slowLiveVideoWindow = SlowLiveVideoWindow(Constants.colorBlack.gColor) + self.addToWindowStack( self.slowLiveVideoWindow, self.windowStack[len(self.windowStack)-1] ) + self.slowLiveVideoWindow.set_glivex(self.ca.glivex) + self.slowLiveVideoWindow.set_events(gtk.gdk.BUTTON_RELEASE_MASK) + self.slowLiveVideoWindow.connect("button_release_event", self._returnButtonReleaseCb) + self.slowLiveVideoWindow.add_events(gtk.gdk.VISIBILITY_NOTIFY_MASK) + self.slowLiveVideoWindow.connect("visibility-notify-event", self._visibleNotifyCb) self.recordWindow = RecordWindow(self) self.addToWindowStack( self.recordWindow, self.windowStack[len(self.windowStack)-1] ) @@ -544,7 +546,7 @@ class UI: self.moveWinOffscreen( self.maxWindow ) self.moveWinOffscreen( self.pipBgdWindow ) self.moveWinOffscreen( self.infWindow ) - self.moveWinOffscreen( self.returnToLiveWindow ) + self.moveWinOffscreen( self.slowLiveVideoWindow ) if (self.FULLSCREEN): self.moveWinOffscreen( self.recordWindow ) @@ -834,6 +836,7 @@ class UI: def _returnButtonReleaseCb(self, widget, event): self.ca.gplay.stop() + self.ca.glivex.stop() self.ca.glive.play() self.resumeLiveVideo() @@ -1327,7 +1330,7 @@ class UI: pos.append({"position":"inf", "window":self.infWindow} ) elif (self.ca.m.MODE == Constants.MODE_VIDEO): pos.append({"position":"pgd", "window":self.pipBgdWindow} ) - pos.append({"position":"pip", "window":self.returnToLiveWindow} ) + pos.append({"position":"pip", "window":self.slowLiveVideoWindow} ) pos.append({"position":"inb", "window":self.playOggWindow} ) pos.append({"position":"inf", "window":self.infWindow} ) elif (self.ca.m.MODE == Constants.MODE_AUDIO): @@ -1359,7 +1362,7 @@ class UI: else: pos.append({"position":"img", "window":self.playOggWindow} ) pos.append({"position":"pgd", "window":self.pipBgdWindow} ) - pos.append({"position":"pip", "window":self.returnToLiveWindow} ) + pos.append({"position":"pip", "window":self.slowLiveVideoWindow} ) if (not self.MESHING): pos.append({"position":"max", "window":self.maxWindow} ) pos.append({"position":"scr", "window":self.scrubWindow} ) @@ -1421,7 +1424,7 @@ class UI: elif (self.ca.m.MODE == Constants.MODE_VIDEO): if (not self.LIVEMODE): pos.append({"position":"pgd", "window":self.pipBgdWindow} ) - pos.append({"position":"pip", "window":self.returnToLiveWindow} ) + pos.append({"position":"pip", "window":self.slowLiveVideoWindow} ) if (not self.MESHING): pos.append({"position":"max", "window":self.maxWindow} ) pos.append({"position":"scr", "window":self.scrubWindow} ) @@ -1638,6 +1641,7 @@ class UI: mediaFilepath = recd.getMediaFilepath() if (mediaFilepath != None): self.ca.glive.stop() + self.ca.glivex.play() videoUrl = "file://" + str( mediaFilepath ) self.ca.gplay.setLocation(videoUrl) self.scrubWindow.doPlay() @@ -1646,6 +1650,7 @@ class UI: if (not ableToShowVideo): # FIXME is this correct? self.ca.glive.stop() + self.ca.glivex.play() thumbFilepath = recd.getThumbFilepath( ) thumbUrl = "file://" + str( thumbFilepath ) self.ca.gplay.setLocation(thumbUrl) @@ -1817,12 +1822,6 @@ class xoPanel(P5): self.xoGuy.render_cairo( ctx ) -class ReturnToLiveWindow(gtk.Window): - def __init__(self): - gtk.Window.__init__(self) - self.add(gtk.Label("Back")) - - class ScrubberWindow(gtk.Window): def __init__(self, ui): gtk.Window.__init__(self) |