diff options
| -rw-r--r-- | src/audio_out/audio_none_out.c | 12 | ||||
| -rw-r--r-- | src/audio_out/audio_pulse_out.c | 12 | ||||
| -rw-r--r-- | src/xine-engine/load_plugins.c | 2 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 4 |
4 files changed, 7 insertions, 23 deletions
diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c index a815d645a..f4c9d83c1 100644 --- a/src/audio_out/audio_none_out.c +++ b/src/audio_out/audio_none_out.c @@ -215,14 +215,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, * class functions */ -static char* get_identifier (audio_driver_class_t *this_gen) { - return "none"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine dummy audio output plugin"); -} - static void dispose_class (audio_driver_class_t *this_gen) { none_class_t *this = (none_class_t *) this_gen; @@ -241,8 +233,8 @@ static void *init_class (xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; + this->driver_class.identifier = "none"; + this->driver_class.description = N_("xine dummy audio output plugin"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c index 26d121bf6..a853ee58a 100644 --- a/src/audio_out/audio_pulse_out.c +++ b/src/audio_out/audio_pulse_out.c @@ -574,14 +574,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da * class functions */ -static char* get_identifier (audio_driver_class_t *this_gen) { - return "pulseaudio"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine audio output plugin using pulseaudio sound server"); -} - static void dispose_class (audio_driver_class_t *this_gen) { pulse_class_t *this = (pulse_class_t *) this_gen; @@ -606,9 +598,9 @@ static void *init_class (xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; this->driver_class.dispose = dispose_class; + this->driver_class.identifier = "pulseaudio"; + this->driver_class.description = _("xine audio output plugin using pulseaudio sound server"); this->xine = xine; diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 1c59099a5..22d199295 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -2299,7 +2299,7 @@ const char *const *xine_list_post_plugins_typed(xine_t *xine, uint32_t type) { else \ return NULL; \ } \ - return gettext(ic->description); \ + return ic->description; \ } \ } \ return NULL; \ diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index abd9a932c..eb5d624e2 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -862,7 +862,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { int res; xine_log (stream->xine, XINE_LOG_MSG, _("xine: found input plugin : %s\n"), - gettext(stream->input_plugin->input_class->description)); + stream->input_plugin->input_class->description); if (stream->input_plugin->input_class->eject_media) stream->eject_class = stream->input_plugin->input_class; _x_meta_info_set_utf8(stream, XINE_META_INFO_INPUT_PLUGIN, @@ -1214,7 +1214,7 @@ static int open_internal (xine_stream_t *stream, const char *mrl) { } xine_log (stream->xine, XINE_LOG_MSG, _("xine: found demuxer plugin: %s\n"), - gettext(stream->demux_plugin->demux_class->description)); + stream->demux_plugin->demux_class->description); _x_extra_info_reset( stream->current_extra_info ); _x_extra_info_reset( stream->video_decoder_extra_info ); |