diff options
Diffstat (limited to 'model.py')
| -rw-r--r-- | model.py | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -125,6 +125,7 @@ class Model: self._mode = mode self.activity.remove_all_thumbnails() + for recd in self.mediaHashs[mode]: self.activity.add_thumbnail(recd, True) @@ -272,6 +273,7 @@ class Model: return True def do_shutter(self): + # if recording, stop if self._state == constants.STATE_RECORDING: self._stop_media_capture() @@ -291,6 +293,7 @@ class Model: # called from gstreamer thread def still_ready(self, pixbuf): + GObject.idle_add(self.activity.show_still, pixbuf) def add_recd(self, recd): @@ -305,6 +308,7 @@ class Model: # called from gstreamer thread def save_photo(self, pixbuf): + recd = self.createNewRecorded(constants.TYPE_PHOTO) imgpath = os.path.join(Instance.instancePath, recd.mediaFilename) @@ -315,9 +319,8 @@ class Model: #now that we've saved both the image and its pixbuf, we get their md5s self.createNewRecordedMd5Sums( recd ) - GObject.idle_add(self.add_recd, recd, priority=GObject.PRIORITY_HIGH) - GObject.idle_add(self.activity.set_shutter_sensitive, - True, priority=GObject.PRIORITY_HIGH) + GObject.idle_add(self.add_recd, recd) + GObject.idle_add(self.activity.set_shutter_sensitive, True) # called from gstreamer thread def save_video(self, path, still): @@ -330,7 +333,7 @@ class Model: self.createNewRecordedMd5Sums( recd ) - GObject.idle_add(self.add_recd, recd, priority=GObject.PRIORITY_HIGH) + GObject.idle_add(self.add_recd, recd) GObject.idle_add(self.set_state, constants.STATE_READY) def save_audio(self, path, still): @@ -349,7 +352,7 @@ class Model: self.createNewRecordedMd5Sums( recd ) - GObject.idle_add(self.add_recd, recd, priority=GObject.PRIORITY_HIGH) + GObject.idle_add(self.add_recd, recd) GObject.idle_add(self.set_state, constants.STATE_READY) def _playback_status_changed(self, widget, status, value): @@ -384,12 +387,15 @@ class Model: self.activity.set_paused(False) def start_seek(self): + self.gplay.pause() def do_seek(self, position): + self.gplay.seek(position) def end_seek(self): + self.gplay.play() def get_recd_by_md5(self, md5): @@ -431,6 +437,7 @@ class Model: recd.colorFill = color.get_fill_color() logger.debug('createNewRecorded: ' + str(recd)) + return recd def createNewRecordedMd5Sums( self, recd ): |