Merge CAPS branch

Original commit message from CVS:
Merge CAPS branch

5 files changed, 60 insertions, 101 deletions

diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c
index 79321622..48402cf5 100644
--- a/sys/oss/gstosselement.c
+++ b/sys/oss/gstosselement.c
@@ -486,19 +486,22 @@ gst_ossformat_get (gint law, gint endianness, gboolean sign, gint width, gint de
 }
 
 gboolean 
-gst_osselement_parse_caps (GstOssElement *oss, GstCaps *caps) 
+gst_osselement_parse_caps (GstOssElement *oss, const GstCaps *caps) 
 {
   gint bps, format;
+  GstStructure *structure;
 
-  gst_caps_get_int (caps, "width", &oss->width);
-  gst_caps_get_int (caps, "depth", &oss->depth);
+  structure = gst_caps_get_structure (caps, 0);
+
+  gst_structure_get_int  (structure, "width", &oss->width);
+  gst_structure_get_int  (structure, "depth", &oss->depth);
 	        
   if (oss->width != oss->depth) 
     return FALSE;
 		  
-  gst_caps_get_int (caps, "law", &oss->law); 
-  gst_caps_get_int (caps, "endianness", &oss->endianness);
-  gst_caps_get_boolean (caps, "signed", &oss->sign);
+  gst_structure_get_int  (structure, "law", &oss->law); 
+  gst_structure_get_int  (structure, "endianness", &oss->endianness);
+  gst_structure_get_boolean  (structure, "signed", &oss->sign);
 			    
   if (!gst_ossformat_get (oss->law, oss->endianness, oss->sign, 
                           oss->width, oss->depth, &format, &bps))
@@ -507,8 +510,8 @@ gst_osselement_parse_caps (GstOssElement *oss, GstCaps *caps)
      return FALSE;
   }
 
-  gst_caps_get_int (caps, "channels", &oss->channels);
-  gst_caps_get_int (caps, "rate", &oss->rate);
+  gst_structure_get_int  (structure, "channels", &oss->channels);
+  gst_structure_get_int  (structure, "rate", &oss->rate);
 			      
   oss->bps = bps * oss->channels * oss->rate;
   oss->format = format;
@@ -519,25 +522,28 @@ gst_osselement_parse_caps (GstOssElement *oss, GstCaps *caps)
 #define GET_FIXED_INT(caps, name, dest)         \
 G_STMT_START {                                  \
   if (gst_caps_has_fixed_property (caps, name)) \
-    gst_caps_get_int (caps, name, dest);        \
+    gst_structure_get_int  (structure, name, dest);        \
 } G_STMT_END
 #define GET_FIXED_BOOLEAN(caps, name, dest)     \
 G_STMT_START {                                  \
   if (gst_caps_has_fixed_property (caps, name)) \
-    gst_caps_get_boolean (caps, name, dest);    \
+    gst_structure_get_boolean  (structure, name, dest);    \
 } G_STMT_END
 
 gboolean 
 gst_osselement_merge_fixed_caps (GstOssElement *oss, GstCaps *caps) 
 {
   gint bps, format;
+  GstStructure *structure;
 
+  structure = gst_caps_get_structure (caps, 0);
+  
   /* peel off fixed stuff from the caps */
-  GET_FIXED_INT         (caps, "law",        &oss->law);
-  GET_FIXED_INT         (caps, "endianness", &oss->endianness);
-  GET_FIXED_BOOLEAN     (caps, "signed",     &oss->sign);
-  GET_FIXED_INT         (caps, "width",      &oss->width);
-  GET_FIXED_INT         (caps, "depth",      &oss->depth);
+  gst_structure_get_int (structure, "law",        &oss->law);
+  gst_structure_get_int (structure, "endianness", &oss->endianness);
+  gst_structure_get_boolean (structure, "signed",     &oss->sign);
+  gst_structure_get_int (structure, "width",      &oss->width);
+  gst_structure_get_int (structure, "depth",      &oss->depth);
 
   if (!gst_ossformat_get (oss->law, oss->endianness, oss->sign, 
                           oss->width, oss->depth, &format, &bps))
@@ -545,8 +551,8 @@ gst_osselement_merge_fixed_caps (GstOssElement *oss, GstCaps *caps)
      return FALSE;
   }
 
