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/input_rtp.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/input/input_rtp.c') diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index 1a57b7a6d..12e97bd02 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -765,15 +765,6 @@ static input_plugin_t *rtp_class_get_instance (input_class_t *cls_gen, /* * net plugin class */ - -static const char *rtp_class_get_description (input_class_t *this_gen) { - return _("RTP and UDP input plugin as shipped with xine"); -} - -static const char *rtp_class_get_identifier (input_class_t *this_gen) { - return "RTP/UDP"; -} - static void rtp_class_dispose (input_class_t *this_gen) { rtp_input_class_t *this = (rtp_input_class_t *) this_gen; @@ -790,8 +781,8 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = rtp_class_get_instance; - this->input_class.get_description = rtp_class_get_description; - this->input_class.get_identifier = rtp_class_get_identifier; + this->input_class.description = _("RTP and UDP input plugin as shipped with xine"); + this->input_class.identifier = "RTP/UDP"; this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; this->input_class.dispose = rtp_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/input_rtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input/input_rtp.c') diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index 12e97bd02..5ef5184cc 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -781,7 +781,7 @@ static void *init_class (xine_t *xine, void *data) { this->xine = xine; this->input_class.get_instance = rtp_class_get_instance; - this->input_class.description = _("RTP and UDP input plugin as shipped with xine"); + this->input_class.description = N_("RTP and UDP input plugin as shipped with xine"); this->input_class.identifier = "RTP/UDP"; this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; -- cgit v1.2.3 From 32a70cef7fdce1648d6850dafbe78bee04830429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 15:40:37 +0100 Subject: Use default_*_class_dispose macro whenever the class dispose function only called free(). --- src/input/input_rtp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/input/input_rtp.c') diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index 5ef5184cc..1914935e1 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -765,12 +765,6 @@ static input_plugin_t *rtp_class_get_instance (input_class_t *cls_gen, /* * net plugin class */ -static void rtp_class_dispose (input_class_t *this_gen) { - rtp_input_class_t *this = (rtp_input_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { rtp_input_class_t *this; @@ -785,7 +779,7 @@ static void *init_class (xine_t *xine, void *data) { this->input_class.identifier = "RTP/UDP"; this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = rtp_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; return this; -- cgit v1.2.3 From b803c2268c144475f4037677b2eea20f364e35b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 18:07:02 +0100 Subject: Bump the input plugins interface version to 18 as they got updated. --- src/input/input_rtp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input/input_rtp.c') diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c index 1914935e1..c3abf4bf5 100644 --- a/src/input/input_rtp.c +++ b/src/input/input_rtp.c @@ -791,7 +791,7 @@ static void *init_class (xine_t *xine, void *data) { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_INPUT, 17, "rtp", XINE_VERSION_CODE, NULL, init_class }, + { PLUGIN_INPUT, 18, "rtp", XINE_VERSION_CODE, NULL, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; -- cgit v1.2.3