diff options
author | Andy Wingo <wingo@pobox.com> | 2002-03-24 22:07:03 +0000 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2002-03-24 22:07:03 +0000 |
commit | 29aa39e99c71e2c7ae98883e72620e590e6ec965 (patch) | |
tree | b553181db23bf46ba9e27382b6fcf9c731cfa934 /gst | |
parent | 9e745b472d465325f1e8fd05a5d6465cb120d004 (diff) |
filter newlines out of GST_DEBUG statements to reflect new core behavior fixes to adder's caps, again
Original commit message from CVS:
* filter newlines out of GST_DEBUG statements to reflect new core behavior
* fixes to adder's caps, again
Diffstat (limited to 'gst')
-rw-r--r-- | gst/auparse/gstauparse.c | 4 | ||||
-rw-r--r-- | gst/avi/audiocodecs.c | 4 | ||||
-rw-r--r-- | gst/avi/gstaviaudiodecoder.c | 2 | ||||
-rw-r--r-- | gst/avi/gstavidecoder.c | 4 | ||||
-rw-r--r-- | gst/avi/gstavidemux.c | 18 | ||||
-rw-r--r-- | gst/avi/gstavimux.c | 2 | ||||
-rw-r--r-- | gst/avi/gstcdxaparse.c | 2 | ||||
-rw-r--r-- | gst/flx/gstflxdec.c | 2 | ||||
-rw-r--r-- | gst/goom/gstgoom.c | 8 | ||||
-rw-r--r-- | gst/median/gstmedian.c | 2 | ||||
-rw-r--r-- | gst/monoscope/gstmonoscope.c | 10 | ||||
-rw-r--r-- | gst/smoothwave/gstsmoothwave.c | 12 | ||||
-rw-r--r-- | gst/wavparse/gstwavparse.c | 20 |
13 files changed, 45 insertions, 45 deletions
diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c index 85b679c8..11b049bb 100644 --- a/gst/auparse/gstauparse.c +++ b/gst/auparse/gstauparse.c @@ -181,7 +181,7 @@ gst_auparse_chain (GstPad *pad, GstBuffer *buf) auparse = GST_AUPARSE (gst_pad_get_parent (pad)); - GST_DEBUG (0, "gst_auparse_chain: got buffer in '%s'\n", + GST_DEBUG (0, "gst_auparse_chain: got buffer in '%s'", gst_element_get_name (GST_ELEMENT (auparse))); data = GST_BUFFER_DATA (buf); @@ -219,7 +219,7 @@ gst_auparse_chain (GstPad *pad, GstBuffer *buf) g_print ("offset %ld, size %ld, encoding %ld, frequency %ld, channels %ld\n", auparse->offset,auparse->size,auparse->encoding, auparse->frequency,auparse->channels); - GST_DEBUG (0, "offset %ld, size %ld, encoding %ld, frequency %ld, channels %ld\n", + GST_DEBUG (0, "offset %ld, size %ld, encoding %ld, frequency %ld, channels %ld", auparse->offset,auparse->size,auparse->encoding, auparse->frequency,auparse->channels); diff --git a/gst/avi/audiocodecs.c b/gst/avi/audiocodecs.c index 51b0a062..05c8862c 100644 --- a/gst/avi/audiocodecs.c +++ b/gst/avi/audiocodecs.c @@ -177,13 +177,13 @@ static GstPad *gst_avi_decoder_get_audio_srcpad_winloader(GstAviDecoder *avi_dec data->out = sinkpad; - GST_DEBUG (0,"gst_avi_decoder: pads created\n"); + GST_DEBUG (0,"gst_avi_decoder: pads created"); return sinkpad; } static void gst_avi_decoder_winloader_audio_chain(GstPad *pad, GstBuffer *buf) { - GST_DEBUG (0,"gst_avi_decoder: got buffer %08lx %p\n", *(gulong *)GST_BUFFER_DATA(buf), GST_BUFFER_DATA(buf)); + GST_DEBUG (0,"gst_avi_decoder: got buffer %08lx %p", *(gulong *)GST_BUFFER_DATA(buf), GST_BUFFER_DATA(buf)); gst_buffer_unref(buf); } diff --git a/gst/avi/gstaviaudiodecoder.c b/gst/avi/gstaviaudiodecoder.c index 7e9e0837..38a6b853 100644 --- a/gst/avi/gstaviaudiodecoder.c +++ b/gst/avi/gstaviaudiodecoder.c @@ -143,7 +143,7 @@ gst_avi_audio_decoder_chain (GstPad *pad, g_return_if_fail (GST_BUFFER_DATA(buf) != NULL); avi_audio_decoder = GST_AVI_AUDIO_DECODER (gst_pad_get_parent (pad)); - GST_DEBUG (0,"gst_avi_audio_decoder_chain: got buffer in %u\n", GST_BUFFER_OFFSET (buf)); + GST_DEBUG (0,"gst_avi_audio_decoder_chain: got buffer in %u", GST_BUFFER_OFFSET (buf)); g_print ("gst_avi_audio_decoder_chain: got buffer in %u\n", GST_BUFFER_OFFSET (buf)); data = (guchar *)GST_BUFFER_DATA (buf); size = GST_BUFFER_SIZE (buf); diff --git a/gst/avi/gstavidecoder.c b/gst/avi/gstavidecoder.c index d0e33ba4..44ccd81a 100644 --- a/gst/avi/gstavidecoder.c +++ b/gst/avi/gstavidecoder.c @@ -186,7 +186,7 @@ gst_avi_decoder_new_pad (GstElement *element, GstPad *pad, GstAviDecoder *avi_de #define AVI_TYPE_AUDIO 2 gint media_type = 0; - GST_DEBUG (0, "avidecoder: new pad for element \"%s\"\n", gst_element_get_name (element)); + GST_DEBUG (0, "avidecoder: new pad for element \"%s\"", gst_element_get_name (element)); caps = gst_pad_get_caps (pad); format = gst_caps_get_string (caps, "format"); @@ -303,7 +303,7 @@ avi_typefind (GstBuffer *buf, gchar *data = GST_BUFFER_DATA (buf); GstCaps *new; - GST_DEBUG (0,"avi_decoder: typefind\n"); + GST_DEBUG (0,"avi_decoder: typefind"); if (strncmp (&data[0], "RIFF", 4)) return NULL; if (strncmp (&data[8], "AVI ", 4)) return NULL; diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 6bddcfe6..d659a3f3 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -258,7 +258,7 @@ avi_typefind (GstBuffer *buf, gchar *data = GST_BUFFER_DATA (buf); GstCaps *new; - GST_DEBUG (0,"avi_demux: typefind\n"); + GST_DEBUG (0,"avi_demux: typefind"); if (GUINT32_FROM_LE (((guint32 *)data)[0]) != GST_RIFF_TAG_RIFF) return NULL; @@ -769,7 +769,7 @@ gst_avidemux_process_chunk (GstAviDemux *avi_demux, guint64 *filepos, case GST_RIFF_00db: case GST_RIFF_00__: { - GST_DEBUG (0,"gst_avi_demux_chain: tag found %08x size %08x\n", + GST_DEBUG (0,"gst_avi_demux_chain: tag found %08x size %08x", chunkid, *chunksize); if (GST_PAD_IS_CONNECTED (avi_demux->video_pad[0])) { @@ -787,9 +787,9 @@ gst_avidemux_process_chunk (GstAviDemux *avi_demux, guint64 *filepos, avi_demux->video_need_flush[0] = FALSE; } - GST_DEBUG (0,"gst_avi_demux_chain: send video buffer %08x\n", *chunksize); + GST_DEBUG (0,"gst_avi_demux_chain: send video buffer %08x", *chunksize); gst_pad_push(avi_demux->video_pad[0], buf); - GST_DEBUG (0,"gst_avi_demux_chain: sent video buffer %08x %p\n", + GST_DEBUG (0,"gst_avi_demux_chain: sent video buffer %08x %p", *chunksize, &avi_demux->video_pad[0]); avi_demux->current_frame++; } @@ -799,7 +799,7 @@ gst_avidemux_process_chunk (GstAviDemux *avi_demux, guint64 *filepos, } case GST_RIFF_01wb: { - GST_DEBUG (0,"gst_avi_demux_chain: tag found %08x size %08x\n", + GST_DEBUG (0,"gst_avi_demux_chain: tag found %08x size %08x", chunkid, *chunksize); if (avi_demux->init_audio) { @@ -816,21 +816,21 @@ gst_avidemux_process_chunk (GstAviDemux *avi_demux, guint64 *filepos, GST_BUFFER_TIMESTAMP (buf) = -1LL; if (avi_demux->audio_need_flush[0]) { - GST_DEBUG (0,"audio flush\n"); + GST_DEBUG (0,"audio flush"); avi_demux->audio_need_flush[0] = FALSE; /* FIXME, do some flush event here */ } - GST_DEBUG (0,"gst_avi_demux_chain: send audio buffer %08x\n", *chunksize); + GST_DEBUG (0,"gst_avi_demux_chain: send audio buffer %08x", *chunksize); gst_pad_push (avi_demux->audio_pad[0], buf); - GST_DEBUG (0,"gst_avi_demux_chain: sent audio buffer %08x\n", *chunksize); + GST_DEBUG (0,"gst_avi_demux_chain: sent audio buffer %08x", *chunksize); } } *chunksize = (*chunksize + 1) & ~1; break; } default: - GST_DEBUG (0, " ***** unknown chunkid %08x (%s)\n", chunkid, gst_riff_id_to_fourcc (chunkid)); + GST_DEBUG (0, " ***** unknown chunkid %08x (%s)", chunkid, gst_riff_id_to_fourcc (chunkid)); *chunksize = (*chunksize + 1) & ~1; break; } diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index b48fe858..4273a40a 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -284,7 +284,7 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps) if (!GST_CAPS_IS_FIXED (vscaps)) return GST_PAD_CONNECT_DELAYED; - GST_DEBUG (0, "avimux: sinkconnect triggered on %s\n", gst_pad_get_name (pad)); + GST_DEBUG (0, "avimux: sinkconnect triggered on %s", gst_pad_get_name (pad)); for (caps = vscaps; caps != NULL; caps = vscaps = vscaps->next) { diff --git a/gst/avi/gstcdxaparse.c b/gst/avi/gstcdxaparse.c index 31ce3161..bcffdaf0 100644 --- a/gst/avi/gstcdxaparse.c +++ b/gst/avi/gstcdxaparse.c @@ -164,7 +164,7 @@ cdxa_typefind (GstBuffer *buf, gchar *data = GST_BUFFER_DATA (buf); GstCaps *new; - GST_DEBUG (0,"cdxa_parse: typefind\n"); + GST_DEBUG (0,"cdxa_parse: typefind"); if (GUINT32_FROM_LE (((guint32 *)data)[0]) != GST_RIFF_TAG_RIFF) return NULL; diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c index 98dda1f3..eeeb9c5a 100644 --- a/gst/flx/gstflxdec.c +++ b/gst/flx/gstflxdec.c @@ -465,7 +465,7 @@ gst_flxdec_loop (GstElement *element) g_return_if_fail (element != NULL); g_return_if_fail (GST_IS_FLXDEC(element)); - GST_DEBUG (0, "entering loop function\n"); + GST_DEBUG (0, "entering loop function"); flxdec = GST_FLXDEC(element); diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index dc59feab..bdbd07fc 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -230,11 +230,11 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin) goom = GST_GOOM (gst_pad_get_parent (pad)); - GST_DEBUG (0, "GOOM: chainfunc called\n"); + GST_DEBUG (0, "GOOM: chainfunc called"); samples_in = GST_BUFFER_SIZE (bufin) / sizeof (gint16); - GST_DEBUG (0, "input buffer has %d samples\n", samples_in); + GST_DEBUG (0, "input buffer has %d samples", samples_in); if (GST_BUFFER_TIMESTAMP (bufin) < goom->next_time || samples_in < 1024) { gst_buffer_unref (bufin); @@ -252,7 +252,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin) goom_init (goom->width, goom->height); - GST_DEBUG (0, "making new pad\n"); + GST_DEBUG (0, "making new pad"); caps = GST_CAPS_NEW ( "goomsrc", @@ -287,7 +287,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin) gst_buffer_unref (bufin); - GST_DEBUG (0, "GOOM: exiting chainfunc\n"); + GST_DEBUG (0, "GOOM: exiting chainfunc"); } diff --git a/gst/median/gstmedian.c b/gst/median/gstmedian.c index 72a48e61..2c6113dc 100644 --- a/gst/median/gstmedian.c +++ b/gst/median/gstmedian.c @@ -274,7 +274,7 @@ gst_median_chain (GstPad *pad, GstBuffer *buf) data = GST_BUFFER_DATA(buf); size = GST_BUFFER_SIZE(buf); - GST_DEBUG (0,"median: have buffer of %d\n", GST_BUFFER_SIZE(buf)); + GST_DEBUG (0,"median: have buffer of %d", GST_BUFFER_SIZE(buf)); outbuf = gst_buffer_new(); GST_BUFFER_DATA(outbuf) = g_malloc(GST_BUFFER_SIZE(buf)); diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index 2b5a33fb..61d155e0 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -233,15 +233,15 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin) monoscope = GST_MONOSCOPE (gst_pad_get_parent (pad)); - GST_DEBUG (0, "Monoscope: chainfunc called\n"); + GST_DEBUG (0, "Monoscope: chainfunc called"); samples_in = GST_BUFFER_SIZE (bufin) / sizeof (gint16); - GST_DEBUG (0, "input buffer has %d samples\n", samples_in); + GST_DEBUG (0, "input buffer has %d samples", samples_in); /* FIXME: should really select the first 1024 samples after the timestamp. */ if (GST_BUFFER_TIMESTAMP (bufin) < monoscope->next_time || samples_in < 1024) { - GST_DEBUG (0, "timestamp is %llu: want >= %llu\n", GST_BUFFER_TIMESTAMP (bufin), monoscope->next_time); + GST_DEBUG (0, "timestamp is %llu: want >= %llu", GST_BUFFER_TIMESTAMP (bufin), monoscope->next_time); gst_buffer_unref (bufin); return; } @@ -257,7 +257,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin) monoscope->visstate = monoscope_init (monoscope->width, monoscope->height); g_assert(monoscope->visstate != 0); - GST_DEBUG (0, "making new pad\n"); + GST_DEBUG (0, "making new pad"); caps = GST_CAPS_NEW ( "monoscopesrc", @@ -292,7 +292,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin) gst_buffer_unref (bufin); - GST_DEBUG (0, "Monoscope: exiting chainfunc\n"); + GST_DEBUG (0, "Monoscope: exiting chainfunc"); } diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c index 4fa855a4..48d32c4b 100644 --- a/gst/smoothwave/gstsmoothwave.c +++ b/gst/smoothwave/gstsmoothwave.c @@ -124,12 +124,12 @@ gst_smoothwave_init (GstSmoothWave *smoothwave) /* gtk_widget_set_default_colormap (gdk_rgb_get_cmap()); */ /* gtk_widget_set_default_visual (gdk_rgb_get_visual()); */ -/* GST_DEBUG (0,"creating palette\n"); */ +/* GST_DEBUG (0,"creating palette"); */ for (i=0;i<256;i++) palette[i] = (i << 16) || (i << 8); -/* GST_DEBUG (0,"creating cmap\n"); */ +/* GST_DEBUG (0,"creating cmap"); */ smoothwave->cmap = gdk_rgb_cmap_new(palette,256); -/* GST_DEBUG (0,"created cmap\n"); */ +/* GST_DEBUG (0,"created cmap"); */ /* gtk_widget_set_default_colormap (smoothwave->cmap); */ smoothwave->image = gtk_drawing_area_new(); @@ -175,7 +175,7 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf) qheight = smoothwave->height/4; -/* GST_DEBUG (0,"traversing %d\n",smoothwave->width); */ +/* GST_DEBUG (0,"traversing %d",smoothwave->width); */ for (i=0;i<MAX(smoothwave->width,samplecount);i++) { gint16 y1 = (gint32)(samples[i*2] * qheight) / 32768 + qheight; @@ -194,8 +194,8 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf) ptr++; } -/* GST_DEBUG (0,"drawing\n"); */ -/* GST_DEBUG (0,"gdk_draw_indexed_image(%p,%p,%d,%d,%d,%d,%s,%p,%d,%p);\n", +/* GST_DEBUG (0,"drawing"); */ +/* GST_DEBUG (0,"gdk_draw_indexed_image(%p,%p,%d,%d,%d,%d,%s,%p,%d,%p);", smoothwave->image->window, smoothwave->image->style->fg_gc[GTK_STATE_NORMAL], 0,0,smoothwave->width,smoothwave->height, diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index f2e6307a..388e3beb 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -175,7 +175,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) g_return_if_fail (GST_BUFFER_DATA (buf) != NULL); wavparse = GST_WAVPARSE (gst_pad_get_parent (pad)); - GST_DEBUG (0, "gst_wavparse_chain: got buffer in '%s'\n", + GST_DEBUG (0, "gst_wavparse_chain: got buffer in '%s'", gst_object_get_name (GST_OBJECT (wavparse))); data = (guchar *) GST_BUFFER_DATA (buf); size = GST_BUFFER_SIZE (buf); @@ -197,7 +197,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) } if (wavparse->state == GST_WAVPARSE_OTHER) { - GST_DEBUG (0, "we're in unknown territory here, not passing on\n"); + GST_DEBUG (0, "we're in unknown territory here, not passing on"); return; } @@ -210,7 +210,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) if (wavparse->state == GST_WAVPARSE_UNKNOWN) { gint retval; - GST_DEBUG (0, "GstWavParse: checking for RIFF format\n"); + GST_DEBUG (0, "GstWavParse: checking for RIFF format"); /* create a new RIFF parser */ wavparse->riff = gst_riff_new (); @@ -219,13 +219,13 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) retval = gst_riff_next_buffer (wavparse->riff, buf, 0); buffer_riffed = TRUE; if (retval < 0) { - GST_DEBUG (0, "sorry, isn't RIFF\n"); + GST_DEBUG (0, "sorry, isn't RIFF"); return; } /* this has to be a file of form WAVE for us to deal with it */ if (wavparse->riff->form != gst_riff_fourcc_to_id ("WAVE")) { - GST_DEBUG (0, "sorry, isn't WAVE\n"); + GST_DEBUG (0, "sorry, isn't WAVE"); return; } @@ -238,7 +238,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) GstRiffChunk *fmt; GstWavParseFormat *format; - GST_DEBUG (0, "GstWavParse: looking for fmt chunk\n"); + GST_DEBUG (0, "GstWavParse: looking for fmt chunk"); /* there's a good possibility we may not have parsed this buffer */ if (buffer_riffed == FALSE) { @@ -274,7 +274,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) gst_pad_try_set_caps (wavparse->srcpad, caps); wavparse->bps = format->wBlockAlign; - GST_DEBUG (0, "frequency %d, channels %d\n", + GST_DEBUG (0, "frequency %d, channels %d", format->dwSamplesPerSec, format->wChannels); /* we're now looking for the data chunk */ @@ -291,7 +291,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) GstBuffer *newbuf; GstRiffChunk *datachunk; - GST_DEBUG (0, "GstWavParse: looking for data chunk\n"); + GST_DEBUG (0, "GstWavParse: looking for data chunk"); /* again, we might need to parse the buffer */ if (buffer_riffed == FALSE) { @@ -304,14 +304,14 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) if (datachunk != NULL) { gulong subsize; - GST_DEBUG (0, "data begins at %ld\n", datachunk->offset); + GST_DEBUG (0, "data begins at %ld", datachunk->offset); /* at this point we can ACK that we have data */ wavparse->state = GST_WAVPARSE_DATA; /* now we construct a new buffer for the remainder */ subsize = size - datachunk->offset; - GST_DEBUG (0, "sending last %ld bytes along as audio\n", subsize); + GST_DEBUG (0, "sending last %ld bytes along as audio", subsize); newbuf = gst_buffer_new (); GST_BUFFER_DATA (newbuf) = g_malloc (subsize); |