[gst-cvs] dschleef gst-plugins: gst-plugins/ext/alsa/ gst-plugins/ext/sdl/ gst-plugins/ext/vorbis/

[David S. <dsc...@us...>]

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     dschleef
Date:           Sun Dec 14 2003  15:52:01 PST
Branch:         CAPS

Log message:
Minor fixes

Modified files:
    ext/alsa        : gstalsa.c
    ext/sdl         : sdlvideosink.c
    ext/vorbis      : vorbisenc.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.77.4.1&r2=1.77.4.2
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/sdl/sdlvideosink.c.diff?r1=1.36.4.1&r2=1.36.4.2
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/vorbis/vorbisenc.c.diff?r1=1.41.2.1&r2=1.41.2.2

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.77.4.1
retrieving revision 1.77.4.2
diff -u -d -r1.77.4.1 -r1.77.4.2
--- gstalsa.c	12 Dec 2003 22:52:57 -0000	1.77.4.1
+++ gstalsa.c	14 Dec 2003 23:51:48 -0000	1.77.4.2
@@ -453,13 +453,16 @@
 
     return gst_caps2_new_simple ("audio/x-raw-float",
 	    "width",      G_TYPE_INT, (gint) snd_pcm_format_width (format),
-	    "endianness", G_TYPE_INT, G_BYTE_ORDER);
+	    "endianness", G_TYPE_INT, G_BYTE_ORDER,
+            NULL);
   }
   return NULL;
 }
 
 static inline void
-add_channels (GstStructure *structure, gint min_rate, gint max_rate, gint min_channels, gint max_channels) {
+add_channels (GstStructure *structure, gint min_rate, gint max_rate,
+    gint min_channels, gint max_channels)
+{
   if (min_rate < 0) {
     min_rate = GST_ALSA_MIN_RATE;
     max_rate = GST_ALSA_MAX_RATE;
@@ -467,7 +470,8 @@
   if (max_rate < 0) {
     gst_structure_set (structure, "rate", G_TYPE_INT, min_rate, NULL);
   } else {
-    gst_structure_set (structure, "rate", GST_TYPE_INT_RANGE, min_rate, max_rate);
+    gst_structure_set (structure, "rate", GST_TYPE_INT_RANGE, min_rate,
+        max_rate, NULL);
   }
   if (min_channels < 0) {
     min_channels = 1;
@@ -476,7 +480,8 @@
   if (max_channels < 0) {
     gst_structure_set (structure, "channels", G_TYPE_INT, min_channels, NULL);
   } else {
-    gst_structure_set (structure, "channels", GST_TYPE_INT_RANGE, min_channels, max_channels);
+    gst_structure_set (structure, "channels", GST_TYPE_INT_RANGE,
+        min_channels, max_channels, NULL);
   }
 }
 
@@ -489,7 +494,7 @@
 GstCaps2 *
 gst_alsa_caps (snd_pcm_format_t format, gint rate, gint channels)
 {
-  GstCaps2 *ret_caps = NULL;
+  GstCaps2 *ret_caps;
 
   if (format != SND_PCM_FORMAT_UNKNOWN) {
     /* there are some caps set already */
@@ -504,6 +509,7 @@
     int i;
     GstCaps2 *temp;
 
+    ret_caps = gst_caps2_new_empty ();
     for (i = 0; i <= SND_PCM_FORMAT_LAST; i++) {
       temp = gst_alsa_get_caps_internal (i);
 
Index: sdlvideosink.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/sdl/sdlvideosink.c,v
retrieving revision 1.36.4.1
retrieving revision 1.36.4.2
diff -u -d -r1.36.4.1 -r1.36.4.2
--- sdlvideosink.c	11 Dec 2003 10:49:14 -0000	1.36.4.1
+++ sdlvideosink.c	14 Dec 2003 23:51:49 -0000	1.36.4.2
@@ -145,7 +145,7 @@
 	   "format", GST_TYPE_FOURCC, format[i],
 	   "width",  GST_TYPE_INT_RANGE, 1, G_MAXINT,
 	   "height", GST_TYPE_INT_RANGE, 1, G_MAXINT,
-	   "framerate", GST_TYPE_DOUBLE_RANGE, 0, G_MAXDOUBLE,
+	   "framerate", GST_TYPE_DOUBLE_RANGE, 0.0, G_MAXDOUBLE,
 	   NULL));
   }
 
Index: vorbisenc.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/vorbis/vorbisenc.c,v
retrieving revision 1.41.2.1
retrieving revision 1.41.2.2
diff -u -d -r1.41.2.1 -r1.41.2.2
--- vorbisenc.c	11 Dec 2003 10:49:15 -0000	1.41.2.1
+++ vorbisenc.c	14 Dec 2003 23:51:49 -0000	1.41.2.2
@@ -160,10 +160,10 @@
 
   gst_vorbisenc_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK, 
 		                                      GST_PAD_ALWAYS, 
-					              raw_caps, NULL);
+					              raw_caps);
   gst_vorbisenc_src_template = gst_pad_template_new ("src", GST_PAD_SRC, 
 		                                     GST_PAD_ALWAYS, 
-					             vorbis_caps, NULL);
+					             vorbis_caps);
   gst_element_class_add_pad_template (element_class, gst_vorbisenc_sink_template);
   gst_element_class_add_pad_template (element_class, gst_vorbisenc_src_template);
   gst_element_class_set_details (element_class, &vorbisenc_details);