diff options
author | Andy Wingo <wingo@pobox.com> | 2002-03-19 04:10:05 +0000 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2002-03-19 04:10:05 +0000 |
commit | d6258153e0aa7d3fe89a31acd3e57b9c13de4464 (patch) | |
tree | 92fd06f31c13bf0eee35395bfcef45ba6166c0d8 /sys | |
parent | 0f1d7549324aa62357580b1b35e61bec6b6482ab (diff) |
removal of //-style comments don't link plugins to core libs -- the versioning is done internally to the plugins with...
Original commit message from CVS:
* removal of //-style comments
* don't link plugins to core libs -- the versioning is done internally to the plugins with the plugin_info struct,
and symbol resolution is lazy, so we can always know if a plugin can be loaded by the plugin_info data. in theory.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/oss/Makefile.am | 2 | ||||
-rw-r--r-- | sys/oss/gstossclock.c | 2 | ||||
-rw-r--r-- | sys/oss/gstossgst.c | 14 | ||||
-rw-r--r-- | sys/oss/gstosshelper.c | 4 | ||||
-rw-r--r-- | sys/oss/gstosssrc.c | 18 |
5 files changed, 20 insertions, 20 deletions
diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am index 53e45468..b4870fe8 100644 --- a/sys/oss/Makefile.am +++ b/sys/oss/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstossaudio.la libgstosshelper.la libgstossaudio_la_SOURCES = gstosssink.c gstosssrc.c gstossaudio.c gstossgst.c gstossclock.c libgstossaudio_la_CFLAGS = $(GST_CFLAGS) -libgstossaudio_la_LIBADD = $(GST_LIBS) +libgstossaudio_la_LIBADD = libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstosshelper_la_SOURCES = gstosshelper.c diff --git a/sys/oss/gstossclock.c b/sys/oss/gstossclock.c index 625cb07a..5b3f16fb 100644 --- a/sys/oss/gstossclock.c +++ b/sys/oss/gstossclock.c @@ -240,7 +240,7 @@ gst_oss_clock_set_time (GstClock *clock, GstClockTime time) time += oss_clock->base_time; - //g_print ("set time %llu\n", time); + /*g_print ("set time %llu\n", time); */ oss_clock->current_time = time; diff --git a/sys/oss/gstossgst.c b/sys/oss/gstossgst.c index ddaecaaa..16c45e5e 100644 --- a/sys/oss/gstossgst.c +++ b/sys/oss/gstossgst.c @@ -140,10 +140,10 @@ gst_ossgst_class_init (GstOssGstClass *klass) g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_MUTE, g_param_spec_boolean("mute","mute","mute", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_PROGRAM, g_param_spec_string("command","command","command", - NULL, G_PARAM_READWRITE)); // CHECKME + NULL, G_PARAM_READWRITE)); /* CHECKME */ gobject_class->set_property = gst_ossgst_set_property; gobject_class->get_property = gst_ossgst_get_property; @@ -368,16 +368,16 @@ gst_ossgst_spawn_process (GstOssGst *ossgst) setenv ("LD_PRELOAD", ld_preload, TRUE); - // child + /* child */ dup2(ossgst->fdin[0], HELPER_MAGIC_IN); /* set the childs input stream */ dup2(ossgst->fdout[1], HELPER_MAGIC_OUT); /* set the childs output stream */ - // split the arguments + /* split the arguments */ args = g_strsplit (ossgst->command, " ", 0); execvp(args[0], args); - // will only reach if error + /* will only reach if error */ perror("exec"); gst_element_error(GST_ELEMENT(ossgst),"starting child process"); return FALSE; @@ -422,8 +422,8 @@ gst_ossgst_factory_init (GstPlugin *plugin) gchar **path; gint i =0; - // get the path of this plugin, we assume the helper progam lives in the - // same directory. + /* get the path of this plugin, we assume the helper progam lives in the */ + /* same directory. */ path = g_strsplit (plugin->filename, G_DIR_SEPARATOR_S, 0); while (path[i]) { i++; diff --git a/sys/oss/gstosshelper.c b/sys/oss/gstosshelper.c index a47840a5..ffae6be7 100644 --- a/sys/oss/gstosshelper.c +++ b/sys/oss/gstosshelper.c @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -//#define DSP_DEBUG +/*#define DSP_DEBUG */ /* This lets you run multiple instances of x11amp by setting the X11AMPNUM environment variable. Only works on glibc2. @@ -208,7 +208,7 @@ write (int fd, const void *buf, size_t len) (*func) (HELPER_MAGIC_OUT, &cmd, sizeof(command)); (*func) (HELPER_MAGIC_OUT, buf, len); - //return (*func) (fd, buf, len); + /*return (*func) (fd, buf, len); */ return len; } diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c index 920e427e..e493e554 100644 --- a/sys/oss/gstosssrc.c +++ b/sys/oss/gstosssrc.c @@ -96,7 +96,7 @@ static void gst_osssrc_sync_parms (GstOssSrc *osssrc); static GstBuffer * gst_osssrc_get (GstPad *pad); static GstElementClass *parent_class = NULL; -//static guint gst_osssrc_signals[LAST_SIGNAL] = { 0 }; +/*static guint gst_osssrc_signals[LAST_SIGNAL] = { 0 }; */ GType gst_osssrc_get_type (void) @@ -133,19 +133,19 @@ gst_osssrc_class_init (GstOssSrcClass *klass) g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_BYTESPERREAD, g_param_spec_ulong("bytes_per_read","bytes_per_read","bytes_per_read", - 0,G_MAXULONG,0,G_PARAM_READWRITE)); // CHECKME + 0,G_MAXULONG,0,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CUROFFSET, g_param_spec_ulong("curoffset","curoffset","curoffset", - 0,G_MAXULONG,0,G_PARAM_READABLE)); // CHECKME + 0,G_MAXULONG,0,G_PARAM_READABLE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FORMAT, g_param_spec_int("format","format","format", - G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); // CHECKME + G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CHANNELS, g_param_spec_int("channels","channels","channels", - G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); // CHECKME + G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FREQUENCY, g_param_spec_int("frequency","frequency","frequency", - G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); // CHECKME + G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_DEVICE, g_param_spec_string("device","device","oss device (/dev/dspN usually)", "default",G_PARAM_READWRITE)); @@ -210,9 +210,9 @@ gst_osssrc_get (GstPad *pad) "oss_src", "audio/raw", "format", GST_PROPS_STRING ("int"), - "law", GST_PROPS_INT (0), //FIXME - "endianness", GST_PROPS_INT (G_BYTE_ORDER), //FIXME - "signed", GST_PROPS_BOOLEAN (TRUE), //FIXME + "law", GST_PROPS_INT (0), /*FIXME */ + "endianness", GST_PROPS_INT (G_BYTE_ORDER), /*FIXME */ + "signed", GST_PROPS_BOOLEAN (TRUE), /*FIXME */ "width", GST_PROPS_INT (src->format), "depth", GST_PROPS_INT (src->format), "rate", GST_PROPS_INT (src->frequency), |