1 files changed, 8 insertions, 35 deletions

diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 3e30f664d..3445be127 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -1333,8 +1333,8 @@ static void update_config_cb (void *data, xine_cfg_entry_t *entry) {
    
 static void init_config (directfb_driver_t *this) {
   config_values_t   *config             = this->xine->config;
-  static const char *buffermode_enum[]  = {"single", "double", "triple", 0};
-  static const char *fieldparity_enum[] = {"none", "top", "bottom", 0};
+  static const char *const buffermode_enum[]  = {"single", "double", "triple", 0};
+  static const char *const fieldparity_enum[] = {"none", "top", "bottom", 0};
   
   this->buffermode = config->register_enum (config,
       "video.device.directfb_buffermode", this->buffermode, (char**)buffermode_enum,
@@ -1880,19 +1880,6 @@ static vo_driver_t *open_plugin_fb (video_driver_class_t *class_gen, const void
   return &this->vo_driver;
 }
 
-static char* get_identifier_fb (video_driver_class_t *this_gen) {
-  return "DirectFB";
-}
-
-static char* get_description_fb (video_driver_class_t *this_gen) {
-  return _("xine video output plugin using DirectFB.");
-}
-
-static void dispose_class_fb (video_driver_class_t *this_gen) {
-  directfb_class_t *this = (directfb_class_t *) this_gen;
-  free (this);
-}
-
 #ifndef DIRECTFB_X11
 static void *init_class_fb (xine_t *xine, void *visual_gen) {
   directfb_class_t *this;
@@ -1910,9 +1897,9 @@ static void *init_class_fb (xine_t *xine, void *visual_gen) {
 
   this = (directfb_class_t *) xine_xmalloc (sizeof (directfb_class_t));
   this->driver_class.open_plugin     = open_plugin_fb;
-  this->driver_class.get_identifier  = get_identifier_fb;
-  this->driver_class.get_description = get_description_fb;
-  this->driver_class.dispose         = dispose_class_fb;
+  this->driver_class.identifier      = "DirectFB";
+  this->driver_class.description     = N_("xine video output plugin using DirectFB.");
+  this->driver_class.dispose         = default_video_driver_class_dispose;
 
   this->xine = xine;
 
@@ -2088,20 +2075,6 @@ static vo_driver_t *open_plugin_x11 (video_driver_class_t *class_gen, const void
   return &this->vo_driver;
 }
 
-static char* get_identifier_x11 (video_driver_class_t *this_gen) {
-  return "XDirectFB";
-}
-
-static char* get_description_x11 (video_driver_class_t *this_gen) {
-  return _("xine video output plugin using DirectFB under XDirectFB.");
-}
-
-static void dispose_class_x11 (video_driver_class_t *this_gen) {
-  directfb_class_t *this = (directfb_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_class_x11 (xine_t *xine, void *visual_gen) {
   directfb_class_t *this;
   x11_visual_t     *visual = (x11_visual_t *) visual_gen;
@@ -2129,9 +2102,9 @@ static void *init_class_x11 (xine_t *xine, void *visual_gen) {
 
   this = (directfb_class_t *) xine_xmalloc (sizeof (directfb_class_t));
   this->driver_class.open_plugin     = open_plugin_x11;
-  this->driver_class.get_identifier  = get_identifier_x11;
-  this->driver_class.get_description = get_description_x11;
-  this->driver_class.dispose         = dispose_class_x11;
+  this->driver_class.identifier      = "XDirectFB";
+  this->driver_class.description     = N_("xine video output plugin using DirectFB under XDirectFB.");
+  this->driver_class.dispose         = default_video_driver_class_dispose;
 
   this->visual_type = XINE_VISUAL_TYPE_X11;
   this->xine        = xine;