pitivi r1242 - in branches/SOC_2008_SLAKSHMAN: . pitivi pitivi/ui

[slynux svn gnome org]

Author: slynux
Date: Thu Aug 28 14:21:11 2008
New Revision: 1242
URL: http://svn.gnome.org/viewvc/pitivi?rev=1242&view=rev

Log:
Added statusbar for network stream manager, Added queues to correct SinkBin

Modified:
   branches/SOC_2008_SLAKSHMAN/ChangeLog
   branches/SOC_2008_SLAKSHMAN/pitivi/bin.py
   branches/SOC_2008_SLAKSHMAN/pitivi/ui/net_capture.glade
   branches/SOC_2008_SLAKSHMAN/pitivi/ui/netstream_managerdialog.py

Modified: branches/SOC_2008_SLAKSHMAN/pitivi/bin.py
==============================================================================
--- branches/SOC_2008_SLAKSHMAN/pitivi/bin.py	(original)
+++ branches/SOC_2008_SLAKSHMAN/pitivi/bin.py	Thu Aug 28 14:21:11 2008
@@ -249,6 +249,7 @@
         self.getRealVideoSink().set_property("sync", True)
 
         self.recording = False
+        self.set_state(gst.STATE_PLAYING)
         return True
 
     def getSettings(self):

Modified: branches/SOC_2008_SLAKSHMAN/pitivi/ui/net_capture.glade
==============================================================================
--- branches/SOC_2008_SLAKSHMAN/pitivi/ui/net_capture.glade	(original)
+++ branches/SOC_2008_SLAKSHMAN/pitivi/ui/net_capture.glade	Thu Aug 28 14:21:11 2008
@@ -1034,10 +1034,24 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkStatusbar" id="status">
-	      <property name="width_request">397</property>
+	    <widget class="GtkLabel" id="status">
+	      <property name="width_request">404</property>
+	      <property name="height_request">22</property>
 	      <property name="visible">True</property>
-	      <property name="has_resize_grip">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">2</property>

Modified: branches/SOC_2008_SLAKSHMAN/pitivi/ui/netstream_managerdialog.py
==============================================================================
--- branches/SOC_2008_SLAKSHMAN/pitivi/ui/netstream_managerdialog.py	(original)
+++ branches/SOC_2008_SLAKSHMAN/pitivi/ui/netstream_managerdialog.py	Thu Aug 28 14:21:11 2008
@@ -56,7 +56,6 @@
 		self.address = self.objectpool_ui.get_widget("address")
 		self.uri = self.objectpool_ui.get_widget("url")
 		self.status = self.objectpool_ui.get_widget("status")
-		self.status_id = self.status.get_context_id("status")
 
 		self.http_radiobtn = self.objectpool_ui.get_widget("protocol")
 		self.udp_radiobtn = self.objectpool_ui.get_widget("udp")
@@ -114,7 +113,7 @@
 		if uri != None :
 
 			if gst.uri_is_valid (uri) is False:
-				self.status.push(self.status_id,"Invalid URI. Please verify.")
+				self.status.set_label("Invalid URI. Please verify.")
 				gst.debug("Invalid URI")
 				return 
 			if gst.uri_protocol_is_supported(gst.URI_SRC,uri.split('://')[0]):
@@ -122,7 +121,7 @@
 				self.player.set_state(gst.STATE_PLAYING)
 				self.status.push(self.status_id,"")
 			else:
-				self.status.push(self.status_id,"Unsupported Protocol. Please verify the URI.")
+				self.status.set_label("Unsupported Protocol. Please verify the URI.")
 				gst.debug("Unsupported Protocol")
 
 
@@ -134,17 +133,18 @@
 		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.push(self.status_id,"Unsupported Protocol. Please verify the URI.")
+				self.status.set_label("Unsupported Protocol. Please verify the URI.")
 				return
 			elif self.player is False:
 				self.player.set_state(gst.STATE_NULL)
 				self.setSinks(uri)
 
+
 			gst.debug("recording started")
 			self.filepath = 'file://'+tempfile.mktemp()+'.ogg'
 			self.player.record(self.filepath,ExportSettings())
 			self.capture_btn.set_label("Stop")
-			self.player.set_state(gst.STATE_PLAYING)
+
 
 		else:
 			gst.debug("recording stopped")