From 188ad57156a4175326299d6ea22188ff73550ee3 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 11 Feb 2003 20:41:40 +0000 Subject: [PATCH] Define default scheduler name in just one place. Original commit message from CVS: Define default scheduler name in just one place. --- gst/gst.c | 6 +++--- gst/gstscheduler.c | 2 +- gst/gstscheduler.h | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gst/gst.c b/gst/gst.c index 17748a1865..4341d5a243 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -100,8 +100,8 @@ enum { #define NUL '\0' #endif -/* default scheduler, 'basicomega', can be changed in - * gstscheduler.c in function gst_scheduler_factory_class_init +/* default scheduler, can be changed in gstscheduler.h with + * the GST_SCHEDULER_DEFAULT_NAME define. */ static const struct poptOption options[] = { {NULL, NUL, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, &init_popt_callback, 0, NULL, NULL}, @@ -114,7 +114,7 @@ static const struct poptOption options[] = { {"gst-plugin-spew", NUL, POPT_ARG_NONE|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_SPEW, "enable verbose plugin loading diagnostics", NULL}, {"gst-plugin-path", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_PATH, "'" G_SEARCHPATH_SEPARATOR_S "'--separated path list for loading plugins", "PATHS"}, {"gst-plugin-load", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_PLUGIN_LOAD, "comma-separated list of plugins to preload in addition to the list stored in env variable GST_PLUGIN_PATH", "PLUGINS"}, - {"gst-scheduler", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_SCHEDULER, "scheduler to use ('basicomega' is the default)", "SCHEDULER"}, + {"gst-scheduler", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_SCHEDULER, "scheduler to use ('"GST_SCHEDULER_DEFAULT_NAME"' is the default)", "SCHEDULER"}, {"gst-nothreads", NUL, POPT_ARG_NONE|POPT_ARGFLAG_STRIP, NULL, ARG_NOTHREADS, "use NOPs for all threading and locking operations", NULL}, {"gst-registry", NUL, POPT_ARG_STRING|POPT_ARGFLAG_STRIP, NULL, ARG_REGISTRY, "registry to use" , "REGISTRY"}, POPT_TABLEEND diff --git a/gst/gstscheduler.c b/gst/gstscheduler.c index 53f78a1fb4..c538865bdd 100644 --- a/gst/gstscheduler.c +++ b/gst/gstscheduler.c @@ -802,7 +802,7 @@ gst_scheduler_factory_class_init (GstSchedulerFactoryClass *klass) factory_parent_class = g_type_class_ref (GST_TYPE_PLUGIN_FEATURE); if (!_default_name) - _default_name = g_strdup ("basicomega"); + _default_name = g_strdup (GST_SCHEDULER_DEFAULT_NAME); } static void diff --git a/gst/gstscheduler.h b/gst/gstscheduler.h index bbac780722..bd9ad3e7f3 100644 --- a/gst/gstscheduler.h +++ b/gst/gstscheduler.h @@ -151,6 +151,9 @@ void gst_scheduler_show (GstScheduler *sched); #define GST_IS_SCHEDULER_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SCHEDULER_FACTORY)) #define GST_SCHEDULER_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_SCHEDULER_FACTORY, GstSchedulerFactoryClass)) +/* change this to change the default scheduler */ +#define GST_SCHEDULER_DEFAULT_NAME "basicomega" + typedef struct _GstSchedulerFactory GstSchedulerFactory; typedef struct _GstSchedulerFactoryClass GstSchedulerFactoryClass;