# HG changeset patch
# User rosfran
# Date 1169838625 0
# Node ID fb8c04a619ad7343d84475bd23c0b2629f64274d
# Parent  0a8fe4427e41565a19bb0afc6ae3970ca9c0dde8
[svn r309] Some changes in the channel name to the LiveTV.

diff -r 0a8fe4427e41 -r fb8c04a619ad gst-plugins-mythtv/src/gstmythtvsrc.c
--- a/gst-plugins-mythtv/src/gstmythtvsrc.c	Fri Jan 26 19:08:17 2007 +0000
+++ b/gst-plugins-mythtv/src/gstmythtvsrc.c	Fri Jan 26 19:10:25 2007 +0000
@@ -208,9 +208,9 @@
 
   g_object_class_install_property
       (gobject_class, PROP_GMYTHTV_CHANNEL_NUM,
-      g_param_spec_int ("mythtv-channel", "mythtv-channel",
+      g_param_spec_string ("mythtv-channel", "mythtv-channel",
           "Change MythTV channel number",
-          -1, 99999, GST_GMYTHTV_CHANNEL_DEFAULT_NUM, G_PARAM_READWRITE));
+          "", G_PARAM_READWRITE));
 
 #ifndef GST_DISABLE_GST_DEBUG
   g_object_class_install_property
@@ -260,7 +260,7 @@
   this->mythtv_caps = NULL;
   this->update_prog_chain = FALSE;
 
-  this->channel_num = GST_GMYTHTV_CHANNEL_DEFAULT_NUM;
+  this->channel_name = NULL;
 
   this->eos = FALSE;
 
@@ -652,12 +652,12 @@
   if ( src->live_tv ) {
     src->spawn_livetv = gmyth_livetv_new ();
     
-    gint ch = gmyth_uri_get_channel_num( gmyth_uri );
-    if ( ch != -1 )
-    	src->channel_num = ch;
+    gchar* ch = gmyth_uri_get_channel_name( gmyth_uri );
+    if ( ch != NULL )
+    	src->channel_name = ch;
     	
-    if (src->channel_num != GST_GMYTHTV_CHANNEL_DEFAULT_NUM) {
-      if (gmyth_livetv_channel_setup (src->spawn_livetv, src->channel_num,
+    if (src->channel_name != NULL) {
+      if (gmyth_livetv_channel_name_setup (src->spawn_livetv, src->channel_name,
               src->backend_info) == FALSE) {
         GST_INFO_OBJECT (src, "LiveTV setup felt down on error");
         ret = FALSE;
@@ -1138,7 +1138,7 @@
     }
     case PROP_GMYTHTV_CHANNEL_NUM:
     {
-      mythtvsrc->channel_num = g_value_get_int (value);
+      mythtvsrc->channel_name = g_value_dup_string (value);
       break;
     }
     default:
@@ -1206,7 +1206,7 @@
     }
     case PROP_GMYTHTV_CHANNEL_NUM:
     {
-      g_value_set_int (value, mythtvsrc->channel_num);
+      g_value_set_string (value, mythtvsrc->channel_name);
       break;
     }
     default:
diff -r 0a8fe4427e41 -r fb8c04a619ad gst-plugins-mythtv/src/gstmythtvsrc.h
--- a/gst-plugins-mythtv/src/gstmythtvsrc.h	Fri Jan 26 19:08:17 2007 +0000
+++ b/gst-plugins-mythtv/src/gstmythtvsrc.h	Fri Jan 26 19:10:25 2007 +0000
@@ -95,7 +95,7 @@
 
   gint live_tv_id;
 
-  gint channel_num;  
+  gchar* channel_name;  
 
   guint mode;