[ekiga] common-videooutput: extended stream in frame info

[Eugen Dedu <ededu src gnome org>]

commit 382146c036d75626c006bd38022ee0d3811cf98d
Author: VÃctor Manuel JÃquez Leal <vjaquez igalia com>
Date:   Wed Sep 5 17:08:39 2012 -0500

    common-videooutput: extended stream in frame info
    
    This patch adds a boolean variable (ext_stream_active). It tells if there is
    an extended remote video stream in the connection. It is stored in the frame
    info (FrameInfo) structure.
    
    FrameInfo is the structure that is going to be used for each frame that
    arrives. So it will tell to the user interface if connection contains an
    extended video.
    
    The patch specifies the value of this new attribute for current_frame and
    last_frame instances of FrameInfo.

 .../videooutput-manager-common.cpp                 |    6 ++++++
 .../videooutput-manager-common.h                   |    1 +
 .../x-videooutput/videooutput-manager-x.cpp        |    1 +
 3 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/lib/engine/components/common-videooutput/videooutput-manager-common.cpp b/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
index bb1de65..2daee9b 100644
--- a/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
+++ b/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
@@ -179,6 +179,7 @@ void GMVideoOutputManager::set_frame_data (const char* data,
     }
 
     current_frame.both_streams_active = false;
+    current_frame.ext_stream_active = false;
   } else {
 
     if (local_frame_received && !remote_frame_received)
@@ -188,6 +189,7 @@ void GMVideoOutputManager::set_frame_data (const char* data,
         local_display_info.mode = Ekiga::VO_MODE_REMOTE;
 
     current_frame.both_streams_active = local_frame_received & remote_frame_received;
+    current_frame.ext_stream_active = ext_frame_received;
   }
   current_frame.mode = local_display_info.mode;
   current_frame.zoom = local_display_info.zoom;
@@ -240,6 +242,7 @@ void GMVideoOutputManager::init()
   last_frame.mode = Ekiga::VO_MODE_UNSET;
   last_frame.accel = Ekiga::VO_ACCEL_NO_VIDEO;
   last_frame.both_streams_active = false;
+  last_frame.ext_stream_active = false;
 
   last_frame.local_width = 0;
   last_frame.local_height = 0;
@@ -251,6 +254,7 @@ void GMVideoOutputManager::init()
   last_frame.embedded_x = 0;
   last_frame.embedded_y = 0;
 
+  current_frame.ext_stream_active = false;
   current_frame.both_streams_active = false;
   current_frame.local_width = 0;
   current_frame.local_height = 0;
@@ -281,6 +285,8 @@ void GMVideoOutputManager::uninit ()
 void GMVideoOutputManager::update_gui_device ()
 {
   last_frame.both_streams_active = current_frame.both_streams_active;
+  last_frame.ext_stream_active = current_frame.ext_stream_active;
+
   Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager::device_closed_in_main, this));
   Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager::device_opened_in_main, this, current_frame.accel, current_frame.mode, current_frame.zoom, current_frame.both_streams_active));
 
diff --git a/lib/engine/components/common-videooutput/videooutput-manager-common.h b/lib/engine/components/common-videooutput/videooutput-manager-common.h
index 021e886..e3b86f8 100644
--- a/lib/engine/components/common-videooutput/videooutput-manager-common.h
+++ b/lib/engine/components/common-videooutput/videooutput-manager-common.h
@@ -223,6 +223,7 @@
       Ekiga::VideoOutputMode mode;
       Ekiga::VideoOutputAccel accel;
       bool both_streams_active;
+      bool ext_stream_active;
 
       unsigned int remote_width;
       unsigned int remote_height;
diff --git a/lib/engine/components/x-videooutput/videooutput-manager-x.cpp b/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
index 33f2be0..9334e31 100644
--- a/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
+++ b/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
@@ -419,6 +419,7 @@ GMVideoOutputManager_x::setup_frame_display ()
   }
 
   last_frame.both_streams_active = current_frame.both_streams_active;
+  last_frame.ext_stream_active = current_frame.ext_stream_active;
 
   if (video_disabled) {
     Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager_x::device_error_in_main, this, Ekiga::VO_ERROR));