ekiga r6931 - in trunk: . lib/engine/videooutput/common

[mschneid svn gnome org]

Author: mschneid
Date: Thu Sep 11 17:29:00 2008
New Revision: 6931
URL: http://svn.gnome.org/viewvc/ekiga?rev=6931&view=rev

Log:
Fix preview window mixup with remote window due to last commit.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/videooutput/common/videooutput-manager-common.cpp

Modified: trunk/lib/engine/videooutput/common/videooutput-manager-common.cpp
==============================================================================
--- trunk/lib/engine/videooutput/common/videooutput-manager-common.cpp	(original)
+++ trunk/lib/engine/videooutput/common/videooutput-manager-common.cpp	Thu Sep 11 17:29:00 2008
@@ -124,7 +124,7 @@
 					   unsigned width,
 					   unsigned height,
 					   bool local,
-					   int /*devices_nbr*/)
+					   int devices_nbr)
 { 
   Ekiga::DisplayInfo local_display_info;
 
@@ -154,6 +154,13 @@
   /* If there is only one device open, ignore the setting, and 
    * display what we can actually display.
    */
+  if (devices_nbr <= 1) {
+    if (!local)
+      local_display_info.mode = Ekiga::VO_MODE_REMOTE;
+    else 
+      local_display_info.mode = Ekiga::VO_MODE_LOCAL;
+  }
+  
   if (local_frame_received && !remote_frame_received)
       local_display_info.mode = Ekiga::VO_MODE_LOCAL;