From 3fc5af5916d50b6e7a078f21a364a17429e82f23 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Fri, 16 Jul 2010 22:56:17 +0000
Subject: 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
---
diff --git a/ui.py b/ui.py
index 09222eb..51bd3b9 100644
--- a/ui.py
+++ b/ui.py
@@ -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()
--
cgit v0.9.1