[gst-cvs] CVS: gstreamer/plugins/alsa alsa.c,1.9,1.10

[Andy Wingo]

Update of /cvsroot/gstreamer/gstreamer/plugins/alsa
In directory usw-pr-cvs1:/tmp/cvs-serv31192

Modified Files:
	alsa.c 
Log Message:
fixed stupid problem with requested pads

Index: alsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/plugins/alsa/alsa.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- alsa.c	2001/10/22 00:51:11	1.9
+++ alsa.c	2001/10/26 20:37:51	1.10
@@ -85,7 +85,7 @@
     ARG_DEVICE,
     ARG_FORMAT,
     ARG_CHANNELS,
-    ARG_FREQUENCY,
+    ARG_RATE,
     ARG_PERIODCOUNT,
     ARG_PERIODFRAMES
 };
@@ -222,6 +222,9 @@
     if (parent_class == NULL)
         parent_class = g_type_class_ref(GST_TYPE_ELEMENT);
     
+    object_class->get_property = gst_alsa_get_property;
+    object_class->set_property = gst_alsa_set_property;
+    
     g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_DEVICE,
                                     g_param_spec_string("device","device","alsa device: please see README for details",
                                                      "default",
@@ -234,8 +237,8 @@
                                     g_param_spec_int("channels","channels","channels",
                                                      1, 64, 1,
                                                      G_PARAM_READWRITE));
-    g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FREQUENCY,
-                                    g_param_spec_int("frequency","frequency","frequency",
+    g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_RATE,
+                                    g_param_spec_int("rate","rate","rate",
                                                      8000, 192000, 44100,
                                                      G_PARAM_READWRITE));
     g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_PERIODCOUNT,
@@ -247,9 +250,6 @@
                                                      64, 4096, 256,
                                                      G_PARAM_READWRITE));
     
-    object_class->get_property = gst_alsa_get_property;
-    object_class->set_property = gst_alsa_set_property;
-    
     element_class->change_state = gst_alsa_change_state;
     
     element_class->request_new_pad = gst_alsa_request_new_pad;
@@ -399,7 +399,7 @@
     case ARG_CHANNELS:
         this->channels = g_value_get_int (value);
         break;
-    case ARG_FREQUENCY:
+    case ARG_RATE:
         this->rate = g_value_get_int (value);
         break;
     case ARG_PERIODCOUNT:
@@ -444,7 +444,7 @@
     case ARG_CHANNELS:
         g_value_set_int (value, this->channels);
         break;
-    case ARG_FREQUENCY:
+    case ARG_RATE:
         g_value_set_int (value, this->rate);
         break;
     case ARG_PERIODCOUNT:
@@ -1005,11 +1005,6 @@
         this->sample_bytes = snd_pcm_format_physical_width(this->format) / 8;
     }
     
-    if (!this->data_interleaved) {
-        /* if we are in multichannel mode */
-        this->channels = snd_pcm_hw_params_get_channels_max(hw_param);
-    }
-
     ret = snd_pcm_hw_params_set_channels(this->handle, hw_param, this->channels);
     if (ret < 0) {
         g_warning("Channels count (%d) not available: %s", this->channels, snd_strerror(ret));