summaryrefslogtreecommitdiff
path: root/src/vdr
diff options
context:
space:
mode:
Diffstat (limited to 'src/vdr')
-rw-r--r--src/vdr/input_vdr.c26
-rw-r--r--src/vdr/post_vdr.h16
-rw-r--r--src/vdr/post_vdr_audio.c25
-rw-r--r--src/vdr/post_vdr_video.c25
4 files changed, 13 insertions, 79 deletions
diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c
index 069eb734a..946e963a3 100644
--- a/src/vdr/input_vdr.c
+++ b/src/vdr/input_vdr.c
@@ -2627,24 +2627,6 @@ static input_plugin_t *vdr_class_get_instance(input_class_t *cls_gen, xine_strea
/*
* vdr input plugin class stuff
*/
-
-static const char *vdr_class_get_description(input_class_t *this_gen)
-{
- return _("VDR display device plugin");
-}
-
-static const char *vdr_class_get_identifier (input_class_t *this_gen)
-{
- return "VDR";
-}
-
-static void vdr_class_dispose (input_class_t *this_gen)
-{
- vdr_input_class_t *this = (vdr_input_class_t *)this_gen;
-
- free(this);
-}
-
static char **vdr_class_get_autoplay_list(input_class_t *this_gen,
int *num_files)
{
@@ -2668,11 +2650,11 @@ static void *init_class(xine_t *xine, void *data)
this->mrls[ 1 ] = 0;
this->input_class.get_instance = vdr_class_get_instance;
- this->input_class.get_identifier = vdr_class_get_identifier;
- this->input_class.get_description = vdr_class_get_description;
+ this->input_class.identifier = "VDR";
+ this->input_class.description = N_("VDR display device plugin");
this->input_class.get_dir = NULL;
this->input_class.get_autoplay_list = vdr_class_get_autoplay_list;
- this->input_class.dispose = vdr_class_dispose;
+ this->input_class.dispose = default_input_class_dispose;
this->input_class.eject_media = NULL;
return this;
@@ -2685,7 +2667,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, "VDR", XINE_VERSION_CODE, NULL, init_class },
+ { PLUGIN_INPUT, 18, "VDR", XINE_VERSION_CODE, NULL, init_class },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};
diff --git a/src/vdr/post_vdr.h b/src/vdr/post_vdr.h
index b16a2d2df..46aa8dcb3 100644
--- a/src/vdr/post_vdr.h
+++ b/src/vdr/post_vdr.h
@@ -62,19 +62,9 @@ inline static int vdr_is_vdr_stream(xine_stream_t *stream)
return 0;
}
- {
- input_class_t *input_class = stream->input_plugin->input_class;
-
- if (input_class->get_identifier)
- {
- const char *identifier = input_class->get_identifier(input_class);
- if (identifier
- && 0 == strcmp(identifier, "VDR"))
- {
- return 1;
- }
- }
- }
+ if (stream->input_plugin->input_class->identifier &&
+ strcmp(stream->input_plugin->input_class->identifier, "VDR"))
+ return 1;
return 0;
}
diff --git a/src/vdr/post_vdr_audio.c b/src/vdr/post_vdr_audio.c
index 9248e9c45..96fa84fb5 100644
--- a/src/vdr/post_vdr_audio.c
+++ b/src/vdr/post_vdr_audio.c
@@ -58,9 +58,6 @@ static void vdr_audio_select_audio(vdr_audio_post_plugin_t *this, uint8_t channe
static post_plugin_t *vdr_audio_open_plugin(post_class_t *class_gen, int inputs,
xine_audio_port_t **audio_target,
xine_video_port_t **video_target);
-static char *vdr_audio_get_identifier(post_class_t *class_gen);
-static char *vdr_audio_get_description(post_class_t *class_gen);
-static void vdr_audio_class_dispose(post_class_t *class_gen);
/* plugin instance functions */
static void vdr_audio_dispose(post_plugin_t *this_gen);
@@ -80,9 +77,9 @@ void *vdr_audio_init_plugin(xine_t *xine, void *data)
return NULL;
class->open_plugin = vdr_audio_open_plugin;
- class->get_identifier = vdr_audio_get_identifier;
- class->get_description = vdr_audio_get_description;
- class->dispose = vdr_audio_class_dispose;
+ class->identifier = "vdr_audio";
+ class->description = N_("modifies every audio frame as requested by VDR");
+ class->dispose = default_post_class_dispose;
return class;
}
@@ -120,22 +117,6 @@ fprintf(stderr, "~~~~~~~~~~ vdr open plugin\n");
return &this->post_plugin;
}
-static char *vdr_audio_get_identifier(post_class_t *class_gen)
-{
- return "vdr_audio";
-}
-
-static char *vdr_audio_get_description(post_class_t *class_gen)
-{
- return "modifies every audio frame as requested by VDR";
-}
-
-static void vdr_audio_class_dispose(post_class_t *class_gen)
-{
- free(class_gen);
-}
-
-
static void vdr_audio_dispose(post_plugin_t *this_gen)
{
/*
diff --git a/src/vdr/post_vdr_video.c b/src/vdr/post_vdr_video.c
index 85536819a..ed0eafc35 100644
--- a/src/vdr/post_vdr_video.c
+++ b/src/vdr/post_vdr_video.c
@@ -81,9 +81,6 @@ static void vdr_video_set_video_window(vdr_video_post_plugin_t *this, int32_t x,
static post_plugin_t *vdr_video_open_plugin(post_class_t *class_gen, int inputs,
xine_audio_port_t **audio_target,
xine_video_port_t **video_target);
-static char *vdr_video_get_identifier(post_class_t *class_gen);
-static char *vdr_video_get_description(post_class_t *class_gen);
-static void vdr_video_class_dispose(post_class_t *class_gen);
/* plugin instance functions */
static void vdr_video_dispose(post_plugin_t *this_gen);
@@ -103,9 +100,9 @@ void *vdr_video_init_plugin(xine_t *xine, void *data)
return NULL;
class->open_plugin = vdr_video_open_plugin;
- class->get_identifier = vdr_video_get_identifier;
- class->get_description = vdr_video_get_description;
- class->dispose = vdr_video_class_dispose;
+ class->identifier = "vdr";
+ class->description = N_("modifies every video frame as requested by VDR");
+ class->dispose = default_post_class_dispose;
return class;
}
@@ -146,22 +143,6 @@ static post_plugin_t *vdr_video_open_plugin(post_class_t *class_gen, int inputs,
return &this->post_plugin;
}
-static char *vdr_video_get_identifier(post_class_t *class_gen)
-{
- return "vdr";
-}
-
-static char *vdr_video_get_description(post_class_t *class_gen)
-{
- return "modifies every video frame as requested by VDR";
-}
-
-static void vdr_video_class_dispose(post_class_t *class_gen)
-{
- free(class_gen);
-}
-
-
static void vdr_video_dispose(post_plugin_t *this_gen)
{
if (_x_post_dispose(this_gen))
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 22:33:06 +0000