From 8837a03dc8f5127d71c2a5640bb4cd7c9fe4242c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 12:26:40 +0100 Subject: Update all input plugins to the new identifier/description interface. --- src/input/vcd/xineplug_inp_vcd.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'src/input/vcd') diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index 474cc7339..4b11096c0 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1002,31 +1002,6 @@ vcd_plugin_get_mrl (input_plugin_t *this_gen) } } -/*! - From xine plugin spec: - - return human readable (verbose = 1 line) description for this plugin -*/ -static const char * -vcd_class_get_description (input_class_t *this_gen) -{ - dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n"); - return _("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "); -} - -/*! - From xine plugin spec: - - return short, human readable identifier for this plugin - this is used for GUI buttons, The identifier must have max. 4 characters - characters (max. 5 including terminating \0) -*/ -static const char * -vcd_class_get_identifier (input_class_t *this_gen) { - dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n"); - return SHORT_PLUGIN_NAME; -} - /* Handle all queued keyboard/mouse events. Return TRUE if this causes a change in the play item. @@ -1776,8 +1751,8 @@ vcd_init (xine_t *xine, void *data) class->mrls = NULL; class->input_class.get_instance = vcd_class_get_instance; - class->input_class.get_identifier = vcd_class_get_identifier; - class->input_class.get_description = vcd_class_get_description; + class->input_class.identifier = SHORT_PLUGIN_NAME; + class->input_class.description = _("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "); class->input_class.get_dir = vcd_class_get_dir; class->input_class.get_autoplay_list = vcd_class_get_autoplay_list; class->input_class.dispose = vcd_class_dispose; -- cgit v1.2.3 From e2a10c5fdaed1f45040fb3d737ab79f0e5d774d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 14:12:35 +0100 Subject: Use N_() rather than _(), passing the string just once to gettext(). This way the gettext code for description does not need to be repeated by every plugin. --- src/input/vcd/xineplug_inp_vcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input/vcd') diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index 4b11096c0..c33f73e40 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1752,7 +1752,7 @@ vcd_init (xine_t *xine, void *data) class->input_class.get_instance = vcd_class_get_instance; class->input_class.identifier = SHORT_PLUGIN_NAME; - class->input_class.description = _("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "); + class->input_class.description = N_("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "); class->input_class.get_dir = vcd_class_get_dir; class->input_class.get_autoplay_list = vcd_class_get_autoplay_list; class->input_class.dispose = vcd_class_dispose; -- cgit v1.2.3 From f7cbfdf9575df64a5ba6f594912ae18c45a1058e Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 11 Dec 2007 17:22:54 +0000 Subject: Bump the interface version of the VCD plugin (which got missed earlier). --- src/input/vcd/xineplug_inp_vcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input/vcd') diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index c33f73e40..45d9789ba 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1988,7 +1988,7 @@ _("For tracking down bugs in the VCD plugin. Mask values are:\n" const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, (char *) SHORT_PLUGIN_NAME, + { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, (char *) SHORT_PLUGIN_NAME, XINE_VERSION_CODE, NULL, vcd_init }, { PLUGIN_NONE, 0, (char *) "", 0, NULL, NULL } }; -- cgit v1.2.3