pitivi r1277 - trunk/pitivi/ui

[edwardrv svn gnome org]

Author: edwardrv
Date: Fri Sep 26 17:14:37 2008
New Revision: 1277
URL: http://svn.gnome.org/viewvc/pitivi?rev=1277&view=rev

Log:
remove broken imports and remove whitespaces

Modified:
   trunk/pitivi/ui/netstream_managerdialog.py
   trunk/pitivi/ui/screencast_managerdialog.py
   trunk/pitivi/ui/webcam_managerdialog.py

Modified: trunk/pitivi/ui/netstream_managerdialog.py
==============================================================================
--- trunk/pitivi/ui/netstream_managerdialog.py	(original)
+++ trunk/pitivi/ui/netstream_managerdialog.py	Fri Sep 26 17:14:37 2008
@@ -24,9 +24,7 @@
 import gtk.glade
 import pango
 import gobject
-import pygst
 import time
-pygst.require("0.10")
 import gst
 import tempfile
 from gettext import gettext as _
@@ -40,7 +38,6 @@
 class NetstreamManagerDialog(object):
 
 	def __init__(self):
-		
 		self.sourcefactories = SourceFactoriesWidget()
 		self.capture_pipe = None
 		self.player = None
@@ -52,7 +49,7 @@
 		self.capture_btn = self.objectpool_ui.get_widget("capture_btn")
 		self.preview_btn = self.objectpool_ui.get_widget("preview_btn")
 		self.close_btn = self.objectpool_ui.get_widget("close_btn")
-		self.port = self.objectpool_ui.get_widget("port")	
+		self.port = self.objectpool_ui.get_widget("port")
 		self.address = self.objectpool_ui.get_widget("address")
 		self.uri = self.objectpool_ui.get_widget("url")
 		self.status = self.objectpool_ui.get_widget("status")
@@ -71,7 +68,7 @@
 		self.close_btn.connect("clicked",self.close)
 		self.stream_window.connect("destroy",self.close)
 
-	
+
 		dic = { "on_close_clicked" : self.close, "on_preview_btn_clicked":self.live_pipeline,"on_capture_btn_clicked":self.capture_pipeline}
 
 		self.objectpool_ui.signal_autoconnect(dic)
@@ -81,8 +78,6 @@
 		self.capture_btn = self.capture_btn.get_children()[0]
 		self.capture_btn = self.capture_btn.get_children()[0].get_children()[1]
 		self.capture_btn.set_label("Capture")
-	
-		
 
 
 	# For Setting up audio,video sinks
@@ -99,14 +94,12 @@
 		bus.enable_sync_message_emission()
 		bus.connect('sync-message::element', self.on_sync_message)
 
-	
-		
+
 	# Create live display pipeline
 	def live_pipeline(self,w=None):
-		
+
 		if self.player:
 			self.player.set_state(gst.STATE_NULL)
-		
 
 		uri = self.uri.get_text()
 
@@ -131,7 +124,6 @@
 
 		uri = self.uri.get_text()
 		if self.capture_btn.get_label() == "Capture":
-			
 			if self.player is False and gst.uri_protocol_is_supported(gst.URI_SRC,uri.split('://')[0]) is False :
 				self.status.set_label("Unsupported Protocol. Please verify the URI.")
 				return
@@ -151,7 +143,6 @@
 			self.player.stopRecording()
 			self.sourcefactories.sourcelist.addFiles([self.filepath])
 			self.capture_btn.set_label("Capture")
-		
 
 	def on_message(self,bus,message):
 		t = message.type
@@ -176,12 +167,11 @@
 			imagesink = message.src
 			imagesink.set_property('force-aspect-ratio',True)
 			imagesink.set_xwindow_id(self.screen.window.xid)
-			
-			
+
 	# radio buttons address set callback
 	def on_protocol_toggled(self,widget,data=None):
 		self.uri.set_text(data+"://"+self.uri.get_text().split('://')[1])
-			
+
 	def on_address_port_changed(self,widget,data=None):
 		self.uri.set_text(self.uri.get_text().split('://')[0] + '://' + self.address.get_text() + ['',':'][self.port.get_text().isdigit()] + self.port.get_text())
 

Modified: trunk/pitivi/ui/screencast_managerdialog.py
==============================================================================
--- trunk/pitivi/ui/screencast_managerdialog.py	(original)
+++ trunk/pitivi/ui/screencast_managerdialog.py	Fri Sep 26 17:14:37 2008
@@ -22,9 +22,7 @@
 import gtk
 import os
 import gtk.glade
