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

4 files changed, 33 insertions, 14 deletions

diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index b3a62646a..34475c17f 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -17,7 +17,7 @@
  * along with self program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_out.c,v 1.56 2002/06/03 09:45:12 f1rmb Exp $
+ * $Id: audio_out.c,v 1.57 2002/06/12 12:22:38 f1rmb Exp $
  * 
  * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
  *   (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -718,11 +718,12 @@ ao_instance_t *ao_new_instance (ao_driver_t *driver, xine_t *xine) {
   this->gap_tolerance         = driver->get_gap_tolerance (this->driver);
 
   this->resample_conf = config->register_enum (config, "audio.resample_mode", 0,
-					       resample_modes, "adjust whether resampling is done or not",
+					       resample_modes,
+					       _("adjust whether resampling is done or not"),
 					       NULL, NULL, NULL);
   this->force_rate    = config->register_num (config, "audio.force_rate", 0,
-						"if !=0 always resample to given rate",
-						NULL, NULL, NULL);
+					      _("if !=0 always resample to given rate"),
+					      NULL, NULL, NULL);
 
   /*
    * pre-allocate memory for samples
@@ -749,12 +750,12 @@ ao_instance_t *ao_new_instance (ao_driver_t *driver, xine_t *xine) {
     int vol;
     
     vol = config->register_range (config, "audio.mixer_volume", 
-				  50, 0, 100, "Audio volume", 
+				  50, 0, 100, _("Audio volume"), 
 				  NULL, NULL, NULL);
     
     if(config->register_bool (config, "audio.remember_volume", 0,
-			      "restore volume level at startup", 
-			      "if this not set, xine will not touch any mixer settings at startup",
+			      _("restore volume level at startup"), 
+			      _("if this not set, xine will not touch any mixer settings at startup"),
 			      NULL, NULL)) {
       int prop = 0;
 
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 9cf00ab6b..b93e86d65 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.77 2002/05/01 19:42:57 guenter Exp $
+ * $Id: load_plugins.c,v 1.78 2002/06/12 12:22:38 f1rmb Exp $
  *
  *
  * Load input/demux/audio_out/video_out/codec plugins
@@ -648,6 +648,10 @@ char **xine_list_video_output_plugins (int visual_type) {
 
   install_segv_handler();
   
+#ifdef ENABLE_NLS
+  bindtextdomain("xine-lib", XINE_LOCALEDIR);
+#endif 
+
   dir = opendir (XINE_PLUGINDIR);
 
   if (dir) {
@@ -770,6 +774,10 @@ vo_driver_t *xine_load_video_output_plugin(config_values_t *config,
   DIR *dir;
   vo_driver_t *vod;
 
+#ifdef ENABLE_NLS
+  bindtextdomain("xine-lib", XINE_LOCALEDIR);
+#endif 
+
 #if IGNORE_DXR3ENC
   if (! strcasecmp(id, "dxr3enc")) {
     printf( /* big poo poo */
@@ -882,6 +890,10 @@ char **xine_list_audio_output_plugins(void) {
 
   install_segv_handler();
   
+#ifdef ENABLE_NLS
+  bindtextdomain("xine-lib", XINE_LOCALEDIR);
+#endif 
+
   dir = opendir (XINE_PLUGINDIR);
   
   if (dir) {
@@ -927,8 +939,9 @@ char **xine_list_audio_output_plugins(void) {
 	    ao_info = getinfo();
 
 #ifdef LOG
-	    printf("load_plugins: id=%s, priority=%d, interface_version=%d\n", 
-		   ao_info->id, ao_info->priority, ao_info->interface_version); 
+	    printf("load_plugins: id=%s (%s), priority=%d, interface_version=%d\n", 
+		   ao_info->id, ao_info->description, 
+		   ao_info->priority, ao_info->interface_version); 
 #endif
 
 	    if ( ao_info->interface_version == AUDIO_OUT_IFACE_VERSION) {
@@ -986,6 +999,10 @@ ao_driver_t *xine_load_audio_output_plugin(config_values_t *config, char *id) {
 
   install_segv_handler();
   
+#ifdef ENABLE_NLS
+  bindtextdomain("xine-lib", XINE_LOCALEDIR);
+#endif 
+
   dir = opendir (XINE_PLUGINDIR);
   
   if (dir) {
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index d0c5ef4a6..eecf6f376 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -860,7 +860,7 @@ osd_renderer_t *osd_renderer_init( video_overlay_instance_t *video_overlay, conf
 
   this->textpalette = config->register_enum (config, "misc.osd_text_palette", 0,
                                              textpalettes_str, 
-                                             "Palette (foreground-border-background) to use on subtitles",
+                                             _("Palette (foreground-border-background) to use on subtitles"),
                                              NULL, update_text_palette, this);
   
   /*
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index bad6a10ff..d8a7f36c2 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.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: xine.c,v 1.139 2002/06/10 13:41:55 miguelfreitas Exp $
+ * $Id: xine.c,v 1.140 2002/06/12 12:22:38 f1rmb Exp $
  *
  * top-level xine functions
  *
@@ -584,7 +584,7 @@ xine_t *xine_init (vo_driver_t *vo,
 
   pthread_mutex_lock (&this->logo_lock);
   this->logo_mrl = config->register_string(config, "misc.logo_mrl", XINE_LOGO_FILE,
-					   "logo mrl, displayed in video output window",
+					   _("logo mrl, displayed in video output window"),
 					   NULL, _logo_change_cb, (void *) this);
   pthread_mutex_unlock (&this->logo_lock);
 
@@ -596,8 +596,9 @@ xine_t *xine_init (vo_driver_t *vo,
   
 #ifdef ENABLE_NLS
   bindtextdomain("xine-lib", XINE_LOCALEDIR);
+  textdomain("xine-lib");
 #endif 
-
+  
   printf ("xine: xine_init entered\n");
   
   this->err     = XINE_ERROR_NONE;