diff options
author | Andy Wingo <wingo@pobox.com> | 2002-04-07 23:32:16 +0000 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2002-04-07 23:32:16 +0000 |
commit | 70cfc6cb4db1ce5b0a9e1f4c7939cb9eb198358d (patch) | |
tree | aee511b4cd9f35ffeed89d2201869e45fcf59201 /gst/gstparse.h | |
parent | 3cbe1bacd03f0356ac038e5bc9bb603666ae07d3 (diff) |
new parser that uses flex and bison
Original commit message from CVS:
* new parser that uses flex and bison
- doesn't do dynamic pipelines yet...
* added GErrors to the gst_parse_launch[v] api
* added --gst-mask-help command line option
* fixed -o option for gst-launch
* GstElement api change:
- gst_element_get_pad
- gst_element_get_request_pad, gst_element_get_static_pad
- gst_element_get_compatible_pad
- gst_element_get_compatible_static_pad, gst_element_get_compatible_request_pad
- gst_element_[dis]connect -> gst_element_[dis]connect_pads
- gst_element_[dis]connect_elements -> gst_element_[dis]connect
* manual update
* example, tool, and doc updates for the api changes
- no more plugin docs in the core docs, plugins require a more
extensive doc system
Diffstat (limited to 'gst/gstparse.h')
-rw-r--r-- | gst/gstparse.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gst/gstparse.h b/gst/gstparse.h index f32eec1f9..807f00113 100644 --- a/gst/gstparse.h +++ b/gst/gstparse.h @@ -25,22 +25,24 @@ #include <gst/gstpipeline.h> -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #ifndef GST_DISABLE_PARSE -typedef enum { - GST_PARSE_ERROR_SYNTAX = -1, - GST_PARSE_ERROR_CREATING_ELEMENT = -2, - GST_PARSE_ERROR_NOSUCH_ELEMENT = -3, - GST_PARSE_ERROR_INTERNAL = -4, - GST_PARSE_ERROR_CONNECT = -5, -} GstParseErrors; - -GstPipeline* gst_parse_launch (const gchar *pipeline_description); -GstPipeline* gst_parse_launchv (const gchar **argv); +GQuark gst_parse_error_quark (void); +#define GST_PARSE_ERROR gst_parse_error_quark () + +typedef enum +{ + GST_PARSE_ERROR_SYNTAX, + GST_PARSE_ERROR_NO_SUCH_ELEMENT, + GST_PARSE_ERROR_NO_SUCH_PROPERTY, + GST_PARSE_ERROR_CONNECT +} GstParseError; + + +GstBin* gst_parse_launch (const gchar *pipeline_description, GError **error); +GstBin* gst_parse_launchv (const gchar **argv, GError **error); #else /* GST_DISABLE_PARSE */ @@ -48,8 +50,6 @@ GstPipeline* gst_parse_launchv (const gchar **argv); #endif /* GST_DISABLE_PARSE */ -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GST_PARSE_H__ */ |