[GnomeMeeting-devel-list] [PATCH][Bug 171361] video slider settings reset after each call is back

[thomas schorpp <t schorpp gmx de>]

old hack is broken, since spca5xx driver inits with defaults since last year fall.

pls commit and users report if it breaks other drivers, especially auto-exposure enabled!

manual re-adjustment on each call is unergonomical and gets on my nerves ;) 
no autoexpo yet with aiptek dv 3500.

y
tom

Index: src/gui/main.cpp
===================================================================
RCS file: /cvs/gnome/ekiga/src/gui/main.cpp,v
retrieving revision 1.35
diff -U3 -r1.35 main.cpp
--- src/gui/main.cpp	1 Mar 2006 03:23:30 -0000	1.35
+++ src/gui/main.cpp	6 Mar 2006 03:33:40 -0000
@@ -4574,6 +4574,10 @@
     GnomeMeeting::Process ()->Connect (url);
 
   
+  /* Setup video sliders with common values*/
+  gm_main_window_set_video_sliders_values (GTK_WIDGET (GnomeMeeting::Process ()->GetMainWindow ()), 0, 140, 30, 40);
+
+
   /* The GTK loop */
   gtk_main ();
   gdk_threads_leave ();

Index: src/devices/videoinput.cpp
===================================================================
RCS file: /cvs/gnome/ekiga/src/devices/videoinput.cpp,v
retrieving revision 1.6
diff -U3 -r1.6 videoinput.cpp
--- src/devices/videoinput.cpp	16 Jan 2006 23:07:57 -0000	1.6
+++ src/devices/videoinput.cpp	6 Mar 2006 03:34:26 -0000
@@ -445,21 +445,7 @@
     var_mutex.Signal ();
   
       
-    /* Setup the video settings */
-    GetParameters (&whiteness, &brightness, &colour, &contrast);
-    if (whiteness > 0 || brightness > 0 || colour > 0 || contrast > 0) {
-
-      gnomemeeting_threads_enter ();
-      gm_main_window_set_video_sliders_values (main_window,
-					       whiteness,
-					       brightness,
-					       colour, 
-					       contrast);
-      gnomemeeting_threads_leave ();
-    }
-    else {
-
-      /* Driver made a reset, keep the old values */
+    /* Setup the video settings, auto brightness drivers dont care and GetParameters() broke manual settings*/
       gnomemeeting_threads_enter ();
       gm_main_window_get_video_sliders_values (main_window,
 					       whiteness,
@@ -472,8 +458,6 @@
       SetBrightness (brightness << 8);
       SetColour (colour << 8);
       SetContrast (contrast << 8);
-    }
-
       
     /* Update the GUI sensitivity if not in a call */
     if (ep.GetCallingState () == GMManager::Standby) {