summaryrefslogtreecommitdiff
path: root/src/libxinevdec
diff options
context:
space:
mode:
Diffstat (limited to 'src/libxinevdec')
-rw-r--r--src/libxinevdec/bitplane.c18
-rw-r--r--src/libxinevdec/foovideo.c20
-rw-r--r--src/libxinevdec/gdkpixbuf.c23
-rw-r--r--src/libxinevdec/image.c23
-rw-r--r--src/libxinevdec/rgb.c18
-rw-r--r--src/libxinevdec/yuv.c18
6 files changed, 17 insertions, 103 deletions
diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c
index a3b18d060..08bdb4c22 100644
--- a/src/libxinevdec/bitplane.c
+++ b/src/libxinevdec/bitplane.c
@@ -1520,26 +1520,14 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
return &this->video_decoder;
}
-static char *get_identifier (video_decoder_class_t *this) {
- return "bitplane";
-}
-
-static char *get_description (video_decoder_class_t *this) {
- return "Raw bitplane video decoder plugin";
-}
-
-static void dispose_class (video_decoder_class_t *this) {
- free (this);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
bitplane_class_t *this = (bitplane_class_t *) xine_xmalloc (sizeof (bitplane_class_t));
this->decoder_class.open_plugin = open_plugin;
- this->decoder_class.get_identifier = get_identifier;
- this->decoder_class.get_description = get_description;
- this->decoder_class.dispose = dispose_class;
+ this->decoder_class.identifier = "bitplane";
+ this->decoder_class.description = N_("Raw bitplane video decoder plugin");
+ this->decoder_class.dispose = default_video_decoder_class_dispose;
return this;
}
diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c
index 1113f8df0..1dc6fa137 100644
--- a/src/libxinevdec/foovideo.c
+++ b/src/libxinevdec/foovideo.c
@@ -221,22 +221,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
}
/*
- * This function returns a brief string that describes (usually with the
- * decoder's most basic name) the video decoder plugin.
- */
-static char *get_identifier (video_decoder_class_t *this) {
- return "foovideo";
-}
-
-/*
- * This function returns a slightly longer string describing the video
- * decoder plugin.
- */
-static char *get_description (video_decoder_class_t *this) {
- return "foovideo: reference xine video decoder plugin";
-}
-
-/*
* This function frees the video decoder class and any other memory that was
* allocated.
*/
@@ -255,8 +239,8 @@ static void *init_plugin (xine_t *xine, void *data) {
this = (foovideo_class_t *) xine_xmalloc (sizeof (foovideo_class_t));
this->decoder_class.open_plugin = open_plugin;
- this->decoder_class.get_identifier = get_identifier;
- this->decoder_class.get_description = get_description;
+ this->decoder_class.identifier = "foovideo";
+ this->decoder_class.description = N_("foovideo: reference xine video decoder plugin");
this->decoder_class.dispose = dispose_class;
return this;
diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c
index b5acdfa42..1ae0920bd 100644
--- a/src/libxinevdec/gdkpixbuf.c
+++ b/src/libxinevdec/gdkpixbuf.c
@@ -256,23 +256,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
/*
* image plugin class
*/
-
-static char *get_identifier (video_decoder_class_t *this) {
- return "gdkpixbuf";
-}
-
-static char *get_description (video_decoder_class_t *this) {
- return "gdk-pixbuf image video decoder plugin";
-}
-
-static void dispose_class (video_decoder_class_t *this_gen) {
- image_class_t *this = (image_class_t *) this_gen;
-
- lprintf("class closed\n");
-
- free (this);
-}
-
static void *init_class (xine_t *xine, void *data) {
image_class_t *this;
@@ -280,9 +263,9 @@ static void *init_class (xine_t *xine, void *data) {
this = (image_class_t *) xine_xmalloc (sizeof (image_class_t));
this->decoder_class.open_plugin = open_plugin;
- this->decoder_class.get_identifier = get_identifier;
- this->decoder_class.get_description = get_description;
- this->decoder_class.dispose = dispose_class;
+ this->decoder_class.identifier = "gdkpixbuf";
+ this->decoder_class.description = N_("gdk-pixbuf image video decoder plugin");
+ this->decoder_class.dispose = default_video_decoder_class_dispose;
/*
* initialisation of privates
diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c
index a338e3cab..a73440f9c 100644
--- a/src/libxinevdec/image.c
+++ b/src/libxinevdec/image.c
@@ -234,23 +234,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
/*
* image plugin class
*/
-
-static char *get_identifier (video_decoder_class_t *this) {
- return "imagevdec";
-}
-
-static char *get_description (video_decoder_class_t *this) {
- return "image video decoder plugin";
-}
-
-static void dispose_class (video_decoder_class_t *this_gen) {
- image_class_t *this = (image_class_t *) this_gen;
-
- lprintf("class closed\n");
-
- free (this);
-}
-
static void *init_class (xine_t *xine, void *data) {
image_class_t *this;
@@ -258,9 +241,9 @@ static void *init_class (xine_t *xine, void *data) {
this = (image_class_t *) xine_xmalloc (sizeof (image_class_t));
this->decoder_class.open_plugin = open_plugin;
- this->decoder_class.get_identifier = get_identifier;
- this->decoder_class.get_description = get_description;
- this->decoder_class.dispose = dispose_class;
+ this->decoder_class.identifier = "imagevdec";
+ this->decoder_class.description = N_("image video decoder plugin");
+ this->decoder_class.dispose = default_video_decoder_class_dispose;
/*
* initialisation of privates
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index 803e4fb3a..1cf61febe 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -412,18 +412,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
return &this->video_decoder;
}
-static char *get_identifier (video_decoder_class_t *this) {
- return "RGB";
-}
-
-static char *get_description (video_decoder_class_t *this) {
- return "Raw RGB video decoder plugin";
-}
-
-static void dispose_class (video_decoder_class_t *this) {
- free (this);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
rgb_class_t *this;
@@ -431,9 +419,9 @@ static void *init_plugin (xine_t *xine, void *data) {
this = (rgb_class_t *) xine_xmalloc (sizeof (rgb_class_t));
this->decoder_class.open_plugin = open_plugin;
- this->decoder_class.get_identifier = get_identifier;
- this->decoder_class.get_description = get_description;
- this->decoder_class.dispose = dispose_class;
+ this->decoder_class.identifier = "RGB";
+ this->decoder_class.description = N_("Raw RGB video decoder plugin");
+ this->decoder_class.dispose = default_video_decoder_class_dispose;
return this;
}
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index 456a2cb93..b9856379a 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -334,18 +334,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
return &this->video_decoder;
}
-static char *get_identifier (video_decoder_class_t *this) {
- return "YUV";
-}
-
-static char *get_description (video_decoder_class_t *this) {
- return "Raw YUV video decoder plugin";
-}
-
-static void dispose_class (video_decoder_class_t *this) {
- free (this);
-}
-
static void *init_plugin (xine_t *xine, void *data) {
yuv_class_t *this;
@@ -353,9 +341,9 @@ static void *init_plugin (xine_t *xine, void *data) {
this = (yuv_class_t *) xine_xmalloc (sizeof (yuv_class_t));
this->decoder_class.open_plugin = open_plugin;
- this->decoder_class.get_identifier = get_identifier;
- this->decoder_class.get_description = get_description;
- this->decoder_class.dispose = dispose_class;
+ this->decoder_class.identifier = "YUV";
+ this->decoder_class.description = N_("Raw YUV video decoder plugin");
+ this->decoder_class.dispose = default_video_decoder_class_dispose;
return this;
}