-  GET_FIXED_INT         (caps, "rate",       &oss->rate);
-  GET_FIXED_INT         (caps, "channels",   &oss->channels);
+  gst_structure_get_int (structure, "rate",       &oss->rate);
+  gst_structure_get_int (structure, "channels",   &oss->channels);
 			      
   oss->bps = bps * oss->channels * oss->rate;
   oss->format = format;
diff --git a/sys/oss/gstosselement.h b/sys/oss/gstosselement.h
index f9d8182e..36e1281e 100644
--- a/sys/oss/gstosselement.h
+++ b/sys/oss/gstosselement.h
@@ -101,9 +101,9 @@ GType		gst_osselement_get_type		(void);
 
 /* some useful functions */
 gboolean 	gst_osselement_parse_caps 	(GstOssElement *oss,
-						 GstCaps       *caps);
+						 const GstCaps      *caps);
 gboolean	gst_osselement_merge_fixed_caps (GstOssElement *oss,
-						 GstCaps       *caps);
+						 GstCaps      *caps);
 	
 gboolean 	gst_osselement_sync_parms 	(GstOssElement *oss);
 void		gst_osselement_reset 		(GstOssElement *oss);
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index d93912ed..b1402b29 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -58,7 +58,7 @@ static gboolean 		gst_osssink_query 		(GstElement *element, GstQueryType type,
 static gboolean 		gst_osssink_sink_query 		(GstPad *pad, GstQueryType type,
 								 GstFormat *format, gint64 *value);
 
-static GstPadLinkReturn		gst_osssink_sinkconnect		(GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn		gst_osssink_sinkconnect		(GstPad *pad, const GstCaps *caps);
 
 static void 			gst_osssink_set_property	(GObject *object, guint prop_id, const GValue *value, 
 		  						 GParamSpec *pspec);
@@ -83,28 +83,18 @@ enum {
   /* FILL ME */
 };
 
-GST_PAD_TEMPLATE_FACTORY (osssink_sink_factory,
+static GstStaticPadTemplate osssink_sink_factory =
+GST_STATIC_PAD_TEMPLATE (
   "sink",
   GST_PAD_SINK,
   GST_PAD_ALWAYS,
-  GST_CAPS_NEW (
-    "osssink_sink",
-    "audio/x-raw-int",
-      "endianness", GST_PROPS_INT (G_BYTE_ORDER),
-      "signed",     GST_PROPS_LIST (
-         	      GST_PROPS_BOOLEAN (FALSE),
-     		      GST_PROPS_BOOLEAN (TRUE)
-      		    ),
-      "width",      GST_PROPS_LIST (
-         	      GST_PROPS_INT (8),
-     		      GST_PROPS_INT (16)
-      		    ),
-      "depth",      GST_PROPS_LIST (
-    		      GST_PROPS_INT (8),
-     		      GST_PROPS_INT (16)
-     		    ),
-      "rate",       GST_PROPS_INT_RANGE (1000, 48000),
-      "channels",   GST_PROPS_INT_RANGE (1, 2)
+  GST_STATIC_CAPS ("audio/x-raw-int, "
+      "endianness = (int) BYTE_ORDER, "
+      "signed = (boolean) { TRUE, FALSE }, "
+      "width = (int) { 8, 16 }, "
+      "depth = (int) { 8, 16 }, "
+      "rate = (int) [ 1000, 48000 ], "
+      "channels = (int) [ 1, 2 ]"
   )
 );
 
@@ -134,20 +124,6 @@ gst_osssink_get_type (void)
   return osssink_type;
 }
 
-static GstBufferPool*
-gst_osssink_get_bufferpool (GstPad *pad)
-{
-  GstOssSink *oss;
-  
-  oss = GST_OSSSINK (gst_pad_get_parent(pad));
-
-  /* 6 buffers per chunk by default */
-  if (!oss->sinkpool)
-    oss->sinkpool = gst_buffer_pool_get_default (oss->bufsize, 6);
-
-  return oss->sinkpool;
-}
-
 static void
 gst_osssink_dispose (GObject *object)
 {
@@ -164,7 +140,7 @@ gst_osssink_base_init (gpointer g_class)
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
   
   gst_element_class_set_details (element_class, &gst_osssink_details);
-  gst_element_class_add_pad_template (element_class, GST_PAD_TEMPLATE_GET (osssink_sink_factory));
+  gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&osssink_sink_factory));
 }
 static void
 gst_osssink_class_init (GstOssSinkClass *klass) 
@@ -214,10 +190,9 @@ static void
 gst_osssink_init (GstOssSink *osssink) 
 {
   osssink->sinkpad = gst_pad_new_from_template (
-		  GST_PAD_TEMPLATE_GET (osssink_sink_factory), "sink");
+		  gst_static_pad_template_get (&osssink_sink_factory), "sink");
   gst_element_add_pad (GST_ELEMENT (osssink), osssink->sinkpad);
   gst_pad_set_link_function (osssink->sinkpad, gst_osssink_sinkconnect);
-  gst_pad_set_bufferpool_function (osssink->sinkpad, gst_osssink_get_bufferpool);
   gst_pad_set_convert_function (osssink->sinkpad, gst_osssink_convert);
   gst_pad_set_query_function (osssink->sinkpad, gst_osssink_sink_query);
   gst_pad_set_query_type_function (osssink->sinkpad, gst_osssink_get_query_types);
@@ -230,7 +205,6 @@ gst_osssink_init (GstOssSink *osssink)
   osssink->resync = FALSE;
   osssink->mute = FALSE;
   osssink->sync = TRUE;
-  osssink->sinkpool = NULL;
   osssink->provided_clock = gst_audio_clock_new ("ossclock", gst_osssink_get_time, osssink);
   gst_object_set_parent (GST_OBJECT (osssink->provided_clock), GST_OBJECT (osssink));
   osssink->handled = 0;
@@ -241,13 +215,10 @@ gst_osssink_init (GstOssSink *osssink)
 
 
 static GstPadLinkReturn 
-gst_osssink_sinkconnect (GstPad *pad, GstCaps *caps) 
+gst_osssink_sinkconnect (GstPad *pad, const GstCaps *caps) 
 {
   GstOssSink *osssink = GST_OSSSINK (gst_pad_get_parent (pad));
 
-  if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_LINK_DELAYED;
-
   if (!gst_osselement_parse_caps (GST_OSSELEMENT (osssink), caps))
     return GST_PAD_LINK_REFUSED;
 
@@ -529,7 +500,6 @@ gst_osssink_set_property (GObject *object, guint prop_id, const GValue *value, G
       break;
     case ARG_BUFFER_SIZE:
       osssink->bufsize = g_value_get_uint (value);
-      osssink->sinkpool = gst_buffer_pool_get_default (osssink->bufsize, 6);
       g_object_notify (object, "buffer_size");
       break;
     case ARG_SYNC:
diff --git a/sys/oss/gstosssink.h b/sys/oss/gstosssink.h
index 33bf13fe..f484007b 100644
--- a/sys/oss/gstosssink.h
+++ b/sys/oss/gstosssink.h
@@ -56,7 +56,6 @@ struct _GstOssSink {
   GstOssElement	 element;
 
   GstPad 	*sinkpad;
-  GstBufferPool *sinkpool;
 
   GstClock 	*provided_clock;
   GstClock 	*clock;
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index 01d74fb1..1edba80f 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -57,37 +57,27 @@ enum {
   ARG_FRAGMENT,
 };
 
-GST_PAD_TEMPLATE_FACTORY (osssrc_src_factory,
+static GstStaticPadTemplate osssrc_src_factory =
+GST_STATIC_PAD_TEMPLATE (
   "src",
   GST_PAD_SRC,
   GST_PAD_ALWAYS,
-  GST_CAPS_NEW (
-    "osssrc_src",
-    "audio/x-raw-int",
-      "endianness",     GST_PROPS_INT (G_BYTE_ORDER),
-      "signed",   	GST_PROPS_LIST (
-			  GST_PROPS_BOOLEAN (TRUE),
-			  GST_PROPS_BOOLEAN (FALSE)
-			),
-      "width",   	GST_PROPS_LIST (
-			  GST_PROPS_INT (8),
-			  GST_PROPS_INT (16)
-			),
-      "depth",   	GST_PROPS_LIST (
-			  GST_PROPS_INT (8),
-			  GST_PROPS_INT (16)
-			),
-      "rate",     	GST_PROPS_INT_RANGE (1000, 48000),
-      "channels", 	GST_PROPS_INT_RANGE (1, 2)
+  GST_STATIC_CAPS ("audio/x-raw-int, "
+      "endianness = (int) BYTE_ORDER, "
+      "signed = (boolean) { TRUE, FALSE }, "
+      "width = (int) { 8, 16 }, "
+      "depth = (int) { 8, 16 }, "
+      "rate = (int) [ 1000, 48000 ], "
+      "channels = (int) [ 1, 2 ]"
   )
-)
+);
 
 static void			gst_osssrc_base_init	(gpointer g_class);
 static void 			gst_osssrc_class_init	(GstOssSrcClass *klass);
 static void 			gst_osssrc_init		(GstOssSrc *osssrc);
 static void 			gst_osssrc_dispose	(GObject *object);
 
-static GstPadLinkReturn 	gst_osssrc_srcconnect 	(GstPad *pad, GstCaps *caps);
+static GstPadLinkReturn 	gst_osssrc_srcconnect 	(GstPad *pad, const GstCaps *caps);
 static const GstFormat* 	gst_osssrc_get_formats 	(GstPad *pad);
 static gboolean 		gst_osssrc_convert 	(GstPad *pad, 
 							 GstFormat src_format, gint64 src_value,
@@ -143,7 +133,7 @@ gst_osssrc_base_init (gpointer g_class)
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
   
   gst_element_class_set_details (element_class, &gst_osssrc_details);
-  gst_element_class_add_pad_template (element_class, GST_PAD_TEMPLATE_GET (osssrc_src_factory));
+  gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&osssrc_src_factory));
 }
 static void
 gst_osssrc_class_init (GstOssSrcClass *klass) 
@@ -179,7 +169,7 @@ static void
 gst_osssrc_init (GstOssSrc *osssrc) 
 {
   osssrc->srcpad = gst_pad_new_from_template (
-		  GST_PAD_TEMPLATE_GET (osssrc_src_factory), "src");
+		  gst_static_pad_template_get (&osssrc_src_factory), "src");
   gst_pad_set_get_function (osssrc->srcpad, gst_osssrc_get);
   gst_pad_set_link_function (osssrc->srcpad, gst_osssrc_srcconnect);
   gst_pad_set_convert_function (osssrc->srcpad, gst_osssrc_convert);
@@ -212,15 +202,12 @@ gst_osssrc_dispose (GObject *object)
 }
 
 static GstPadLinkReturn 
-gst_osssrc_srcconnect (GstPad *pad, GstCaps *caps)
+gst_osssrc_srcconnect (GstPad *pad, const GstCaps *caps)
 {
   GstOssSrc *src;
 
   src = GST_OSSSRC(gst_pad_get_parent (pad));
 
-  if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_LINK_DELAYED;
-
   if (!gst_osselement_parse_caps (GST_OSSELEMENT (src), caps))
     return GST_PAD_LINK_REFUSED;
 
@@ -248,17 +235,14 @@ gst_osssrc_negotiate (GstPad *pad)
     
   /* set caps on src pad */
   if (gst_pad_try_set_caps (src->srcpad, 
-	GST_CAPS_NEW (
-    	  "oss_src",
-	  "audio/x-raw-int",
-	    "endianness", GST_PROPS_INT (GST_OSSELEMENT (src)->endianness),
-	    "signed",     GST_PROPS_BOOLEAN (GST_OSSELEMENT (src)->sign),
-	    "width",      GST_PROPS_INT (GST_OSSELEMENT (src)->width),
-	    "depth",      GST_PROPS_INT (GST_OSSELEMENT (src)->depth),
-	    "rate",       GST_PROPS_INT (GST_OSSELEMENT (src)->rate),
-	    "channels",   GST_PROPS_INT (GST_OSSELEMENT (src)->channels)
-        )) <= 0) 
-  {
+	gst_caps_new_simple("audio/x-raw-int",
+	    "endianness", G_TYPE_INT, GST_OSSELEMENT (src)->endianness,
+	    "signed",     G_TYPE_BOOLEAN, GST_OSSELEMENT (src)->sign,
+	    "width",      G_TYPE_INT, GST_OSSELEMENT (src)->width,
+	    "depth",      G_TYPE_INT, GST_OSSELEMENT (src)->depth,
+	    "rate",       G_TYPE_INT, GST_OSSELEMENT (src)->rate,
+	    "channels",   G_TYPE_INT, GST_OSSELEMENT (src)->channels,
+	    NULL)) <= 0) {
     return FALSE;
   }
   return TRUE;