diff options
Diffstat (limited to 'src')
59 files changed, 405 insertions, 348 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c index b77e9dbc8..42b85cb29 100644 --- a/src/audio_out/audio_alsa_out.c +++ b/src/audio_out/audio_alsa_out.c @@ -26,7 +26,7 @@ * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk> * * - * $Id: audio_alsa_out.c,v 1.55 2002/06/03 23:12:44 tmattern Exp $ + * $Id: audio_alsa_out.c,v 1.56 2002/06/12 12:22:26 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -105,7 +105,6 @@ typedef struct alsa_driver_s { long left_vol; long right_vol; int mute; - int remember_volume; } mixer; } alsa_driver_t; @@ -187,7 +186,7 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int pcm_device = config->register_string(config, "audio.alsa_default_device", "default", - "device used for mono output", + _("device used for mono output"), NULL, NULL, NULL); @@ -197,7 +196,7 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int pcm_device = config->register_string(config, "audio.alsa_front_device", "default", - "device used for stereo output", + _("device used for stereo output"), NULL, NULL, NULL); @@ -207,7 +206,7 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int pcm_device = config->register_string(config, "audio.alsa_surround40_device", "surround40", - "device used for 4-channel output", + _("device used for 4-channel output"), NULL, NULL, NULL); @@ -217,7 +216,7 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int pcm_device = config->register_string(config, "audio.alsa_surround50_device", "surround51", - "device used for 5-channel output", + _("device used for 5-channel output"), NULL, NULL, NULL); @@ -227,7 +226,7 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int pcm_device = config->register_string(config, "audio.alsa_surround51_device", "surround51", - "device used for 5.1-channel output", + _("device used for 5.1-channel output"), NULL, NULL, NULL); @@ -238,7 +237,7 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int pcm_device = config->register_string(config, "audio.alsa_a52_device", "iec958:AES0=0x6,AES1=0x82,AES2=0x0,AES3=0x2", - "device used for 5.1-channel output", + _("device used for 5.1-channel output"), NULL, NULL, NULL); @@ -709,7 +708,7 @@ static void ao_alsa_mixer_init(ao_driver_t *this_gen) { pcm_device = config->register_string(config, "audio.alsa_default_device", "default", - "device used for mono output", + _("device used for mono output"), NULL, NULL, NULL); @@ -843,7 +842,7 @@ static void ao_alsa_mixer_init(ao_driver_t *this_gen) { this->mixer.name = config->register_string(config, "audio.alsa_mixer_name", "PCM", - "alsa mixer device", + _("alsa mixer device"), NULL, NULL, NULL); @@ -891,42 +890,42 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { pcm_device = config->register_string(config, "audio.alsa_default_device", "default", - "device used for mono output", + _("device used for mono output"), NULL, NULL, NULL); pcm_device = config->register_string(config, "audio.alsa_front_device", "default", - "device used for stereo output", + _("device used for stereo output"), NULL, NULL, NULL); pcm_device = config->register_string(config, "audio.alsa_surround40_device", "surround40", - "device used for 4-channel output", + _("device used for 4-channel output"), NULL, NULL, NULL); pcm_device = config->register_string(config, "audio.alsa_surround50_device", "surround51", - "device used for 5-channel output", + _("device used for 5-channel output"), NULL, NULL, NULL); pcm_device = config->register_string(config, "audio.alsa_surround51_device", "surround51", - "device used for 5.1-channel output", + _("device used for 5.1-channel output"), NULL, NULL, NULL); pcm_device = config->register_string(config, "audio.alsa_a52_device", "iec958:AES0=0x6,AES1=0x82,AES2=0x0,AES3=0x2", - "device used for 5.1-channel output", + _("device used for 5.1-channel output"), NULL, NULL, NULL); @@ -935,7 +934,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { pcm_device = config->register_string(config, "audio.alsa_default_device", "default", - "device used for mono output", + _("device used for mono output"), NULL, NULL, NULL); @@ -982,7 +981,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { config->register_bool (config, "audio.four_channel", 0, - "used to inform xine about what the sound card can do", + _("used to inform xine about what the sound card can do"), NULL, NULL, NULL) ) { @@ -995,7 +994,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { config->register_bool (config, "audio.five_channel", 0, - "used to inform xine about what the sound card can do", + _("used to inform xine about what the sound card can do"), NULL, NULL, NULL) ) { @@ -1008,7 +1007,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { config->register_bool (config, "audio.five_lfe_channel", 0, - "used to inform xine about what the sound card can do", + _("used to inform xine about what the sound card can do"), NULL, NULL, NULL) ) { @@ -1026,7 +1025,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { if (config->register_bool (config, "audio.a52_pass_through", 0, - "used to inform xine about what the sound card can do", + _("used to inform xine about what the sound card can do"), NULL, NULL, NULL) ) { @@ -1045,7 +1044,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { this->mixer.name = config->register_string(config, "audio.alsa_mixer_name", "PCM", - "alsa mixer device", + _("alsa mixer device"), NULL, NULL, NULL); @@ -1072,11 +1071,13 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { static ao_info_t ao_info_alsa9 = { AO_OUT_ALSA_IFACE_VERSION, "alsa09", - "xine audio output plugin using alsa-compliant audio devices/drivers", + NULL, 11 }; ao_info_t *get_audio_out_plugin_info() { + + ao_info_alsa9.description = _("xine audio output plugin using alsa-compliant audio devices/drivers"); return &ao_info_alsa9; } diff --git a/src/audio_out/audio_arts_out.c b/src/audio_out/audio_arts_out.c index 4ea0ae27e..4d0530fbd 100644 --- a/src/audio_out/audio_arts_out.c +++ b/src/audio_out/audio_arts_out.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_arts_out.c,v 1.12 2002/05/27 11:43:22 miguelfreitas Exp $ + * $Id: audio_arts_out.c,v 1.13 2002/06/12 12:22:26 f1rmb Exp $ */ /* required for swab() */ @@ -351,11 +351,12 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { static ao_info_t ao_info_arts = { AO_OUT_ARTS_IFACE_VERSION, "arts", - "xine audio output plugin using arts-compliant audio devices/drivers", + NULL, 5 }; ao_info_t *get_audio_out_plugin_info() { + ao_info_arts.description = _("xine audio output plugin using arts-compliant audio devices/drivers"); return &ao_info_arts; } diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c index a04e3525a..3ac872a69 100644 --- a/src/audio_out/audio_esd_out.c +++ b/src/audio_out/audio_esd_out.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_esd_out.c,v 1.18 2002/03/11 19:58:00 jkeil Exp $ + * $Id: audio_esd_out.c,v 1.19 2002/06/12 12:22:26 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -411,7 +411,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { this->capabilities = AO_CAP_MODE_MONO | AO_CAP_MODE_STEREO | AO_CAP_MIXER_VOL | AO_CAP_MUTE_VOL; this->latency = config->register_range (config, "audio.esd_latency", 30000, -30000, 90000, - "esd audio output latency (adjust a/v sync)", + _("esd audio output latency (adjust a/v sync)"), NULL, NULL, NULL); this->ao_driver.get_capabilities = ao_esd_get_capabilities; @@ -433,11 +433,12 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { static ao_info_t ao_info_esd = { AO_OUT_ESD_IFACE_VERSION, "esd", - "xine audio output plugin using esd", + NULL, 5 }; ao_info_t *get_audio_out_plugin_info() { + ao_info_esd.description = _("xine audio output plugin using esd"); return &ao_info_esd; } diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c index 04ba8ecc8..a116033d2 100644 --- a/src/audio_out/audio_irixal_out.c +++ b/src/audio_out/audio_irixal_out.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_irixal_out.c,v 1.6 2002/03/11 19:58:00 jkeil Exp $ + * $Id: audio_irixal_out.c,v 1.7 2002/06/12 12:22:27 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -379,7 +379,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) /* TODO: anything can change during runtime... move check to the right location */ this->gap_tolerance = config->register_range (config, "audio.irixal_gap_tolerance", DEFAULT_GAP_TOLERANCE, 0, 90000, - "irixal audio output maximum gap length in 1/90000s", + _("irixal audio output maximum gap length in 1/90000s"), NULL, NULL, NULL); this->ao_driver.get_capabilities = ao_irixal_get_capabilities; @@ -402,12 +402,13 @@ static ao_info_t ao_info_irixal = { AO_IRIXAL_IFACE_VERSION, "irixal", - "xine audio output plugin using IRIX libaudio", + NULL, 10 }; ao_info_t *get_audio_out_plugin_info() { + ao_info_irixal.description = _("xine audio output plugin using IRIX libaudio"); return &ao_info_irixal; } diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c index 19cbdbfa5..ff5a5fc1e 100644 --- a/src/audio_out/audio_oss_out.c +++ b/src/audio_out/audio_oss_out.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_oss_out.c,v 1.67 2002/06/03 23:12:44 tmattern Exp $ + * $Id: audio_oss_out.c,v 1.68 2002/06/12 12:22:27 f1rmb Exp $ * * 20-8-2001 First implementation of Audio sync and Audio driver separation. * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk @@ -633,7 +633,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { best_rate = 0; devnum = config->register_num (config, "audio.oss_device_num", -1, - "/dev/dsp# device to use for oss output, -1 => auto_detect", + _("/dev/dsp# device to use for oss output, -1 => auto_detect"), NULL, NULL, NULL); if (devnum >= 0) { @@ -701,7 +701,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { this->sync_method = config->register_enum (config, "audio.oss_sync_method", OSS_SYNC_AUTO_DETECT, sync_methods, - "A/V sync method to use by OSS, depends on driver/hardware", + _("A/V sync method to use by OSS, depends on driver/hardware"), NULL, NULL, NULL); if (this->sync_method == OSS_SYNC_AUTO_DETECT) { @@ -768,8 +768,8 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { this->latency = config->register_range (config, "audio.oss_latency", 0, -3000, 3000, - "Adjust a/v sync for OSS softsync", - "Use this to manually adjust a/v sync if you're using softsync", + _("Adjust a/v sync for OSS softsync"), + _("Use this to manually adjust a/v sync if you're using softsync"), NULL, NULL); this->capabilities = 0; @@ -791,7 +791,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); if ( (status != -1) && (num_channels==4) ) { if (config->register_bool (config, "audio.four_channel", 0, - "Enable 4.0 channel analog surround output", + _("Enable 4.0 channel analog surround output"), NULL, NULL, NULL)) { this->capabilities |= AO_CAP_MODE_4CHANNEL; printf ("4-channel "); @@ -802,7 +802,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); if ( (status != -1) && (num_channels==5) ) { if (config->register_bool (config, "audio.five_channel", 0, - "Enable 5.0 channel analog surround output", + _("Enable 5.0 channel analog surround output"), NULL, NULL, NULL)) { this->capabilities |= AO_CAP_MODE_5CHANNEL; printf ("5-channel "); @@ -813,7 +813,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { status = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &num_channels); if ( (status != -1) && (num_channels==6) ) { if (config->register_bool (config, "audio.five_lfe_channel", 0, - "Enable 5.1 channel analog surround output", + _("Enable 5.1 channel analog surround output"), NULL, NULL, NULL)) { this->capabilities |= AO_CAP_MODE_5_1CHANNEL; printf ("5.1-channel "); @@ -824,7 +824,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { ioctl(audio_fd,SNDCTL_DSP_GETFMTS,&caps); if (caps & AFMT_AC3) { if (config->register_bool (config, "audio.a52_pass_through", 0, - "Enable A52 / AC5 digital audio output via spdif", + _("Enable A52 / AC5 digital audio output via spdif"), NULL, NULL, NULL)) { this->capabilities |= AO_CAP_MODE_A52; this->capabilities |= AO_CAP_MODE_AC5; @@ -840,7 +840,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { */ this->mixer.name = config->register_string(config, "audio.mixer_name", "/dev/mixer", - "oss mixer device", NULL, NULL, NULL); + _("oss mixer device"), NULL, NULL, NULL); { int mixer_fd; int audio_devs; @@ -907,11 +907,11 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { static ao_info_t ao_info_oss = { AO_OUT_OSS_IFACE_VERSION, "oss", - "xine audio output plugin using oss-compliant audio devices/drivers", + NULL, 10 }; ao_info_t *get_audio_out_plugin_info() { + ao_info_oss.description = _("xine audio output plugin using oss-compliant audio devices/drivers"); return &ao_info_oss; } - diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c index 1f3c735da..944b91b60 100644 --- a/src/audio_out/audio_sun_out.c +++ b/src/audio_out/audio_sun_out.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_sun_out.c,v 1.19 2002/04/06 14:19:12 miguelfreitas Exp $ + * $Id: audio_sun_out.c,v 1.20 2002/06/12 12:22:28 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -661,7 +661,7 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { devname = config->register_string(config, "audio.sun_audio_device", "/dev/audio", - "device used for audio output with the 'Sun' audio plugin", + _("device used for audio output with the 'Sun' audio plugin"), NULL, NULL, NULL); @@ -740,11 +740,12 @@ ao_driver_t *init_audio_out_plugin (config_values_t *config) { static ao_info_t ao_info_sun = { AO_SUN_IFACE_VERSION, "sun", - "xine audio output plugin using sun-compliant audio devices/drivers", + NULL, 10 }; ao_info_t *get_audio_out_plugin_info() { + ao_info_sun.description = _("xine audio output plugin using sun-compliant audio devices/drivers"); return &ao_info_sun; } diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 6ba986aa3..11b22bdb5 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.44 2002/06/07 04:15:46 miguelfreitas Exp $ + * $Id: demux_asf.c,v 1.45 2002/06/12 12:22:28 f1rmb Exp $ * * demultiplexer for asf streams * @@ -1366,7 +1366,7 @@ static int demux_asf_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_asf", VALID_ENDS, - "valid mrls ending for asf demuxer", + _("valid mrls ending for asf demuxer"), NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { @@ -1405,9 +1405,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_asf_t *this; if (iface != 9) { - printf ("demux_asf: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n", + printf (_("demux_asf: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin.\nInstalling current demux plugins should help.\n"), iface); return NULL; } @@ -1418,7 +1418,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_asf", VALID_ENDS, - "valid mrls ending for asf demuxer", + _("valid mrls ending for asf demuxer"), NULL, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 7978bd3a4..9cca600b1 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.94 2002/06/07 04:15:46 miguelfreitas Exp $ + * $Id: demux_avi.c,v 1.95 2002/06/12 12:22:32 f1rmb Exp $ * * demultiplexer for avi streams * @@ -1494,7 +1494,7 @@ static int demux_avi_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, this->config->register_string(this->config, "mrl.ends_avi", VALID_ENDS, - "valid mrls ending for avi demuxer", + _("valid mrls ending for avi demuxer"), NULL, NULL, NULL)); while((m = xine_strsep(&valid_ends, ",")) != NULL) { @@ -1553,15 +1553,15 @@ static int demux_avi_get_stream_length (demux_plugin_t *this_gen) { } demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { - + demux_avi_t *this; - + if (iface != 9) { xine_log (xine, XINE_LOG_PLUGIN, _("demux_avi: this plugin doesn't support plugin API version %d.\n" "demux_avi: this means there's a version mismatch between xine and this " "demux_avi: demuxer plugin.\nInstalling current demuxer plugins should help.\n"), - iface); + iface); return NULL; } @@ -1571,7 +1571,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_avi", VALID_ENDS, - "valid mrls ending for avi demuxer", + _("valid mrls ending for avi demuxer"), NULL, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c index 8b0665a19..6dba3d75b 100644 --- a/src/demuxers/demux_cda.c +++ b/src/demuxers/demux_cda.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_cda.c,v 1.19 2002/06/07 02:40:46 miguelfreitas Exp $ + * $Id: demux_cda.c,v 1.20 2002/06/12 12:22:33 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -294,9 +294,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_cda_t *this; if (iface != 9) { - printf ("demux_cda: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n", + printf (_("demux_cda: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin.\nInstalling current demux plugins should help.\n"), iface); return NULL; } diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index ad37e2a85..52abe63c3 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.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_elem.c,v 1.46 2002/06/07 02:40:46 miguelfreitas Exp $ + * $Id: demux_elem.c,v 1.47 2002/06/12 12:22:33 f1rmb Exp $ * * demultiplexer for elementary mpeg streams * @@ -316,7 +316,7 @@ static int demux_mpeg_elem_open(demux_plugin_t *this_gen, if(suffix) { xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_elem", VALID_ENDS, - "valid mrls ending for elementary demuxer", + _("valid mrls ending for elementary demuxer"), NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { @@ -367,9 +367,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_mpeg_elem_t *this; if (iface != 9) { - printf ("demux_elem: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n", + printf (_("demux_elem: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin.\nInstalling current demux plugins should help.\n"), iface); return NULL; } @@ -380,7 +380,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_elem", VALID_ENDS, - "valid mrls ending for elementary demuxer", + _("valid mrls ending for elementary demuxer"), NULL, NULL, NULL); this->demux_plugin.interface_version = DEMUX_MPEG_ELEM_IFACE_VERSION; diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 47ee5a753..a8ac34c91 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -21,7 +21,7 @@ * For more information on the FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_film.c,v 1.10 2002/06/07 02:40:47 miguelfreitas Exp $ + * $Id: demux_film.c,v 1.11 2002/06/12 12:22:33 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -497,10 +497,11 @@ static int demux_film_open(demux_plugin_t *this_gen, input_plugin_t *input, if(!suffix) return DEMUX_CANNOT_HANDLE; - xine_strdupa(valid_ends, (this->config->register_string(this->config, - "mrl.ends_film", VALID_ENDS, - "valid mrls ending for film demuxer", - NULL, NULL, NULL))); + xine_strdupa(valid_ends, + (this->config->register_string(this->config, + "mrl.ends_film", VALID_ENDS, + _("valid mrls ending for film demuxer"), + NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -729,9 +730,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_film_t *this; if (iface != 9) { - printf ("demux_film: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin. Installing current demux plugins should help.\n", + printf (_("demux_film: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin. Installing current demux plugins should help.\n"), iface); return NULL; } @@ -739,6 +740,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this = (demux_film_t *) xine_xmalloc(sizeof(demux_film_t)); this->config = xine->config; this->xine = xine; + + (void *) this->config->register_string(this->config, + "mrl.ends_film", VALID_ENDS, + _("valid mrls ending for film demuxer"), + NULL, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_film_open; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 3e66def68..161e93b64 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.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_mpeg.c,v 1.64 2002/06/07 02:40:47 miguelfreitas Exp $ + * $Id: demux_mpeg.c,v 1.65 2002/06/12 12:22:33 f1rmb Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -890,7 +890,7 @@ static int demux_mpeg_open(demux_plugin_t *this_gen, xine_strdupa(valid_mrls, this->config->register_string(this->config, "mrl.mrls_mpeg", VALID_MRLS, - "valid mrls for mpeg demuxer", + _("valid mrls for mpeg demuxer"), NULL, NULL, NULL)); media = strstr(MRL, "://"); @@ -923,7 +923,7 @@ static int demux_mpeg_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, this->config->register_string(this->config, "mrl.ends_mpeg", VALID_ENDS, - "valid mrls ending for mpeg demuxer", + _("valid mrls ending for mpeg demuxer"), NULL, NULL, NULL)); while((m = xine_strsep(&valid_ends, ",")) != NULL) { @@ -974,9 +974,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_mpeg_t *this; if (iface != 9) { - printf ("demux_mpeg: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n", + printf (_("demux_mpeg: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin.\nInstalling current demux plugins should help.\n"), iface); return NULL; } @@ -987,11 +987,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { /* Calling register_string() configure valid mrls in configfile */ (void*) this->config->register_string(this->config, "mrl.mrls_mpeg", VALID_MRLS, - "valid mrls for mpeg demuxer", + _("valid mrls for mpeg demuxer"), NULL, NULL, NULL); (void*) this->config->register_string(this->config, "mrl.ends_mpeg", VALID_ENDS, - "valid mrls ending for mpeg demuxer", + _("valid mrls ending for mpeg demuxer"), NULL, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index c21468950..1f07b61ea 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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_mpeg_block.c,v 1.103 2002/06/07 02:40:47 miguelfreitas Exp $ + * $Id: demux_mpeg_block.c,v 1.104 2002/06/12 12:22:33 f1rmb Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -1083,7 +1083,7 @@ static int demux_mpeg_block_open(demux_plugin_t *this_gen, xine_strdupa(valid_mrls, (this->config->register_string(this->config, "mrl.mrls_mpeg_block", VALID_MRLS, - "valid mrls for mpeg block demuxer", + _("valid mrls for mpeg block demuxer"), NULL, NULL, NULL))); MRL = input->get_mrl (input); @@ -1124,7 +1124,7 @@ static int demux_mpeg_block_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_mpeg_block", VALID_ENDS, - "valid mrls ending for mpeg block demuxer", + _("valid mrls ending for mpeg block demuxer"), NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { @@ -1174,9 +1174,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_mpeg_block_t *this; if (iface != 9) { - printf ("demux_mpeg_block: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n", + printf (_("demux_mpeg_block: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin.\nInstalling current demux plugins should help.\n"), iface); return NULL; } @@ -1187,11 +1187,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { /* Calling register_string() configure valid mrls in configfile */ (void*) this->config->register_string(this->config, "mrl.mrls_mpeg_block", VALID_MRLS, - "valid mrls for mpeg block demuxer", + _("valid mrls for mpeg block demuxer"), NULL, NULL, NULL); (void*) this->config->register_string(this->config, "mrl.ends_mpeg_block", VALID_ENDS, - "valid mrls ending for mpeg block demuxer", + _("valid mrls ending for mpeg block demuxer"), NULL, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 14cb93460..dd5c10ee5 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.49 2002/06/07 02:40:47 miguelfreitas Exp $ + * $Id: demux_mpgaudio.c,v 1.50 2002/06/12 12:22:33 f1rmb Exp $ * * demultiplexer for mpeg audio (i.e. mp3) streams * @@ -466,7 +466,7 @@ static int demux_mpgaudio_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_mgaudio", VALID_ENDS, - "valid mrls ending for mpeg audio demuxer", + _("valid mrls ending for mpeg audio demuxer"), NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { @@ -522,9 +522,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_mpgaudio_t *this; if (iface != 9) { - printf ("demux_mpeg: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n", + printf (_("demux_mpeg: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin.\nInstalling current demux plugins should help.\n"), iface); return NULL; } @@ -535,7 +535,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_mgaudio", VALID_ENDS, - "valid mrls ending for mpeg audio demuxer", + _("valid mrls ending for mpeg audio demuxer"), NULL, NULL, NULL); this->demux_plugin.interface_version = DEMUX_MPGAUDIO_IFACE_VERSION; diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index 1177a0ebd..ca9f77ec0 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.28 2002/06/07 02:40:47 miguelfreitas Exp $ + * $Id: demux_ogg.c,v 1.29 2002/06/12 12:22:33 f1rmb Exp $ * * demultiplexer for ogg streams * @@ -608,7 +608,7 @@ static int demux_ogg_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_ogg", VALID_ENDS, - "valid mrls ending for ogg demuxer", + _("valid mrls ending for ogg demuxer"), NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { @@ -659,7 +659,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.ends_ogg", VALID_ENDS, - "valid mrls ending for ogg demuxer", + _("valid mrls ending for ogg demuxer"), NULL, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c index 7cb96fe49..6b6372958 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.31 2002/06/07 02:40:47 miguelfreitas Exp $ + * $Id: demux_pes.c,v 1.32 2002/06/12 12:22:33 f1rmb Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -529,7 +529,7 @@ static int demux_pes_open(demux_plugin_t *this_gen, xine_strdupa(valid_mrls, (this->config->register_string(this->config, "mrl.mrls_pes", VALID_MRLS, - "valid mrls for pes demuxer", + _("valid mrls for pes demuxer"), NULL, NULL, NULL))); media = strstr(MRL, "://"); @@ -559,7 +559,7 @@ static int demux_pes_open(demux_plugin_t *this_gen, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_pes", VALID_ENDS, - "valid mrls ending for pes demuxer", + _("valid mrls ending for pes demuxer"), NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { @@ -605,9 +605,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_pes_t *this; if (iface != 9) { - printf ("demux_pes: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n", + printf (_("demux_pes: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin.\nInstalling current demux plugins should help.\n"), iface); return NULL; } @@ -617,11 +617,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->xine = xine; (void*) this->config->register_string(this->config, "mrl.mrls_pes", VALID_MRLS, - "valid mrls for pes demuxer", + _("valid mrls for pes demuxer"), NULL, NULL, NULL); (void*) this->config->register_string(this->config, "mrl.ends_pes", VALID_ENDS, - "valid mrls ending for pes demuxer", + _("valid mrls ending for pes demuxer"), NULL, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 7ffcecbc8..4b6eeaf40 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,7 +30,7 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.51 2002/06/09 11:12:22 miguelfreitas Exp $ + * $Id: demux_qt.c,v 1.52 2002/06/12 12:22:33 f1rmb Exp $ * */ @@ -1204,9 +1204,9 @@ static int demux_qt_open(demux_plugin_t *this_gen, return DEMUX_CANNOT_HANDLE; xine_strdupa(valid_ends, (this->config->register_string(this->config, - "mrl.ends_qt", VALID_ENDS, - "valid mrls ending for qt demuxer", - NULL, NULL, NULL))); + "mrl.ends_qt", VALID_ENDS, + _("valid mrls ending for qt demuxer"), + NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -1437,10 +1437,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_qt_t *this; if (iface != 9) { - printf ("demux_qt: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should -help.\n", + printf (_("demux_qt: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin.\nInstalling current demux plugins should help.\n"), iface); return NULL; } @@ -1451,7 +1450,7 @@ help.\n", (void*) this->config->register_string(this->config, "mrl.ends_qt", VALID_ENDS, - "valid mrls ending for qt demuxer", + _("valid mrls ending for qt demuxer"), NULL, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 668f5ad44..5ddc91684 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.4 2002/06/07 02:40:47 miguelfreitas Exp $ + * $Id: demux_roq.c,v 1.5 2002/06/12 12:22:33 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -294,9 +294,9 @@ static int demux_roq_open(demux_plugin_t *this_gen, input_plugin_t *input, return DEMUX_CANNOT_HANDLE; xine_strdupa(valid_ends, (this->config->register_string(this->config, - "mrl.ends_roq", VALID_ENDS, - "valid mrls ending for roq demuxer", - NULL, NULL, NULL))); + "mrl.ends_roq", VALID_ENDS, + _("valid mrls ending for roq demuxer"), + NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -533,9 +533,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { demux_roq_t *this; if (iface != 9) { - printf ("demux_roq: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n", + printf (_("demux_roq: plugin doesn't support plugin API version %d.\n" + " this means there's a version mismatch between xine and this " + " demuxer plugin.\nInstalling current demux plugins should help.\n"), iface); return NULL; } @@ -544,6 +544,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->config = xine->config; this->xine = xine; + (void *) this->config->register_string(this->config, + "mrl.ends_roq", VALID_ENDS, + _("valid mrls ending for roq demuxer"), + NULL, NULL, NULL); + this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_roq_open; this->demux_plugin.start = demux_roq_start; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index b775d3d4e..c08d9c1b6 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.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_ts.c,v 1.49 2002/06/07 02:40:47 miguelfreitas Exp $ + * $Id: demux_ts.c,v 1.50 2002/06/12 12:22:33 f1rmb Exp $ * * Demultiplexer for MPEG2 Transport Streams. * @@ -1443,9 +1443,9 @@ static int demux_ts_open(demux_plugin_t *this_gen, input_plugin_t *input, xine_strdupa(valid_mrls, (this->config->register_string(this->config, "mrl.mrls_ts", VALID_MRLS, - "valid mrls for ts demuxer", + _("valid mrls for ts demuxer"), NULL, NULL, NULL))); - + mrl = input->get_mrl(input); media = strstr(mrl, "://"); @@ -1478,8 +1478,7 @@ static int demux_ts_open(demux_plugin_t *this_gen, input_plugin_t *input, xine_strdupa(valid_ends, (this->config->register_string(this->config, "mrl.ends_ts", VALID_ENDS, - "valid mrls ending for ts " - "demuxer", + _("valid mrls ending for ts demuxer"), NULL, NULL, NULL))); while((m = xine_strsep(&valid_ends, ",")) != NULL) { @@ -1658,11 +1657,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { (void*) this->config->register_string(this->config, "mrl.mrls_ts", VALID_MRLS, - "valid mrls for ts demuxer", + _("valid mrls for ts demuxer"), NULL, NULL, NULL); (void*) this->config->register_string(this->config, "mrl.ends_ts", VALID_ENDS, - "valid mrls ending for ts demuxer", + _("valid mrls ending for ts demuxer"), NULL, NULL, NULL); this->plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h index c17708e11..b898f7369 100644 --- a/src/dxr3/dxr3.h +++ b/src/dxr3/dxr3.h @@ -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.h,v 1.2 2002/05/24 22:09:44 miguelfreitas Exp $ + * $Id: dxr3.h,v 1.3 2002/06/12 12:22:34 f1rmb Exp $ */ #ifndef HAVE_DXR3_H @@ -25,13 +25,16 @@ #include <linux/em8300.h> +#include "xine_internal.h" + /* data for the device name config entry */ #define CONF_LOOKUP "dxr3.devicename" #define CONF_DEFAULT "/dev/em8300-0" -#define CONF_NAME "Dxr3: Device Name" -#define CONF_HELP "The device file of the dxr3 mpeg decoder card control device." +#define CONF_NAME _("Dxr3: Device Name") +#define CONF_HELP _("The device file of the dxr3 mpeg decoder card control device.") /* image format used by dxr3_decoder to tag undecoded mpeg data */ #define IMGFMT_MPEG (('G'<<24)|('E'<<16)|('P'<<8)|'M') #endif + diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index d0f99a844..f46ad2dd9 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.6 2002/06/03 20:29:16 mroi Exp $ + * $Id: dxr3_decode_video.c,v 1.7 2002/06/12 12:22:34 f1rmb Exp $ */ /* dxr3 video decoder plugin. @@ -161,9 +161,10 @@ video_decoder_t *init_video_decoder_plugin(int iface_version, xine_t *xine) this->video_decoder.close = dxr3_close; this->video_decoder.dispose = dxr3_dispose; this->video_decoder.priority = cfg->register_num(cfg, - "dxr3.decoder_priority", 10, "Dxr3: video decoder priority", - "Decoder priorities greater 5 enable hardware decoding, 0 disables it.", - dxr3_update_priority, this); + "dxr3.decoder_priority", 10, + _("Dxr3: video decoder priority"), + _("Decoder priorities greater 5 enable hardware decoding, 0 disables it."), + dxr3_update_priority, this); this->scr = NULL; this->xine = xine; @@ -172,18 +173,21 @@ video_decoder_t *init_video_decoder_plugin(int iface_version, xine_t *xine) this->repeat_first_field = 0; this->sync_every_frame = cfg->register_bool(cfg, - "dxr3.sync_every_frame", 0, "Try to sync video every frame", - "This is relevant for progressive video only (most PAL films).", - dxr3_update_sync_mode, this); + "dxr3.sync_every_frame", 0, + _("Try to sync video every frame"), + _("This is relevant for progressive video only (most PAL films)."), + dxr3_update_sync_mode, this); this->sync_retry = 0; this->enhanced_mode = cfg->register_bool(cfg, - "dxr3.alt_play_mode", 1, "Use alternate Play mode", - "Enabling this option will utilise a smoother play mode.", - dxr3_update_enhanced_mode, this); + "dxr3.alt_play_mode", 1, + _("Use alternate Play mode"), + _("Enabling this option will utilise a smoother play mode."), + dxr3_update_enhanced_mode, this); this->correct_durations = cfg->register_bool(cfg, - "dxr3.correct_durations", 0, "Correct frame durations in broken streams", - "Enable this for streams with wrong frame durations.", - dxr3_update_correct_durations, this); + "dxr3.correct_durations", 0, + _("Correct frame durations in broken streams"), + _("Enable this for streams with wrong frame durations."), + dxr3_update_correct_durations, this); /* set a/v offset to compensate dxr3 internal delay */ cur_offset = this->xine->metronom->get_option(this->xine->metronom, METRONOM_AV_OFFSET); diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c index 46d3f4fc7..3fb7f1bdc 100644 --- a/src/dxr3/dxr3_mpeg_encoders.c +++ b/src/dxr3/dxr3_mpeg_encoders.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_mpeg_encoders.c,v 1.2 2002/06/01 17:21:28 mroi Exp $ + * $Id: dxr3_mpeg_encoders.c,v 1.3 2002/06/12 12:22:34 f1rmb Exp $ */ /* mpeg encoders for the dxr3 video out plugin. @@ -170,10 +170,10 @@ static int rte_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame) } this->rte_bitrate = drv->config->register_range(drv->config, - "dxr3.rte_bitrate", 10000, 1000, 20000, - "Dxr3enc: rte mpeg output bitrate (kbit/s)", - "The bitrate the mpeg encoder library librte should use for dxr3's encoding mode", - NULL, NULL); + "dxr3.rte_bitrate", 10000, 1000, 20000, + _("Dxr3enc: rte mpeg output bitrate (kbit/s)"), + _("The bitrate the mpeg encoder library librte should use for dxr3's encoding mode"), + NULL, NULL); this->rte_bitrate *= 1000; /* config in kbit/s, rte wants bit/s */ /* FIXME: this needs to be replaced with a codec option call. @@ -371,10 +371,10 @@ static int fame_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame) this->fp = init_fp; this->fp.quality = drv->config->register_range(drv->config, - "dxr3.fame_quality", 90, 10, 100, - "Dxr3enc: fame mpeg encoding quality", - "The encoding quality of the libfame mpeg encoder library.", - NULL,NULL); + "dxr3.fame_quality", 90, 10, 100, + _("Dxr3enc: fame mpeg encoding quality"), + _("The encoding quality of the libfame mpeg encoder library."), + NULL,NULL); #if LOG_ENC /* the really interesting bit is the quantizer scale. The formula * below is copied from libfame's sources (could be changed in the diff --git a/src/dxr3/dxr3_scr.c b/src/dxr3/dxr3_scr.c index 97cfb9bdf..bbc157211 100644 --- a/src/dxr3/dxr3_scr.c +++ b/src/dxr3/dxr3_scr.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_scr.c,v 1.2 2002/05/24 22:09:44 miguelfreitas Exp $ + * $Id: dxr3_scr.c,v 1.3 2002/06/12 12:22:34 f1rmb Exp $ */ /* dxr3 scr plugin. @@ -61,10 +61,10 @@ dxr3_scr_t *dxr3_scr_init(xine_t *xine) this = (dxr3_scr_t *)malloc(sizeof(dxr3_scr_t)); confstr = xine->config->register_string(xine->config, - CONF_LOOKUP, CONF_DEFAULT, CONF_NAME, CONF_HELP, NULL, NULL); + CONF_LOOKUP, CONF_DEFAULT, CONF_NAME, CONF_HELP, NULL, NULL); if ((this->fd_control = open(confstr, O_WRONLY)) < 0) { printf("dxr3_scr: Failed to open control device %s (%s)\n", - confstr, strerror(errno)); + confstr, strerror(errno)); free(this); return NULL; } diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 43e7e2322..0ce1a6e80 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.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_out_dxr3.c,v 1.23 2002/06/10 15:02:48 mroi Exp $ + * $Id: video_out_dxr3.c,v 1.24 2002/06/12 12:22:34 f1rmb Exp $ */ /* mpeg1 encoding video out plugin for the dxr3. @@ -149,14 +149,18 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen) this->aspect = ASPECT_FULL; this->overlay_enabled = 0; this->swap_fields = config->register_bool(config, - "dxr3.enc_swap_fields", 0, "swap odd and even lines", NULL, dxr3_update_swap_fields, this); + "dxr3.enc_swap_fields", 0, + _("swap odd and even lines"), + NULL, dxr3_update_swap_fields, this); this->add_bars = config->register_bool(config, - "dxr3.enc_add_bars", 1, "Add black bars to correct aspect ratio", - "If disabled, will assume source has 4:3 aspect ratio.", dxr3_update_add_bars, this); + "dxr3.enc_add_bars", 1, + _("Add black bars to correct aspect ratio"), + _("If disabled, will assume source has 4:3 aspect ratio."), dxr3_update_add_bars, this); this->enhanced_mode = config->register_bool(config, - "dxr3.enc_alt_play_mode", 1, "dxr3: use alternate play mode for mpeg encoder playback", - "Enabling this option will utilise a smoother play mode", dxr3_update_enhanced_mode, this); - + "dxr3.enc_alt_play_mode", 1, + _("dxr3: use alternate play mode for mpeg encoder playback"), + _("Enabling this option will utilise a smoother play mode"), dxr3_update_enhanced_mode, this); + confstr = config->register_string(config, CONF_LOOKUP, CONF_DEFAULT, CONF_NAME, CONF_HELP, NULL, NULL); strncpy(this->devname, confstr, 128); this->devname[127] = '\0'; @@ -208,16 +212,15 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen) printf("rte, "); #endif #endif - available_encoders[encoder] = "none"; + available_encoders[encoder] = _("none"); available_encoders[encoder + 1] = NULL; #if LOG_VID printf("none\n"); #endif if (encoder) { encoder = config->register_enum(config, "dxr3.encoder", - 0, available_encoders, "the encoder for non mpeg content", - "Content other than mpeg has to pass an additional reencoding " - "stage, because the dxr3 handles mpeg only.", NULL, NULL); + 0, available_encoders, _("the encoder for non mpeg content"), + _("Content other than mpeg has to pass an additional reencoding stage, because the dxr3 handles mpeg only."), NULL, NULL); #ifdef HAVE_LIBRTE if ((strcmp(available_encoders[encoder], "rte") == 0) && !dxr3_rte_init(this)) { printf("video_out_dxr3: Mpeg encoder rte failed to init.\n"); @@ -230,7 +233,7 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen) return 0; } #endif - if (strcmp(available_encoders[encoder], "none") == 0) + if (strcmp(available_encoders[encoder], _("none")) == 0) printf("video_out_dxr3: Mpeg encoding disabled.\n" "video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n" "video_out_dxr3: you will not be able to play non-mpeg content using this video out\n" @@ -246,15 +249,18 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen) printf("video_out_dxr3: cannot read bcs values (%s)\n", strerror(errno)); this->bcs.contrast = config->register_range(config, "dxr3.contrast", - this->bcs.contrast, 100, 900, "Dxr3: contrast control", NULL, NULL, NULL); + this->bcs.contrast, 100, 900, + _("Dxr3: contrast control"), NULL, NULL, NULL); this->bcs.saturation = config->register_range(config, "dxr3.saturation", - this->bcs.saturation, 100, 900, "Dxr3: saturation control", NULL, NULL, NULL); + this->bcs.saturation, 100, 900, + _("Dxr3: saturation control"), NULL, NULL, NULL); this->bcs.brightness = config->register_range(config, "dxr3.brightness", - this->bcs.brightness, 100, 900, "Dxr3: brightness control", NULL, NULL, NULL); - + this->bcs.brightness, 100, 900, + _("Dxr3: brightness control"), NULL, NULL, NULL); + /* overlay or tvout? */ confnum = config->register_enum(config, "dxr3.videoout_mode", 0, videoout_modes, - "Dxr3: videoout mode (tv or overlay)", NULL, NULL, NULL); + _("Dxr3: videoout mode (tv or overlay)"), NULL, NULL, NULL); #if LOG_VID printf("video_out_dxr3: overlaymode = %s\n", videoout_modes[confnum]); #endif @@ -272,11 +278,11 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen) this->overlay_enabled = 1; this->tv_switchable = 1; confstr = config->register_string(config, "dxr3.keycolor", "0x80a040", - "Dxr3: overlay colorkey value", NULL, NULL, NULL); + _("Dxr3: overlay colorkey value"), NULL, NULL, NULL); sscanf(confstr, "%x", &this->overlay.colorkey); confstr = config->register_string(config, "dxr3.color_interval", "50.0", - "Dxr3: overlay colorkey range", - "A greater value widens the tolerance for the overlay keycolor", NULL, NULL); + _("Dxr3: overlay colorkey range"), + _("A greater value widens the tolerance for the overlay keycolor"), NULL, NULL); sscanf(confstr, "%f", &this->overlay.color_interval); } else { printf("video_out_dxr3: please run autocal, overlay disabled\n"); @@ -287,7 +293,7 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen) /* init tvmode */ confnum = config->register_enum(config, "dxr3.preferred_tvmode", 3, tv_modes, - "dxr3 preferred tv mode", NULL, NULL, NULL); + _("dxr3 preferred tv mode"), NULL, NULL, NULL); switch (confnum) { case 0: /* ntsc */ this->tv_mode = EM8300_VIDEOMODE_NTSC; diff --git a/src/input/input_cda.c b/src/input/input_cda.c index 9553f4c94..f64a0a379 100644 --- a/src/input/input_cda.c +++ b/src/input/input_cda.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: input_cda.c,v 1.24 2002/05/25 19:19:17 siggi Exp $ + * $Id: input_cda.c,v 1.25 2002/06/12 12:22:34 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -1841,23 +1841,23 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { this->cda->cur_pos = -1; this->cda->device_name = strdup(config->register_string(config, "input.cda_device", CDROM, - "path to your local cd audio device file", + _("path to your local cd audio device file"), NULL, device_change_cb, (void *) this)); this->cddb.server = config->register_string(config, "input.cda_cddb_server", CDDB_SERVER, - "cddbp server name", NULL, + _("cddbp server name"), NULL, server_change_cb, (void *) this); this->cddb.port = config->register_num(config, "input.cda_cddb_port", CDDB_PORT, - "cddbp server port", NULL, + _("cddbp server port"), NULL, port_change_cb, (void *) this); this->cddb.fd = -1; this->cddb.cache_dir = config->register_string(config, "input.cda_cddb_cachedir", (_cda_cddb_get_default_location()), - "cddbp cache directory", NULL, + _("cddbp cache directory"), NULL, cachedir_change_cb, (void *) this); this->mrls = (mrl_t **) xine_xmalloc(sizeof(mrl_t*)); diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 8eb7256f8..5362e972d 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.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: input_dvd.c,v 1.49 2002/05/25 19:19:17 siggi Exp $ + * $Id: input_dvd.c,v 1.50 2002/06/12 12:22:34 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -854,10 +854,10 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { */ this->device = config->register_string(config, "input.dvd_device", DVD, - "path to your local dvd device file", + _("path to your local dvd device file"), NULL, device_change_cb, (void *)this); this->raw_device = config->register_string(config, "input.dvd_raw_device", RDVD, - "path to a raw device set up for dvd access", + _("path to a raw device set up for dvd access"), NULL, rawdevice_change_cb, (void*)this); #ifdef __sun check_solaris_vold_device(this); diff --git a/src/input/input_file.c b/src/input/input_file.c index ec3c20b2a..957108fb7 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.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: input_file.c,v 1.50 2002/06/09 13:23:36 miguelfreitas Exp $ + * $Id: input_file.c,v 1.51 2002/06/12 12:22:34 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -905,12 +905,12 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { strcpy(current_dir, "."); this->origin_path = config->register_string(this->config, "input.file_origin_path", - current_dir, "origin path to grab file mrls", + current_dir, _("origin path to grab file mrls"), NULL, origin_change_cb, (void *) this); } this->show_hidden_files = this->config->register_bool(this->config, "input.file_hidden_files", - 1, "hidden files displaying.", + 1, _("hidden files displaying."), NULL, hidden_bool_cb, (void *) this); return (input_plugin_t *) this; diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index f2f2238c2..5f336e6a1 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.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: input_vcd.c,v 1.42 2002/05/25 19:19:18 siggi Exp $ + * $Id: input_vcd.c,v 1.43 2002/06/12 12:22:34 f1rmb Exp $ * */ @@ -1181,7 +1181,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { this->input_plugin.is_branch_possible= NULL; this->device = config->register_string(config, "input.vcd_device", CDROM, - "path to your local vcd device file", + _("path to your local vcd device file"), NULL, device_change_cb, (void *)this); this->mrls = (mrl_t **) xine_xmalloc(sizeof(mrl_t*)); diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c index a4623e0b0..d9e7d9bfb 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.26 2002/05/25 19:19:18 siggi Exp $ + * $Id: xine_decoder.c,v 1.27 2002/06/12 12:22:34 f1rmb Exp $ * * stuff needed to turn liba52 into a xine decoder plugin */ @@ -547,10 +547,10 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) { config_values_t *cfg; if (iface_version != 8) { - printf( "liba52: plugin doesn't support plugin API version %d.\n" - "liba52: this means there's a version mismatch between xine and this " - "liba52: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("liba52: plugin doesn't support plugin API version %d.\n" + "liba52: this means there's a version mismatch between xine and this " + "liba52: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } @@ -571,13 +571,13 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) { this->a52_level = (float) cfg->register_range (cfg, "codec.a52_level", 100, 0, 200, - "a/52 volume control", + _("a/52 volume control"), NULL, NULL, NULL) / 100.0; this->disable_dynrng = !cfg->register_bool (cfg, "codec.a52_dynrng", 0, - "enable a/52 dynamic range compensation", + _("enable a/52 dynamic range compensation"), NULL, NULL, NULL); this->enable_surround_downmix = cfg->register_bool (cfg, "codec.a52_surround_downmix", 0, - "enable audio downmixing to 2.0 surround stereo", + _("enable audio downmixing to 2.0 surround stereo"), NULL, NULL, NULL); return (audio_decoder_t *) this; diff --git a/src/libdivx4/xine_decoder.c b/src/libdivx4/xine_decoder.c index 350778b6d..930e3f79d 100644 --- a/src/libdivx4/xine_decoder.c +++ b/src/libdivx4/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 2002/06/04 15:39:05 miguelfreitas Exp $ + * $Id: xine_decoder.c,v 1.37 2002/06/12 12:22:35 f1rmb Exp $ * * xine decoder plugin using divx4 * @@ -552,10 +552,10 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) { config_values_t *cfg; if (iface_version != 9) { - printf( "divx4: plugin doesn't support plugin API version %d.\n" - "divx4: this means there's a version mismatch between xine and this " - "divx4: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("divx4: plugin doesn't support plugin API version %d.\n" + "divx4: this means there's a version mismatch between xine and this " + "divx4: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } @@ -565,7 +565,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) { if it fails, print a message and return 0 so that xine ignores us from then on. */ libdecore_name = cfg->register_string (cfg, "codec.divx4_libdivxdecore", "libdivxdecore.so", - "Relative path to libdivxdecore.so to open", + _("Relative path to libdivxdecore.so to open"), NULL, NULL, NULL); libdecore_handle = dlopen(libdecore_name, RTLD_LAZY); @@ -590,20 +590,20 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) { this->video_decoder.reset = divx4_reset; this->video_decoder.dispose = divx4_dispose; this->video_decoder.priority = cfg->register_num (cfg, "codec.divx4_priority", 4, - "priority of the divx4 plugin (>5 => enable)", + _("priority of the divx4 plugin (>5 => enable)"), NULL, NULL, NULL); this->decore = libdecore_func; this->postproc = cfg->register_range (cfg, "codec.divx4_postproc", 3, 0, 6, - "the postprocessing level, 0 = none and fast, 6 = all and slow", + _("the postprocessing level, 0 = none and fast, 6 = all and slow"), NULL, divx4_update_postproc, this); this->can_handle_311 = cfg->register_bool (cfg, "codec.divx4_msmpeg4v3", 1, - "use divx4 plugin for msmpeg4v3 streams", + _("use divx4 plugin for msmpeg4v3 streams"), NULL, NULL, NULL); this->size = 0; /* allow override of version checking by user */ this->version = cfg->register_num(cfg, "codec.divx4_forceversion", 0, - "Divx version to check for (set to 0 (default) if unsure)", + _("Divx version to check for (set to 0 (default) if unsure)"), NULL, NULL, NULL); /* if the version set in the config file, we can check right now. diff --git a/src/libdts/xine_decoder.c b/src/libdts/xine_decoder.c index f4a1af58b..b0d77421a 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.21 2002/05/25 19:19:18 siggi Exp $ + * $Id: xine_decoder.c,v 1.22 2002/06/12 12:22:35 f1rmb Exp $ * * 04-09-2001 DTS passtrough (C) Joachim Koenig * 09-12-2001 DTS passthrough inprovements (C) James Courtier-Dutton @@ -230,10 +230,10 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) { dts_decoder_t *this ; if (iface_version != 8) { - printf( "libdts: plugin doesn't support plugin API version %d.\n" - "libdts: this means there's a version mismatch between xine and this " - "libdts: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("libdts: plugin doesn't support plugin API version %d.\n" + "libdts: this means there's a version mismatch between xine and this " + "libdts: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index f5f351af2..c297a99cd 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/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 2002/06/09 21:09:58 miguelfreitas Exp $ + * $Id: xine_decoder.c,v 1.42 2002/06/12 12:22:35 f1rmb Exp $ * * xine decoder plugin using ffmpeg * @@ -372,10 +372,10 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) { static pthread_once_t once_control = PTHREAD_ONCE_INIT; if (iface_version != 9) { - printf( "ffmpeg: plugin doesn't support plugin API version %d.\n" - "ffmpeg: this means there's a version mismatch between xine and this " - "ffmpeg: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("ffmpeg: plugin doesn't support plugin API version %d.\n" + "ffmpeg: this means there's a version mismatch between xine and this " + "ffmpeg: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c index c64819b77..7924fcd31 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.25 2002/05/25 19:19:18 siggi Exp $ + * $Id: xine_decoder.c,v 1.26 2002/06/12 12:22:36 f1rmb Exp $ * * 31-8-2001 Added LPCM rate sensing. * (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk @@ -185,10 +185,10 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) { lpcm_decoder_t *this ; if (iface_version != 8) { - printf( "liblpcm: plugin doesn't support plugin API version %d.\n" - "liblpcm: this means there's a version mismatch between xine and this " - "liblpcm: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("liblpcm: plugin doesn't support plugin API version %d.\n" + "liblpcm: this means there's a version mismatch between xine and this " + "liblpcm: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } diff --git a/src/libmad/xine_decoder.c b/src/libmad/xine_decoder.c index 927ef4612..bf486bbd6 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.20 2002/05/25 19:19:18 siggi Exp $ + * $Id: xine_decoder.c,v 1.21 2002/06/12 12:22:36 f1rmb Exp $ * * stuff needed to turn libmad into a xine decoder plugin */ @@ -280,10 +280,10 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) { mad_decoder_t *this ; if (iface_version != 8) { - printf( "libmad: plugin doesn't support plugin API version %d.\n" - "libmad: this means there's a version mismatch between xine and this " - "libmad: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("libmad: plugin doesn't support plugin API version %d.\n" + "libmad: this means there's a version mismatch between xine and this " + "libmad: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } diff --git a/src/libmpeg2/xine_decoder.c b/src/libmpeg2/xine_decoder.c index 743cf8d04..b9d046c3c 100644 --- a/src/libmpeg2/xine_decoder.c +++ b/src/libmpeg2/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.33 2002/05/25 19:19:18 siggi Exp $ + * $Id: xine_decoder.c,v 1.34 2002/06/12 12:22:36 f1rmb Exp $ * * stuff needed to turn libmpeg2 into a xine decoder plugin */ @@ -153,10 +153,10 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) { mpeg2dec_decoder_t *this ; if (iface_version != 9) { - printf( "libmpeg2: plugin doesn't support plugin API version %d.\n" - "libmpeg2: this means there's a version mismatch between xine and this " - "libmpeg2: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("libmpeg2: plugin doesn't support plugin API version %d.\n" + "libmpeg2: this means there's a version mismatch between xine and this " + "libmpeg2: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } diff --git a/src/libmpg123/xine_decoder.c b/src/libmpg123/xine_decoder.c index ea7cd9866..c293980ef 100644 --- a/src/libmpg123/xine_decoder.c +++ b/src/libmpg123/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.7 2002/03/31 20:38:41 jcdutton Exp $ + * $Id: xine_decoder.c,v 1.8 2002/06/12 12:22:36 f1rmb Exp $ * * stuff needed to turn libmpg123 into a xine decoder plugin */ @@ -106,10 +106,10 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, config_values_t * mpgdec_decoder_t *this ; if (iface_version != 2) { - printf( "libmpg123: plugin doesn't support plugin API version %d.\n" - "libmpg123: this means there's a version mismatch between xine and this " - "libmpg123: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("libmpg123: plugin doesn't support plugin API version %d.\n" + "libmpg123: this means there's a version mismatch between xine and this " + "libmpg123: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } diff --git a/src/libspucc/xine_decoder.c b/src/libspucc/xine_decoder.c index 5aafd6d0e..1d8b7c214 100644 --- a/src/libspucc/xine_decoder.c +++ b/src/libspucc/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.13 2002/05/25 19:19:18 siggi Exp $ + * $Id: xine_decoder.c,v 1.14 2002/06/12 12:22:36 f1rmb Exp $ * * closed caption spu decoder. receive data by events. * @@ -217,37 +217,37 @@ static void spucc_register_cfg_vars(spucc_decoder_t *this, cc_vars->cc_enabled = xine_cfg->register_bool(xine_cfg, "misc.cc_enabled", 0, - "Enable closed captions in MPEG-2 streams", + _("Enable closed captions in MPEG-2 streams"), NULL, spucc_cfg_enable_change, this); - + cc_vars->cc_scheme = xine_cfg->register_enum(xine_cfg, "misc.cc_scheme", 0, cc_schemes, - "Closed-captioning foreground/background scheme", + _("Closed-captioning foreground/background scheme"), NULL, spucc_cfg_scheme_change, this); - + copy_str(cc_vars->font, xine_cfg->register_string(xine_cfg, "misc.cc_font", "cc", - "Standard closed captioning font", + _("Standard closed captioning font"), NULL, spucc_font_change, this), CC_FONT_MAX); - + copy_str(cc_vars->italic_font, xine_cfg->register_string(xine_cfg, "misc.cc_italic_font", "cci", - "Italic closed captioning font", + _("Italic closed captioning font"), NULL, spucc_font_change, this), CC_FONT_MAX); - + cc_vars->font_size = xine_cfg->register_num(xine_cfg, "misc.cc_font_size", 24, - "Closed captioning font size", + _("Closed captioning font size"), NULL, spucc_num_change, this); - + cc_vars->center = xine_cfg->register_bool(xine_cfg, "misc.cc_center", 1, - "Center-adjust closed captions", + _("Center-adjust closed captions"), NULL, spucc_num_change, this); } @@ -386,9 +386,9 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) { spucc_decoder_t *this ; if (iface_version != 8) { - printf("libspucc: doesn't support plugin api version %d.\n" - "libspucc: This means there is a version mismatch between xine and\n" - "libspucc: this plugin.\n", iface_version); + printf(_("libspucc: doesn't support plugin api version %d.\n" + "libspucc: This means there is a version mismatch between xine and\n" + "libspucc: this plugin.\n"), iface_version); return NULL; } diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index 1aa7988b0..ab2759c7c 100644 --- a/src/libspudec/xine_decoder.c +++ b/src/libspudec/xine_decoder.c @@ -19,7 +19,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.68 2002/05/25 19:19:18 siggi Exp $ + * $Id: xine_decoder.c,v 1.69 2002/06/12 12:22:36 f1rmb Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -302,9 +302,9 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) { spudec_decoder_t *this ; if (iface_version != 8) { - printf("libspudec: Doesn't support plugin API version %d.\n" - "libspudec: This means there is a version mismatch between XINE and\n" - "libspudec: this plugin.\n", iface_version); + printf(_("libspudec: Doesn't support plugin API version %d.\n" + "libspudec: This means there is a version mismatch between XINE and\n" + "libspudec: this plugin.\n"), iface_version); return NULL; } diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c index 5ea13b503..9bec54cca 100644 --- a/src/libsputext/xine_decoder.c +++ b/src/libsputext/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.26 2002/05/30 15:12:45 f1rmb Exp $ + * $Id: xine_decoder.c,v 1.27 2002/06/12 12:22:36 f1rmb Exp $ * * code based on mplayer module: * @@ -1002,9 +1002,9 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) { sputext_decoder_t *this ; if (iface_version != 8) { - printf("libsputext: doesn't support plugin api version %d.\n" - "libsputext: This means there is a version mismatch between xine and\n" - "libsputext: this plugin.\n", iface_version); + printf(_("libsputext: doesn't support plugin api version %d.\n" + "libsputext: This means there is a version mismatch between xine and\n" + "libsputext: this plugin.\n"), iface_version); return NULL; } @@ -1024,17 +1024,17 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) { this->font = xine->config->register_string(xine->config, "codec.spu_font", "sans", - "font for avi subtitles", + _("font for avi subtitles"), NULL, update_osd_font, this); this->src_encoding = xine->config->register_string(xine->config, "codec.spu_src_encoding", "windows-1250", - "source encoging of subtitles", + _("source encoging of subtitles"), NULL, update_osd_src_encoding, this); this->dst_encoding = xine->config->register_string(xine->config, "codec.spu_dst_encoding", "iso-8859-2", - "target encoging for subtitles (have to match font encoding)", + _("target encoging for subtitles (have to match font encoding)"), NULL, update_osd_dst_encoding, this); return (spu_decoder_t *) this; diff --git a/src/libvorbis/xine_decoder.c b/src/libvorbis/xine_decoder.c index 9cdcd4ed8..344001e48 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.12 2002/05/25 19:19:19 siggi Exp $ + * $Id: xine_decoder.c,v 1.13 2002/06/12 12:22:36 f1rmb Exp $ * * (ogg/)vorbis audio decoder plugin (libvorbis wrapper) for xine */ @@ -244,10 +244,10 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) { vorbis_decoder_t *this ; if (iface_version != 8) { - printf( "libvorbis: plugin doesn't support plugin API version %d.\n" - "libvorbis: this means there's a version mismatch between xine and this " - "libvorbis: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("libvorbis: plugin doesn't support plugin API version %d.\n" + "libvorbis: this means there's a version mismatch between xine and this " + "libvorbis: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index f5c6c8e31..fa044499e 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.80 2002/06/09 13:23:36 miguelfreitas Exp $ + * $Id: w32codec.c,v 1.81 2002/06/12 12:22:36 f1rmb Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) @@ -1356,7 +1356,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) { } cfg = xine->config; win32_def_path = cfg->register_string (cfg, "codec.win32_path", "/usr/lib/win32", - "path to win32 codec dlls", + _("path to win32 codec dlls"), NULL, NULL, NULL); this = (w32v_decoder_t *) xine_xmalloc (sizeof (w32v_decoder_t)); @@ -1395,17 +1395,17 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) { config_values_t *cfg; if (iface_version != 8) { - printf( "w32codec: plugin doesn't support plugin API version %d.\n" - "w32codec: this means there's a version mismatch between xine and this " - "w32codec: decoder plugin.\nInstalling current input plugins should help.\n", - iface_version); + printf(_("w32codec: plugin doesn't support plugin API version %d.\n" + "w32codec: this means there's a version mismatch between xine and this " + "w32codec: decoder plugin.\nInstalling current input plugins should help.\n"), + iface_version); return NULL; } cfg = xine->config; win32_def_path = cfg->register_string (cfg, "codec.win32_path", "/usr/lib/win32", - "path to win32 codec dlls", + _("path to win32 codec dlls"), NULL, NULL, NULL); this = (w32a_decoder_t *) xine_xmalloc (sizeof (w32a_decoder_t)); diff --git a/src/libxineadec/roqaudio.c b/src/libxineadec/roqaudio.c index 80c7869c6..7f2b1fb7b 100644 --- a/src/libxineadec/roqaudio.c +++ b/src/libxineadec/roqaudio.c @@ -21,7 +21,7 @@ * For more information regarding the RoQ file format, visit: * http://www.csse.monash.edu.au/~timf/ * - * $Id: roqaudio.c,v 1.2 2002/06/03 00:57:34 tmmm Exp $ + * $Id: roqaudio.c,v 1.3 2002/06/12 12:22:37 f1rmb Exp $ * */ @@ -191,10 +191,10 @@ audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) { roqaudio_decoder_t *this ; if (iface_version != 8) { - printf( "RoQ Audio: plugin doesn't support plugin API version %d.\n" - "RoQ Audio: this means there's a version mismatch between xine and this\n" - "RoQ Audio: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("RoQ Audio: plugin doesn't support plugin API version %d.\n" + "RoQ Audio: this means there's a version mismatch between xine and this\n" + "RoQ Audio: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } diff --git a/src/libxinevdec/cinepak.c b/src/libxinevdec/cinepak.c index fedadeb70..e2540f53e 100644 --- a/src/libxinevdec/cinepak.c +++ b/src/libxinevdec/cinepak.c @@ -22,7 +22,7 @@ * based on overview of Cinepak algorithm and example decoder * by Tim Ferguson: http://www.csse.monash.edu.au/~timf/ * - * $Id: cinepak.c,v 1.7 2002/06/03 17:31:29 esnel Exp $ + * $Id: cinepak.c,v 1.8 2002/06/12 12:22:37 f1rmb Exp $ */ #include <stdlib.h> @@ -429,10 +429,10 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) { cvid_decoder_t *this ; if (iface_version != 9) { - printf( "cinepak: plugin doesn't support plugin API version %d.\n" - "cinepak: this means there's a version mismatch between xine and this " - "cinepak: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("cinepak: plugin doesn't support plugin API version %d.\n" + "cinepak: this means there's a version mismatch between xine and this " + "cinepak: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } diff --git a/src/libxinevdec/roqvideo.c b/src/libxinevdec/roqvideo.c index 1eb03813f..11afa1a98 100644 --- a/src/libxinevdec/roqvideo.c +++ b/src/libxinevdec/roqvideo.c @@ -18,7 +18,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: roqvideo.c,v 1.3 2002/06/05 13:09:37 miguelfreitas Exp $ + * $Id: roqvideo.c,v 1.4 2002/06/12 12:22:37 f1rmb Exp $ */ /* And this is the header that came with the RoQ video decoder: */ @@ -493,10 +493,10 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) { roq_decoder_t *this ; if (iface_version != 9) { - printf( "RoQ: plugin doesn't support plugin API version %d.\n" - "RoQ: this means there's a version mismatch between xine and this " - "RoQ: decoder plugin.\nInstalling current plugins should help.\n", - iface_version); + printf(_("RoQ: plugin doesn't support plugin API version %d.\n" + "RoQ: this means there's a version mismatch between xine and this " + "RoQ: decoder plugin.\nInstalling current plugins should help.\n"), + iface_version); return NULL; } diff --git a/src/libxvid/xine_decoder.c b/src/libxvid/xine_decoder.c index e33ceb02f..dd6415109 100644 --- a/src/libxvid/xine_decoder.c +++ b/src/libxvid/xine_decoder.c @@ -221,9 +221,9 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) { XVID_INIT_PARAM xinit; if (iface_version != 9) { - printf ("xvid: plugin doesn't support plugin API version %d.\n" - "xvid: this means there's a version mismatch between xine and this\n" - "xvid: decoder plugin. Installing current plugins should help.\n", + printf (_("xvid: plugin doesn't support plugin API version %d.\n" + "xvid: this means there's a version mismatch between xine and this\n" + "xvid: decoder plugin. Installing current plugins should help.\n"), iface_version); return NULL; } @@ -231,9 +231,9 @@ video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) { xinit.cpu_flags = 0; xvid_init(NULL, 0, &xinit, NULL); if (xinit.api_version != API_VERSION) { - printf ("xvid: there is mismatch between API used by currently installed XviD\n" - "xvid: library (%d.%d) and library used to compile this plugin (%d.%d).\n" - "xvid: Compiling this plugin against current XviD library should help.\n", + printf (_("xvid: there is mismatch between API used by currently installed XviD\n" + "xvid: library (%d.%d) and library used to compile this plugin (%d.%d).\n" + "xvid: Compiling this plugin against current XviD library should help.\n"), xinit.api_version >> 16, xinit.api_version & 0xFFFF, API_VERSION >> 16, API_VERSION & 0xFFFF); return NULL; diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 16de5ab4f..b4a44642b 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.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_out_aa.c,v 1.19 2002/04/29 23:32:00 jcdutton Exp $ + * $Id: video_out_aa.c,v 1.20 2002/06/12 12:22:38 f1rmb Exp $ * * video_out_aa.c, ascii-art output plugin for xine * @@ -298,11 +298,12 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { static vo_info_t vo_info_aa = { 5, "aa", - "xine video output plugin using the ascii-art library", + NULL, VISUAL_TYPE_AA, 10 }; vo_info_t *get_video_out_plugin_info() { + vo_info_aa.description = _("xine video output plugin using the ascii-art library"); return &vo_info_aa; } diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index 0ab7acfe6..4dba74ab6 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.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_out_directfb.c,v 1.8 2002/05/06 00:48:09 miguelfreitas Exp $ + * $Id: video_out_directfb.c,v 1.9 2002/06/12 12:22:38 f1rmb Exp $ * * DirectFB based output plugin. * Rich Wareham <richwareham@users.sourceforge.net> @@ -560,12 +560,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { static vo_info_t vo_info_directfb = { 4, "DirectFB", - "xine video output plugin using the DirectFB library.", + NULL, VISUAL_TYPE_DFB, 8 }; vo_info_t *get_video_out_plugin_info() { + vo_info_directfb.description = _("xine video output plugin using the DirectFB library."); return &vo_info_directfb; } diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 0d8af80f2..59fe0b109 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.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_out_fb.c,v 1.10 2002/05/06 00:48:09 miguelfreitas Exp $ + * $Id: video_out_fb.c,v 1.11 2002/06/12 12:22:38 f1rmb Exp $ * * video_out_fb.c, frame buffer xine driver by Miguel Freitas * @@ -702,9 +702,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->output_scale_factor = 1.0; this->scaling_disabled = config->register_bool (config, "video.disable_scaling", 0, - "disable all video scaling (faster!)", + _("disable all video scaling (faster!)"), NULL, NULL, NULL); - + this->vo_driver.get_capabilities = fb_get_capabilities; this->vo_driver.alloc_frame = fb_alloc_frame; this->vo_driver.update_frame_format = fb_update_frame_format; @@ -718,8 +718,8 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->vo_driver.redraw_needed = fb_redraw_needed; device_name = config->register_string (config, "video.fb_device", "/dev/fb0", - "framebuffer device", NULL, NULL, NULL); - + _("framebuffer device"), NULL, NULL, NULL); + if( (this->fd = open(device_name, O_RDWR) ) < 0) { printf("video_out_fb: aborting. (unable to open device \"%s\")\n", device_name); free(this); @@ -876,11 +876,12 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { static vo_info_t vo_info_fb = { 5, "fb", - "xine video output plugin using linux framebuffer device", + NULL, VISUAL_TYPE_FB, 5 }; vo_info_t *get_video_out_plugin_info() { + vo_info_fb.description = _("xine video output plugin using linux framebuffer device"); return &vo_info_fb; } diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 11cb4fd28..b4b41c580 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.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_out_opengl.c,v 1.10 2002/04/29 23:32:00 jcdutton Exp $ + * $Id: video_out_opengl.c,v 1.11 2002/06/12 12:22:38 f1rmb Exp $ * * video_out_glut.c, glut based OpenGL rendering interface for xine * Matthias Hopf <mat@mshopf.de> @@ -1103,7 +1103,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->yuv2rgb_gamma = config->register_range (config, "video.opengl_gamma", 0, -100, 100, - "gamma correction for OpenGL driver", + _("gamma correction for OpenGL driver"), NULL, NULL, NULL); this->yuv2rgb_factory = yuv2rgb_factory_init (YUV_FORMAT, YUV_SWAP_MODE, this->yuv2rgb_cmap); @@ -1115,12 +1115,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { static vo_info_t vo_info_shm = { 5, "OpenGL", - "xine video output plugin using OpenGL(tm)", + NULL, VISUAL_TYPE_X11, 8 }; vo_info_t *get_video_out_plugin_info() { + vo_info_shm.description = _("xine video output plugin using OpenGL(tm)"); return &vo_info_shm; } diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 313e133e2..ffc11b0cb 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.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_out_sdl.c,v 1.7 2002/05/13 02:42:12 miguelfreitas Exp $ + * $Id: video_out_sdl.c,v 1.8 2002/06/12 12:22:38 f1rmb Exp $ * * video_out_sdl.c, Simple DirectMedia Layer * @@ -687,12 +687,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { static vo_info_t vo_info_sdl = { 5, "sdl", - "xine video output plugin using Simple DirectMedia Layer", + NULL, VISUAL_TYPE_X11, 4 }; vo_info_t *get_video_out_plugin_info() { + vo_info_sdl.description = _("xine video output plugin using Simple DirectMedia Layer"); return &vo_info_sdl; } diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 2fddb1618..66d02e72a 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.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_out_syncfb.c,v 1.70 2002/05/28 10:43:45 heikos Exp $ + * $Id: video_out_syncfb.c,v 1.71 2002/06/12 12:22:38 f1rmb Exp $ * * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine * @@ -992,7 +992,7 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen) display = visual->display; device_name = config->register_string(config, "video.syncfb_device", "/dev/syncfb", - "syncfb (teletux) device node", NULL, NULL, NULL); + _("syncfb (teletux) device node"), NULL, NULL, NULL); if(!(this = xine_xmalloc(sizeof (syncfb_driver_t)))) { printf("video_out_syncfb: aborting. (allocation of syncfb_driver_t failed: out of memory)\n"); @@ -1161,11 +1161,12 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen) static vo_info_t vo_info_syncfb = { 5, "SyncFB", - "xine video output plugin using the SyncFB module for Matrox G200/G400 cards", + NULL, VISUAL_TYPE_X11, 10 }; vo_info_t *get_video_out_plugin_info() { + vo_info_syncfb.description = _("xine video output plugin using the SyncFB module for Matrox G200/G400 cards"); return &vo_info_syncfb; } diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 1d70f9f97..55c1a5da2 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.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_out_vidix.c,v 1.1 2002/06/01 14:08:37 f1rmb Exp $ + * $Id: video_out_vidix.c,v 1.2 2002/06/12 12:22:38 f1rmb Exp $ * * video_out_vidix.c * @@ -860,12 +860,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { static vo_info_t vo_info_vidix = { 5, "vidix", - "xine video output plugin using libvidix", + NULL, VISUAL_TYPE_X11, 4 }; vo_info_t *get_video_out_plugin_info() { + vo_info_vidix.description = _("xine video output plugin using libvidix"); return &vo_info_vidix; } diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index f4a6bb9f9..a7c07f1ca 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.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_out_xshm.c,v 1.75 2002/05/18 12:36:45 miguelfreitas Exp $ + * $Id: video_out_xshm.c,v 1.76 2002/06/12 12:22:38 f1rmb Exp $ * * video_out_xshm.c, X11 shared memory extension interface for xine * @@ -1280,7 +1280,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->user_ratio = ASPECT_AUTO; this->scaling_disabled = config->register_bool (config, "video.disable_scaling", 0, - "disable all video scaling (faster!)", + _("disable all video scaling (faster!)"), NULL, NULL, NULL); this->drawable = visual->d; this->expecting_event = 0; @@ -1422,7 +1422,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->yuv2rgb_swap = swapped; this->yuv2rgb_gamma = config->register_range (config, "video.xshm_gamma", 0, -100, 100, - "gamma correction for XShm driver", + _("gamma correction for XShm driver"), NULL, NULL, NULL); this->yuv2rgb_factory = yuv2rgb_factory_init (mode, swapped, @@ -1435,12 +1435,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { static vo_info_t vo_info_shm = { 5, /* interface version */ "XShm", /* id */ - "xine video output plugin using the MIT X shared memory extension", + NULL, VISUAL_TYPE_X11, /* visual_type */ 6 }; vo_info_t *get_video_out_plugin_info() { + vo_info_shm.description = _("xine video output plugin using the MIT X shared memory extension"); return &vo_info_shm; } diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 1e21e816f..31e8d1419 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.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_out_xv.c,v 1.119 2002/06/10 21:42:45 mshopf Exp $ + * $Id: video_out_xv.c,v 1.120 2002/06/12 12:22:38 f1rmb Exp $ * * video_out_xv.c, X11 video extension interface for xine * @@ -1157,12 +1157,14 @@ static void xv_check_capability (xv_driver_t *this, /* is this a boolean property ? */ if ((attr.min_value == 0) && (attr.max_value == 1)) { this->config->register_bool (this->config, this->scratch, int_default, - "Xv property", NULL, xv_property_callback, &this->props[property]); + _("Xv property"), + NULL, xv_property_callback, &this->props[property]); } else { this->config->register_range (this->config, this->scratch, int_default, this->props[property].min, this->props[property].max, - "Xv property", NULL, xv_property_callback, &this->props[property]); + _("Xv property"), + NULL, xv_property_callback, &this->props[property]); } entry = this->config->lookup_entry (this->config, this->scratch); @@ -1403,13 +1405,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { /* This setting is specific to Permedia 2/3 cards. */ xv_filter = config->register_range (config, "video.XV_FILTER", 0, attr[k].min_value, attr[k].max_value, - "bilinear scaling mode (permedia 2/3)", + _("bilinear scaling mode (permedia 2/3)"), NULL, xv_update_XV_FILTER, this); config->update_num(config,"video.XV_FILTER",xv_filter); } else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) { int xv_double_buffer; xv_double_buffer = config->register_bool (config, "video.XV_DOUBLE_BUFFER", 1, - "double buffer to sync video to the retrace", + _("double buffer to sync video to the retrace"), NULL, xv_update_XV_DOUBLE_BUFFER, this); config->update_num(config,"video.XV_DOUBLE_BUFFER",xv_double_buffer); } @@ -1458,7 +1460,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->deinterlace_method = config->register_enum (config, "video.deinterlace_method", 4, deinterlace_methods, - "Software deinterlace method (Key I toggles deinterlacer on/off)", + _("Software deinterlace method (Key I toggles deinterlacer on/off)"), NULL, xv_update_deinterlace, this); this->deinterlace_enabled = 0; @@ -1468,12 +1470,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { static vo_info_t vo_info_xv = { 5, "Xv", - "xine video output plugin using the MIT X video extension", + NULL, VISUAL_TYPE_X11, 10 }; vo_info_t *get_video_out_plugin_info() { + vo_info_xv.description = _("xine video output plugin using the MIT X video extension"); return &vo_info_xv; } diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index b3a62646a..34475c17f 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.56 2002/06/03 09:45:12 f1rmb Exp $ + * $Id: audio_out.c,v 1.57 2002/06/12 12:22:38 f1rmb Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -718,11 +718,12 @@ ao_instance_t *ao_new_instance (ao_driver_t *driver, xine_t *xine) { this->gap_tolerance = driver->get_gap_tolerance (this->driver); this->resample_conf = config->register_enum (config, "audio.resample_mode", 0, - resample_modes, "adjust whether resampling is done or not", + resample_modes, + _("adjust whether resampling is done or not"), NULL, NULL, NULL); this->force_rate = config->register_num (config, "audio.force_rate", 0, - "if !=0 always resample to given rate", - NULL, NULL, NULL); + _("if !=0 always resample to given rate"), + NULL, NULL, NULL); /* * pre-allocate memory for samples @@ -749,12 +750,12 @@ ao_instance_t *ao_new_instance (ao_driver_t *driver, xine_t *xine) { int vol; vol = config->register_range (config, "audio.mixer_volume", - 50, 0, 100, "Audio volume", + 50, 0, 100, _("Audio volume"), NULL, NULL, NULL); if(config->register_bool (config, "audio.remember_volume", 0, - "restore volume level at startup", - "if this not set, xine will not touch any mixer settings at startup", + _("restore volume level at startup"), + _("if this not set, xine will not touch any mixer settings at startup"), NULL, NULL)) { int prop = 0; diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 9cf00ab6b..b93e86d65 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.77 2002/05/01 19:42:57 guenter Exp $ + * $Id: load_plugins.c,v 1.78 2002/06/12 12:22:38 f1rmb Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -648,6 +648,10 @@ char **xine_list_video_output_plugins (int visual_type) { install_segv_handler(); +#ifdef ENABLE_NLS + bindtextdomain("xine-lib", XINE_LOCALEDIR); +#endif + dir = opendir (XINE_PLUGINDIR); if (dir) { @@ -770,6 +774,10 @@ vo_driver_t *xine_load_video_output_plugin(config_values_t *config, DIR *dir; vo_driver_t *vod; +#ifdef ENABLE_NLS + bindtextdomain("xine-lib", XINE_LOCALEDIR); +#endif + #if IGNORE_DXR3ENC if (! strcasecmp(id, "dxr3enc")) { printf( /* big poo poo */ @@ -882,6 +890,10 @@ char **xine_list_audio_output_plugins(void) { install_segv_handler(); +#ifdef ENABLE_NLS + bindtextdomain("xine-lib", XINE_LOCALEDIR); +#endif + dir = opendir (XINE_PLUGINDIR); if (dir) { @@ -927,8 +939,9 @@ char **xine_list_audio_output_plugins(void) { ao_info = getinfo(); #ifdef LOG - printf("load_plugins: id=%s, priority=%d, interface_version=%d\n", - ao_info->id, ao_info->priority, ao_info->interface_version); + printf("load_plugins: id=%s (%s), priority=%d, interface_version=%d\n", + ao_info->id, ao_info->description, + ao_info->priority, ao_info->interface_version); #endif if ( ao_info->interface_version == AUDIO_OUT_IFACE_VERSION) { @@ -986,6 +999,10 @@ ao_driver_t *xine_load_audio_output_plugin(config_values_t *config, char *id) { install_segv_handler(); +#ifdef ENABLE_NLS + bindtextdomain("xine-lib", XINE_LOCALEDIR); +#endif + dir = opendir (XINE_PLUGINDIR); if (dir) { diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index d0c5ef4a6..eecf6f376 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -860,7 +860,7 @@ osd_renderer_t *osd_renderer_init( video_overlay_instance_t *video_overlay, conf this->textpalette = config->register_enum (config, "misc.osd_text_palette", 0, textpalettes_str, - "Palette (foreground-border-background) to use on subtitles", + _("Palette (foreground-border-background) to use on subtitles"), NULL, update_text_palette, this); /* diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index bad6a10ff..d8a7f36c2 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.139 2002/06/10 13:41:55 miguelfreitas Exp $ + * $Id: xine.c,v 1.140 2002/06/12 12:22:38 f1rmb Exp $ * * top-level xine functions * @@ -584,7 +584,7 @@ xine_t *xine_init (vo_driver_t *vo, pthread_mutex_lock (&this->logo_lock); this->logo_mrl = config->register_string(config, "misc.logo_mrl", XINE_LOGO_FILE, - "logo mrl, displayed in video output window", + _("logo mrl, displayed in video output window"), NULL, _logo_change_cb, (void *) this); pthread_mutex_unlock (&this->logo_lock); @@ -596,8 +596,9 @@ xine_t *xine_init (vo_driver_t *vo, #ifdef ENABLE_NLS bindtextdomain("xine-lib", XINE_LOCALEDIR); + textdomain("xine-lib"); #endif - + printf ("xine: xine_init entered\n"); this->err = XINE_ERROR_NONE; diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c index a1e114b70..daaec310e 100644 --- a/src/xine-utils/memcpy.c +++ b/src/xine-utils/memcpy.c @@ -434,9 +434,9 @@ void xine_probe_fast_memcpy(config_values_t *config) best = config->register_enum (config, "misc.memcpy_method", 0, memcpy_methods, - "Memcopy method to use in xine for large data chunks.", + _("Memcopy method to use in xine for large data chunks."), NULL, update_fast_memcpy, NULL); - + /* check if function is configured and valid for this machine */ if( best != 0 && (config_flags & memcpy_method[best].cpu_require) == |