From 022058d29e1bd0b0896b8204f1f2890805fff768 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 16 Apr 2005 08:31:50 +0000 Subject: [PATCH] some trademark protection Original commit message from CVS: some trademark protection --- docs/gst/tmpl/gst.sgml | 4 ++-- docs/gst/tmpl/gstenumtypes.sgml | 2 +- docs/gst/tmpl/gstobject.sgml | 2 +- docs/gst/tmpl/gstplugin.sgml | 12 ++++++------ docs/gst/tmpl/gstquery.sgml | 2 +- gst/gstplugin.c | 9 +++++---- gst/gstplugin.h | 4 ++-- gst/gstutils.c | 2 +- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/docs/gst/tmpl/gst.sgml b/docs/gst/tmpl/gst.sgml index 6ba37f6f54..7d5a9b5bee 100644 --- a/docs/gst/tmpl/gst.sgml +++ b/docs/gst/tmpl/gst.sgml @@ -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. -Initializing the gstreamer library +Initializing the GStreamer library int 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 fragment: -Initializing own parameters when initializing gstreamer +Initializing own parameters when initializing GStreamer static gboolean stats = FALSE; ... diff --git a/docs/gst/tmpl/gstenumtypes.sgml b/docs/gst/tmpl/gstenumtypes.sgml index 5250640b80..ef7c137814 100644 --- a/docs/gst/tmpl/gstenumtypes.sgml +++ b/docs/gst/tmpl/gstenumtypes.sgml @@ -2,7 +2,7 @@ GstEnumTypes -all gstreamer core related enumerations +all GStreamer core-related enumerations diff --git a/docs/gst/tmpl/gstobject.sgml b/docs/gst/tmpl/gstobject.sgml index 2c60d982a4..7e215939b7 100644 --- a/docs/gst/tmpl/gstobject.sgml +++ b/docs/gst/tmpl/gstobject.sgml @@ -14,7 +14,7 @@ very usable on its own. 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 (e.g. g_object_ref becomes gst_object_ref). diff --git a/docs/gst/tmpl/gstplugin.sgml b/docs/gst/tmpl/gstplugin.sgml index 88949df2af..7a8fd67282 100644 --- a/docs/gst/tmpl/gstplugin.sgml +++ b/docs/gst/tmpl/gstplugin.sgml @@ -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. -@major_version: the major version number of core that plugin was compiled for -@minor_version: the minor 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 GStreamer that plugin was compiled for @name: a unique name of the plugin @description: @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 -@major: major version number of the gstreamer-core that plugin was compiled for -@minor: minor 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 GStreamer that plugin was compiled for @name: short, but unique name of the plugin @description: information about the purpose of the plugin @init: function pointer to the plugin_init method with the signature of static gboolean plugin_init (GstPlugin * plugin). @@ -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. -@major: major version number of the gstreamer-core that plugin was compiled for -@minor: minor 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 plugin was compiled for @name: short, but unique name of the plugin @description: information about the purpose of the plugin @init: function pointer to the plugin_init method with the signature of static gboolean plugin_init (GstPlugin * plugin). diff --git a/docs/gst/tmpl/gstquery.sgml b/docs/gst/tmpl/gstquery.sgml index 0a78e58f9c..1e4494d502 100644 --- a/docs/gst/tmpl/gstquery.sgml +++ b/docs/gst/tmpl/gstquery.sgml @@ -6,7 +6,7 @@ Dynamically register new query types -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. diff --git a/gst/gstplugin.c b/gst/gstplugin.c index 231d7dd308..bdf847cb65 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -57,8 +57,8 @@ static gboolean _gst_plugin_fault_handler_is_setup = FALSE; #endif /* list of valid licenses. - * One of these must be specified or the plugin won't be loaded - * Contact gstreamer-devel@lists.sourceforge.net if your license should be + * One of these must be specified or the plugin won't be loaded + * Contact gstreamer-devel@lists.sourceforge.net if your license should be * added. * * GPL: http://www.gnu.org/copyleft/gpl.html @@ -147,8 +147,9 @@ _gst_plugin_initialize (void) NULL); } -/* this function could be extended to check if the plugin license matches the - * applications license (would require the app to register its license somehow). +/* this function could be extended to check if the plugin license matches the + * 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 :) */ static gboolean diff --git a/gst/gstplugin.h b/gst/gstplugin.h index bf5d8c670b..13602d099c 100644 --- a/gst/gstplugin.h +++ b/gst/gstplugin.h @@ -53,8 +53,8 @@ typedef gboolean (*GstPluginInitFunc) (GstPlugin *plugin); typedef void (*GstPluginExitFunc) (GstPlugin *plugin); struct _GstPluginDesc { - gint major_version; /* major version of core that plugin was compiled for */ - gint minor_version; /* minor 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 GStreamer that plugin was compiled for */ gchar *name; /* unique name of plugin */ gchar *description; /* description of plugin */ GstPluginInitFunc plugin_init; /* pointer to plugin_init function */ diff --git a/gst/gstutils.c b/gst/gstutils.c index e00e23e612..b2762351b8 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -273,7 +273,7 @@ gst_util_set_object_arg (GObject * object, const gchar * name, /* ----------------------------------------------------- * * The following code will be moved out of the main - * gstreamer library someday. + * GStreamer library someday. */ #include "gstpad.h"