diff options
author | Daniel Drake <dsd@laptop.org> | 2010-07-16 22:56:17 (GMT) |
---|---|---|
committer | Daniel Drake <dsd@laptop.org> | 2010-07-16 22:56:17 (GMT) |
commit | 3fc5af5916d50b6e7a078f21a364a17429e82f23 (patch) | |
tree | 66e25ad3788a5fb094391fa7d3a59a619d681306 | |
parent | 56e740b5bec04d18369d2f9fb6982293efe52985 (diff) |
Always resume live video feed in startLiveVideo()
I can't see any code paths where we would want to bail out early
from startLiveVideo().
Fixes http://dev.laptop.org/ticket/10239
-rw-r--r-- | ui.py | 19 |
1 files changed, 4 insertions, 15 deletions
@@ -928,7 +928,7 @@ class UI: self.showLiveVideoTags() self.LIVEMODE = True - self.startLiveVideo( False ) + self.startLiveVideo() self.updateVideoComponents() @@ -994,7 +994,7 @@ class UI: #set up the x & xv x-ition (if need be) self.ca.gplay.stop() - self.startLiveVideo( True ) + self.startLiveVideo() bottomKid = self.bottomCenter.get_child() if (bottomKid != None): @@ -1007,16 +1007,7 @@ class UI: self.resetWidgetFadeTimer() - def startLiveVideo(self, force): - #We need to know which window and which pipe here - - #if returning from another activity, active won't be false and needs to be to get started - if (self.ca.glive.window == self.liveVideoWindow - and self.ca.props.active - and not force): - return - - self.liveVideoWindow.set_glive(self.ca.glive) + def startLiveVideo(self): self.ca.glivex.stop() self.ca.glive.play() @@ -1741,7 +1732,7 @@ class UI: self.livePhotoCanvas.setImage( None ) elif (recd.type == Constants.TYPE_VIDEO): self.ca.gplay.stop() - self.startLiveVideo( False ) + self.startLiveVideo() elif (recd.type == Constants.TYPE_AUDIO): self.livePhotoCanvas.setImage( None ) self.startLiveAudio() @@ -1757,8 +1748,6 @@ class UI: self.ca.m.setUpdating(True) self.ca.gplay.stop() - self.liveVideoWindow.set_glive(self.ca.glive) - self.showLiveVideoTags() self.LIVEMODE = True self.updateVideoComponents() |