X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgstparse.h;h=ac248e4afb010a22056c6761ab01572be2e83cf6;hb=f34472822c257359d69ebf671b81d85646a40618;hp=70e24600e09063f909be74628152a95598d23e52;hpb=ecd88e381da9e74573f7819bac467b251d03049c;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/gst/gstparse.h b/gst/gstparse.h
index 70e2460..ac248e4 100644
--- a/gst/gstparse.h
+++ b/gst/gstparse.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
  *                    2000 Wim Taymans <wtay@chello.be>
  *
- * filename:
+ * gstparse.h: get a pipeline from a text pipeline description
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -16,22 +16,41 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef __GST_PARSE_H__
 #define __GST_PARSE_H__
 
-#include <gst/gstbin.h>
+#include <gst/gstelement.h>
 
 G_BEGIN_DECLS
 
-#ifndef GST_DISABLE_PARSE
-
+GST_API
 GQuark gst_parse_error_quark (void);
+/**
+ * GST_PARSE_ERROR:
+ *
+ * Get access to the error quark of the parse subsystem.
+ */
 #define GST_PARSE_ERROR gst_parse_error_quark ()
 
+/* FIXME 2.0: rename to GstParseLaunchError, this is not only related to
+ *parsing */
+/**
+ * GstParseError:
+ * @GST_PARSE_ERROR_SYNTAX: A syntax error occurred.
+ * @GST_PARSE_ERROR_NO_SUCH_ELEMENT: The description contained an unknown element
+ * @GST_PARSE_ERROR_NO_SUCH_PROPERTY: An element did not have a specified property
+ * @GST_PARSE_ERROR_LINK: There was an error linking two pads.
+ * @GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY: There was an error setting a property
+ * @GST_PARSE_ERROR_EMPTY_BIN: An empty bin was specified.
+ * @GST_PARSE_ERROR_EMPTY: An empty description was specified
+ * @GST_PARSE_ERROR_DELAYED_LINK: A delayed link did not get resolved.
+ *
+ * The different parsing errors that can occur.
+ */
 typedef enum
 {
   GST_PARSE_ERROR_SYNTAX,
@@ -40,19 +59,81 @@ typedef enum
   GST_PARSE_ERROR_LINK,
   GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY,
   GST_PARSE_ERROR_EMPTY_BIN,
-  GST_PARSE_ERROR_EMPTY
+  GST_PARSE_ERROR_EMPTY,
+  GST_PARSE_ERROR_DELAYED_LINK
 } GstParseError;
 
+/**
+ * GstParseFlags:
+ * @GST_PARSE_FLAG_NONE: Do not use any special parsing options.
+ * @GST_PARSE_FLAG_FATAL_ERRORS: Always return %NULL when an error occurs
+ *     (default behaviour is to return partially constructed bins or elements
+ *      in some cases)
+ * @GST_PARSE_FLAG_NO_SINGLE_ELEMENT_BINS: If a bin only has a single element,
+ *     just return the element.
+ * @GST_PARSE_FLAG_PLACE_IN_BIN: If more than one toplevel element is described
+ *     by the pipeline description string, put them in a #GstBin instead of a
+ *     #GstPipeline. (Since 1.10)
+ *
+ * Parsing options.
+ */
+typedef enum
+{
+  GST_PARSE_FLAG_NONE = 0,
+  GST_PARSE_FLAG_FATAL_ERRORS = (1 << 0),
+  GST_PARSE_FLAG_NO_SINGLE_ELEMENT_BINS = (1 << 1),
+  GST_PARSE_FLAG_PLACE_IN_BIN = (1 << 2)
+} GstParseFlags;
+
+#define GST_TYPE_PARSE_CONTEXT (gst_parse_context_get_type())
+
+/**
+ * GstParseContext:
+ *
+ * Opaque structure.
+ */
+typedef struct _GstParseContext GstParseContext;
+
+/* create, process and free a parse context */
+
+GST_API
+GType             gst_parse_context_get_type (void);
+
+GST_API
+GstParseContext * gst_parse_context_new (void) G_GNUC_MALLOC;
+
+GST_API
+gchar          ** gst_parse_context_get_missing_elements (GstParseContext * context) G_GNUC_MALLOC;
+
+GST_API
+void              gst_parse_context_free (GstParseContext * context);
+
+GST_API
+GstParseContext * gst_parse_context_copy (const GstParseContext * context);
 
-GstElement*	gst_parse_launch	(const gchar *pipeline_description, GError **error);
-GstElement*	gst_parse_launchv	(const gchar **argv, GError **error);
 
-#else /* GST_DISABLE_PARSE */
+/* parse functions */
 
-#pragma GCC poison gst_parse_launch
-#pragma GCC poison gst_parse_launchv
+GST_API
+GstElement      * gst_parse_launch       (const gchar      * pipeline_description,
+                                          GError          ** error) G_GNUC_MALLOC;
+GST_API
+GstElement      * gst_parse_launchv      (const gchar     ** argv,
+                                          GError          ** error) G_GNUC_MALLOC;
+GST_API
+GstElement      * gst_parse_launch_full  (const gchar      * pipeline_description,
+                                          GstParseContext  * context,
+                                          GstParseFlags      flags,
+                                          GError          ** error) G_GNUC_MALLOC;
+GST_API
+GstElement      * gst_parse_launchv_full (const gchar     ** argv,
+                                          GstParseContext  * context,
+                                          GstParseFlags      flags,
+                                          GError          ** error) G_GNUC_MALLOC;
 
-#endif /* GST_DISABLE_PARSE */
+#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstParseContext, gst_parse_context_free)
+#endif
 
 G_END_DECLS