summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/demuxers/demux_mpgaudio.c4
-rw-r--r--src/dxr3/dxr3_decode_video.c4
-rw-r--r--src/liba52/xine_decoder.c20
-rw-r--r--src/libdts/xine_decoder.c18
-rw-r--r--src/libfaad/xine_decoder.c4
-rw-r--r--src/libffmpeg/dvaudio_decoder.c4
-rw-r--r--src/libffmpeg/video_decoder.c10
-rw-r--r--src/liblpcm/xine_decoder.c4
-rw-r--r--src/libmad/xine_decoder.c10
-rw-r--r--src/libmpeg2/decode.c2
-rw-r--r--src/libmpeg2new/xine_decoder.c6
-rw-r--r--src/libreal/audio_decoder.c12
-rw-r--r--src/libreal/xine_decoder.c8
-rw-r--r--src/libspeex/xine_decoder.c4
-rw-r--r--src/libvorbis/xine_decoder.c4
-rw-r--r--src/libw32dll/w32codec.c68
-rw-r--r--src/libxineadec/fooaudio.c4
-rw-r--r--src/libxineadec/gsm610.c4
-rw-r--r--src/libxineadec/nsf.c4
-rw-r--r--src/libxinevdec/bitplane.c24
-rw-r--r--src/libxinevdec/foovideo.c4
-rw-r--r--src/libxinevdec/rgb.c4
-rw-r--r--src/libxinevdec/yuv.c12
-rw-r--r--src/xine-engine/audio_decoder.c4
-rw-r--r--src/xine-engine/video_decoder.c4
-rw-r--r--src/xine-engine/xine.c18
26 files changed, 132 insertions, 132 deletions
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 87f5f6aa4..36ffcfb11 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.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_mpgaudio.c,v 1.138 2004/06/13 21:28:54 miguelfreitas Exp $
+ * $Id: demux_mpgaudio.c,v 1.139 2004/12/16 13:59:11 mroi Exp $
*
* demultiplexer for mpeg audio (i.e. mp3) streams
*
@@ -414,7 +414,7 @@ static int mpg123_parse_frame_payload(demux_mpgaudio_t *this,
snprintf(scratch_buf, 256, "MPEG %s Layer %1d%s",
mpeg_ver[this->cur_frame.version_idx], this->cur_frame.layer,
(this->is_vbr)? " VBR" : " CBR" );
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, scratch_buf);
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, scratch_buf);
this->meta_info_flag = 1;
}
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index b04f9a44b..f19cf529b 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.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: dxr3_decode_video.c,v 1.58 2004/12/12 22:01:04 mroi Exp $
+ * $Id: dxr3_decode_video.c,v 1.59 2004/12/16 13:59:06 mroi Exp $
*/
/* dxr3 video decoder plugin.
@@ -821,7 +821,7 @@ static void frame_format_change(dxr3_decoder_t *this)
_x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->height);
_x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_RATIO, 10000 * this->ratio);
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "MPEG (DXR3)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "MPEG (DXR3)");
}
static void dxr3_update_panscan(void *this_gen, xine_cfg_entry_t *entry)
diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c
index 53ad05f83..ac47fcfe9 100644
--- a/src/liba52/xine_decoder.c
+++ b/src/liba52/xine_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: xine_decoder.c,v 1.72 2004/12/12 22:01:08 mroi Exp $
+ * $Id: xine_decoder.c,v 1.73 2004/12/16 13:59:10 mroi Exp $
*
* stuff needed to turn liba52 into a xine decoder plugin
*/
@@ -530,26 +530,26 @@ static void a52dec_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
a52_bit_rate_old != this->a52_bit_rate) {
if (((this->a52_flags & A52_CHANNEL_MASK) == A52_3F2R) && (this->a52_flags & A52_LFE))
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.1");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.1");
else if ((((this->a52_flags & A52_CHANNEL_MASK) == A52_2F2R) && (this->a52_flags & A52_LFE)) ||
(((this->a52_flags & A52_CHANNEL_MASK) == A52_3F1R) && (this->a52_flags & A52_LFE)))
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.1");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.1");
else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_3F2R)
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.0");
else if (((this->a52_flags & A52_CHANNEL_MASK) == A52_2F2R) ||
((this->a52_flags & A52_CHANNEL_MASK) == A52_3F1R))
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.0");
else if (((this->a52_flags & A52_CHANNEL_MASK) == A52_2F1R) ||
((this->a52_flags & A52_CHANNEL_MASK) == A52_3F))
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 3.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 3.0");
else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_STEREO)
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (stereo)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (stereo)");
else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_DOLBY)
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (dolby)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (dolby)");
else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_MONO)
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 1.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 1.0");
else
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52");
_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, this->a52_bit_rate);
_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->a52_sample_rate);
diff --git a/src/libdts/xine_decoder.c b/src/libdts/xine_decoder.c
index d2a69893d..7ee5651b0 100644
--- a/src/libdts/xine_decoder.c
+++ b/src/libdts/xine_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: xine_decoder.c,v 1.59 2004/11/03 19:30:05 mroi Exp $
+ * $Id: xine_decoder.c,v 1.60 2004/12/16 13:59:10 mroi Exp $
*
* 04-09-2001 DTS passtrough (C) Joachim Koenig
* 09-12-2001 DTS passthrough inprovements (C) James Courtier-Dutton
@@ -412,24 +412,24 @@ static void dts_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
this->rate = this->dts_sample_rate;
if (((this->dts_flags & DTS_CHANNEL_MASK) == DTS_3F2R) && (this->dts_flags & DTS_LFE))
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 5.1");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 5.1");
else if ((((this->dts_flags & DTS_CHANNEL_MASK) == DTS_2F2R) && (this->dts_flags & DTS_LFE)) ||
(((this->dts_flags & DTS_CHANNEL_MASK) == DTS_3F1R) && (this->dts_flags & DTS_LFE)))
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 4.1");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 4.1");
else if ((this->dts_flags & DTS_CHANNEL_MASK) == DTS_3F2R)
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 5.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 5.0");
else if (((this->dts_flags & DTS_CHANNEL_MASK) == DTS_2F2R) ||
((this->dts_flags & DTS_CHANNEL_MASK) == DTS_3F1R))
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 4.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 4.0");
else if (((this->dts_flags & DTS_CHANNEL_MASK) == DTS_2F1R) ||
((this->dts_flags & DTS_CHANNEL_MASK) == DTS_3F))
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 3.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 3.0");
else if ((this->dts_flags & DTS_CHANNEL_MASK) == DTS_STEREO)
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 2.0 (stereo)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 2.0 (stereo)");
else if ((this->dts_flags & DTS_CHANNEL_MASK) == DTS_MONO)
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 1.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS 1.0");
else
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DTS");
_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, this->dts_bit_rate);
_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->dts_sample_rate);
diff --git a/src/libfaad/xine_decoder.c b/src/libfaad/xine_decoder.c
index d86d3fd41..065355554 100644
--- a/src/libfaad/xine_decoder.c
+++ b/src/libfaad/xine_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: xine_decoder.c,v 1.36 2004/12/03 01:15:31 tmattern Exp $
+ * $Id: xine_decoder.c,v 1.37 2004/12/16 13:59:10 mroi Exp $
*
*/
@@ -302,7 +302,7 @@ static void faad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
}
/* stream/meta info */
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"AAC (libfaad)");
} else {
diff --git a/src/libffmpeg/dvaudio_decoder.c b/src/libffmpeg/dvaudio_decoder.c
index d43c87b2a..af2c95db9 100644
--- a/src/libffmpeg/dvaudio_decoder.c
+++ b/src/libffmpeg/dvaudio_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: dvaudio_decoder.c,v 1.5 2004/08/26 18:03:40 valtri Exp $
+ * $Id: dvaudio_decoder.c,v 1.6 2004/12/16 13:58:57 mroi Exp $
*
* dv audio decoder based on patch by Dan Dennedy <dan@dennedy.org>
*
@@ -278,7 +278,7 @@ static void dvaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
this->audio_bits = buf->decoder_info[2];
this->audio_channels = buf->decoder_info[3];
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "DV Audio");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DV Audio");
this->decoder_ok = 1;
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index fd3715023..3d2b9d456 100644
--- a/src/libffmpeg/video_decoder.c
+++ b/src/libffmpeg/video_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: video_decoder.c,v 1.37 2004/12/12 22:01:08 mroi Exp $
+ * $Id: video_decoder.c,v 1.38 2004/12/16 13:59:05 mroi Exp $
*
* xine video decoder plugin using ffmpeg
*
@@ -336,8 +336,8 @@ static int ff_handle_mpeg_sequence(ff_video_decoder_t *this, mpeg_parser_t *pars
* init codec
*/
if (!this->decoder_ok) {
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
- "mpeg-1 (ffmpeg)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
+ "mpeg-1 (ffmpeg)");
this->codec = avcodec_find_decoder (CODEC_ID_MPEG1VIDEO);
if (!this->codec) {
@@ -748,8 +748,8 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
for(i = 0; i < sizeof(ff_video_lookup)/sizeof(ff_codec_t); i++)
if(ff_video_lookup[i].type == codec_type) {
this->codec = avcodec_find_decoder(ff_video_lookup[i].id);
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
- ff_video_lookup[i].name);
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
+ ff_video_lookup[i].name);
break;
}
diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c
index 4e568fcbe..5577ff998 100644
--- a/src/liblpcm/xine_decoder.c
+++ b/src/liblpcm/xine_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: xine_decoder.c,v 1.55 2004/11/19 05:35:49 tmmm Exp $
+ * $Id: xine_decoder.c,v 1.56 2004/12/16 13:59:10 mroi Exp $
*
* 31-8-2001 Added LPCM rate sensing.
* (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -145,7 +145,7 @@ static void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
this->ao_cap_mode) ;
/* stream/meta info */
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Linear PCM");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "Linear PCM");
_x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE,
this->bits_per_sample * this->rate * this->number_of_channels);
}
diff --git a/src/libmad/xine_decoder.c b/src/libmad/xine_decoder.c
index 6934b5581..415a4dd74 100644
--- a/src/libmad/xine_decoder.c
+++ b/src/libmad/xine_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: xine_decoder.c,v 1.52 2004/03/16 14:12:04 mroi Exp $
+ * $Id: xine_decoder.c,v 1.53 2004/12/16 13:59:11 mroi Exp $
*
* stuff needed to turn libmad into a xine decoder plugin
*/
@@ -202,19 +202,19 @@ static void mad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
if (! _x_meta_info_get(this->xstream, XINE_META_INFO_AUDIOCODEC)) {
switch (this->frame.header.layer) {
case MAD_LAYER_I:
- _x_meta_info_set(this->xstream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC,
"MPEG audio layer 1 (lib: MAD)");
break;
case MAD_LAYER_II:
- _x_meta_info_set(this->xstream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC,
"MPEG audio layer 2 (lib: MAD)");
break;
case MAD_LAYER_III:
- _x_meta_info_set(this->xstream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC,
"MPEG audio layer 3 (lib: MAD)");
break;
default:
- _x_meta_info_set(this->xstream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->xstream, XINE_META_INFO_AUDIOCODEC,
"MPEG audio (lib: MAD)");
}
}
diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c
index a6102ea15..3a6c4486f 100644
--- a/src/libmpeg2/decode.c
+++ b/src/libmpeg2/decode.c
@@ -242,7 +242,7 @@ static void remember_metainfo (mpeg2dec_t *mpeg2dec) {
_x_stream_info_set(mpeg2dec->stream, XINE_STREAM_INFO_FRAME_DURATION, 3000);
}
- _x_meta_info_set(mpeg2dec->stream, XINE_META_INFO_VIDEOCODEC, "MPEG (libmpeg2)");
+ _x_meta_info_set_utf8(mpeg2dec->stream, XINE_META_INFO_VIDEOCODEC, "MPEG (libmpeg2)");
}
diff --git a/src/libmpeg2new/xine_decoder.c b/src/libmpeg2new/xine_decoder.c
index d0dd2650f..9e36772b7 100644
--- a/src/libmpeg2new/xine_decoder.c
+++ b/src/libmpeg2new/xine_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: xine_decoder.c,v 1.21 2004/03/23 03:40:38 jcdutton Exp $
+ * $Id: xine_decoder.c,v 1.22 2004/12/16 13:59:06 mroi Exp $
*
* stuff needed to turn libmpeg2 into a xine decoder plugin
*/
@@ -174,9 +174,9 @@ static void mpeg2_video_decode_data (video_decoder_t *this_gen, buf_element_t *b
_x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_RATIO, (int)(10000*this->ratio));
if (info->sequence->flags & SEQ_FLAG_MPEG2) {
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "MPEG 2 (libmpeg2new)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "MPEG 2 (libmpeg2new)");
} else {
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "MPEG 1 (libmpeg2new)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "MPEG 1 (libmpeg2new)");
}
break;
diff --git a/src/libreal/audio_decoder.c b/src/libreal/audio_decoder.c
index 8276f8bcd..002f20f5b 100644
--- a/src/libreal/audio_decoder.c
+++ b/src/libreal/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.42 2004/12/12 22:01:09 mroi Exp $
+ * $Id: audio_decoder.c,v 1.43 2004/12/16 13:59:10 mroi Exp $
*
* thin layer to use real binary-only codecs in xine
*
@@ -292,32 +292,32 @@ static int init_codec (realdec_decoder_t *this, buf_element_t *buf) {
switch (buf->type) {
case BUF_AUDIO_COOK:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Cook");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "Cook");
if (!load_syms_linux (this, "cook.so.6.0"))
return 0;
break;
case BUF_AUDIO_ATRK:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Atrac");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "Atrac");
if (!load_syms_linux (this, "atrc.so.6.0"))
return 0;
this->block_align = 384;
break;
case BUF_AUDIO_14_4:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 14.4");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 14.4");
if (!load_syms_linux (this, "14_4.so.6.0"))
return 0;
break;
case BUF_AUDIO_28_8:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 28.8");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 28.8");
if (!load_syms_linux (this, "28_8.so.6.0"))
return 0;
break;
case BUF_AUDIO_SIPRO:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Sipro");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "Sipro");
if (!load_syms_linux (this, "sipr.so.6.0"))
return 0;
/* this->block_align = 19; */
diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c
index 1cbf9f833..cd6585286 100644
--- a/src/libreal/xine_decoder.c
+++ b/src/libreal/xine_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: xine_decoder.c,v 1.75 2004/12/12 22:01:10 mroi Exp $
+ * $Id: xine_decoder.c,v 1.76 2004/12/16 13:59:10 mroi Exp $
*
* thin layer to use real binary-only codecs in xine
*
@@ -205,17 +205,17 @@ static int init_codec (realdec_decoder_t *this, buf_element_t *buf) {
switch (buf->type) {
case BUF_VIDEO_RV20:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 2.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 2.0");
if (!load_syms_linux (this, "drv2.so.6.0"))
return 0;
break;
case BUF_VIDEO_RV30:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 3.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 3.0");
if (!load_syms_linux (this, "drv3.so.6.0"))
return 0;
break;
case BUF_VIDEO_RV40:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 4.0");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Real Video 4.0");
if (!load_syms_linux(this, "drv4.so.6.0"))
return 0;
break;
diff --git a/src/libspeex/xine_decoder.c b/src/libspeex/xine_decoder.c
index b95fa5fe2..5d4f57ab6 100644
--- a/src/libspeex/xine_decoder.c
+++ b/src/libspeex/xine_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: xine_decoder.c,v 1.15 2004/12/16 13:16:50 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.16 2004/12/16 13:59:11 mroi Exp $
*
* (ogg/)speex audio decoder plugin (libspeex wrapper) for xine
*/
@@ -128,7 +128,7 @@ void read_metadata (speex_decoder_t *this, char * comments, int length)
int len, i, nb_fields;
char * end;
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "speex");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "speex");
if (length < 8) {
xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "libspeex: invalid/corrupted comments\n");
diff --git a/src/libvorbis/xine_decoder.c b/src/libvorbis/xine_decoder.c
index 6ed3e9d41..67f662cef 100644
--- a/src/libvorbis/xine_decoder.c
+++ b/src/libvorbis/xine_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: xine_decoder.c,v 1.41 2004/12/16 13:16:49 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.42 2004/12/16 13:59:10 mroi Exp $
*
* (ogg/)vorbis audio decoder plugin (libvorbis wrapper) for xine
*/
@@ -131,7 +131,7 @@ static void get_metadata (vorbis_decoder_t *this) {
++ptr;
}
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "vorbis");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "vorbis");
}
static void vorbis_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 08340d0e1..d54dc1891 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.144 2004/12/12 22:01:25 mroi Exp $
+ * $Id: w32codec.c,v 1.145 2004/12/16 13:59:07 mroi Exp $
*
* routines for using w32 codecs
* DirectShow support by Miguel Freitas (Nov/2001)
@@ -363,7 +363,7 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
this->yuv_supported=1;
this->driver_type = DRIVER_DS;
this->guid=&msmpeg4_clsid;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"MS MPEG-4 V1/V2 (win32)");
return "mpg4ds32.ax";
@@ -372,7 +372,7 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
this->yuv_supported=1;
this->yuv_hack_needed=1;
this->flipped=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"MS MPEG-4 V3 (win32)");
return "divxc32.dll";
@@ -380,28 +380,28 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
/* Video in Indeo Video 5 format */
this->yuv_supported=1; /* YUV pic is upside-down :( */
this->flipped=0;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"Indeo Video 5 (win32)");
return "ir50_32.dll";
case BUF_VIDEO_IV41:
/* Video in Indeo Video 4.1 format */
this->flipped=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"Indeo Video 4.1 (win32)");
return "ir41_32.dll";
case BUF_VIDEO_IV32:
/* Video in Indeo Video 3.2 format */
this->flipped=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"Indeo Video 3.2 (win32)");
return "ir32_32.dll";
case BUF_VIDEO_IV31:
/* Video in Indeo Video 3.1 format */
this->flipped=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"Indeo Video 3.1 (win32)");
return "ir32_32.dll";
@@ -409,7 +409,7 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
/* Video in Cinepak format */
this->flipped=1;
this->yuv_supported=0;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"Cinepak (win32)");
return "iccvid.dll";
@@ -422,7 +422,7 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
case BUF_VIDEO_ATIVCR2:
/* Video in ATI VCR2 format */
this->yuv_supported=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"ATI VCR2 (win32)");
return "ativcr2.dll";
@@ -430,7 +430,7 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
/* Video in I263 format */
this->flipped=1;
this->yuv_supported=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"I263 (win32)");
return "i263_32.drv";
@@ -439,7 +439,7 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
/* note: can't play streams with 8bpp */
this->flipped=1;
this->yuv_supported=0;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"MS Windows Video 1 (win32)");
return "msvidc32.dll";
@@ -448,13 +448,13 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
this->yuv_supported=1;
this->driver_type = DRIVER_DS;
this->guid=&dvsd_clsid;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"Sony DV (win32)");
return "qdv.dll";
case BUF_VIDEO_WMV7:
this->yuv_supported=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"MS WMV 7 (win32)");
if (n == 2) {
this->driver_type = DRIVER_DMO;
@@ -467,7 +467,7 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
case BUF_VIDEO_WMV8:
this->yuv_supported=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"MS WMV 8 (win32)");
if (n == 2) {
this->driver_type = DRIVER_DMO;
@@ -481,7 +481,7 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
case BUF_VIDEO_WMV9:
this->yuv_supported=1;
this->driver_type = DRIVER_DMO;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"MS WMV 9 (win32)");
if (n == 2) {
this->guid=&wmvdmo_clsid;
@@ -494,48 +494,48 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
this->yuv_supported=1;
this->ex_functions=1;
this->flipped=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"On2 VP3.1 (win32)");
return "vp31vfw.dll";
case BUF_VIDEO_VP4:
this->yuv_supported=1;
this->ex_functions=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"On2 VP4 (win32)");
return "vp4vfw.dll";
case BUF_VIDEO_VP5:
this->yuv_supported=1;
this->ex_functions=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"On2 VP5 (win32)");
return "vp5vfw.dll";
case BUF_VIDEO_VP6:
this->yuv_supported=1;
this->ex_functions=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"On2 VP6 (win32)");
return "vp6vfw.dll";
case BUF_VIDEO_MSS1:
this->driver_type = DRIVER_DS;
this->guid=&mss1_clsid;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"Windows Screen Video (win32)");
return "msscds32.ax";
case BUF_VIDEO_TSCC:
this->flipped=1;
this->yuv_supported=0;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"TechSmith Screen Capture Codec (win32)");
return "tsccvid.dll";
case BUF_VIDEO_UCOD:
this->yuv_supported=1;
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC,
"ClearVideo (win32)");
return "clrviddd.dll";
@@ -1076,59 +1076,59 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) {
switch (buf_type) {
case BUF_AUDIO_WMAV1:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"Windows Media Audio v1 (win32)");
return "divxa32.acm";
case BUF_AUDIO_WMAV2:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"Windows Media Audio v2 (win32)");
return "divxa32.acm";
case BUF_AUDIO_WMAV3:
this->driver_type = DRIVER_DMO;
this->guid=&wma3_clsid;
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"Windows Media Audio v3 (win32)");
return "wma9dmod.dll";
case BUF_AUDIO_WMAV:
this->driver_type = DRIVER_DMO;
this->guid=&wmav_clsid;
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"Windows Media Audio Voice (win32)");
return "wmspdmod.dll";
case BUF_AUDIO_MSADPCM:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"MS ADPCM (win32)");
return "msadp32.acm";
case BUF_AUDIO_MSIMAADPCM:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"MS IMA ADPCM (win32)");
return "imaadp32.acm";
case BUF_AUDIO_MSGSM:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"MS GSM (win32)");
return "msgsm32.acm";
case BUF_AUDIO_IMC:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"Intel Music Coder (win32)");
return "imc32.acm";
case BUF_AUDIO_LH:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"Lernout & Hauspie (win32)");
return "lhacm.acm";
case BUF_AUDIO_VOXWARE:
this->driver_type = DRIVER_DS;
this->guid=&CLSID_Voxware;
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"Voxware Metasound (win32)");
return "voxmsdec.ax";
case BUF_AUDIO_ACELPNET:
this->driver_type = DRIVER_DS;
this->guid=&CLSID_Acelp;
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"ACELP.net (win32)");
return "acelpdec.ax";
case BUF_AUDIO_VIVOG723:
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"Vivo G.723/Siren Audio Codec (win32)");
return "vivog723.acm";
}
diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c
index 6efc49d51..8460c1265 100644
--- a/src/libxineadec/fooaudio.c
+++ b/src/libxineadec/fooaudio.c
@@ -21,7 +21,7 @@
* player. It really works too! It will output a continuous sine wave in
* place of the data it should actually send.
*
- * $Id: fooaudio.c,v 1.13 2004/03/17 22:50:35 tmattern Exp $
+ * $Id: fooaudio.c,v 1.14 2004/12/16 13:59:12 mroi Exp $
*/
#include <stdio.h>
@@ -98,7 +98,7 @@ static void fooaudio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
this->size = 0;
/* take this opportunity to initialize stream/meta information */
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "fooaudio");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "fooaudio");
/* perform any other required initialization */
this->last_pts = -1;
diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c
index 16c6b35f6..1a189e493 100644
--- a/src/libxineadec/gsm610.c
+++ b/src/libxineadec/gsm610.c
@@ -44,7 +44,7 @@
* Carsten Bormann
* --------------------------------------------------------------------
*
- * $Id: gsm610.c,v 1.15 2004/01/12 17:35:18 miguelfreitas Exp $
+ * $Id: gsm610.c,v 1.16 2004/12/16 13:59:12 mroi Exp $
*
*/
@@ -109,7 +109,7 @@ static void gsm610_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
this->size = 0;
/* stream/meta info */
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "GSM 6.10");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "GSM 6.10");
return;
}
diff --git a/src/libxineadec/nsf.c b/src/libxineadec/nsf.c
index df0b31927..53185c1d5 100644
--- a/src/libxineadec/nsf.c
+++ b/src/libxineadec/nsf.c
@@ -20,7 +20,7 @@
* NSF Audio "Decoder" using the Nosefart NSF engine by Matt Conte
* http://www.baisoku.org/
*
- * $Id: nsf.c,v 1.7 2004/01/12 17:35:18 miguelfreitas Exp $
+ * $Id: nsf.c,v 1.8 2004/12/16 13:59:12 mroi Exp $
*/
#include <stdio.h>
@@ -86,7 +86,7 @@ static void nsf_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
this->channels = buf->decoder_info[3];
/* take this opportunity to initialize stream/meta information */
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC,
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC,
"NES Music (Nosefart)");
this->song_number = buf->content[4];
diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c
index 203dc300e..d8801fe6a 100644
--- a/src/libxinevdec/bitplane.c
+++ b/src/libxinevdec/bitplane.c
@@ -28,7 +28,7 @@
* 8 (long and short)
* - untested (found no testfiles) IFF-ANIM OPT 3, 4 and 6
*
- * $Id: bitplane.c,v 1.10 2004/08/21 21:21:13 manfredtremmel Exp $
+ * $Id: bitplane.c,v 1.11 2004/12/16 13:59:12 mroi Exp $
*/
#include <stdio.h>
@@ -1203,13 +1203,13 @@ static void bitplane_decode_data (video_decoder_t *this_gen,
/* load the stream/meta info */
switch( buf->type ) {
case BUF_VIDEO_BITPLANE:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Uncompressed bitplane");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Uncompressed bitplane");
break;
case BUF_VIDEO_BITPLANE_BR1:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "ByteRun1 bitplane");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "ByteRun1 bitplane");
break;
default:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Unknown bitplane");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Unknown bitplane");
break;
}
@@ -1340,25 +1340,25 @@ static void bitplane_decode_data (video_decoder_t *this_gen,
break;
/* also known as IFF-ANIM OPT3 */
case IFF_ANHD_SDELTA:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT3");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT3");
bitplane_sdelta_opt_3 ( this );
return;
break;
/* also known as IFF-ANIM OPT4 (never seen in real world) */
case IFF_ANHD_SLDELTA:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT4 (SLDELTA)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT4 (SLDELTA)");
bitplane_set_dlta_short ( this );
break;
/* also known as IFF-ANIM OPT5 */
case IFF_ANHD_BVDELTA:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT5 (BVDELTA)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT5 (BVDELTA)");
bitplane_dlta_5(this);
break;
/* IFF-ANIM OPT6 is exactly the same as OPT5, but for stereo-displays */
/* first picture is on the left display, second on the right, third on */
/* the left, forth on right, ... Only display left picture on mono display*/
case IFF_ANHD_STEREOO5:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT6 (BVDELTA STEREO)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT6 (BVDELTA STEREO)");
bitplane_dlta_5(this);
if( this->framenumber % 2 == 0 )
this->skipframes = 1;
@@ -1366,19 +1366,19 @@ static void bitplane_decode_data (video_decoder_t *this_gen,
break;
case IFF_ANHD_OPT7:
if(anhd->bits == 0) {
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT7 (SHORT)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT7 (SHORT)");
bitplane_dlta_7_short(this);
} else {
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT7 (LONG)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT7 (LONG)");
bitplane_dlta_7_long(this);
}
break;
case IFF_ANHD_OPT8:
if(anhd->bits == 0) {
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT8 (SHORT)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT8 (SHORT)");
bitplane_dlta_8_short(this);
} else {
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT8 (LONG)");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Anim OPT8 (LONG)");
bitplane_dlta_8_long(this);
}
break;
diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c
index f87d9ed01..853dae089 100644
--- a/src/libxinevdec/foovideo.c
+++ b/src/libxinevdec/foovideo.c
@@ -23,7 +23,7 @@
* value from the last frame. This creates a slowly rotating solid color
* frame when the frames are played in succession.
*
- * $Id: foovideo.c,v 1.22 2004/02/09 22:04:11 jstembridge Exp $
+ * $Id: foovideo.c,v 1.23 2004/12/16 13:59:12 mroi Exp $
*/
#include <stdio.h>
@@ -115,7 +115,7 @@ static void foovideo_decode_data (video_decoder_t *this_gen,
this->size = 0;
/* take this opportunity to load the stream/meta info */
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "foovideo");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "foovideo");
/* do anything else relating to initializing this decoder */
this->current_yuv_byte = 0;
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index 24fc9b90a..1ea2fcc69 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -30,7 +30,7 @@
* One more catch: Raw RGB from a Microsoft file is upside down. This is
* indicated by a negative height parameter.
*
- * $Id: rgb.c,v 1.28 2004/05/29 22:55:11 tmmm Exp $
+ * $Id: rgb.c,v 1.29 2004/12/16 13:59:12 mroi Exp $
*/
#include <stdio.h>
@@ -151,7 +151,7 @@ static void rgb_decode_data (video_decoder_t *this_gen,
this->decoder_ok = 1;
/* load the stream/meta info */
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw RGB");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw RGB");
return;
} else if (this->decoder_ok) {
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index aacec69a3..b0efd85f5 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -21,7 +21,7 @@
* Actually, this decoder just reorganizes chunks of raw YUV data in such
* a way that xine can display them.
*
- * $Id: yuv.c,v 1.33 2004/05/21 19:54:42 mroi Exp $
+ * $Id: yuv.c,v 1.34 2004/12/16 13:59:12 mroi Exp $
*/
#include <stdio.h>
@@ -121,23 +121,23 @@ static void yuv_decode_data (video_decoder_t *this_gen,
switch (buf->type) {
case BUF_VIDEO_YUY2:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YUY2");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YUY2");
break;
case BUF_VIDEO_YV12:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YV12");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YV12");
break;
case BUF_VIDEO_YVU9:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YVU9");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw YVU9");
break;
case BUF_VIDEO_GREY:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Greyscale YUV");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Greyscale YUV");
break;
case BUF_VIDEO_I420:
- _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw I420");
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_VIDEOCODEC, "Raw I420");
break;
}
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 99f13df11..6338eac6c 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.132 2004/12/12 22:01:30 mroi Exp $
+ * $Id: audio_decoder.c,v 1.133 2004/12/16 13:59:06 mroi Exp $
*
*
* functions that implement audio decoding
@@ -347,7 +347,7 @@ static void *audio_decoder_loop (void *stream_gen) {
_("audio_decoder: no plugin available to handle '%s'\n"), _x_buf_audio_name( buf->type ) );
if( !_x_meta_info_get(stream, XINE_META_INFO_AUDIOCODEC) )
- _x_meta_info_set(stream, XINE_META_INFO_AUDIOCODEC, _x_buf_audio_name( buf->type ));
+ _x_meta_info_set_utf8(stream, XINE_META_INFO_AUDIOCODEC, _x_buf_audio_name( buf->type ));
buftype_unknown = buf->type;
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index a8a009a92..460672d59 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_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: video_decoder.c,v 1.154 2004/12/12 22:01:31 mroi Exp $
+ * $Id: video_decoder.c,v 1.155 2004/12/16 13:59:06 mroi Exp $
*
*/
@@ -373,7 +373,7 @@ static void *video_decoder_loop (void *stream_gen) {
_("video_decoder: no plugin available to handle '%s'\n"), _x_buf_video_name( buf->type ) );
if( !_x_meta_info_get(stream, XINE_META_INFO_VIDEOCODEC))
- _x_meta_info_set(stream, XINE_META_INFO_VIDEOCODEC, _x_buf_video_name( buf->type ));
+ _x_meta_info_set_utf8(stream, XINE_META_INFO_VIDEOCODEC, _x_buf_video_name( buf->type ));
buftype_unknown = buf->type;
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index b3959afbd..acfe59c0c 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.304 2004/12/12 22:01:32 mroi Exp $
+ * $Id: xine.c,v 1.305 2004/12/16 13:59:06 mroi Exp $
*/
/*
@@ -668,8 +668,8 @@ static int __open_internal (xine_stream_t *stream, const char *mrl) {
stream->input_plugin->input_class->get_description(stream->input_plugin->input_class));
if (stream->input_plugin->input_class->eject_media)
stream->eject_class = stream->input_plugin->input_class;
- _x_meta_info_set(stream, XINE_META_INFO_INPUT_PLUGIN,
- (stream->input_plugin->input_class->get_identifier (stream->input_plugin->input_class)));
+ _x_meta_info_set_utf8(stream, XINE_META_INFO_INPUT_PLUGIN,
+ (stream->input_plugin->input_class->get_identifier (stream->input_plugin->input_class)));
if (!stream->input_plugin->open(stream->input_plugin)) {
xine_log (stream->xine, XINE_LOG_MSG, _("xine: input plugin cannot open MRL [%s]\n"),mrl);
@@ -723,8 +723,8 @@ static int __open_internal (xine_stream_t *stream, const char *mrl) {
return 0;
}
- _x_meta_info_set(stream, XINE_META_INFO_SYSTEMLAYER,
- (stream->demux_plugin->demux_class->get_identifier(stream->demux_plugin->demux_class)));
+ _x_meta_info_set_utf8(stream, XINE_META_INFO_SYSTEMLAYER,
+ (stream->demux_plugin->demux_class->get_identifier(stream->demux_plugin->demux_class)));
free(demux_name);
} else {
xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
@@ -796,8 +796,8 @@ static int __open_internal (xine_stream_t *stream, const char *mrl) {
}
lprintf ("demux and input plugin found\n");
- _x_meta_info_set(stream, XINE_META_INFO_SYSTEMLAYER,
- (stream->demux_plugin->demux_class->get_identifier(stream->demux_plugin->demux_class)));
+ _x_meta_info_set_utf8(stream, XINE_META_INFO_SYSTEMLAYER,
+ (stream->demux_plugin->demux_class->get_identifier(stream->demux_plugin->demux_class)));
free(demux_name);
} else {
xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
@@ -1002,8 +1002,8 @@ static int __open_internal (xine_stream_t *stream, const char *mrl) {
}
lprintf ("demux and input plugin found\n");
- _x_meta_info_set(stream, XINE_META_INFO_SYSTEMLAYER,
- (stream->demux_plugin->demux_class->get_identifier(stream->demux_plugin->demux_class)));
+ _x_meta_info_set_utf8(stream, XINE_META_INFO_SYSTEMLAYER,
+ (stream->demux_plugin->demux_class->get_identifier(stream->demux_plugin->demux_class)));
}
xine_log (stream->xine, XINE_LOG_MSG, _("xine: found demuxer plugin: %s\n"),
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:20:58 +0000