[svn r309] Some changes in the channel name to the LiveTV.
1.1 --- a/gst-plugins-mythtv/src/gstmythtvsrc.c Fri Jan 26 19:08:17 2007 +0000
1.2 +++ b/gst-plugins-mythtv/src/gstmythtvsrc.c Fri Jan 26 19:10:25 2007 +0000
1.3 @@ -208,9 +208,9 @@
1.4
1.5 g_object_class_install_property
1.6 (gobject_class, PROP_GMYTHTV_CHANNEL_NUM,
1.7 - g_param_spec_int ("mythtv-channel", "mythtv-channel",
1.8 + g_param_spec_string ("mythtv-channel", "mythtv-channel",
1.9 "Change MythTV channel number",
1.10 - -1, 99999, GST_GMYTHTV_CHANNEL_DEFAULT_NUM, G_PARAM_READWRITE));
1.11 + "", G_PARAM_READWRITE));
1.12
1.13 #ifndef GST_DISABLE_GST_DEBUG
1.14 g_object_class_install_property
1.15 @@ -260,7 +260,7 @@
1.16 this->mythtv_caps = NULL;
1.17 this->update_prog_chain = FALSE;
1.18
1.19 - this->channel_num = GST_GMYTHTV_CHANNEL_DEFAULT_NUM;
1.20 + this->channel_name = NULL;
1.21
1.22 this->eos = FALSE;
1.23
1.24 @@ -652,12 +652,12 @@
1.25 if ( src->live_tv ) {
1.26 src->spawn_livetv = gmyth_livetv_new ();
1.27
1.28 - gint ch = gmyth_uri_get_channel_num( gmyth_uri );
1.29 - if ( ch != -1 )
1.30 - src->channel_num = ch;
1.31 + gchar* ch = gmyth_uri_get_channel_name( gmyth_uri );
1.32 + if ( ch != NULL )
1.33 + src->channel_name = ch;
1.34
1.35 - if (src->channel_num != GST_GMYTHTV_CHANNEL_DEFAULT_NUM) {
1.36 - if (gmyth_livetv_channel_setup (src->spawn_livetv, src->channel_num,
1.37 + if (src->channel_name != NULL) {
1.38 + if (gmyth_livetv_channel_name_setup (src->spawn_livetv, src->channel_name,
1.39 src->backend_info) == FALSE) {
1.40 GST_INFO_OBJECT (src, "LiveTV setup felt down on error");
1.41 ret = FALSE;
1.42 @@ -1138,7 +1138,7 @@
1.43 }
1.44 case PROP_GMYTHTV_CHANNEL_NUM:
1.45 {
1.46 - mythtvsrc->channel_num = g_value_get_int (value);
1.47 + mythtvsrc->channel_name = g_value_dup_string (value);
1.48 break;
1.49 }
1.50 default:
1.51 @@ -1206,7 +1206,7 @@
1.52 }
1.53 case PROP_GMYTHTV_CHANNEL_NUM:
1.54 {
1.55 - g_value_set_int (value, mythtvsrc->channel_num);
1.56 + g_value_set_string (value, mythtvsrc->channel_name);
1.57 break;
1.58 }
1.59 default:
2.1 --- a/gst-plugins-mythtv/src/gstmythtvsrc.h Fri Jan 26 19:08:17 2007 +0000
2.2 +++ b/gst-plugins-mythtv/src/gstmythtvsrc.h Fri Jan 26 19:10:25 2007 +0000
2.3 @@ -95,7 +95,7 @@
2.4
2.5 gint live_tv_id;
2.6
2.7 - gint channel_num;
2.8 + gchar* channel_name;
2.9
2.10 guint mode;
2.11