cheese r795 - in trunk: . src

[fargiolas svn gnome org]

Author: fargiolas
Date: Sat Jul  5 14:24:53 2008
New Revision: 795
URL: http://svn.gnome.org/viewvc/cheese?rev=795&view=rev

Log:
Close #523475. Bump gstreamer requirement to 0.10.16


Modified:
   trunk/AUTHORS
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/cheese-webcam.c

Modified: trunk/AUTHORS
==============================================================================
--- trunk/AUTHORS	(original)
+++ trunk/AUTHORS	Sat Jul  5 14:24:53 2008
@@ -18,6 +18,7 @@
   - Thomas Perl <thp perli ne>
   - Tim Philipp MÃller <tim centricular net>
   - Tommi Vainikainen <thv iki fi>
+  - Filippo Argiolas <filippo argiolas gmail com>
 
 icon-work
   - cheese icons by Andreas Nilsson <andreas andreasn se>

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jul  5 14:24:53 2008
@@ -61,7 +61,7 @@
 GTK_REQUIRED=2.10.0
 LIBGNOMEUI_REQUIRED=2.14.0
 GCONF_REQUIRED=2.16.0
-GSTREAMER_REQUIRED=0.10.15
+GSTREAMER_REQUIRED=0.10.16
 CAIRO_REQUIRED=1.2.4
 GNOME_VFS_REQUIRED=2.18.0
 LIBEBOOK_REQUIRED=1.12.0

Modified: trunk/src/cheese-webcam.c
==============================================================================
--- trunk/src/cheese-webcam.c	(original)
+++ trunk/src/cheese-webcam.c	Sat Jul  5 14:24:53 2008
@@ -219,10 +219,9 @@
 
   if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_EOS)
   {
+    g_print ("Received EOS message\n");
     g_signal_emit (webcam, webcam_signals [VIDEO_SAVED], 0);
-
-    gst_element_set_locked_state (priv->video_source, FALSE);
-    gst_element_set_locked_state (priv->audio_source, FALSE);
+    
     cheese_webcam_change_sink (webcam, priv->video_display_bin, 
                                priv->photo_save_bin, priv->video_save_bin);
     priv->is_recording = FALSE;
@@ -1118,10 +1117,8 @@
   CheeseWebcamPrivate* priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
 
   /* Send EOS message down the pipeline by stopping video and audio source*/
-  gst_element_set_state (priv->video_source, GST_STATE_NULL);
-  gst_element_set_locked_state (priv->video_source, TRUE);
-  gst_element_set_state (priv->audio_source, GST_STATE_NULL);
-  gst_element_set_locked_state (priv->audio_source, TRUE);
+  gst_element_send_event (priv->video_source, gst_event_new_eos ());
+  gst_element_send_event (priv->audio_source, gst_event_new_eos ());
 }
 
 void