some trademark protection

Original commit message from CVS:
some trademark protection
This commit is contained in:
Thomas Vander Stichele 2005-04-16 08:31:50 +00:00
parent a0b1f16670
commit 022058d29e
8 changed files with 19 additions and 18 deletions

View file

@ -29,7 +29,7 @@ it can be used. You should pass a pointer to the main argc and argv variables so
process its own command line options, as shown in the following example. process its own command line options, as shown in the following example.
<example> <example>
<title>Initializing the gstreamer library</title> <title>Initializing the GStreamer library</title>
<programlisting> <programlisting>
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
@ -50,7 +50,7 @@ line args to GStreamer.
You can also use a popt table to initialize your own parameters as shown in the next code You can also use a popt table to initialize your own parameters as shown in the next code
fragment: fragment:
<example> <example>
<title>Initializing own parameters when initializing gstreamer</title> <title>Initializing own parameters when initializing GStreamer</title>
<programlisting> <programlisting>
static gboolean stats = FALSE; static gboolean stats = FALSE;
... ...

View file

@ -2,7 +2,7 @@
GstEnumTypes GstEnumTypes
<!-- ##### SECTION Short_Description ##### --> <!-- ##### SECTION Short_Description ##### -->
all gstreamer core related enumerations all GStreamer core-related enumerations
<!-- ##### SECTION Long_Description ##### --> <!-- ##### SECTION Long_Description ##### -->
<para> <para>

View file

@ -14,7 +14,7 @@ very usable on its own.
<para> <para>
GstObject gives us basic refcounting, parenting functionality and locking. GstObject gives us basic refcounting, parenting functionality and locking.
Most of the function are just extended for special gstreamer needs and can be Most of the function are just extended for special GStreamer needs and can be
found under the same name in the base class of GstObject which is GObject found under the same name in the base class of GstObject which is GObject
(e.g. g_object_ref becomes gst_object_ref). (e.g. g_object_ref becomes gst_object_ref).
</para> </para>

View file

@ -78,8 +78,8 @@ A plugins should export a variable of this type called plugin_desc. This plugin
loaded will use this variable to initialize the plugin. loaded will use this variable to initialize the plugin.
</para> </para>
@major_version: the major version number of core that plugin was compiled for @major_version: the major version number of GStreamer that plugin was compiled for
@minor_version: the minor version number of core that plugin was compiled for @minor_version: the minor version number of GStreamer that plugin was compiled for
@name: a unique name of the plugin @name: a unique name of the plugin
@description: @description:
@plugin_init: The init function of this plugin. @plugin_init: The init function of this plugin.
@ -116,8 +116,8 @@ This macro needs to be used to define the entry point and meta data of a plugin.
One would use this macro to export a plugin, so that it can be used by other applications One would use this macro to export a plugin, so that it can be used by other applications
</para> </para>
@major: major version number of the gstreamer-core that plugin was compiled for @major: major version number of GStreamer that plugin was compiled for
@minor: minor version number of the gstreamer-core that plugin was compiled for @minor: minor version number of GStreamer that plugin was compiled for
@name: short, but unique name of the plugin @name: short, but unique name of the plugin
@description: information about the purpose of the plugin @description: information about the purpose of the plugin
@init: function pointer to the plugin_init method with the signature of <code>static gboolean plugin_init (GstPlugin * plugin)</code>. @init: function pointer to the plugin_init method with the signature of <code>static gboolean plugin_init (GstPlugin * plugin)</code>.
@ -133,8 +133,8 @@ This macro needs to be used to define the entry point and meta data of a local p
One would use this macro to define a local plugin that can only be used by the own application. One would use this macro to define a local plugin that can only be used by the own application.
</para> </para>
@major: major version number of the gstreamer-core that plugin was compiled for @major: major version number of the GStreamer plugin was compiled for
@minor: minor version number of the gstreamer-core that plugin was compiled for @minor: minor version number of the GStreamer plugin was compiled for
@name: short, but unique name of the plugin @name: short, but unique name of the plugin
@description: information about the purpose of the plugin @description: information about the purpose of the plugin
@init: function pointer to the plugin_init method with the signature of <code>static gboolean plugin_init (GstPlugin * plugin)</code>. @init: function pointer to the plugin_init method with the signature of <code>static gboolean plugin_init (GstPlugin * plugin)</code>.

View file

@ -6,7 +6,7 @@ Dynamically register new query types
<!-- ##### SECTION Long_Description ##### --> <!-- ##### SECTION Long_Description ##### -->
<para> <para>
GstQuery functions are used to register a new query types to the gstreamer core. GstQuery functions are used to register a new query types to GStreamer's core.
Query types can be used to perform queries on pads and elements. Query types can be used to perform queries on pads and elements.
</para> </para>

View file

@ -57,8 +57,8 @@ static gboolean _gst_plugin_fault_handler_is_setup = FALSE;
#endif #endif
/* list of valid licenses. /* list of valid licenses.
* One of these must be specified or the plugin won't be loaded * One of these must be specified or the plugin won't be loaded
* Contact gstreamer-devel@lists.sourceforge.net if your license should be * Contact gstreamer-devel@lists.sourceforge.net if your license should be
* added. * added.
* *
* GPL: http://www.gnu.org/copyleft/gpl.html * GPL: http://www.gnu.org/copyleft/gpl.html
@ -147,8 +147,9 @@ _gst_plugin_initialize (void)
NULL); NULL);
} }
/* this function could be extended to check if the plugin license matches the /* this function could be extended to check if the plugin license matches the
* applications license (would require the app to register its license somehow). * application's license
* (would require the app to register its license somehow).
* We'll wait for someone who's interested in it to code it :) * We'll wait for someone who's interested in it to code it :)
*/ */
static gboolean static gboolean

View file

@ -53,8 +53,8 @@ typedef gboolean (*GstPluginInitFunc) (GstPlugin *plugin);
typedef void (*GstPluginExitFunc) (GstPlugin *plugin); typedef void (*GstPluginExitFunc) (GstPlugin *plugin);
struct _GstPluginDesc { struct _GstPluginDesc {
gint major_version; /* major version of core that plugin was compiled for */ gint major_version; /* major version of GStreamer that plugin was compiled for */
gint minor_version; /* minor version of core that plugin was compiled for */ gint minor_version; /* minor version of GStreamer that plugin was compiled for */
gchar *name; /* unique name of plugin */ gchar *name; /* unique name of plugin */
gchar *description; /* description of plugin */ gchar *description; /* description of plugin */
GstPluginInitFunc plugin_init; /* pointer to plugin_init function */ GstPluginInitFunc plugin_init; /* pointer to plugin_init function */

View file

@ -273,7 +273,7 @@ gst_util_set_object_arg (GObject * object, const gchar * name,
/* ----------------------------------------------------- /* -----------------------------------------------------
* *
* The following code will be moved out of the main * The following code will be moved out of the main
* gstreamer library someday. * GStreamer library someday.
*/ */
#include "gstpad.h" #include "gstpad.h"