1.1 --- a/gmyth-stream/gmemcoder/src/gmencoder.c Fri May 18 19:36:49 2007 +0100
1.2 +++ b/gmyth-stream/gmemcoder/src/gmencoder.c Fri May 18 21:15:39 2007 +0100
1.3 @@ -635,7 +635,9 @@
1.4
1.5 if (priv->pipe != NULL) {
1.6 //TODO: fixe pipeline dispose
1.7 - //gst_element_set_state (priv->pipe, GST_STATE_NULL);
1.8 + g_debug ("SETING STATE TO NULL");
1.9 + gst_element_set_state (priv->pipe, GST_STATE_NULL);
1.10 + g_debug ("SETING STATE TO NULL: OK");
1.11 //gst_object_unref (priv->pipe);
1.12 gst_object_unref (priv->src);
1.13 priv->src = NULL;
2.1 --- a/gmyth/src/gmyth_uri.c Fri May 18 19:36:49 2007 +0100
2.2 +++ b/gmyth/src/gmyth_uri.c Fri May 18 21:15:39 2007 +0100
2.3 @@ -416,8 +416,6 @@
2.4 g_return_val_if_fail (uri->uri != NULL, FALSE);
2.5 g_return_val_if_fail (uri->uri->str != NULL, FALSE);
2.6
2.7 - g_debug ("verify [%s]", uri->uri->str);
2.8 -
2.9 if ((strstr (uri->uri->str, "channel") == NULL) ||
2.10 (strstr (uri->uri->str, "livetv") == NULL))
2.11 ret = FALSE;
3.1 --- a/gst-gmyth/mythsrc/gstmythtvsrc.c Fri May 18 19:36:49 2007 +0100
3.2 +++ b/gst-gmyth/mythsrc/gstmythtvsrc.c Fri May 18 21:15:39 2007 +0100
3.3 @@ -332,8 +332,6 @@
3.4 {
3.5 mythtv_src->unique_setup = FALSE;
3.6
3.7 - g_debug ("CLEAR");
3.8 -
3.9 if (mythtv_src->spawn_livetv) {
3.10 g_object_unref (mythtv_src->spawn_livetv);
3.11 mythtv_src->spawn_livetv = NULL;
3.12 @@ -353,10 +351,6 @@
3.13 g_byte_array_free (mythtv_src->bytes_queue, TRUE);
3.14 mythtv_src->bytes_queue = NULL;
3.15 }
3.16 -
3.17 -
3.18 - g_debug ("CLEAR END");
3.19 -
3.20 }
3.21
3.22 static void
3.23 @@ -722,21 +716,8 @@
3.24 src->channel_name = ch;
3.25
3.26 if (src->channel_name != NULL) {
3.27 - gint try = 0;
3.28 gboolean result;
3.29 -
3.30 - while (try < 100) {
3.31 - result = gmyth_livetv_channel_name_setup (src->spawn_livetv, src->channel_name);
3.32 - if (result == TRUE) {
3.33 - g_debug ("LIVE STARTED");
3.34 - break;
3.35 - }
3.36 -
3.37 - g_debug ("FAIL TO START LIVE");
3.38 - g_usleep (0.5 * G_USEC_PER_SEC);
3.39 - try++;
3.40 - }
3.41 -
3.42 + result = gmyth_livetv_channel_name_setup (src->spawn_livetv, src->channel_name);
3.43 if (result == FALSE) {
3.44 GST_INFO_OBJECT (src, "LiveTV setup felt down on error");
3.45 ret = FALSE;
3.46 @@ -1015,6 +996,8 @@
3.47 GstStateChangeReturn ret = GST_STATE_CHANGE_FAILURE;
3.48 GstMythtvSrc *src = GST_MYTHTV_SRC (element);
3.49
3.50 + g_debug ("MYTHSRC: state_changed");
3.51 +
3.52 switch (transition) {
3.53 case GST_STATE_CHANGE_NULL_TO_READY:
3.54 break;
3.55 @@ -1033,13 +1016,18 @@
3.56 break;
3.57 }
3.58
3.59 +
3.60 + g_debug ("MYTHSRC: state_changed 1");
3.61 +
3.62 ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
3.63 if (ret == GST_STATE_CHANGE_FAILURE)
3.64 return ret;
3.65
3.66 +
3.67 + g_debug ("MYTHSRC: state_changed2");
3.68 +
3.69 switch (transition) {
3.70 case GST_STATE_CHANGE_READY_TO_NULL:
3.71 - g_debug ("STAAAAAAAAAAAATTTTTTTTTEEEEEEEEE NULLLLLLLLLLLLLLLL");
3.72 gst_mythtv_src_clear (src);
3.73 break;
3.74 case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
3.75 @@ -1049,6 +1037,7 @@
3.76 break;
3.77 }
3.78
3.79 + g_debug ("MYTHSRC: state_changed: DONE");
3.80 return ret;
3.81 }
3.82
4.1 --- a/gst-gmyth/nuvdemux/gstnuvdemux.c Fri May 18 19:36:49 2007 +0100
4.2 +++ b/gst-gmyth/nuvdemux/gstnuvdemux.c Fri May 18 21:15:39 2007 +0100
4.3 @@ -1583,6 +1583,7 @@
4.4 {
4.5 GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
4.6
4.7 + g_debug ("Nuvdemux state_change");
4.8 switch (transition) {
4.9 case GST_STATE_CHANGE_NULL_TO_READY:
4.10 gst_nuv_demux_reset (GST_NUV_DEMUX (element));
4.11 @@ -1592,11 +1593,16 @@
4.12 break;
4.13 }
4.14
4.15 + g_debug ("Nuvdemux state_change: 1");
4.16 +
4.17 ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
4.18 if (ret == GST_STATE_CHANGE_FAILURE) {
4.19 goto done;
4.20 }
4.21
4.22 +
4.23 + g_debug ("Nuvdemux state_change: 2");
4.24 +
4.25 switch (transition) {
4.26 case GST_STATE_CHANGE_READY_TO_NULL:
4.27 gst_nuv_demux_reset (GST_NUV_DEMUX (element));
4.28 @@ -1606,6 +1612,9 @@
4.29 break;
4.30 }
4.31
4.32 +
4.33 + g_debug ("Nuvdemux state_change: DONE");
4.34 +
4.35 done:
4.36 return ret;
4.37 }