Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/model.py
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2008-07-01 18:48:07 (GMT)
committer Daniel Drake <dsd@laptop.org>2008-07-01 18:48:07 (GMT)
commit4c52afbb3da6e81fa9940ab78ce52b4ed5d38909 (patch)
treea17905a2b37e765a81c4e705b184b1beedd55a1a /model.py
parent1d3d774aaeebb80721f87ab3451dac193de8bd03 (diff)
Pipeline rework
Move to a model where the pipeline core is fixed, and we can plug in photo and video bins to the tee element, and/or add an audiobin separated from the rest for recording audio. Fixes problems caused by not doing pad blocking and having unconnected elements lying around in the pipeline. Video recording is not quite working right... Audio and photo seem OK.
Diffstat (limited to 'model.py')
-rw-r--r--model.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/model.py b/model.py
index c9f2a90..15c4553 100644
--- a/model.py
+++ b/model.py
@@ -297,7 +297,6 @@ class Model:
#resume live video from the camera (if the activity is active)
if (self.ca.ui.ACTIVE):
self.ca.ui.updateVideoComponents()
- self.ca.glive.play()
self.ca.ui.progressWindow.updateProgress( 0, "" )
self.setRecording( False )
@@ -457,4 +456,4 @@ class Model:
self.MODE = Constants.MODE_AUDIO
self.setUpdating(True)
- gobject.idle_add( self.setupMode, self.MODE, True ) \ No newline at end of file
+ gobject.idle_add( self.setupMode, self.MODE, True )