From ce8e4a887971c11b5255306d23e0416c4830a9a5 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 14 Apr 2002 14:59:34 +0000 Subject: [PATCH] we don't use // in code we commit :) Original commit message from CVS: hi wtay (and some others): we don't use // in code we commit :) --- gst/autoplug/gstautoplugger.c | 2 +- gst/gstclock.c | 2 +- gst/gstobject.c | 2 -- gst/gstpad.h | 2 +- gst/gstparse.c | 8 ++++---- gst/gstregistry.c | 2 +- gst/schedulers/gstbasicscheduler.c | 2 +- gst/schedulers/gstfastscheduler.c | 8 ++++---- libs/gst/control/unitconvert.c | 6 +++--- 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/gst/autoplug/gstautoplugger.c b/gst/autoplug/gstautoplugger.c index de36537..1358fd6 100644 --- a/gst/autoplug/gstautoplugger.c +++ b/gst/autoplug/gstautoplugger.c @@ -462,7 +462,7 @@ gst_scheduler_show(GST_ELEMENT_SCHED(autoplugger)); g_return_if_fail(autoplugger->autobin != NULL); gst_bin_add(GST_BIN(autoplugger),autoplugger->autobin); -* // re-attach the srcpad's original peer to the cache * +* * re-attach the srcpad's original peer to the cache * * GST_DEBUG(GST_CAT_AUTOPLUG, "reconnecting the cache to the downstream peer"); * * gst_pad_connect(autoplugger->cache_srcpad,autoplugger->srcpadpeer); * diff --git a/gst/gstclock.c b/gst/gstclock.c index c220ea1..212af41 100644 --- a/gst/gstclock.c +++ b/gst/gstclock.c @@ -478,7 +478,7 @@ gst_clock_wait_id (GstClock *clock, GstClockID id) entry->func = gst_clock_unlock_func; target = GST_CLOCK_ENTRY_TIME (entry) - current + current_real; - //g_print ("%lld %lld %lld\n", target, current, current_real); + /* g_print ("%lld %lld %lld\n", target, current, current_real); */ if (target > current_real) { timeval.tv_usec = target % 1000000; diff --git a/gst/gstobject.c b/gst/gstobject.c index 8681914..f4b94f1 100644 --- a/gst/gstobject.c +++ b/gst/gstobject.c @@ -335,8 +335,6 @@ gst_object_set_name (GstObject *object, const gchar *name) const gchar* gst_object_get_name (GstObject *object) { - /* CR1: GLib checks for NULL */ - //FIXME: _REDUNDANT g_return_val_if_fail (object != NULL, NULL); g_return_val_if_fail (GST_IS_OBJECT (object), NULL); return object->name; diff --git a/gst/gstpad.h b/gst/gstpad.h index c1331f0..edc6693 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -178,7 +178,7 @@ struct _GstRealPad { GstRealPad *peer; GstBuffer *bufpen; - //CR1: FIXME: regiontype should go away + /* CR1: FIXME: regiontype should go away */ GstRegionType regiontype; guint64 offset; guint64 len; diff --git a/gst/gstparse.c b/gst/gstparse.c index c3e273a..bdcfaa7 100644 --- a/gst/gstparse.c +++ b/gst/gstparse.c @@ -256,7 +256,7 @@ make_connections (graph_t *g, GError **error) a = c->src_pads; b = c->sink_pads; -// g_print ("a: %p, b: %p\n", a, b); + /* g_print ("a: %p, b: %p\n", a, b); */ if (a && b) { /* balanced multipad connection */ while (a && b) { @@ -289,14 +289,14 @@ make_connections (graph_t *g, GError **error) } } else if (a) { if ((pt1 = gst_element_get_pad_template (src, (gchar*)a->data))) { -// g_print ("have padtemplate %s, SOMETIMES=%s\n", pt1->name_template, pt1->presence == GST_PAD_SOMETIMES ? "TRUE" : "FALSE"); + /* g_print ("have padtemplate %s, SOMETIMES=%s\n", pt1->name_template, pt1->presence == GST_PAD_SOMETIMES ? "TRUE" : "FALSE"); */ if ((p1 = gst_element_get_pad (src, (gchar*)a->data)) || pt1->presence == GST_PAD_SOMETIMES) { if (!p1) { /* sigh, a hack until i fix the gstelement api... */ if ((pt2 = gst_element_get_compatible_pad_template (sink, pt1))) { -// g_print ("have compatible pad template %s\n", pt2->name_template); + /* g_print ("have compatible pad template %s\n", pt2->name_template); */ if ((p2 = gst_element_get_pad (sink, pt2->name_template))) { -// g_print ("got the pad\n"); + /* g_print ("got the pad\n"); */ dc = g_new0 (dynamic_connection_t, 1); dc->srcpadname = (gchar*)a->data; dc->target_pad = p2; diff --git a/gst/gstregistry.c b/gst/gstregistry.c index 5c67d8d..ba9dafc 100644 --- a/gst/gstregistry.c +++ b/gst/gstregistry.c @@ -50,7 +50,7 @@ gst_registry_option_set (const gchar *registry) gboolean gst_registry_use_global (void) { - //struct stat reg_stat; + /* struct stat reg_stat; */ FILE *reg; if (getuid () == 0) return TRUE; /* root always uses global */ diff --git a/gst/schedulers/gstbasicscheduler.c b/gst/schedulers/gstbasicscheduler.c index b2ee55f..6420ae0 100644 --- a/gst/schedulers/gstbasicscheduler.c +++ b/gst/schedulers/gstbasicscheduler.c @@ -683,7 +683,7 @@ gst_basic_scheduler_chain_enable_element (GstSchedulerChain * chain, GstElement /* notify the scheduler that something changed */ GST_FLAG_SET(chain->sched, GST_BASIC_SCHEDULER_CHANGE); - //GST_FLAG_UNSET(element, GST_ELEMENT_COTHREAD_STOPPING); + /* GST_FLAG_UNSET(element, GST_ELEMENT_COTHREAD_STOPPING); */ /* reschedule the chain */ return gst_basic_scheduler_cothreaded_chain (GST_BIN (GST_SCHEDULER (chain->sched)->parent), chain); diff --git a/gst/schedulers/gstfastscheduler.c b/gst/schedulers/gstfastscheduler.c index 6a9fa45..2f13304 100644 --- a/gst/schedulers/gstfastscheduler.c +++ b/gst/schedulers/gstfastscheduler.c @@ -333,7 +333,7 @@ gst_fast_scheduler_chained_element (GstBin *bin, GstElement *element) { GST_DEBUG (GST_CAT_SCHEDULING,"chain entered\n"); - // walk through all the pads + /* walk through all the pads */ pads = gst_element_get_pad_list (element); while (pads) { pad = GST_PAD (pads->data); @@ -536,9 +536,9 @@ gst_fast_scheduler_chain_elements (GstFastScheduler * sched, GstElement * elemen /* take the contents of chain2 and merge them into chain1 */ chain1->disabled = g_list_concat (chain1->disabled, g_list_copy (chain2->disabled)); chain1->elements = g_list_concat (chain1->elements, g_list_copy (chain2->elements)); - //chain1->cothreaded_elements = g_list_concat (chain1->cothreaded_elements, g_list_copy (chain2->cothreaded_elements)); + /* chain1->cothreaded_elements = g_list_concat (chain1->cothreaded_elements, g_list_copy (chain2->cothreaded_elements)); */ chain1->num_elements += chain2->num_elements; - //chain1->num_cothreaded += chain2->num_cothreaded; + /* chain1->num_cothreaded += chain2->num_cothreaded; */ gst_fast_scheduler_chain_destroy (chain2); @@ -938,7 +938,7 @@ gst_fast_scheduler_iterate (GstScheduler * sched) continue; } - //if (chain->num_cothreaded > 1) { + /* if (chain->num_cothreaded > 1) { */ if (FALSE) { g_warning ("this scheduler can only deal with 1 cothreaded element in a chain"); diff --git a/libs/gst/control/unitconvert.c b/libs/gst/control/unitconvert.c index 074072e..e770d62 100644 --- a/libs/gst/control/unitconvert.c +++ b/libs/gst/control/unitconvert.c @@ -308,7 +308,7 @@ gst_unitconv_register_unit(const gchar *domain_name, unit->domain_default = is_domain_default; unit->logarithmic = is_logarithmic; unit->convert_to_funcs = g_hash_table_new(NULL,NULL); - //unit->convert_properties = g_hash_table_new(g_str_hash,g_str_equal); + /* unit->convert_properties = g_hash_table_new(g_str_hash,g_str_equal); */ g_hash_table_insert(_gst_units, g_strdup(unit_name), unit); @@ -382,7 +382,7 @@ static void gst_unitconv_time_seconds_to_samples(GstUnitConvert *unitconv, GValue *seconds_val, GValue *samples_val) { GValue *samplerate; - //GValue *samplerate = g_hash_table_lookup(unitconv->currentToUnit->convert_properties, "samplerate"); + /* GValue *samplerate = g_hash_table_lookup(unitconv->currentToUnit->convert_properties, "samplerate"); */ g_value_set_int64(samples_val, (gint64)(g_value_get_float(seconds_val) * (gfloat)g_value_get_int(samplerate))); } @@ -391,7 +391,7 @@ static void gst_unitconv_time_samples_to_seconds(GstUnitConvert *unitconv, GValue *samples_val, GValue *seconds_val) { GValue *samplerate; - //GValue *samplerate = g_hash_table_lookup(unitconv->currentFromUnit->convert_properties, "samplerate"); + /* GValue *samplerate = g_hash_table_lookup(unitconv->currentFromUnit->convert_properties, "samplerate"); */ g_value_set_float(seconds_val, ((gfloat)g_value_get_int64(samples_val)) / (gfloat)g_value_get_int(samplerate)); } -- 2.7.4