51

git-svn-id: http://mediamods.com/public-svn/camera-activity/tags/51@1013 574bc980-5f2d-0410-acbc-c8f9f0eb14e0

1 files changed, 15 insertions, 3 deletions

diff --git a/record.py b/record.py
index c208fdc..cdbf583 100755
--- a/record.py
+++ b/record.py
@@ -1,4 +1,4 @@
-#Copyright (c) 2007, Media Modifications Ltd.
+#Copyright (c) 2008, Media Modifications Ltd.
 
 #Permission is hereby granted, free of charge, to any person obtaining a copy
 #of this software and associated documentation files (the "Software"), to deal
@@ -122,13 +122,25 @@ class Record(activity.Activity):
 			self.destroy()
 
 
+#	def stopPipes(self):
+#		self.gplay.stop()
+#		self.ui.doMouseListener( False )
+
+#		#todo: only abandon iff countingdown
+#		if (self.ui.COUNTINGDOWN or self.m.RECORDING or self.ui.TRANSCODING):
+#			self.m.setUpdating( False )
+#			self.m.abandonRecording()
+#		else:
+#			self.glive.stop()
+
+
 	def stopPipes(self):
 		self.gplay.stop()
 		self.ui.doMouseListener( False )
 
-		if (self.ui.COUNTINGDOWN or self.m.RECORDING or self.ui.TRANSCODING):
+		if (self.m.RECORDING):
 			self.m.setUpdating( False )
-			self.m.abandonRecording()
+			self.m.doShutter()
 		else:
 			self.glive.stop()