From 4359de26166000e317604b6b20283c79dd2a0521 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 19 Mar 2002 04:10:06 +0000 Subject: 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. --- gst-libs/gst/riff/Makefile.am | 2 +- gst-libs/gst/riff/riff.c | 38 +++++++++++++++++++------------------- gst-libs/gst/riff/riffencode.c | 2 +- gst-libs/gst/riff/riffparse.c | 32 ++++++++++++++++---------------- gst-libs/gst/riff/riffutil.c | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) (limited to 'gst-libs/gst/riff') diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index c0931c8a..deaa0bcc 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -7,6 +7,6 @@ libgstriff_la_SOURCES = riffparse.c riffencode.c riffutil.c libgstriffincludedir = $(includedir)/gst/riff libgstriffinclude_HEADERS = riff.h -libgstriff_la_LIBADD = $(GST_LIBS) +libgstriff_la_LIBADD = libgstriff_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math libgstriff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/riff/riff.c b/gst-libs/gst/riff/riff.c index e0bb7293..0ac4ee88 100644 --- a/gst-libs/gst/riff/riff.c +++ b/gst-libs/gst/riff/riff.c @@ -20,7 +20,7 @@ #include -//#define debug(format,args...) g_print(format,##args) +/*#define debug(format,args...) g_print(format,##args) */ #define debug(format,args...) @@ -69,33 +69,33 @@ gint gst_riff_next_buffer(GstRiff *riff,GstBuffer *buf,gulong off) { GST_BUFFER_DATA(buf) = riff->dataleft; GST_BUFFER_SIZE(buf) = newsize; off -= riff->dataleft_size; - //last -= riff->dataleft_size; + /*last -= riff->dataleft_size; */ riff->dataleft = NULL; } if (off == 0) { guint32 *words = (guin32 *)GST_BUFFER_DATA(buf); - // don't even try to parse the head if it's not there FIXME + /* don't even try to parse the head if it's not there FIXME */ if (last < 12) { riff->state = GST_RIFF_ENOTRIFF; return riff->state; } - //g_print("testing is 0x%08lx '%s'\n",words[0],gst_riff_id_to_fourcc(words[0])); + /*g_print("testing is 0x%08lx '%s'\n",words[0],gst_riff_id_to_fourcc(words[0])); */ /* verify this is a valid RIFF file, first of all */ if (GUINT32_FROM_LE (words[0]) != GST_RIFF_TAG_RIFF) { riff->state = GST_RIFF_ENOTRIFF; return riff->state; } riff->form = GUINT32_FROM_LE (words[2]); - //g_print("form is 0x%08lx '%s'\n",words[2],gst_riff_id_to_fourcc(words[2])); + /*g_print("form is 0x%08lx '%s'\n",words[2],gst_riff_id_to_fourcc(words[2])); */ riff->nextlikely = 12; /* skip 'RIFF', length, and form */ - // all OK here + /* all OK here */ riff->incomplete_chunk = NULL; } - // if we have an incomplete chunk from the previous buffer + /* if we have an incomplete chunk from the previous buffer */ if (riff->incomplete_chunk) { guint leftover; debug("have incomplete chunk %08x filled\n", riff->incomplete_chunk_size); @@ -135,14 +135,14 @@ gint gst_riff_next_buffer(GstRiff *riff,GstBuffer *buf,gulong off) { while ((riff->nextlikely+12) <= last) { guin32 *words = (guin32 *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off ); - // loop over all of the chunks to check which one is finished + /* loop over all of the chunks to check which one is finished */ while (riff->chunks) { chunk = g_list_nth_data(riff->chunks, 0); debug("next 0x%08x offset 0x%08lx size 0x%08x\n",riff->nextlikely, chunk->offset, chunk->size); if (riff->nextlikely >= chunk->offset+chunk->size) { - //g_print("found END LIST\n"); - // we have the end of the chunk on the stack, remove it + /*g_print("found END LIST\n"); */ + /* we have the end of the chunk on the stack, remove it */ riff->chunks = g_list_remove(riff->chunks, chunk); } else break; @@ -157,17 +157,17 @@ gint gst_riff_next_buffer(GstRiff *riff,GstBuffer *buf,gulong off) { chunk->id = GUINT32_FROM_LE (words[0])); chunk->size = GUINT32_FROM_LE (words[1]); chunk->data = (gchar *)(words+2); - // we need word alignment - //if (chunk->size & 0x01) chunk->size++; + /* we need word alignment */ + /*if (chunk->size & 0x01) chunk->size++; */ chunk->form = GUINT32_FROM_LE (words[2]); /* fill in the form, might not be valid */ if (chunk->id == GST_RIFF_TAG_LIST) { - //g_print("found LIST %s\n", gst_riff_id_to_fourcc(chunk->form)); + /*g_print("found LIST %s\n", gst_riff_id_to_fourcc(chunk->form)); */ riff->nextlikely += 12; - // we push the list chunk on our 'stack' + /* we push the list chunk on our 'stack' */ riff->chunks = g_list_prepend(riff->chunks,chunk); - // send the buffer to the listener if we have received a function + /* send the buffer to the listener if we have received a function */ if (riff->new_tag_found) { riff->new_tag_found(chunk, riff->callback_data); } @@ -178,25 +178,25 @@ gint gst_riff_next_buffer(GstRiff *riff,GstBuffer *buf,gulong off) { gst_riff_id_to_fourcc(GUINT32_FROM_LE (words[0])), GUINT32_FROM_LE (words[1])); riff->nextlikely += 8 + chunk->size; /* doesn't include hdr */ - // if this buffer is incomplete + /* if this buffer is incomplete */ if (riff->nextlikely > last) { guint left = size - (riff->nextlikely - chunk->size - off); - //g_print("make incomplete buffer %08x\n", left); + /*g_print("make incomplete buffer %08x\n", left); */ chunk->data = g_malloc(chunk->size); memcpy(chunk->data, (gchar *)(words+2), left); riff->incomplete_chunk = chunk; riff->incomplete_chunk_size = left; } else { - // send the buffer to the listener if we have received a function + /* send the buffer to the listener if we have received a function */ if (riff->new_tag_found) { riff->new_tag_found(chunk, riff->callback_data); } g_free(chunk); } - //riff->chunks = g_list_prepend(riff->chunks,chunk); + /*riff->chunks = g_list_prepend(riff->chunks,chunk); */ } } diff --git a/gst-libs/gst/riff/riffencode.c b/gst-libs/gst/riff/riffencode.c index a6caed9e..febf2599 100644 --- a/gst-libs/gst/riff/riffencode.c +++ b/gst-libs/gst/riff/riffencode.c @@ -19,7 +19,7 @@ #include -//#define DEBUG_ENABLED +/*#define DEBUG_ENABLED */ #include "riff.h" #define GST_RIFF_ENCODER_BUF_SIZE 1024 diff --git a/gst-libs/gst/riff/riffparse.c b/gst-libs/gst/riff/riffparse.c index eb4746fc..c7fa3f75 100644 --- a/gst-libs/gst/riff/riffparse.c +++ b/gst-libs/gst/riff/riffparse.c @@ -19,7 +19,7 @@ #include -//#define DEBUG_ENABLED +/*#define DEBUG_ENABLED */ #include GstRiff* @@ -71,33 +71,33 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) GST_BUFFER_DATA(buf) = riff->dataleft; size = GST_BUFFER_SIZE(buf) = newsize; off -= riff->dataleft_size; - //last -= riff->dataleft_size; + /*last -= riff->dataleft_size; */ riff->dataleft = NULL; } if (off == 0) { guint32 *words = (guint32 *)GST_BUFFER_DATA(buf); - // don't even try to parse the head if it's not there FIXME + /* don't even try to parse the head if it's not there FIXME */ if (last < 12) { riff->state = GST_RIFF_ENOTRIFF; return riff->state; } - //g_print("testing is 0x%08lx '%s'\n",words[0],gst_riff_id_to_fourcc(words[0])); + /*g_print("testing is 0x%08lx '%s'\n",words[0],gst_riff_id_to_fourcc(words[0])); */ /* verify this is a valid RIFF file, first of all */ if (GUINT32_FROM_LE (words[0]) != GST_RIFF_TAG_RIFF) { riff->state = GST_RIFF_ENOTRIFF; return riff->state; } riff->form = GUINT32_FROM_LE (words[2]); - //g_print("form is 0x%08lx '%s'\n",words[2],gst_riff_id_to_fourcc(words[2])); + /*g_print("form is 0x%08lx '%s'\n",words[2],gst_riff_id_to_fourcc(words[2])); */ riff->nextlikely = 12; /* skip 'RIFF', length, and form */ - // all OK here + /* all OK here */ riff->incomplete_chunk = NULL; } - // if we have an incomplete chunk from the previous buffer + /* if we have an incomplete chunk from the previous buffer */ if (riff->incomplete_chunk) { guint leftover; GST_DEBUG (0,"gst_riff_parser: have incomplete chunk %08x filled\n", riff->incomplete_chunk_size); @@ -130,7 +130,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) while ((riff->nextlikely+12) <= last) { guint32 *words = (guint32 *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off ); - // loop over all of the chunks to check which one is finished + /* loop over all of the chunks to check which one is finished */ while (riff->chunks) { chunk = g_list_nth_data(riff->chunks, 0); @@ -138,7 +138,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) chunk->offset, chunk->size); if (riff->nextlikely >= chunk->offset+chunk->size) { GST_DEBUG (0,"gst_riff_parser: found END LIST\n"); - // we have the end of the chunk on the stack, remove it + /* we have the end of the chunk on the stack, remove it */ riff->chunks = g_list_remove(riff->chunks, chunk); } else break; @@ -153,17 +153,17 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) chunk->id = GUINT32_FROM_LE (words[0]); chunk->size = GUINT32_FROM_LE (words[1]); chunk->data = (gchar *)(words+2); - // we need word alignment - //if (chunk->size & 0x01) chunk->size++; + /* we need word alignment */ + /*if (chunk->size & 0x01) chunk->size++; */ chunk->form = GUINT32_FROM_LE (words[2]); /* fill in the form, might not be valid */ if (chunk->id == GST_RIFF_TAG_LIST) { GST_DEBUG (0,"found LIST %s\n", gst_riff_id_to_fourcc(chunk->form)); riff->nextlikely += 12; - // we push the list chunk on our 'stack' + /* we push the list chunk on our 'stack' */ riff->chunks = g_list_prepend(riff->chunks,chunk); - // send the buffer to the listener if we have received a function + /* send the buffer to the listener if we have received a function */ if (riff->new_tag_found) { riff->new_tag_found(chunk, riff->callback_data); } @@ -175,7 +175,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) gst_riff_id_to_fourcc(GUINT32_FROM_LE (words[0])), GUINT32_FROM_LE (words[1])); riff->nextlikely += 8 + chunk->size; /* doesn't include hdr */ - // if this buffer is incomplete + /* if this buffer is incomplete */ if (riff->nextlikely > last) { guint left = size - (riff->nextlikely - chunk->size - off); @@ -186,7 +186,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) riff->incomplete_chunk_size = left; } else { - // send the buffer to the listener if we have received a function + /* send the buffer to the listener if we have received a function */ if (riff->new_tag_found) { riff->new_tag_found(chunk, riff->callback_data); } @@ -194,7 +194,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) } if (riff->nextlikely & 0x01) riff->nextlikely++; - //riff->chunks = g_list_prepend(riff->chunks,chunk); + /*riff->chunks = g_list_prepend(riff->chunks,chunk); */ } } if ((riff->nextlikely+12) > last && !riff->incomplete_chunk) { diff --git a/gst-libs/gst/riff/riffutil.c b/gst-libs/gst/riff/riffutil.c index ca01f6e6..9005279f 100644 --- a/gst-libs/gst/riff/riffutil.c +++ b/gst-libs/gst/riff/riffutil.c @@ -20,7 +20,7 @@ #include -//#define debug(format,args...) g_print(format,##args) +/*#define debug(format,args...) g_print(format,##args) */ #define debug(format,args...) -- cgit v1.2.1