diff --git a/common b/common index b5288e8215..fcdc6ccbcc 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit b5288e8215c6eacf0782880f6c5b6dea8f445a34 +Subproject commit fcdc6ccbcc674dd487021d87a0313abf02bae396 diff --git a/configure.ac b/configure.ac index 6ef8af9fae..538fe612ba 100644 --- a/configure.ac +++ b/configure.ac @@ -470,7 +470,6 @@ dnl ############################ dnl set license and copyright notice AC_DEFINE(GST_LICENSE, "LGPL", [GStreamer license]) -AC_DEFINE(GST_COPYRIGHT, "(c) 1999-2003 The GStreamer Team", [copyright message in plugins]) dnl package name in plugins AC_ARG_WITH(package-name, AC_HELP_STRING([--with-package-name],[specify package name to use in plugins]), diff --git a/docs/gst/tmpl/gst.sgml b/docs/gst/tmpl/gst.sgml index 0aa658138f..92d32672a9 100644 --- a/docs/gst/tmpl/gst.sgml +++ b/docs/gst/tmpl/gst.sgml @@ -112,14 +112,6 @@ pipeline and Microsoft's DirectShow for some background. @Returns: - - - - - -@Returns: - - diff --git a/docs/gst/tmpl/gstbin.sgml b/docs/gst/tmpl/gstbin.sgml index 8a0038e0b9..68c62da4bc 100644 --- a/docs/gst/tmpl/gstbin.sgml +++ b/docs/gst/tmpl/gstbin.sgml @@ -72,34 +72,6 @@ The GstBin object - - - - - -@gstbin: the object which received the signal. -@arg1: the element that was added to the bin - - - - - - -@gstbin: the object which received the signal. -@arg1: the element that was removed from the bin - - - -This signal is emitted when a bin iterates, either automatically or -due to a #gst_bin_iterate() call. The return value is used to -determine if the object method handler processed any data. -In most normal cases, a user-provided signal handler should return -FALSE. - - -@gstbin: the object which received the signal. -@Returns: TRUE if the state of the bin was advanced. - The signature of the callback for the post and pre iterate function as set with @@ -252,3 +224,31 @@ gst_bin_set_pre_iterate_function() and gst_bin_set_post_iterate_function(). @clock: + + + + + +@gstbin: the object which received the signal. +@arg1: the element that was added to the bin + + + + + + +@gstbin: the object which received the signal. +@arg1: the element that was removed from the bin + + + +This signal is emitted when a bin iterates, either automatically or +due to a #gst_bin_iterate() call. The return value is used to +determine if the object method handler processed any data. +In most normal cases, a user-provided signal handler should return +FALSE. + + +@gstbin: the object which received the signal. +@Returns: TRUE if the state of the bin was advanced. + diff --git a/docs/gst/tmpl/gstclock.sgml b/docs/gst/tmpl/gstclock.sgml index ae2cf0de72..da3b748162 100644 --- a/docs/gst/tmpl/gstclock.sgml +++ b/docs/gst/tmpl/gstclock.sgml @@ -235,16 +235,6 @@ The GstClock object - - -Maximum allowed diff for clock sync requests against the real time. - - - - -Boolean property to activate stat generation on the clock. - - @@ -412,3 +402,13 @@ Boolean property to activate stat generation on the clock. @id: + + +Maximum allowed diff for clock sync requests against the real time. + + + + +Boolean property to activate stat generation on the clock. + + diff --git a/docs/gst/tmpl/gstconfig.sgml b/docs/gst/tmpl/gstconfig.sgml index 99b80335de..650cc595a8 100644 --- a/docs/gst/tmpl/gstconfig.sgml +++ b/docs/gst/tmpl/gstconfig.sgml @@ -44,13 +44,6 @@ If a subsystem is disabled in GStreamer, a value is defined in - - - - - - - diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml index 4ce8a7bea1..e978c80481 100644 --- a/docs/gst/tmpl/gstelement.sgml +++ b/docs/gst/tmpl/gstelement.sgml @@ -71,58 +71,6 @@ The element object - - -Signal emited when the element goes to PAUSED due to an end-of-stream -condition. - - -@gstelement: the object which received the signal. - - - -Is triggered whenever an error occured. - - - -@gstelement: the object which received the signal. -@arg1: the error message -@arg2: - - - - - - -@gstelement: the object which received the signal. -@arg1: -@arg2: - - - -Is triggered whenever a new pad is added to an element. - - -@gstelement: the object which received the signal. -@arg1: the new pad that was added - - - -Is triggered whenever a pad has been removed from the element. - - -@gstelement: the object which received the signal. -@arg1: The pad that was removed. - - - -Is triggered whenever the state of an element changes. - - -@gstelement: the object which received the signal. -@arg1: the new state of the object -@arg2: - Gets the name of the element. @@ -1015,3 +963,55 @@ Helper macro to create query type functions @...: list of query types. + + +Signal emited when the element goes to PAUSED due to an end-of-stream +condition. + + +@gstelement: the object which received the signal. + + + +Is triggered whenever an error occured. + + + +@gstelement: the object which received the signal. +@arg1: the error message +@arg2: + + + + + + +@gstelement: the object which received the signal. +@arg1: +@arg2: + + + +Is triggered whenever a new pad is added to an element. + + +@gstelement: the object which received the signal. +@arg1: the new pad that was added + + + +Is triggered whenever a pad has been removed from the element. + + +@gstelement: the object which received the signal. +@arg1: The pad that was removed. + + + +Is triggered whenever the state of an element changes. + + +@gstelement: the object which received the signal. +@arg1: the new state of the object +@arg2: + diff --git a/docs/gst/tmpl/gstindex.sgml b/docs/gst/tmpl/gstindex.sgml index cdc3cfa10e..d828fa3114 100644 --- a/docs/gst/tmpl/gstindex.sgml +++ b/docs/gst/tmpl/gstindex.sgml @@ -209,19 +209,6 @@ The GstIndex object - - -Is emited when a new entry is added to the index. - - -@gstindex: the object which received the signal. -@arg1: The entry added to the index. - - - - - - @@ -414,3 +401,16 @@ Is emited when a new entry is added to the index. @id: + + +Is emited when a new entry is added to the index. + + +@gstindex: the object which received the signal. +@arg1: The entry added to the index. + + + + + + diff --git a/docs/gst/tmpl/gstobject.sgml b/docs/gst/tmpl/gstobject.sgml index cf69ab93ee..52616a2215 100644 --- a/docs/gst/tmpl/gstobject.sgml +++ b/docs/gst/tmpl/gstobject.sgml @@ -40,47 +40,6 @@ The GstObject - - -The deep notify signal is used to be notified of property changes. -it is typically attached to the toplevel bin to receive notifications -from all the elements contained in that bin. - - -@gstobject: the object which received the signal. -@arg1: the object that originated the signal -@arg2: the property that changed - - - -Is trigered whenever a new object is saved to XML. You can connect to -this signal to insert custom XML tags into the core XML. - - -@gstobject: the object which received the signal. -@arg1: the xmlNodePtr of the parent node - - - -Is emitted when the parent of an object is set. - - -@gstobject: the object which received the signal. -@arg1: the new parent - - - -Is emitted when the parent of an object is unset. - - -@gstobject: the object which received the signal. -@arg1: the old parent - - - -The name of the object - - This macro returns the entire set of flags for the object. @@ -331,3 +290,44 @@ Check if the object has been destroyed. @Returns: + + +The deep notify signal is used to be notified of property changes. +it is typically attached to the toplevel bin to receive notifications +from all the elements contained in that bin. + + +@gstobject: the object which received the signal. +@arg1: the object that originated the signal +@arg2: the property that changed + + + +Is trigered whenever a new object is saved to XML. You can connect to +this signal to insert custom XML tags into the core XML. + + +@gstobject: the object which received the signal. +@arg1: the xmlNodePtr of the parent node + + + +Is emitted when the parent of an object is set. + + +@gstobject: the object which received the signal. +@arg1: the new parent + + + +Is emitted when the parent of an object is unset. + + +@gstobject: the object which received the signal. +@arg1: the old parent + + + +The name of the object + + diff --git a/docs/gst/tmpl/gstpad.sgml b/docs/gst/tmpl/gstpad.sgml index 49342f1b1b..a5555911d7 100644 --- a/docs/gst/tmpl/gstpad.sgml +++ b/docs/gst/tmpl/gstpad.sgml @@ -785,8 +785,11 @@ Flags for the pad. -@padlist: +@pad: +@Varargs: @Returns: + +@padlist: @@ -794,9 +797,11 @@ Flags for the pad. +@padlist: +@Returns: + @pad: @Varargs: -@Returns: diff --git a/docs/gst/tmpl/gstpadtemplate.sgml b/docs/gst/tmpl/gstpadtemplate.sgml index 0396557ef7..f26e9c5f12 100644 --- a/docs/gst/tmpl/gstpadtemplate.sgml +++ b/docs/gst/tmpl/gstpadtemplate.sgml @@ -87,15 +87,6 @@ The padtemplate object. - - -This signal is fired when an element creates a pad from this -template. - - -@gstpadtemplate: the object which received the signal. -@arg1: The pad that was created. - Flags for the padtemplate @@ -208,3 +199,12 @@ Check if the properties of the padtemplate are fixed @Returns: + + +This signal is fired when an element creates a pad from this +template. + + +@gstpadtemplate: the object which received the signal. +@arg1: The pad that was created. + diff --git a/docs/gst/tmpl/gstplugin.sgml b/docs/gst/tmpl/gstplugin.sgml index 30dc50fc7f..88cf73054f 100644 --- a/docs/gst/tmpl/gstplugin.sgml +++ b/docs/gst/tmpl/gstplugin.sgml @@ -96,7 +96,6 @@ loaded will use this variable to initialize the plugin. @plugin_exit: @version: @license: -@copyright: @package: @origin: diff --git a/docs/gst/tmpl/gstreamer-unused.sgml b/docs/gst/tmpl/gstreamer-unused.sgml index 0cad7ce666..c40f9e3a8e 100644 --- a/docs/gst/tmpl/gstreamer-unused.sgml +++ b/docs/gst/tmpl/gstreamer-unused.sgml @@ -196,6 +196,142 @@ GstAudioSink GstAudioSrc + + +GstAutoplug is an abstract class that is used for constructing and +linking elements. Two types of autopluggers exist: renderer ones and non +renderer ones. The renderer autopluggers will not have any src pads while the +non renderer ones do. + + + +You first need to create a suitable autoplugger with gst_autoplug_factory_make() +(see #GstAutoplugFactory). +The name of the autoplugger must be one of the registered autopluggers +(see #GstStaticAutoplug and #GstStaticAutoplugRender). + + +If the autoplugger supports the RENDERER API, use gst_autoplug_to_renderers() to +create a bin that links the src caps to the specified renderer elements. You can +then add the bin to a pipeline and run it. + + + GstAutoplug *autoplug; + GstElement *element; + GstElement *sink; + + /* create a static autoplugger */ + autoplug = gst_autoplug_factory_make ("staticrender"); + + /* create an osssink */ + sink = gst_element_factory_make ("osssink", "our_sink"); + + /* create an element that can play audio/mp3 through osssink */ + element = gst_autoplug_to_renderers (autoplug, + gst_caps_new ( + "sink_audio_caps", + "audio/mp3", + NULL + ), + sink, + NULL); + + /* add the element to a bin and link the sink pad */ + ... + + + +If the autoplugger supports the CAPS API, use gst_autoplug_to_caps() to +link the src caps to the destination caps. The created bin will have src caps +compatible with the provided sink caps. + + + GstAutoplug *autoplug; + GstElement *element; + + /* create a static autoplugger */ + autoplug = gst_autoplug_factory_make ("static"); + + /* create an element that converts audio/mp3 to audio/raw */ + element = gst_autoplug_to_caps (autoplug, + gst_caps_new ( + "sink_audio_caps", + "audio/mp3", + NULL + ), + gst_caps_new ( + "src_audio_caps", + "audio/raw", + NULL + ), + NULL); + + /* add the element to a bin and link the src/sink pads */ + ... + + + + +Optionally you can get a notification when a new object is added to the created +pipeline with a g_signal_connect to the "new_object" signal. + + + +Use the regular gst_object_destroy() call to destroy the autoplugger. + + + + + +#GstStaticAutoplug, #GstStaticAutoplugRender + + + + +Automatically create and link elements + + + +GstAutoplug + + + + +An autoplugfactory is used to create instances of an autoplugger. It +can be added to a #GstPlugin as it extends #GstPluginFeature. + + +Use gst_autoplug_factory_new() to create a new autoplugger which can be registered +to a plugin with gst_plugin_add_feature(). + + +Use gst_autoplug_factory_find() to find the named autoplugfactory. +or use gst_autoplug_factory_get_list() to get a list of all available autopluggers. + + +Once an autoplugfactory has been obtained use gst_autoplug_factory_create() to +instantiate a real autoplugger. Optionally gst_autoplug_factory_make() to create +a autoplugger from the named factory. + + +Use gst_autoplug_factory_destroy() to remove the factory from the global list. + + + + + +#GstAutoplug, #GstPlugin, #GstPluginFeature. + + + + +Create autopluggers from a factory. + + + +GstAutoplugFactory + + @@ -994,6 +1130,48 @@ The start point of a filter graph GstSrc + + +This autoplugger will create a non threaded element before running the +pipeline. + + + + + + + + + + +A static autoplugger. + + + +GstStaticAutoplug + + + + +this autoplugger will create a threaded element that can be used +in media players. + + + + + + + + + + +An autoplugger made for media playback + + + +GstStaticAutoplugRender + + The plugin doesn't alter the data but provides statistics about @@ -1814,6 +1992,12 @@ to the current function, i.e. "('element')" @format: printf-style format string @args...: printf arguments + + + + + + @@ -4290,6 +4474,35 @@ The frequency. + + +The autoplug object + + + + + + + + +@gstautoplug: the object which received the signal. +@arg1: + + + +The autoplugfactory object + + + + + +The type of the autoplugger. + + +@GST_AUTOPLUG_TO_CAPS: +@GST_AUTOPLUG_TO_RENDERER: +@GST_AUTOPLUG_FLAG_LAST: + @@ -5765,15 +5978,6 @@ Query the element for the current mime type - - - - - -@gstxml: the object which received the signal. -@arg1: -@arg2: - @@ -7201,6 +7405,29 @@ must be defined to activate the tracing functionality. @factories: @Returns: + + + + + +@factory: +@Returns: + + + + + + +@factory: + + + + + + +@name: +@Returns: + @@ -7246,6 +7473,24 @@ must be defined to activate the tracing functionality. @parent: @Returns: + + + + + +@name: +@Returns: + + + + + + +@name: +@longdesc: +@type: +@Returns: + @@ -7269,6 +7514,14 @@ must be defined to activate the tracing functionality. @fac: + + + + + +@autoplug: +@object: + @@ -7279,6 +7532,28 @@ must be defined to activate the tracing functionality. @factories: @Returns: + + + + + +@autoplug: +@srccaps: +@sinkcaps: +@Varargs: +@Returns: + + + + + + +@autoplug: +@srccaps: +@target: +@Varargs: +@Returns: + @@ -8681,6 +8956,13 @@ of an element he doesn't need anymore. @format: @args...: + + + + + +@Returns: + ======= diff --git a/docs/gst/tmpl/gstthread.sgml b/docs/gst/tmpl/gstthread.sgml index 38a7691b0a..6d7021906d 100644 --- a/docs/gst/tmpl/gstthread.sgml +++ b/docs/gst/tmpl/gstthread.sgml @@ -34,6 +34,15 @@ The GstThread object + + + + + +@name: +@Returns: + + @@ -46,12 +55,3 @@ The GstThread object The thread priority - - - - - -@name: -@Returns: - - diff --git a/docs/gst/tmpl/gstxml.sgml b/docs/gst/tmpl/gstxml.sgml index ea4e4bd24a..32d00bc1f9 100644 --- a/docs/gst/tmpl/gstxml.sgml +++ b/docs/gst/tmpl/gstxml.sgml @@ -105,3 +105,21 @@ All GstElements can be serialized to an XML presentation and subsequently loaded @Returns: + + + + + +@gstxml: the object which received the signal. +@arg1: +@arg2: + + + + + + +@: +@: +@: + diff --git a/examples/plugins/example.c b/examples/plugins/example.c index 65e047d763..79f9a54e32 100644 --- a/examples/plugins/example.c +++ b/examples/plugins/example.c @@ -426,11 +426,6 @@ GST_PLUGIN_DEFINE ( "0.1", /* The version number of the plugin */ "LGPL", /* ieffective license the plugin can be shipped with. Must be * valid for all libraries it links to, too. */ - "(c) 2003 E. Xamplewriter", - /* Copyright holder for this plugin. This does not include - * the libraries it links to, contrary to the license. This - * field should be considered informational and not legally - * binding */ "my nifty plugin package", /* package this plugin belongs to. */ "http://www.mydomain.com" diff --git a/gst/autoplug/gstspider.c b/gst/autoplug/gstspider.c index 650d0df6d4..c23ca8d288 100644 --- a/gst/autoplug/gstspider.c +++ b/gst/autoplug/gstspider.c @@ -662,7 +662,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/gst/elements/gstelements.c b/gst/elements/gstelements.c index 909b88392c..3b30483535 100644 --- a/gst/elements/gstelements.c +++ b/gst/elements/gstelements.c @@ -95,7 +95,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/gst/gst.c b/gst/gst.c index e42096a210..d18a44a02a 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -467,7 +467,6 @@ static GstPluginDesc plugin_desc = { NULL, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN, diff --git a/gst/gstelement.h b/gst/gstelement.h index 8685163f96..15a9c66615 100644 --- a/gst/gstelement.h +++ b/gst/gstelement.h @@ -431,8 +431,8 @@ G_CONST_RETURN gchar * gst_element_factory_get_klass (GstElementFactory *factor G_CONST_RETURN gchar * gst_element_factory_get_description (GstElementFactory *factory); G_CONST_RETURN gchar * gst_element_factory_get_version (GstElementFactory *factory); G_CONST_RETURN gchar * gst_element_factory_get_author (GstElementFactory *factory); -guint gst_element_factory_get_num_padtemplates (GstElementFactory *factory); -G_CONST_RETURN GList * gst_element_factory_get_padtemplates (GstElementFactory *factory); +guint gst_element_factory_get_num_pad_templates (GstElementFactory *factory); +G_CONST_RETURN GList * gst_element_factory_get_pad_templates (GstElementFactory *factory); guint gst_element_factory_get_uri_type (GstElementFactory *factory); gchar ** gst_element_factory_get_uri_protocols (GstElementFactory *factory); diff --git a/gst/gstplugin.c b/gst/gstplugin.c index 597cf34d11..97aeba0f56 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -168,7 +168,7 @@ gst_plugin_register_func (GstPlugin *plugin, GModule *module, GstPluginDesc *des } if (!desc->license || !desc->description || !desc->package || - !desc->copyright || !desc->origin) { + !desc->origin) { if (GST_CAT_DEFAULT) GST_INFO ("plugin \"%s\" has incorrect GstPluginDesc, not loading", plugin->filename); return FALSE; @@ -327,8 +327,6 @@ gst_plugin_desc_copy (GstPluginDesc *dest, const GstPluginDesc *src) dest->version = g_strdup (src->version); g_free (dest->license); dest->license = g_strdup (src->license); - g_free (dest->copyright); - dest->copyright = g_strdup (src->copyright); g_free (dest->package); dest->package = g_strdup (src->package); g_free (dest->origin); @@ -343,7 +341,6 @@ gst_plugin_desc_free (GstPluginDesc *desc) g_free (desc->description); g_free (desc->version); g_free (desc->license); - g_free (desc->copyright); g_free (desc->package); g_free (desc->origin); @@ -439,21 +436,6 @@ gst_plugin_get_license (GstPlugin *plugin) return plugin->desc.license; } -/** - * gst_plugin_get_copyright: - * @plugin: plugin to get the copyright of - * - * get the informal copyright notice of the plugin - * - * Returns: the copyright of the plugin - */ -G_CONST_RETURN gchar* -gst_plugin_get_copyright (GstPlugin *plugin) -{ - g_return_val_if_fail (plugin != NULL, NULL); - - return plugin->desc.copyright; -} /** * gst_plugin_get_package: * @plugin: plugin to get the package of diff --git a/gst/gstplugin.h b/gst/gstplugin.h index ae54425c73..f1626c0dab 100644 --- a/gst/gstplugin.h +++ b/gst/gstplugin.h @@ -61,7 +61,6 @@ struct _GstPluginDesc { GstPluginExitFunc plugin_exit; /* pointer to exiting function */ gchar *version; /* version of the plugin */ gchar *license; /* effective license of plugin */ - gchar *copyright; /* informal copyright notice */ gchar *package; /* package plugin belongs to */ gchar *origin; /* URL to provider of plugin */ @@ -82,7 +81,7 @@ struct _GstPlugin { }; #ifndef GST_PLUGIN_STATIC -#define GST_PLUGIN_DEFINE_DYNAMIC(major,minor,name,description,init,version,license,copyright,package,origin) \ +#define GST_PLUGIN_DEFINE_DYNAMIC(major,minor,name,description,init,version,license,package,origin) \ GstPluginDesc gst_plugin_desc = { \ major, \ minor, \ @@ -92,15 +91,14 @@ GstPluginDesc gst_plugin_desc = { \ NULL, \ version, \ license, \ - copyright, \ package, \ origin, \ GST_STRUCT_PADDING_INIT \ }; -#define GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,copyright,package,origin) +#define GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,package,origin) #else -#define GST_PLUGIN_DEFINE_DYNAMIC(major,minor,name,description,init,version,license,copyright,package,origin) -#define GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,copyright,package,origin) \ +#define GST_PLUGIN_DEFINE_DYNAMIC(major,minor,name,description,init,version,license,package,origin) +#define GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,package,origin) \ static void GST_GNUC_CONSTRUCTOR \ _gst_plugin_static_init__ ##init (void) \ { \ @@ -113,7 +111,6 @@ _gst_plugin_static_init__ ##init (void) \ NULL, \ version, \ license, \ - copyright, \ package, \ origin, \ GST_STRUCT_PADDING_INIT \ @@ -122,9 +119,9 @@ _gst_plugin_static_init__ ##init (void) \ } #endif -#define GST_PLUGIN_DEFINE(major,minor,name,description,init,version,license,copyright,package,origin)\ - GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,copyright,package,origin)\ - GST_PLUGIN_DEFINE_DYNAMIC(major,minor,name,description,init,version,license,copyright,package,origin) +#define GST_PLUGIN_DEFINE(major,minor,name,description,init,version,license,package,origin)\ + GST_PLUGIN_DEFINE_STATIC(major,minor,name,description,init,version,license,package,origin)\ + GST_PLUGIN_DEFINE_DYNAMIC(major,minor,name,description,init,version,license,package,origin) #define GST_LICENSE_UNKNOWN "unknown" @@ -143,7 +140,6 @@ void gst_plugin_set_name (GstPlugin *plugin, const gchar *name); G_CONST_RETURN gchar* gst_plugin_get_longname (GstPlugin *plugin); G_CONST_RETURN gchar* gst_plugin_get_filename (GstPlugin *plugin); G_CONST_RETURN gchar* gst_plugin_get_license (GstPlugin *plugin); -G_CONST_RETURN gchar* gst_plugin_get_copyright (GstPlugin *plugin); G_CONST_RETURN gchar* gst_plugin_get_package (GstPlugin *plugin); G_CONST_RETURN gchar* gst_plugin_get_origin (GstPlugin *plugin); GModule * gst_plugin_get_module (GstPlugin *plugin); diff --git a/gst/indexers/gstindexers.c b/gst/indexers/gstindexers.c index 6894202a4d..08bb02b70b 100644 --- a/gst/indexers/gstindexers.c +++ b/gst/indexers/gstindexers.c @@ -43,7 +43,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/gst/registries/gstxmlregistry.c b/gst/registries/gstxmlregistry.c index adcf7ae222..1e0b3873b6 100644 --- a/gst/registries/gstxmlregistry.c +++ b/gst/registries/gstxmlregistry.c @@ -663,9 +663,6 @@ gst_xml_registry_parse_plugin (GMarkupParseContext *context, const gchar *tag, c else if (!strcmp (tag, "version")) { plugin->desc.version = g_strndup (text, text_len); } - else if (!strcmp (tag, "copyright")) { - plugin->desc.copyright = g_strndup (text, text_len); - } else if (!strcmp (tag, "license")) { plugin->desc.license = g_strndup (text, text_len); } @@ -1511,7 +1508,6 @@ gst_xml_registry_save_plugin (GstXMLRegistry *xmlregistry, GstPlugin *plugin) PUT_ESCAPED ("filename", plugin->filename); PUT_ESCAPED ("version", plugin->desc.version); PUT_ESCAPED ("license", plugin->desc.license); - PUT_ESCAPED ("copyright", plugin->desc.copyright); PUT_ESCAPED ("package", plugin->desc.package); PUT_ESCAPED ("origin", plugin->desc.origin); diff --git a/gst/schedulers/gstbasicscheduler.c b/gst/schedulers/gstbasicscheduler.c index fba3fb8401..70f844841c 100644 --- a/gst/schedulers/gstbasicscheduler.c +++ b/gst/schedulers/gstbasicscheduler.c @@ -273,7 +273,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/gst/schedulers/gstoptimalscheduler.c b/gst/schedulers/gstoptimalscheduler.c index 4826f27736..dead50442e 100644 --- a/gst/schedulers/gstoptimalscheduler.c +++ b/gst/schedulers/gstoptimalscheduler.c @@ -378,7 +378,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_VERSION, GST_PACKAGE, GST_ORIGIN ); diff --git a/libs/gst/bytestream/bytestream.c b/libs/gst/bytestream/bytestream.c index 32f60708a5..b0a2b72c46 100644 --- a/libs/gst/bytestream/bytestream.c +++ b/libs/gst/bytestream/bytestream.c @@ -763,7 +763,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/libs/gst/getbits/getbits.c b/libs/gst/getbits/getbits.c index 419015cb87..6c521013bc 100644 --- a/libs/gst/getbits/getbits.c +++ b/libs/gst/getbits/getbits.c @@ -227,7 +227,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/plugins/elements/gstelements.c b/plugins/elements/gstelements.c index 909b88392c..3b30483535 100644 --- a/plugins/elements/gstelements.c +++ b/plugins/elements/gstelements.c @@ -95,7 +95,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/plugins/indexers/gstindexers.c b/plugins/indexers/gstindexers.c index 6894202a4d..08bb02b70b 100644 --- a/plugins/indexers/gstindexers.c +++ b/plugins/indexers/gstindexers.c @@ -43,7 +43,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/tests/old/examples/plugins/example.c b/tests/old/examples/plugins/example.c index 65e047d763..79f9a54e32 100644 --- a/tests/old/examples/plugins/example.c +++ b/tests/old/examples/plugins/example.c @@ -426,11 +426,6 @@ GST_PLUGIN_DEFINE ( "0.1", /* The version number of the plugin */ "LGPL", /* ieffective license the plugin can be shipped with. Must be * valid for all libraries it links to, too. */ - "(c) 2003 E. Xamplewriter", - /* Copyright holder for this plugin. This does not include - * the libraries it links to, contrary to the license. This - * field should be considered informational and not legally - * binding */ "my nifty plugin package", /* package this plugin belongs to. */ "http://www.mydomain.com" diff --git a/tests/old/testsuite/bytestream/gstbstest.c b/tests/old/testsuite/bytestream/gstbstest.c index 2e9598f1a9..2858d5160f 100644 --- a/tests/old/testsuite/bytestream/gstbstest.c +++ b/tests/old/testsuite/bytestream/gstbstest.c @@ -403,7 +403,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/tests/old/testsuite/dynparams/dparamstest.c b/tests/old/testsuite/dynparams/dparamstest.c index 160afe313b..db05eb2cd5 100644 --- a/tests/old/testsuite/dynparams/dparamstest.c +++ b/tests/old/testsuite/dynparams/dparamstest.c @@ -222,7 +222,6 @@ static GstPluginDesc plugin_desc = { NULL, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN }; diff --git a/tests/old/testsuite/plugin/static2.c b/tests/old/testsuite/plugin/static2.c index ec401b1e6d..4f2085c01e 100644 --- a/tests/old/testsuite/plugin/static2.c +++ b/tests/old/testsuite/plugin/static2.c @@ -20,7 +20,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ); @@ -39,7 +38,6 @@ GST_PLUGIN_DEFINE ( plugin2_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ); diff --git a/tests/old/testsuite/plugin/testplugin.c b/tests/old/testsuite/plugin/testplugin.c index e834c8eeda..24e8614058 100644 --- a/tests/old/testsuite/plugin/testplugin.c +++ b/tests/old/testsuite/plugin/testplugin.c @@ -19,7 +19,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ); diff --git a/tests/old/testsuite/plugin/testplugin2.c b/tests/old/testsuite/plugin/testplugin2.c index 7af301b586..e9f9ea6db2 100644 --- a/tests/old/testsuite/plugin/testplugin2.c +++ b/tests/old/testsuite/plugin/testplugin2.c @@ -19,7 +19,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ); diff --git a/testsuite/bytestream/gstbstest.c b/testsuite/bytestream/gstbstest.c index 2e9598f1a9..2858d5160f 100644 --- a/testsuite/bytestream/gstbstest.c +++ b/testsuite/bytestream/gstbstest.c @@ -403,7 +403,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ) diff --git a/testsuite/dynparams/dparamstest.c b/testsuite/dynparams/dparamstest.c index 160afe313b..db05eb2cd5 100644 --- a/testsuite/dynparams/dparamstest.c +++ b/testsuite/dynparams/dparamstest.c @@ -222,7 +222,6 @@ static GstPluginDesc plugin_desc = { NULL, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN }; diff --git a/testsuite/plugin/static2.c b/testsuite/plugin/static2.c index ec401b1e6d..4f2085c01e 100644 --- a/testsuite/plugin/static2.c +++ b/testsuite/plugin/static2.c @@ -20,7 +20,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ); @@ -39,7 +38,6 @@ GST_PLUGIN_DEFINE ( plugin2_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ); diff --git a/testsuite/plugin/testplugin.c b/testsuite/plugin/testplugin.c index e834c8eeda..24e8614058 100644 --- a/testsuite/plugin/testplugin.c +++ b/testsuite/plugin/testplugin.c @@ -19,7 +19,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ); diff --git a/testsuite/plugin/testplugin2.c b/testsuite/plugin/testplugin2.c index 7af301b586..e9f9ea6db2 100644 --- a/testsuite/plugin/testplugin2.c +++ b/testsuite/plugin/testplugin2.c @@ -19,7 +19,6 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, GST_LICENSE, - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN ); diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c index a529351e29..25a1ef823a 100644 --- a/tools/gst-inspect.c +++ b/tools/gst-inspect.c @@ -893,7 +893,6 @@ print_plugin_info (GstPlugin *plugin) g_print (" Filename:\t%s\n", plugin->filename); g_print (" Version:\t%s\n", plugin->desc.version); g_print (" License:\t%s\n", plugin->desc.license); - g_print (" Copyright:\t%s\n", plugin->desc.copyright); g_print (" Package:\t%s\n", plugin->desc.package); g_print (" Origin URL:\t%s\n", plugin->desc.origin); g_print ("\n"); diff --git a/tools/gst-xmlinspect.c b/tools/gst-xmlinspect.c index 0405d2f3d2..54af32b6c9 100644 --- a/tools/gst-xmlinspect.c +++ b/tools/gst-xmlinspect.c @@ -887,7 +887,6 @@ print_plugin_info (GstPlugin *plugin) g_print (" Filename:\t%s\n", plugin->filename); g_print (" Version:\t%s\n", plugin->desc.version); g_print (" License:\t%s\n", plugin->desc.license); - g_print (" Copyright:\t%s\n", plugin->desc.copyright); g_print (" Package:\t%s\n", plugin->desc.package); g_print (" Origin URL:\t%s\n", plugin->desc.origin); g_print ("\n");