summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/demuxers/demux_ac3.c3
-rw-r--r--src/demuxers/demux_aiff.c5
-rw-r--r--src/demuxers/demux_asf.c77
-rw-r--r--src/demuxers/demux_aud.c5
-rw-r--r--src/demuxers/demux_avi.c43
-rw-r--r--src/demuxers/demux_cdda.c5
-rw-r--r--src/demuxers/demux_fli.c5
-rw-r--r--src/demuxers/demux_nsf.c5
-rw-r--r--src/demuxers/demux_ogg.c11
-rw-r--r--src/demuxers/demux_pes.c6
-rw-r--r--src/demuxers/demux_pva.c5
-rw-r--r--src/demuxers/demux_realaudio.c5
-rw-r--r--src/demuxers/demux_roq.c5
-rw-r--r--src/demuxers/demux_smjpeg.c5
-rw-r--r--src/demuxers/demux_snd.c5
-rw-r--r--src/demuxers/demux_str.c5
-rw-r--r--src/demuxers/demux_voc.c5
-rw-r--r--src/demuxers/demux_wav.c5
-rw-r--r--src/xine-engine/audio_decoder.c7
-rw-r--r--src/xine-engine/xine.c12
20 files changed, 141 insertions, 83 deletions
diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c
index 701c694e0..751a9acee 100644
--- a/src/demuxers/demux_ac3.c
+++ b/src/demuxers/demux_ac3.c
@@ -21,7 +21,7 @@
* This demuxer detects raw AC3 data in a file and shovels AC3 data
* directly to the AC3 decoder.
*
- * $Id: demux_ac3.c,v 1.5 2003/02/27 22:26:48 mroi Exp $
+ * $Id: demux_ac3.c,v 1.6 2003/03/07 12:51:47 guenter Exp $
*
*/
@@ -299,6 +299,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_ac3_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
printf(_("demux_ac3.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index 9eb5bca02..1ba9c8a0f 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -19,7 +19,7 @@
*
* AIFF File Demuxer by Mike Melanson (melanson@pcisys.net)
*
- * $Id: demux_aiff.c,v 1.27 2003/01/23 16:11:56 miguelfreitas Exp $
+ * $Id: demux_aiff.c,v 1.28 2003/03/07 12:51:47 guenter Exp $
*
*/
@@ -349,7 +349,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_aiff_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_aiff.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_aiff.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 3a937dd34..5edd74959 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_asf.c,v 1.111 2003/03/04 22:46:53 tmattern Exp $
+ * $Id: demux_asf.c,v 1.112 2003/03/07 12:51:47 guenter Exp $
*
* demultiplexer for asf streams
*
@@ -172,7 +172,8 @@ static uint8_t get_byte (demux_asf_t *this) {
/* printf ("%02x ", buf); */
if (i != 1) {
- printf ("demux_asf: end of data\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: end of data\n");
this->status = DEMUX_FINISHED;
}
@@ -189,7 +190,8 @@ static uint16_t get_le16 (demux_asf_t *this) {
/* printf (" [%02x %02x] ", buf[0], buf[1]); */
if (i != 2) {
- printf ("demux_asf: end of data\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: end of data\n");
this->status = DEMUX_FINISHED;
}
@@ -206,7 +208,8 @@ static uint32_t get_le32 (demux_asf_t *this) {
/* printf ("%02x %02x %02x %02x ", buf[0], buf[1], buf[2], buf[3]); */
if (i != 4) {
- printf ("demux_asf: end of data\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: end of data\n");
this->status = DEMUX_FINISHED;
}
@@ -221,7 +224,8 @@ static uint64_t get_le64 (demux_asf_t *this) {
i = this->input->read (this->input, buf, 8);
if (i != 8) {
- printf ("demux_asf: end of data\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: end of data\n");
this->status = DEMUX_FINISHED;
}
@@ -255,10 +259,11 @@ static int get_guid (demux_asf_t *this) {
}
}
- printf ("demux_asf: unknown GUID: 0x%x, 0x%x, 0x%x, "
- "{ 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx }\n",
- g.v1, g.v2, g.v3,
- g.v4[0], g.v4[1], g.v4[2], g.v4[3], g.v4[4], g.v4[5], g.v4[6], g.v4[7]);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: unknown GUID: 0x%x, 0x%x, 0x%x, "
+ "{ 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx }\n",
+ g.v1, g.v2, g.v3,
+ g.v4[0], g.v4[1], g.v4[2], g.v4[3], g.v4[4], g.v4[5], g.v4[6], g.v4[7]);
return GUID_ERROR;
}
@@ -334,7 +339,8 @@ static int asf_read_header (demux_asf_t *this) {
guid = get_guid(this);
if (guid != GUID_ASF_HEADER) {
- printf ("demux_asf: file doesn't start with an asf header\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: file doesn't start with an asf header\n");
return 0;
}
get_le64(this);
@@ -434,8 +440,9 @@ static int asf_read_header (demux_asf_t *this) {
this->reorder_w = (buffer[2]<<8)|buffer[1];
this->reorder_b = (buffer[4]<<8)|buffer[3];
this->reorder_w /= this->reorder_b;
- printf ("demux_asf: audio conceal interleave detected (%d x %d x %d)\n",
- this->reorder_w, this->reorder_h, this->reorder_b );
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: audio conceal interleave detected (%d x %d x %d)\n",
+ this->reorder_w, this->reorder_h, this->reorder_b );
} else {
this->reorder_b=this->reorder_h=this->reorder_w=1;
}
@@ -445,7 +452,7 @@ static int asf_read_header (demux_asf_t *this) {
this->streams[this->num_streams].buf_type =
formattag_to_buf_audio ( wavex->wFormatTag );
if ( !this->streams[this->num_streams].buf_type ) {
- printf ("demux_asf: unknown audio type 0x%x\n", wavex->wFormatTag);
+ printf ("demux_asf: unknown audio type 0x%x\n", wavex->wFormatTag);
this->streams[this->num_streams].buf_type = BUF_AUDIO_UNKNOWN;
}
@@ -993,14 +1000,16 @@ static void asf_read_packet(demux_asf_t *this) {
this->input->seek (this->input, this->packet_size_left, SEEK_CUR);
if (!asf_get_packet(this)) {
- printf ("demux_asf: get_packet failed\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: get_packet failed\n");
this->status = DEMUX_FINISHED;
return ;
}
if (this->packet_padsize > this->packet_size) {
/* skip packet */
- printf ("demux_asf: invalid padsize: %d\n", this->packet_padsize);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: invalid padsize: %d\n", this->packet_padsize);
this->frame = this->nb_frames - 1;
return;
}
@@ -1057,7 +1066,8 @@ static void asf_read_packet(demux_asf_t *this) {
case 3:
seq = get_le32(this); s_hdr_size += 4; break;
default:
- printf ("demux_asf: seq=0\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: seq=0\n");
seq = 0;
}
@@ -1069,7 +1079,8 @@ static void asf_read_packet(demux_asf_t *this) {
case 3:
frag_offset = get_le32(this); s_hdr_size += 4; break;
default:
- printf ("demux_asf: frag_offset=0\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: frag_offset=0\n");
frag_offset = 0;
}
@@ -1090,7 +1101,8 @@ static void asf_read_packet(demux_asf_t *this) {
if (rlen > this->packet_size_left) {
/* skip packet */
- printf ("demux_asf: invalid rlen %d\n", rlen);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: invalid rlen %d\n", rlen);
this->frame = this->nb_frames - 1;
return;
}
@@ -1136,7 +1148,8 @@ static void asf_read_packet(demux_asf_t *this) {
if (data_length > this->packet_size_left) {
/* skip packet */
- printf ("demux_asf: invalid data_length\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: invalid data_length\n");
this->frame = this->nb_frames - 1;
return;
}
@@ -1183,7 +1196,8 @@ static void asf_read_packet(demux_asf_t *this) {
this->input->seek (this->input, rlen - 8, SEEK_CUR);
s_hdr_size += rlen - 8;
} else {
- printf ("demux_asf: strange rlen %d\n", rlen);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: strange rlen %d\n", rlen);
timestamp = 0;
payload_size = 0;
this->input->seek (this->input, rlen, SEEK_CUR);
@@ -1218,7 +1232,8 @@ static void asf_read_packet(demux_asf_t *this) {
if (frag_len > this->packet_size_left) {
/* skip packet */
- printf ("demux_asf: invalid frag_len %d\n", frag_len);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: invalid frag_len %d\n", frag_len);
this->frame = this->nb_frames - 1;
return;
}
@@ -1298,7 +1313,8 @@ static int demux_asf_parse_http_references( demux_asf_t *this) {
if (!strncmp(href, "http", 4)) {
memcpy(href, "mmsh", 4);
}
- printf("demux_asf: http ref: %s\n", href);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf("demux_asf: http ref: %s\n", href);
uevent.type = XINE_EVENT_MRL_REFERENCE;
uevent.stream = this->stream;
uevent.data_length = strlen(href) + sizeof(xine_mrl_reference_data_t);
@@ -1360,7 +1376,8 @@ static int demux_asf_parse_asf_references( demux_asf_t *this) {
}
}
- printf("demux_asf: asf ref: %s\n", ptr);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf("demux_asf: asf ref: %s\n", ptr);
uevent.type = XINE_EVENT_MRL_REFERENCE;
uevent.stream = this->stream;
uevent.data_length = strlen(ptr) + sizeof(xine_mrl_reference_data_t);
@@ -1584,7 +1601,8 @@ static void demux_asf_send_headers (demux_plugin_t *this_gen) {
if (!asf_read_header (this)) {
- printf ("demux_asf: asf_read_header failed.\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_asf: asf_read_header failed.\n");
this->status = DEMUX_FINISHED;
return;
@@ -1616,7 +1634,8 @@ static void demux_asf_send_headers (demux_plugin_t *this_gen) {
stream_id = this->streams[i].stream_id;
bitrate = this->bitrates[stream_id];
- printf("demux_asf: stream: %d, bitrate %d bps\n", stream_id, bitrate);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_LOG)
+ printf("demux_asf: stream: %d, bitrate %d bps\n", stream_id, bitrate);
if ((buf_type == BUF_VIDEO_BASE) &&
(bitrate > max_vrate || this->video_stream_id == 0)) {
@@ -1640,8 +1659,9 @@ static void demux_asf_send_headers (demux_plugin_t *this_gen) {
this->stream->stream_info[XINE_STREAM_INFO_BITRATE] = bitrate;
- printf("demux_asf: video stream_id: %d, audio stream_id: %d\n",
- this->video_stream_id, this->audio_stream_id);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf("demux_asf: video stream_id: %d, audio stream_id: %d\n",
+ this->video_stream_id, this->audio_stream_id);
asf_send_audio_header(this, this->audio_stream);
asf_send_video_header(this, this->video_stream);
@@ -1801,7 +1821,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
break;
default:
- printf ("demux_asf: warning, unkown method %d\n", stream->content_detection_method);
+ printf ("demux_asf: warning, unkown method %d\n",
+ stream->content_detection_method);
return NULL;
}
diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c
index 09fb84c06..93573859a 100644
--- a/src/demuxers/demux_aud.c
+++ b/src/demuxers/demux_aud.c
@@ -32,7 +32,7 @@
* data. This makes seeking conceptually impossible. Upshot: Random
* seeking is not supported.
*
- * $Id: demux_aud.c,v 1.4 2003/01/26 15:56:21 tmmm Exp $
+ * $Id: demux_aud.c,v 1.5 2003/03/07 12:51:47 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -289,7 +289,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_aud_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_aud.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_aud.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 6cbae4ec9..3d9503856 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_avi.c,v 1.152 2003/03/02 17:00:31 tmattern Exp $
+ * $Id: demux_avi.c,v 1.153 2003/03/07 12:51:47 guenter Exp $
*
* demultiplexer for avi streams
*
@@ -764,7 +764,7 @@ static avi_t *AVI_init(demux_avi_t *this) {
AVI->palette_count = AVI->bih->biClrUsed;
if (AVI->palette_count > 256) {
printf ("demux_avi: number of colors exceeded 256 (%d)",
- AVI->palette_count);
+ AVI->palette_count);
AVI->palette_count = 256;
}
for (j = 0; j < AVI->palette_count; j++) {
@@ -1385,9 +1385,11 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) {
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_WIDTH] = this->avi->width;
this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HEIGHT] = this->avi->height;
- for (i=0; i < this->avi->n_audio; i++)
- printf ("demux_avi: audio format[%d] = 0x%x\n",
- i, this->avi->audio[i]->wavex->wFormatTag);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) {
+ for (i=0; i < this->avi->n_audio; i++)
+ printf ("demux_avi: audio format[%d] = 0x%x\n",
+ i, this->avi->audio[i]->wavex->wFormatTag);
+ }
this->no_audio = 0;
for(i=0; i < this->avi->n_audio; i++) {
@@ -1398,7 +1400,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) {
this->avi->audio[i]->wavex->wFormatTag);
this->no_audio = 1;
this->avi->audio[i]->audio_type = BUF_AUDIO_UNKNOWN;
- } else
+ } else if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
printf ("demux_avi: audio type %s (wFormatTag 0x%x)\n",
buf_audio_name(this->avi->audio[i]->audio_type),
(int)this->avi->audio[i]->wavex->wFormatTag);
@@ -1439,8 +1441,10 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) {
}
buf->type = this->avi->video_type;
- printf ("demux_avi: video codec is '%s'\n",
- buf_video_name(buf->type));
+
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_avi: video codec is '%s'\n",
+ buf_video_name(buf->type));
this->video_fifo->put (this->video_fifo, buf);
@@ -1510,7 +1514,9 @@ static int demux_avi_seek (demux_plugin_t *this_gen,
* seek to start pos / time
*/
- printf ("demux_avi: start pos is %lld, start time is %d\n", start_pos, start_time);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_avi: start pos is %lld, start time is %d\n",
+ start_pos, start_time);
/* Seek video. We do a single idx_grow at the beginning rather than
* incrementally growing the index in a loop, so that if the index
@@ -1582,7 +1588,8 @@ static int demux_avi_seek (demux_plugin_t *this_gen,
* position we've already found, so we won't be seeking though the
* file much at this point. */
- printf ("demux_avi: video_pts = %lld\n", video_pts);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_avi: video_pts = %lld\n", video_pts);
audio_pts = 77777777;
@@ -1694,7 +1701,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
this->status = DEMUX_FINISHED;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf("demux_avi.c: streaming mode\n");
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf("demux_avi.c: streaming mode\n");
this->streaming = 1;
}
@@ -1703,8 +1711,9 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
case METHOD_BY_CONTENT:
if (input->get_capabilities(input) & INPUT_CAP_BLOCK) {
- printf ("demux_avi: AVI_init failed (AVI_errno: %d)\n",
- this->AVI_errno);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_avi: AVI_init failed (AVI_errno: %d)\n",
+ this->AVI_errno);
free (this);
return NULL;
}
@@ -1760,14 +1769,16 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
this->avi = AVI_init (this);
if (!this->avi) {
- printf ("demux_avi: AVI_init failed (AVI_errno: %d)\n",
- this->AVI_errno);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_avi: AVI_init failed (AVI_errno: %d)\n",
+ this->AVI_errno);
free (this);
return NULL;
}
strncpy (this->last_mrl, input->get_mrl (input), 1024);
- printf ("demux_avi: %ld frames\n", this->avi->video_idx.video_frames);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_avi: %ld frames\n", this->avi->video_idx.video_frames);
return &this->demux_plugin;
}
diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c
index 2f53d48de..b8ed0bf5c 100644
--- a/src/demuxers/demux_cdda.c
+++ b/src/demuxers/demux_cdda.c
@@ -22,7 +22,7 @@
* linear PCM "decoder" (which in turn sends them directly to the audio
* output target; this is a really fancy CD-playing architecture).
*
- * $Id: demux_cdda.c,v 1.4 2003/02/18 00:10:10 tmmm Exp $
+ * $Id: demux_cdda.c,v 1.5 2003/03/07 12:51:47 guenter Exp $
*
*/
@@ -197,7 +197,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_cdda_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_cdda.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_cdda.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index 63da24a35..606385da5 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -22,7 +22,7 @@
* avoid while programming a FLI decoder, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: demux_fli.c,v 1.38 2003/02/08 15:49:26 tmmm Exp $
+ * $Id: demux_fli.c,v 1.39 2003/03/07 12:51:47 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -302,7 +302,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_fli_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_fli.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_fli.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_nsf.c b/src/demuxers/demux_nsf.c
index 4da0a4715..34fbbf0de 100644
--- a/src/demuxers/demux_nsf.c
+++ b/src/demuxers/demux_nsf.c
@@ -28,7 +28,7 @@
* For more information regarding the NSF format, visit:
* http://www.tripoint.org/kevtris/nes/nsfspec.txt
*
- * $Id: demux_nsf.c,v 1.10 2003/02/22 14:06:47 esnel Exp $
+ * $Id: demux_nsf.c,v 1.11 2003/03/07 12:51:47 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -316,7 +316,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_nsf_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_nsf.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_nsf.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 76763e7a0..4f052897a 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_ogg.c,v 1.67 2003/02/23 22:07:06 guenter Exp $
+ * $Id: demux_ogg.c,v 1.68 2003/03/07 12:51:47 guenter Exp $
*
* demultiplexer for ogg streams
*
@@ -136,8 +136,9 @@ static void check_newpts (demux_ogg_t *this, int64_t pts, int video, int preview
if (!preview && pts &&
(this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD) ) ) {
- printf ("demux_ogg: diff=%lld (pts=%lld, last_pts=%lld)\n",
- diff, pts, this->last_pts[video]);
+ if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("demux_ogg: diff=%lld (pts=%lld, last_pts=%lld)\n",
+ diff, pts, this->last_pts[video]);
if (this->buf_flag_seek) {
xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK);
@@ -326,8 +327,10 @@ static void demux_ogg_send_header (demux_ogg_t *this) {
if (ogg_page_bos(&this->og)) {
+#ifdef LOG
printf ("demux_ogg: beginning of stream\ndemux_ogg: serial number %d\n",
cur_serno);
+#endif
ogg_stream_init(&this->oss[this->num_streams], cur_serno);
stream_num = this->num_streams;
@@ -588,7 +591,9 @@ static void demux_ogg_send_header (demux_ogg_t *this) {
fcc = *(uint32_t*)(op.packet+68);
+#ifdef LOG
printf ("demux_ogg: fourcc %08x\n", fcc);
+#endif
this->buf_types[stream_num] = fourcc_to_buf_video (fcc);
if( !this->buf_types[stream_num] )
diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c
index e09a5926f..7342ae87a 100644
--- a/src/demuxers/demux_pes.c
+++ b/src/demuxers/demux_pes.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_pes.c,v 1.43 2002/12/21 12:56:45 miguelfreitas Exp $
+ * $Id: demux_pes.c,v 1.44 2003/03/07 12:51:48 guenter Exp $
*
* demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
* reads streams of variable blocksizes
@@ -347,8 +347,10 @@ static void *demux_pes_loop (void *this_gen) {
xine_demux_control_end(this->xine, BUF_FLAG_END_STREAM);
}
+#ifdef LOG
printf ("demux_pes: demux loop finished (status: %d, buf:%x)\n",
this->status, w);
+#endif
this->thread_running = 0;
pthread_mutex_unlock( &this->mutex );
@@ -365,7 +367,9 @@ static void demux_pes_stop (demux_plugin_t *this_gen) {
pthread_mutex_lock( &this->mutex );
if (!this->thread_running) {
+#ifdef LOG
printf ("demux_pes: stop...ignored\n");
+#endif
pthread_mutex_unlock( &this->mutex );
return;
}
diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c
index c705c6b01..626c662f4 100644
--- a/src/demuxers/demux_pva.c
+++ b/src/demuxers/demux_pva.c
@@ -21,7 +21,7 @@
* For more information regarding the PVA file format, refer to this PDF:
* http://www.technotrend.de/download/av_format_v1.pdf
*
- * $Id: demux_pva.c,v 1.6 2003/01/26 15:56:21 tmmm Exp $
+ * $Id: demux_pva.c,v 1.7 2003/03/07 12:51:48 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -446,7 +446,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_pva_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_pva.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_pva.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c
index 33eae2c21..0f1e5671c 100644
--- a/src/demuxers/demux_realaudio.c
+++ b/src/demuxers/demux_realaudio.c
@@ -19,7 +19,7 @@
*
* RealAudio File Demuxer by Mike Melanson (melanson@pcisys.net)
*
- * $Id: demux_realaudio.c,v 1.16 2003/01/23 16:12:14 miguelfreitas Exp $
+ * $Id: demux_realaudio.c,v 1.17 2003/03/07 12:51:48 guenter Exp $
*
*/
@@ -291,7 +291,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_ra_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_ra.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_ra.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index e79b99e51..4c6f45ec6 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -21,7 +21,7 @@
* For more information regarding the RoQ file format, visit:
* http://www.csse.monash.edu.au/~timf/
*
- * $Id: demux_roq.c,v 1.36 2003/01/19 23:33:33 tmmm Exp $
+ * $Id: demux_roq.c,v 1.37 2003/03/07 12:51:48 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -406,7 +406,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_roq_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_roq.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_roq.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index a6b1f9f97..91b4ee131 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -21,7 +21,7 @@
* For more information on the SMJPEG file format, visit:
* http://www.lokigames.com/development/smjpeg.php3
*
- * $Id: demux_smjpeg.c,v 1.36 2003/01/19 23:33:33 tmmm Exp $
+ * $Id: demux_smjpeg.c,v 1.37 2003/03/07 12:51:48 guenter Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -414,7 +414,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_smjpeg_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_smjpeg.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_smjpeg.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
index 6ea1719f3..8898460e5 100644
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -19,7 +19,7 @@
*
* SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net)
*
- * $Id: demux_snd.c,v 1.26 2003/01/23 16:12:15 miguelfreitas Exp $
+ * $Id: demux_snd.c,v 1.27 2003/03/07 12:51:48 guenter Exp $
*
*/
@@ -319,7 +319,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_snd_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_snd.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_snd.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index 251dee367..2447a8b1a 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -22,7 +22,7 @@
* This demuxer handles either raw STR files (which are just a concatenation
* of raw compact disc sectors) or STR files with RIFF headers.
*
- * $Id: demux_str.c,v 1.6 2003/03/04 10:30:28 mroi Exp $
+ * $Id: demux_str.c,v 1.7 2003/03/07 12:51:48 guenter Exp $
*/
/* CD-XA format:
@@ -586,7 +586,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_str_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("PSX STR: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("deux_str: PSX STR: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index aa0295e16..7eb42fa83 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -23,7 +23,7 @@
* It will only play that block if it is PCM data. More variations will be
* supported as they are encountered.
*
- * $Id: demux_voc.c,v 1.27 2003/01/19 23:33:33 tmmm Exp $
+ * $Id: demux_voc.c,v 1.28 2003/03/07 12:51:48 guenter Exp $
*
*/
@@ -318,7 +318,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_voc_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_voc.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_voc.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c
index 14eb55458..b0f36a3dc 100644
--- a/src/demuxers/demux_wav.c
+++ b/src/demuxers/demux_wav.c
@@ -20,7 +20,7 @@
* MS WAV File Demuxer by Mike Melanson (melanson@pcisys.net)
* based on WAV specs that are available far and wide
*
- * $Id: demux_wav.c,v 1.37 2003/02/22 13:20:30 esnel Exp $
+ * $Id: demux_wav.c,v 1.38 2003/03/07 12:51:48 guenter Exp $
*
*/
@@ -319,7 +319,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
demux_wav_t *this;
if (! (input->get_capabilities(input) & INPUT_CAP_SEEKABLE)) {
- printf(_("demux_wav.c: input not seekable, can not handle!\n"));
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf(_("demux_wav.c: input not seekable, can not handle!\n"));
return NULL;
}
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 930654ef0..9d9bddf26 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_decoder.c,v 1.102 2003/01/14 00:10:28 miguelfreitas Exp $
+ * $Id: audio_decoder.c,v 1.103 2003/03/07 12:51:48 guenter Exp $
*
*
* functions that implement audio decoding
@@ -165,8 +165,9 @@ void *audio_decoder_loop (void *stream_gen) {
case BUF_CONTROL_AUDIO_CHANNEL:
{
- printf ("audio_decoder: suggested switching to stream_id %02x\n",
- buf->decoder_info[0]);
+ if (stream->xine->verbosity >= XINE_VERBOSITY_DEBUG)
+ printf ("audio_decoder: suggested switching to stream_id %02x\n",
+ buf->decoder_info[0]);
stream->audio_channel_auto = buf->decoder_info[0] & 0xff;
}
break;
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index e5c9a6442..02dbc64a4 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine.c,v 1.233 2003/03/06 16:49:33 guenter Exp $
+ * $Id: xine.c,v 1.234 2003/03/07 12:51:48 guenter Exp $
*
* top-level xine functions
*
@@ -774,6 +774,9 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) {
#endif
}
+ xine_log (stream->xine, XINE_LOG_MSG,
+ "xine: found input plugin : %s\n",
+ stream->input_plugin->input_class->get_description(stream->input_plugin->input_class));
if (!stream->demux_plugin) {
@@ -797,10 +800,9 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) {
= strdup (stream->demux_plugin->demux_class->get_identifier(stream->demux_plugin->demux_class));
}
- if (stream->xine->verbosity >= XINE_VERBOSITY_LOG) {
- printf("xine: found input plugin : %s\n",stream->input_plugin->input_class->get_description(stream->input_plugin->input_class));
- printf("xine: found demuxer plugin: %s\n",stream->demux_plugin->demux_class->get_description(stream->demux_plugin->demux_class));
- }
+ xine_log (stream->xine, XINE_LOG_MSG,
+ "xine: found demuxer plugin: %s\n",
+ stream->demux_plugin->demux_class->get_description(stream->demux_plugin->demux_class));
extra_info_reset( stream->current_extra_info );
extra_info_reset( stream->video_decoder_extra_info );
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 22:33:30 +0000