diff options
author | Daniel Drake <dsd@laptop.org> | 2011-02-16 22:55:06 (GMT) |
---|---|---|
committer | Daniel Drake <dsd@laptop.org> | 2011-02-16 22:55:06 (GMT) |
commit | 61480e2adeb70f84d0ad8b556a24b47929926266 (patch) | |
tree | 17d54a2e19efac635e1a707fab170aa811e65529 /model.py | |
parent | bd03b66578068394917791671db5794f8451b1c6 (diff) |
Fix X to Xv switching
Returning from video playback would continue using X instead of Xv for the
live camera feed.
Diffstat (limited to 'model.py')
-rw-r--r-- | model.py | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -126,6 +126,13 @@ class Model: if state == constants.STATE_READY: self.gplay.stop() + + # if we aren't using Xv (e.g. glive is playing as PIP in video + # mode), then stop the pipeline so that we switch back to Xv + # in the call that follows. + if not self.glive.is_using_xv(): + self.glive.stop() + self.glive.play() self.activity.set_state(state) |