grayscale and other changes

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

1 files changed, 3 insertions, 9 deletions

diff --git a/gplay.py b/gplay.py
index bd4f02c..81a6945 100644
--- a/gplay.py
+++ b/gplay.py
@@ -36,8 +36,7 @@ import record
 
 class Gplay:
 
-	def __init__(self, pca):
-		self.ca = pca
+	def __init__(self):
 		self.window = None
 		self.players = []
 		self.playing = False
@@ -67,10 +66,11 @@ class Gplay:
 
 	def onSyncMessage(self, bus, message):
 		if message.structure is None:
-			return
+			return True
 		if message.structure.get_name() == 'prepare-xwindow-id':
 			self.window.set_sink(message.src)
 			message.src.set_property('force-aspect-ratio', True)
+			return True
 
 
 	def setLocation(self, location):
@@ -137,7 +137,6 @@ class PlayVideoWindow(gtk.Window):
 		gtk.Window.__init__(self)
 
 		self.imagesink = None
-		self.glive = None
 
 		self.modify_bg( gtk.STATE_NORMAL, bgd )
 		self.modify_bg( gtk.STATE_INSENSITIVE, bgd )
@@ -145,11 +144,6 @@ class PlayVideoWindow(gtk.Window):
 		self.set_flags(gtk.APP_PAINTABLE)
 
 
-	def set_gplay(self, pgplay):
-		self.gplay = pgplay
-		self.gplay.window = self
-
-
 	def set_sink(self, sink):
 		if (self.imagesink != None):
 			assert self.window.xid