-import pygst
 from pitivi import instance
-pygst.require("0.10")
 import gst
 import tempfile
 from gettext import gettext as _
@@ -44,10 +42,10 @@
 	def __init__(self):
 		gst.log("Creating new ScreencastManager Dialog")
 
-		# Create gtk widget using glade model 
+		# Create gtk widget using glade model
 		glade_dir = os.path.dirname(os.path.abspath(__file__))
 		pool_ui = gtk.glade.XML(os.path.join(glade_dir, "screencast_manager.glade"))
-	
+
 		self.window = pool_ui.get_widget("screencast_window")
 		self.close_btn = pool_ui.get_widget("btn_close")
 		self.ok_btn = pool_ui.get_widget("btn_ok")
@@ -62,7 +60,7 @@
 
 		self.dbus_connect()
 
-			
+
 
 	def dbus_connect(self):
 		# Connect to istanbul dbus service
@@ -84,7 +82,7 @@
 	def ok(self,w):
 		self.screencast(None)
 		self.close(None)
-		
+
 
 	def start_thread_istanbul(self):
 		os.system("istanbul")
@@ -95,9 +93,6 @@
 		thread.start_new_thread(self.start_thread_istanbul,())
 		time.sleep(2)
 		self.dbus_connect()
-		
-		
-		
 
 	def screencast(self,w):
 		if self.screencast_btn.get_active():
@@ -106,4 +101,4 @@
 		else:
 			self.iface.savemode(False)
 			instance.PiTiVi.screencast = False
-		
+

Modified: trunk/pitivi/ui/webcam_managerdialog.py
==============================================================================
--- trunk/pitivi/ui/webcam_managerdialog.py	(original)
+++ trunk/pitivi/ui/webcam_managerdialog.py	Fri Sep 26 17:14:37 2008
@@ -22,9 +22,7 @@
 import gtk
 import os
 import gtk.glade
-import pygst
 from pitivi import instance
-pygst.require("0.10")
 import gst
 import tempfile
 from gettext import gettext as _
@@ -40,7 +38,7 @@
 	def __init__(self):
 		gst.log("Creating new WebcamManager Dialog")
 
-		# Create gtk widget using glade model 
+		# Create gtk widget using glade model
 		glade_dir = os.path.dirname(os.path.abspath(__file__))
 		self.cam_ui = gtk.glade.XML(os.path.join(glade_dir, "cam_capture.glade"))
 		self.cam_window = self.cam_ui.get_widget("cam_capture")
@@ -51,30 +49,28 @@
 		self.close_btn.connect("clicked",self.close)
 		self.record_btn.connect("clicked", self.threaded_recording)
 		self.cam_window.connect("destroy",self.close)
-		
+
 		self.record_btn = self.record_btn.get_children()[0]
 		self.record_btn = self.record_btn.get_children()[0].get_children()[1]
 		self.record_btn.set_label("Start Recording")
-	
+
 		self.sourcefactories = SourceFactoriesWidget()
 
 		gst.debug("SmartCaptureBin player created")
-		self.player = SmartCaptureBin()		
+		self.player = SmartCaptureBin()
 		self.setSinks()
-	
+
 
 
 		self.player.set_state(gst.STATE_PLAYING)
 
 	# Perform record in a seperate thread
 	def threaded_recording(self,w):
-		
 		CallbackThread(self.do_recording,w).start()
 
 
 	# Record button action callback
 	def do_recording(self, w):
-	
 		if self.record_btn.get_label() == "Start Recording":
 			gst.debug("recording started")
 			self.filepath = 'file://'+tempfile.mktemp()+'.ogg'
@@ -90,7 +86,6 @@
 			self.sourcefactories.sourcelist.addFiles([self.filepath])
 			self.player.set_state(gst.STATE_PLAYING)
 			self.record_btn.set_label("Start Recording")
-		
 
 	# For Setting up audio,video sinks
 	def setSinks(self):
@@ -105,7 +100,7 @@
 	def close(self,w):
 		self.cam_window.destroy()
 		self.player.set_state(gst.STATE_NULL)
-		
+
 	# For draw_window syncs
 	def on_sync_message(self, bus, message):
 		if message.structure is None: