Merge from 1.2 main.

1 files changed, 4 insertions, 16 deletions

diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c
index 41c20bd45..f98733098 100644
--- a/src/video_out/video_out_caca.c
+++ b/src/video_out/video_out_caca.c
@@ -290,27 +290,15 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   return &this->vo_driver;
 }    
 
-static char* get_identifier (video_driver_class_t *this_gen) {
-  return "CACA";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
-  return _("xine video output plugin using the Color AsCii Art library");
-}
-
-static void dispose_class (video_driver_class_t *this_gen) {
-  caca_class_t   *this = (caca_class_t *) this_gen;
-  free(this);
-}
 static void *init_class (xine_t *xine, void *visual_gen) {
   caca_class_t    *this;
   
   this = (caca_class_t *) xine_xmalloc(sizeof(caca_class_t));
   
   this->driver_class.open_plugin     = open_plugin;
-  this->driver_class.get_identifier  = get_identifier;
-  this->driver_class.get_description = get_description;
-  this->driver_class.dispose         = dispose_class;
+  this->driver_class.identifier      = "CACA";
+  this->driver_class.description     = N_("xine video output plugin using the Color AsCii Art library");
+  this->driver_class.dispose         = default_video_driver_class_dispose;
   
   this->config            = xine->config;
   this->xine              = xine;
@@ -325,6 +313,6 @@ static const vo_info_t vo_info_caca = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_VIDEO_OUT, 21, "caca", XINE_VERSION_CODE, &vo_info_caca, init_class },
+  { PLUGIN_VIDEO_OUT, 22, "caca", XINE_VERSION_CODE, &vo_info_caca, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };