Remove no more needed XINE_LOGO.

Internationalize all config related stuff.
Fix not registered mrl ending in roq/film  demuxer.
Add bindtextdomain() calls in load_plugins (for audio/video out plugins).

CVS patchset: 2066
CVS date: 2002/06/12 12:22:25

9 files changed, 42 insertions, 31 deletions

diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 16de5ab4f..b4a44642b 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_aa.c,v 1.19 2002/04/29 23:32:00 jcdutton Exp $
+ * $Id: video_out_aa.c,v 1.20 2002/06/12 12:22:38 f1rmb Exp $
  *
  * video_out_aa.c, ascii-art output plugin for xine
  *
@@ -298,11 +298,12 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 static vo_info_t vo_info_aa = {
   5,
   "aa",
-  "xine video output plugin using the ascii-art library",
+  NULL,
   VISUAL_TYPE_AA,
   10
 };
 
 vo_info_t *get_video_out_plugin_info() {
+  vo_info_aa.description = _("xine video output plugin using the ascii-art library");
   return &vo_info_aa;
 }
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 0ab7acfe6..4dba74ab6 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_directfb.c,v 1.8 2002/05/06 00:48:09 miguelfreitas Exp $
+ * $Id: video_out_directfb.c,v 1.9 2002/06/12 12:22:38 f1rmb Exp $
  *
  * DirectFB based output plugin.
  * Rich Wareham <richwareham@users.sourceforge.net>
@@ -560,12 +560,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 static vo_info_t vo_info_directfb = {
   4,
   "DirectFB",
-  "xine video output plugin using the DirectFB library.",
+  NULL,
   VISUAL_TYPE_DFB,
   8
 };
 
 vo_info_t *get_video_out_plugin_info() {
+  vo_info_directfb.description = _("xine video output plugin using the DirectFB library.");
   return &vo_info_directfb;
 }
 
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 0d8af80f2..59fe0b109 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_fb.c,v 1.10 2002/05/06 00:48:09 miguelfreitas Exp $
+ * $Id: video_out_fb.c,v 1.11 2002/06/12 12:22:38 f1rmb Exp $
  * 
  * video_out_fb.c, frame buffer xine driver by Miguel Freitas
  *
@@ -702,9 +702,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->output_scale_factor = 1.0;
   
   this->scaling_disabled    = config->register_bool (config, "video.disable_scaling", 0,
-						     "disable all video scaling (faster!)",
+						     _("disable all video scaling (faster!)"),
 						     NULL, NULL, NULL);
-
+  
   this->vo_driver.get_capabilities     = fb_get_capabilities;
   this->vo_driver.alloc_frame          = fb_alloc_frame;
   this->vo_driver.update_frame_format  = fb_update_frame_format;
@@ -718,8 +718,8 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->vo_driver.redraw_needed        = fb_redraw_needed;
 
   device_name = config->register_string (config, "video.fb_device", "/dev/fb0",
-					  "framebuffer device", NULL, NULL, NULL);
-
+					 _("framebuffer device"), NULL, NULL, NULL);
+  
   if( (this->fd = open(device_name, O_RDWR) ) < 0) {
     printf("video_out_fb: aborting. (unable to open device \"%s\")\n", device_name);
     free(this);
@@ -876,11 +876,12 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 static vo_info_t vo_info_fb = {
   5,
   "fb",
-  "xine video output plugin using linux framebuffer device",
+  NULL,
   VISUAL_TYPE_FB,
   5
 };
 
 vo_info_t *get_video_out_plugin_info() {
+  vo_info_fb.description = _("xine video output plugin using linux framebuffer device");
   return &vo_info_fb;
 }
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 11cb4fd28..b4b41c580 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_opengl.c,v 1.10 2002/04/29 23:32:00 jcdutton Exp $
+ * $Id: video_out_opengl.c,v 1.11 2002/06/12 12:22:38 f1rmb Exp $
  * 
  * video_out_glut.c, glut based OpenGL rendering interface for xine
  * Matthias Hopf <mat@mshopf.de>
@@ -1103,7 +1103,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
     this->yuv2rgb_gamma = config->register_range (config,
 						  "video.opengl_gamma", 0,
 						  -100, 100,
-						  "gamma correction for OpenGL driver",
+						  _("gamma correction for OpenGL driver"),
 						  NULL, NULL, NULL);
     this->yuv2rgb_factory = yuv2rgb_factory_init (YUV_FORMAT, YUV_SWAP_MODE, 
 						  this->yuv2rgb_cmap);
@@ -1115,12 +1115,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 static vo_info_t vo_info_shm = {
     5,
     "OpenGL",
-    "xine video output plugin using OpenGL(tm)",
+    NULL,
     VISUAL_TYPE_X11,
     8
 };
 
 vo_info_t *get_video_out_plugin_info() {
+    vo_info_shm.description = _("xine video output plugin using OpenGL(tm)");
     return &vo_info_shm;
 }
 
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 313e133e2..ffc11b0cb 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_sdl.c,v 1.7 2002/05/13 02:42:12 miguelfreitas Exp $
+ * $Id: video_out_sdl.c,v 1.8 2002/06/12 12:22:38 f1rmb Exp $
  * 
  * video_out_sdl.c, Simple DirectMedia Layer
  *
@@ -687,12 +687,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 static vo_info_t vo_info_sdl = {
   5,
   "sdl",
-  "xine video output plugin using Simple DirectMedia Layer",
+  NULL,
   VISUAL_TYPE_X11,
   4  
 };
 
 vo_info_t *get_video_out_plugin_info() {
+  vo_info_sdl.description = _("xine video output plugin using Simple DirectMedia Layer");
   return &vo_info_sdl;
 }
 
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 2fddb1618..66d02e72a 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_syncfb.c,v 1.70 2002/05/28 10:43:45 heikos Exp $
+ * $Id: video_out_syncfb.c,v 1.71 2002/06/12 12:22:38 f1rmb Exp $
  * 
  * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
  * 
@@ -992,7 +992,7 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen)
 
    display     = visual->display;
    device_name = config->register_string(config, "video.syncfb_device", "/dev/syncfb",
-					 "syncfb (teletux) device node", NULL, NULL, NULL);
+					 _("syncfb (teletux) device node"), NULL, NULL, NULL);
    
    if(!(this = xine_xmalloc(sizeof (syncfb_driver_t)))) {
       printf("video_out_syncfb: aborting. (allocation of syncfb_driver_t failed: out of memory)\n");
@@ -1161,11 +1161,12 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen)
 static vo_info_t vo_info_syncfb = {
   5,
   "SyncFB",
-  "xine video output plugin using the SyncFB module for Matrox G200/G400 cards",
+  NULL,
   VISUAL_TYPE_X11,
   10
 };
 
 vo_info_t *get_video_out_plugin_info() {
+  vo_info_syncfb.description = _("xine video output plugin using the SyncFB module for Matrox G200/G400 cards");
   return &vo_info_syncfb;
 }
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index 1d70f9f97..55c1a5da2 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_vidix.c,v 1.1 2002/06/01 14:08:37 f1rmb Exp $
+ * $Id: video_out_vidix.c,v 1.2 2002/06/12 12:22:38 f1rmb Exp $
  * 
  * video_out_vidix.c
  *
@@ -860,12 +860,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 static vo_info_t vo_info_vidix = {
   5,
   "vidix",
-  "xine video output plugin using libvidix",
+  NULL,
   VISUAL_TYPE_X11,
   4  
 };
 
 vo_info_t *get_video_out_plugin_info() {
+  vo_info_vidix.description = _("xine video output plugin using libvidix");
   return &vo_info_vidix;
 }
 
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index f4a6bb9f9..a7c07f1ca 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xshm.c,v 1.75 2002/05/18 12:36:45 miguelfreitas Exp $
+ * $Id: video_out_xshm.c,v 1.76 2002/06/12 12:22:38 f1rmb Exp $
  * 
  * video_out_xshm.c, X11 shared memory extension interface for xine
  *
@@ -1280,7 +1280,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->user_ratio          = ASPECT_AUTO;
   
   this->scaling_disabled    = config->register_bool (config, "video.disable_scaling", 0,
-						     "disable all video scaling (faster!)",
+						     _("disable all video scaling (faster!)"),
 						     NULL, NULL, NULL);
   this->drawable	    = visual->d;
   this->expecting_event	    = 0;
@@ -1422,7 +1422,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   this->yuv2rgb_swap  = swapped;
   this->yuv2rgb_gamma = config->register_range (config, "video.xshm_gamma", 0,
 						-100, 100, 
-						"gamma correction for XShm driver",
+						_("gamma correction for XShm driver"),
 						NULL, NULL, NULL);
 
   this->yuv2rgb_factory = yuv2rgb_factory_init (mode, swapped, 
@@ -1435,12 +1435,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 static vo_info_t vo_info_shm = {
   5,                /* interface version */
   "XShm",           /* id                */
-  "xine video output plugin using the MIT X shared memory extension",
+  NULL,
   VISUAL_TYPE_X11,  /* visual_type       */
   6
 };
 
 vo_info_t *get_video_out_plugin_info() {
+  vo_info_shm.description = _("xine video output plugin using the MIT X shared memory extension");
   return &vo_info_shm;
 }
 
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 1e21e816f..31e8d1419 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xv.c,v 1.119 2002/06/10 21:42:45 mshopf Exp $
+ * $Id: video_out_xv.c,v 1.120 2002/06/12 12:22:38 f1rmb Exp $
  * 
  * video_out_xv.c, X11 video extension interface for xine
  *
@@ -1157,12 +1157,14 @@ static void xv_check_capability (xv_driver_t *this,
   /* is this a boolean property ? */
   if ((attr.min_value == 0) && (attr.max_value == 1)) {
     this->config->register_bool (this->config, this->scratch, int_default,
-				 "Xv property", NULL, xv_property_callback, &this->props[property]);
+				 _("Xv property"),
+				 NULL, xv_property_callback, &this->props[property]);
   
   } else {
     this->config->register_range (this->config, this->scratch, int_default,
 				  this->props[property].min, this->props[property].max,   
-				  "Xv property", NULL, xv_property_callback, &this->props[property]);
+				  _("Xv property"), 
+				  NULL, xv_property_callback, &this->props[property]);
   }
   
   entry = this->config->lookup_entry (this->config, this->scratch);
@@ -1403,13 +1405,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 	  /* This setting is specific to Permedia 2/3 cards. */
 	  xv_filter = config->register_range (config, "video.XV_FILTER", 0,
 					      attr[k].min_value, attr[k].max_value,
-					      "bilinear scaling mode (permedia 2/3)",
+					      _("bilinear scaling mode (permedia 2/3)"),
 					      NULL, xv_update_XV_FILTER, this);
 	  config->update_num(config,"video.XV_FILTER",xv_filter);
 	} else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) {
 	  int xv_double_buffer;
 	  xv_double_buffer = config->register_bool (config, "video.XV_DOUBLE_BUFFER", 1,
-						    "double buffer to sync video to the retrace",
+						    _("double buffer to sync video to the retrace"),
 						    NULL, xv_update_XV_DOUBLE_BUFFER, this);
 	  config->update_num(config,"video.XV_DOUBLE_BUFFER",xv_double_buffer);
 	}
@@ -1458,7 +1460,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 
   this->deinterlace_method = config->register_enum (config, "video.deinterlace_method", 4,
 						    deinterlace_methods, 
-						    "Software deinterlace method (Key I toggles deinterlacer on/off)",
+						    _("Software deinterlace method (Key I toggles deinterlacer on/off)"),
 						    NULL, xv_update_deinterlace, this);
   this->deinterlace_enabled = 0;
 
@@ -1468,12 +1470,13 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 static vo_info_t vo_info_xv = {
   5,
   "Xv",
-  "xine video output plugin using the MIT X video extension",
+  NULL,
   VISUAL_TYPE_X11,
   10
 };
 
 vo_info_t *get_video_out_plugin_info() {
+  vo_info_xv.description = _("xine video output plugin using the MIT X video extension");
   return &vo_info_xv;
 }