[xine-cvs] HG: gxine: Make use of -A or -V no longer hide the corresponding driver config option.

[<li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1185055953 -3600
# Node ID 33b82f7fd62c986717cbd5a4de1a7aece4632c06
# Parent  4806b7f2ceedd1d45cd6f481cdbd75fd226a5edb
Make use of -A or -V no longer hide the corresponding driver config option.

diff -r 33b82f7fd62c986717cbd5a4de1a7aece4632c06 -r 4806b7f2ceedd1d45cd6f481cdbd75fd226a5edb ChangeLog
--- a/ChangeLog	Sat Jul 21 23:12:33 2007 +0100
+++ b/ChangeLog	Fri Jul 20 15:21:31 2007 +0100
@@ -90,6 +90,8 @@ 0.5.900:2007/??/??
 	* Fixed two install-debug failures.
 	* Added a compatibility fix for glib 2.13 and later.
 	* New option --configure for setting configuration items.
+	* Use of -A or -V no longer hides the corresponding driver pref.
+	  The configuration remains unchanged by these options.
 	* No longer build with libjs/libsmjs - old libraries, can't test.
 
 0.5.11:	2007/02/01
diff -r 33b82f7fd62c986717cbd5a4de1a7aece4632c06 -r 4806b7f2ceedd1d45cd6f481cdbd75fd226a5edb src/gtkvideo.c
--- a/src/gtkvideo.c	Sat Jul 21 23:12:33 2007 +0100
+++ b/src/gtkvideo.c	Fri Jul 20 15:21:31 2007 +0100
@@ -779,19 +779,14 @@ static xine_video_port_t *load_video_out
   vis.frame_output_cb   = frame_output_cb;
   vis.user_data         = this;
 
-  if (priv->video_driver_id)
-    video_driver_id = priv->video_driver_id;
-  else
-  {
-    char **choices = get_driver_ids (xine_list_video_output_plugins (priv->xine));
-    /* try to init video with stored information */
-    int i = xine_config_register_enum (priv->xine,
-				   "video.driver", 0,
-				   choices,
-				   N_("video driver to use"),
-				   NULL, 10, NULL, NULL);
-    video_driver_id = choices[i];
-  }
+  char **choices = get_driver_ids (xine_list_video_output_plugins (priv->xine));
+  /* try to init video with stored information */
+  int i = xine_config_register_enum (priv->xine,
+				     "video.driver", 0, choices,
+				     N_("video driver to use"),
+				     NULL, 10, NULL, NULL);
+  video_driver_id = priv->video_driver_id ? : choices[i];
+
   if (strcmp (video_driver_id, "auto"))
   {
     video_port=xine_open_video_driver (priv->xine,
diff -r 33b82f7fd62c986717cbd5a4de1a7aece4632c06 -r 4806b7f2ceedd1d45cd6f481cdbd75fd226a5edb src/player.c
--- a/src/player.c	Sat Jul 21 23:12:33 2007 +0100
+++ b/src/player.c	Fri Jul 20 15:21:31 2007 +0100
@@ -1032,17 +1032,14 @@ static xine_audio_port_t *load_audio_out
 {
   xine_audio_port_t      *audio_port;
 
+  char **choices = get_driver_ids (xine_list_audio_output_plugins (xine));
+  /* try to init audio with stored information */
+  int i = xine_config_register_enum (xine,
+				     "audio.driver", 0, choices,
+				     _("audio driver to use"),
+				     NULL, 10, gtk_true, NULL);
   if (!audio_driver_id)
-  {
-    char **choices = get_driver_ids (xine_list_audio_output_plugins (xine));
-    /* try to init audio with stored information */
-    int i = xine_config_register_enum (xine,
-                                   "audio.driver", 0,
-                                   choices,
-                                   _("audio driver to use"),
-                                   NULL, 10, gtk_true, NULL);
     audio_driver_id = choices[i];
-  }
 
   if (!strcmp (audio_driver_id, "null"))
     return NULL;