[ekiga] common-videooutput: display extended stream

[Eugen Dedu <ededu src gnome org>]

commit 718183da72bd387dbfb94036388540d9624d3358
Author: VÃctor Manuel JÃquez Leal <vjaquez igalia com>
Date:   Wed Sep 5 18:03:37 2012 -0500

    common-videooutput: display extended stream
    
    This patch contains the logic when the extended remote video stream changes
    its size, hence the UI window should be adjusted.
    
    Also contains the case that if the stream adds or removes the extended stream,
    the UI setup should be readjusted too.
    
    Finally this patch handles the frame display of the extended remote stream if
    the UI requests it.
    
    No UI changes yet though.

 .../videooutput-manager-common.cpp                 |   59 ++++++++++++-------
 1 files changed, 37 insertions(+), 22 deletions(-)
---
diff --git a/lib/engine/components/common-videooutput/videooutput-manager-common.cpp b/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
index aa3398a..5d87402 100644
--- a/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
+++ b/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
@@ -321,6 +321,8 @@ GMVideoOutputManager::frame_display_change_needed ()
                          last_frame.remote_height != current_frame.remote_height);
   bool window_changed = (local_display_info.x != last_frame.embedded_x ||
                         local_display_info.y != last_frame.embedded_y);
+  bool ext_changed = (last_frame.ext_width  != current_frame.ext_width ||
+                      last_frame.ext_height != current_frame.ext_height);
 
   switch (current_frame.mode) {
   case Ekiga::VO_MODE_LOCAL:
@@ -340,7 +342,10 @@ GMVideoOutputManager::frame_display_change_needed ()
     return ( remote_changed || local_changed );
     break;
 
-  case Ekiga::VO_MODE_REMOTE_EXT: // no need to handle this
+  case Ekiga::VO_MODE_REMOTE_EXT:
+    return ( ext_changed || window_changed );
+    break;
+
   case Ekiga::VO_MODE_UNSET:
   default:
     break;
@@ -354,33 +359,43 @@ GMVideoOutputManager::redraw ()
 {
   UpdateRequired sync_required;
   sync_required = update_required;
-  
-    if (frame_display_change_needed ()) 
-      setup_frame_display (); 
+
+    if (frame_display_change_needed ())
+      setup_frame_display ();
      else
-      if (last_frame.both_streams_active != current_frame.both_streams_active)
+      if (last_frame.both_streams_active != current_frame.both_streams_active ||
+          last_frame.ext_stream_active != current_frame.ext_stream_active)
         update_gui_device();
 
-    switch (current_frame.mode) 
-      {
-      case Ekiga::VO_MODE_LOCAL:
-          if (lframeStore.GetSize() > 0)
-            display_frame ((char*)lframeStore.GetPointer (), current_frame.local_width, current_frame.local_height);
+    switch (current_frame.mode) {
+    case Ekiga::VO_MODE_LOCAL:
+      if (lframeStore.GetSize() > 0)
+        display_frame ((char *) lframeStore.GetPointer (),
+                       current_frame.local_width, current_frame.local_height);
         break;
 
-      case Ekiga::VO_MODE_REMOTE:
-          if (rframeStore.GetSize() > 0)
-            display_frame ((char*)rframeStore.GetPointer (), current_frame.remote_width, current_frame.remote_height);
-        break;
-
-     case Ekiga::VO_MODE_FULLSCREEN:
-     case Ekiga::VO_MODE_PIP:
-     case Ekiga::VO_MODE_PIP_WINDOW:
-          if ((lframeStore.GetSize() > 0) &&  (rframeStore.GetSize() > 0))
-            display_pip_frames ((char*)lframeStore.GetPointer (), current_frame.local_width, current_frame.local_height,
-                              (char*)rframeStore.GetPointer (), current_frame.remote_width, current_frame.remote_height);
+    case Ekiga::VO_MODE_REMOTE:
+      if (rframeStore.GetSize() > 0)
+        display_frame ((char *) rframeStore.GetPointer (),
+                       current_frame.remote_width, current_frame.remote_height);
+      break;
+
+    case Ekiga::VO_MODE_FULLSCREEN:
+    case Ekiga::VO_MODE_PIP:
+    case Ekiga::VO_MODE_PIP_WINDOW:
+      if ((lframeStore.GetSize() > 0) &&  (rframeStore.GetSize() > 0))
+        display_pip_frames ((char *) lframeStore.GetPointer (),
+                            current_frame.local_width, current_frame.local_height,
+                            (char *) rframeStore.GetPointer (),
+                            current_frame.remote_width, current_frame.remote_height);
        break;
-    case Ekiga::VO_MODE_REMOTE_EXT: // no need to handle this
+
+    case Ekiga::VO_MODE_REMOTE_EXT:
+      if (eframeStore.GetSize() > 0)
+        display_frame ((char *) eframeStore.GetPointer (),
+                       current_frame.ext_width, current_frame.ext_height);
+      break;
+
     case Ekiga::VO_MODE_UNSET:
     default:
        break;