Commit 0067d172 authored by Andy Wingo Wingo's avatar Andy Wingo Wingo

removal of //-style comments don't link plugins to core libs -- the versioning...

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.
parent 6ae5f150
......@@ -73,84 +73,84 @@ int main(int argc,char *argv[]) {
TEST_CATEGORY("Creation");
TEST("create object");
// setup
// action
/* setup */
/* action */
object = gst_object_new();
// assertions
/* assertions */
ASSERT(object != NULL);
ASSERT(GST_IS_OBJECT(object));
// cleanup
/* cleanup */
g_free(object);
ENDTEST();
// new category
/* new category */
TEST_CATEGORY("Refcounting");
// category setup
/* category setup */
object = gst_object_new();
TEST("new object");
// setup
// action
// assertions
/* setup */
/* action */
/* assertions */
ASSERT(object->refcount == 1);
ASSERT(GTK_OBJECT_FLOATING(object) == TRUE);
// cleanup
/* cleanup */
ENDTEST();
TEST("increment refcount");
// setup
// action
/* setup */
/* action */
gst_object_ref(object);
// assertions
/* assertions */
ASSERT(object->refcount == 2);
ASSERT(GTK_OBJECT_FLOATING(object) == TRUE);
// cleanup
/* cleanup */
ENDTEST();
TEST("sink object");
// setup
// action
/* setup */
/* action */
gst_object_sink(object);
// assertions
/* assertions */
ASSERT(object->refcount == 1);
ASSERT(GTK_OBJECT_FLOATING(object) == FALSE);
// cleanup
/* cleanup */
ENDTEST();
TEST("increment refcount after sink");
// setup
// action
/* setup */
/* action */
gst_object_ref(object);
// assertions
/* assertions */
ASSERT(object->refcount == 2);
ASSERT(GTK_OBJECT_FLOATING(object) == FALSE);
// cleanup
/* cleanup */
ENDTEST();
TEST("decrement refcount after sink");
// setup
// action
/* setup */
/* action */
gst_object_unref(object);
// assertions
/* assertions */
ASSERT(object->refcount == 1);
ASSERT(GTK_OBJECT_FLOATING(object) == FALSE);
// cleanup
/* cleanup */
ENDTEST();
// category cleanup
/* category cleanup */
g_free(object);
// new category
/* new category */
TEST_CATEGORY("Parentage");
// category setup
/* category setup */
object = gst_object_new();
parent = gst_object_new();
newparent = gst_object_new();
gtkobject = gtk_type_new(gtk_object_get_type());
// category assertions
/* category assertions */
ASSERT(object != NULL);
ASSERT(object->refcount == 1);
ASSERT(object->parent == NULL);
......@@ -160,135 +160,135 @@ int main(int argc,char *argv[]) {
ASSERT(!GST_IS_OBJECT(gtkobject));
TEST("gst_object_set_parent: null object");
// setup
// action
/* setup */
/* action */
gst_object_set_parent(NULL,NULL);
// assertions
/* assertions */
ASSERT(object->parent == NULL);
// cleanup
/* cleanup */
ENDTEST();
TEST("gst_object_set_parent: invalid object");
// setup
// action
/* setup */
/* action */
gst_object_set_parent((GstObject*)gtkobject,NULL);
// assertions
/* assertions */
ASSERT(object->parent == NULL);
// cleanup
/* cleanup */
ENDTEST();
TEST("gst_object_set_parent: null parent");
// setup
// action
/* setup */
/* action */
gst_object_set_parent(object,NULL);
// assertions
/* assertions */
ASSERT(object->parent == NULL);
// cleanup
/* cleanup */
ENDTEST();
TEST("gst_object_set_parent: invalid parent");
// setup
// action
/* setup */
/* action */
gst_object_set_parent(object,(GstObject*)gtkobject);
// assertions
/* assertions */
ASSERT(object->parent == NULL);
// cleanup
/* cleanup */
ENDTEST();
TEST("gst_object_set_parent: valid object, parent is object");
// setup
// action
/* setup */
/* action */
gst_object_set_parent(object,object);
// assertions
/* assertions */
ASSERT(object->parent == NULL);
// cleanup
/* cleanup */
ENDTEST();
TEST("gst_object_set_parent: valid object and parent");
// setup
// action
/* setup */
/* action */
gst_object_set_parent(object,parent);
// assertions
/* assertions */
ASSERT(object->parent == parent);
// cleanup
/* cleanup */
ENDTEST();
TEST("gst_object_set_parent: parent already set");
// setup
// action
/* setup */
/* action */
gst_object_set_parent(object,newparent);
// assertions
/* assertions */
ASSERT(object->parent != newparent);
ASSERT(object->parent == parent);
// cleanup
/* cleanup */
g_free(object);
ENDTEST();
TEST("gst_object_get_parent: null object");
// setup
// action
/* setup */
/* action */
curparent = gst_object_get_parent(NULL);
// assertions
/* assertions */
ASSERT(curparent == NULL);
// cleanup
/* cleanup */
ENDTEST();
TEST("gst_object_get_parent: invalid object");
// setup
// action
/* setup */
/* action */
curparent = gst_object_get_parent((GstObject*)gtkobject);
// assertions
/* assertions */
ASSERT(curparent == NULL);
// cleanup
/* cleanup */
ENDTEST();
TEST("gst_object_get_parent: no parent");
// setup
/* setup */
object = gst_object_new();
// action
/* action */
curparent = gst_object_get_parent(object);
// assertions
/* assertions */
ASSERT(curparent == NULL);
// cleanup
/* cleanup */
ENDTEST();
TEST("gst_object_get_parent: valid parent");
// setup
/* setup */
gst_object_set_parent(object,parent);
// action
/* action */
curparent = gst_object_get_parent(object);
// assertions
/* assertions */
ASSERT(curparent == parent);
// cleanup
/* cleanup */
g_free(object);
ENDTEST();
TEST("gst_object_unparent: null object");
// setup
// action
/* setup */
/* action */
gst_object_unparent(NULL);
// assertions
// NONE - FIXME!
// cleanup
/* assertions */
/* NONE - FIXME! */
/* cleanup */
ENDTEST();
TEST("gst_object_unparent: invalid object");
// setup
// action
/* setup */
/* action */
gst_object_unparent((GstObject*)gtkobject);
// assertions
// NONE - FIXME!
// cleanup
/* assertions */
/* NONE - FIXME! */
/* cleanup */
ENDTEST();
TEST("gst_object_unparent: no parent");
// setup
/* setup */
object = gst_object_new();
// category cleanup
/* category cleanup */
g_free(object);
g_free(parent);
g_free(newparent);
......
......@@ -18,7 +18,7 @@ gst_play_have_type (GstElement *typefind, GstCaps *caps, GstElement *pipeline)
autobin = gst_bin_get_by_name (GST_BIN (pipeline), "autobin");
cache = gst_bin_get_by_name (GST_BIN (autobin), "cache");
// disconnect the typefind from the pipeline and remove it
/* disconnect the typefind from the pipeline and remove it */
gst_element_disconnect (cache, "src", typefind, "sink");
gst_bin_remove (GST_BIN (autobin), typefind);
......
......@@ -47,7 +47,7 @@ void cut_start (GstElement *element)
struct tm *ct;
time (&seconds);
ct = localtime (&seconds);
// sprintf (buffer, "/news/incoming/audio/cutter.%06d.wav", id);
/* sprintf (buffer, "/news/incoming/audio/cutter.%06d.wav", id); */
sprintf (buffer, "/news/incoming/audio/cutter.%04d%02d%02d.%02d%02d%02d.wav",
ct->tm_year + 1900, ct->tm_mon, ct->tm_mday,
ct->tm_hour, ct->tm_min, ct->tm_sec);
......@@ -93,12 +93,12 @@ void cut_stop_signal (GstElement *element)
int main (int argc, char *argv[])
{
//int i, j;
//gboolean done;
/*int i, j; */
/*gboolean done; */
//char buffer[20];
/*char buffer[20]; */
//output_channel_t *channel_out;
/*output_channel_t *channel_out; */
GstElement *audiosrc;
......@@ -183,9 +183,9 @@ int main (int argc, char *argv[])
*/
while (playing)
{
// g_print ("> ");
/* g_print ("> "); */
gst_bin_iterate (GST_BIN (main_bin));
// g_print (" <");
/* g_print (" <"); */
if (cut_start_signalled)
{
g_print ("\nDEBUG: main: cut_start_signalled true !\n");
......
......@@ -7,7 +7,7 @@ main (int argc, char *argv[])
GstElement *src, *sink;
GstPad *srcpad, *sinkpad;
// _gst_plugin_spew = TRUE;
/* _gst_plugin_spew = TRUE; */
gst_init (&argc, &argv);
bin = GST_BIN (gst_pipeline_new ("pipeline"));
......
......@@ -18,7 +18,7 @@ gst_play_have_type (GstElement *typefind, GstCaps *caps, GstElement *pipeline)
autobin = gst_bin_get_by_name (GST_BIN (pipeline), "autobin");
cache = gst_bin_get_by_name (GST_BIN (autobin), "cache");
// disconnect the typefind from the pipeline and remove it
/* disconnect the typefind from the pipeline and remove it */
gst_element_disconnect (cache, "src", typefind, "sink");
gst_bin_remove (GST_BIN (autobin), typefind);
......
......@@ -18,10 +18,10 @@
#include "mixer.h"
#include <unistd.h>
//#define WITH_BUG
//#define WITH_BUG2
//#define DEBUG
//#define AUTOPLUG /* define if you want autoplugging of input channels */
/*#define WITH_BUG */
/*#define WITH_BUG2 */
/*#define DEBUG */
/*#define AUTOPLUG * define if you want autoplugging of input channels * */
/* function prototypes */
input_channel_t* create_input_channel (int id, char* location);
......@@ -37,7 +37,7 @@ void eos(GstElement *element)
{
g_print("have eos, quitting ?\n");
// playing = FALSE;
/* playing = FALSE; */
}
static GstCaps*
......@@ -62,7 +62,7 @@ gst_play_typefind (GstBin *bin, GstElement *element)
gst_element_set_state (pipeline, GST_STATE_PLAYING);
// push a buffer... the have_type signal handler will set the found flag
/* push a buffer... the have_type signal handler will set the found flag */
gst_bin_iterate (GST_BIN (pipeline));
gst_element_set_state (pipeline, GST_STATE_NULL);
......@@ -188,17 +188,17 @@ int main(int argc,char *argv[])
/* start playing */
gst_element_set_state(main_bin, GST_STATE_PLAYING);
// write out the schedule
/* write out the schedule */
gst_scheduler_show(GST_ELEMENT_SCHED(main_bin));
playing = TRUE;
j = 0;
//printf ("main: start iterating from 0");
/*printf ("main: start iterating from 0"); */
while (playing && j < 100)
{
// printf ("main: iterating %d\n", j);
/* printf ("main: iterating %d\n", j); */
gst_bin_iterate(GST_BIN(main_bin));
//fprintf(stderr,"after iterate()\n");
/*fprintf(stderr,"after iterate()\n"); */
++j;
}
}
......@@ -206,7 +206,7 @@ int main(int argc,char *argv[])
while (playing)
{
gst_bin_iterate(GST_BIN(main_bin));
//fprintf(stderr,"after iterate()\n");
/*fprintf(stderr,"after iterate()\n"); */
}
/* stop the bin */
gst_element_set_state(main_bin, GST_STATE_NULL);
......
......@@ -2,6 +2,6 @@ noinst_LTLIBRARIES = libexample.la
libexample_la_SOURCES = example.c
libexample_la_CFLAGS = $(GST_CFLAGS)
libexample_la_LIBADD = $(GST_LIBS)
libexample_la_LIBADD =
noinst_HEADERS = example.h
......@@ -161,7 +161,7 @@ gst_example_class_init (GstExampleClass *klass)
*/
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_ACTIVE,
g_param_spec_int("active","active","active",
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); // CHECKME
G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */
/* Here we add a signal to the object. This is avery useless signal
* called asdf. The signal will also pass a pointer to the listeners
......
......@@ -55,9 +55,9 @@ int main(int argc,char *argv[])
}
*/
//gst_bin_remove(GST_BIN(pipeline), filesrc);
/*gst_bin_remove(GST_BIN(pipeline), filesrc); */
//gst_bin_add(GST_BIN(thread), filesrc);
/*gst_bin_add(GST_BIN(thread), filesrc); */
gst_bin_add(GST_BIN(thread), GST_ELEMENT(pipeline));
/* make it ready */
......
......@@ -36,8 +36,8 @@ int main(int argc,char *argv[])
xml = gst_xml_new ();
// g_signal_connect (G_OBJECT (xml), "object_loaded",
// G_CALLBACK (xml_loaded), xml);
/* g_signal_connect (G_OBJECT (xml), "object_loaded", */
/* G_CALLBACK (xml_loaded), xml); */
if (argc == 2)
ret = gst_xml_parse_file(xml, argv[1], NULL);
......
......@@ -9,27 +9,27 @@ plugin_LTLIBRARIES = \
libgststaticautoplug_la_SOURCES = gststaticautoplug.c
libgststaticautoplug_la_CFLAGS = $(GST_CFLAGS)
libgststaticautoplug_la_LIBADD = $(GST_LIBS)
libgststaticautoplug_la_LIBADD =
libgststaticautoplug_la_LDFLAGS = @GST_LT_LDFLAGS@
libgststaticautoplugrender_la_SOURCES = gststaticautoplugrender.c
libgststaticautoplugrender_la_CFLAGS = $(GST_CFLAGS)
libgststaticautoplugrender_la_LIBADD = $(GST_LIBS)
libgststaticautoplugrender_la_LIBADD =
libgststaticautoplugrender_la_LDFLAGS = @GST_LT_LDFLAGS@
libgstautoplugcache_la_SOURCES = gstautoplugcache.c
libgstautoplugcache_la_CFLAGS = $(GST_CFLAGS)
libgstautoplugcache_la_LIBADD = $(GST_LIBS)
libgstautoplugcache_la_LIBADD =
libgstautoplugcache_la_LDFLAGS = @GST_LT_LDFLAGS@
libgstautoplugger_la_SOURCES = gstautoplugger.c
libgstautoplugger_la_CFLAGS = $(GST_CFLAGS)
libgstautoplugger_la_LIBADD = $(GST_LIBS)
libgstautoplugger_la_LIBADD =
libgstautoplugger_la_LDFLAGS = @GST_LT_LDFLAGS@
libgstspider_la_SOURCES = gstspider.c gstspideridentity.c gstsearchfuncs.c
libgstspider_la_CFLAGS = $(GST_CFLAGS)
libgstspider_la_LIBADD = $(GST_LIBS)
libgstspider_la_LIBADD =
libgstspider_la_LDFLAGS = @GST_LT_LDFLAGS@
noinst_HEADERS = gststaticautoplug.h gststaticautoplugrender.h \
......
......@@ -146,10 +146,10 @@ gst_autoplugger_class_init (GstAutopluggerClass *klass)
/*
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_BUFFER_COUNT,
g_param_spec_int("buffer_count","buffer_count","buffer_count",
0,G_MAXINT,0,G_PARAM_READABLE)); // CHECKME!
0,G_MAXINT,0,G_PARAM_READABLE)); * CHECKME! *
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_RESET,
g_param_spec_boolean("reset","reset","reset",
FALSE,G_PARAM_WRITABLE)); // CHECKME!
FALSE,G_PARAM_WRITABLE)); * CHECKME! *
*/
gobject_class->set_property = gst_autoplugger_set_property;
......@@ -461,11 +461,11 @@ 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
// GST_DEBUG(GST_CAT_AUTOPLUG, "reconnecting the cache to the downstream peer\n");
// gst_pad_connect(autoplugger->cache_srcpad,autoplugger->srcpadpeer);
* // re-attach the srcpad's original peer to the cache *
* GST_DEBUG(GST_CAT_AUTOPLUG, "reconnecting the cache to the downstream peer\n"); *
* gst_pad_connect(autoplugger->cache_srcpad,autoplugger->srcpadpeer); *
// attach the autoplugged bin
* attach the autoplugged bin *
GST_DEBUG(GST_CAT_AUTOPLUG, "attaching the autoplugged bin between cache and downstream peer\n");
gst_pad_connect(autoplugger->cache_srcpad,gst_element_get_pad(autoplugger->autobin,"sink"));
gst_pad_connect(gst_element_get_pad(autoplugger->autobin,"src_00"),autoplugger->srcpadpeer);
......@@ -549,7 +549,7 @@ gst_scheduler_show(GST_ELEMENT_SCHED(autoplugger));
GST_INFO(GST_CAT_AUTOPLUG,"here we go into nothingness, hoping the typefind will return us to safety");
gst_scheduler_show(GST_ELEMENT_SCHED(autoplugger));
} else {
/* // attach the cache_empty handler, since the cache simply isn't needed
/* * attach the cache_empty handler, since the cache simply isn't needed *
* g_signal_connect (G_OBJECT(autoplugger->cache),"cache_empty",
* gst_autoplugger_cache_empty,autoplugger);
*/
......
......@@ -96,7 +96,7 @@ static GstSpiderConnection * gst_spider_connection_get (GstSpiderIdentity *sink
static GstElement * gst_spider_find_element_to_plug (GstElement *src, GstElementFactory *fac, GstPadDirection dir);
static GstPadConnectReturn gst_spider_plug (GstSpiderConnection *conn);
static GstPadConnectReturn gst_spider_plug_from_srcpad (GstSpiderConnection *conn, GstPad *srcpad);
//static GstPadConnectReturn gst_spider_plug_peers (GstSpider *spider, GstPad *srcpad, GstPad *sinkpad);
/*static GstPadConnectReturn gst_spider_plug_peers (GstSpider *spider, GstPad *srcpad, GstPad *sinkpad); */
static GstPadConnectReturn gst_spider_create_and_plug (GstSpiderConnection *conn, GList *plugpath);
/* random functions */
......
......@@ -19,7 +19,7 @@ libgstelements_la_SOURCES = \
gststatistics.c \
gstmd5sink.c
libgstelements_la_CFLAGS = $(GST_CFLAGS)
libgstelements_la_LIBADD = $(GST_LIBS)
libgstelements_la_LIBADD =
libgstelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @GST_LT_LDFLAGS@
noinst_HEADERS = \
......
......@@ -141,7 +141,7 @@ md5_read_ctx (GstMD5Sink *ctx, gpointer resbuf)
void
md5_process_bytes (const void *buffer, size_t len, GstMD5Sink *ctx)
{
//const void aligned_buffer = buffer;
/*const void aligned_buffer = buffer; */
/* When we already have some bits in our internal buffer concatenate
both inputs first. */
......
......@@ -324,7 +324,7 @@ gst_default_info_handler (gint category, gboolean incore,
#else
fprintf(stderr,"INFO (%5d:%2d)%s%s %s\n",
pthread_id,cothread_id,location,elementname,string);
#endif /* GST_DEBUG_COLOR */
#endif /* GST_DEBUG_COLOR */
/*
#else
#ifdef GST_DEBUG_COLOR
......@@ -333,7 +333,7 @@ gst_default_info_handler (gint category, gboolean incore,
#else
fprintf(stderr,"INFO:%s%s %s\n",
location,elementname,string);
#endif // GST_DEBUG_COLOR
#endif * GST_DEBUG_COLOR *
#endif
*/
......
......@@ -501,7 +501,7 @@ gst_parse_launchv (const gchar **argv)
ret = gst_parse_launchv_recurse (argv, GST_BIN (pipeline), NULL);
if (ret <= 0) {
// print an error
/* print an error */
gst_object_unref (GST_OBJECT (pipeline));
return NULL;
} else {
......
......@@ -312,7 +312,7 @@ restart:
GST_ELEMENT_NAME (queue), queue->level_buffers);