[ekiga] Revert "videoutput: new parameter size_changed() signal"

[Eugen Dedu <ededu src gnome org>]

commit 0f33160a33c17bb2603787421f789244978fc2a0
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Thu Nov 15 20:39:46 2012 +0100

    Revert "videoutput: new parameter size_changed() signal"
    
    This reverts commit bffa9237b434c7708b47af04fdc751076a842d9f.

 .../x-videooutput/videooutput-manager-x.cpp        |   31 ++++---------------
 .../x-videooutput/videooutput-manager-x.h          |    3 +-
 lib/engine/gui/gtk-frontend/call-window.cpp        |    4 +--
 lib/engine/videooutput/videooutput-core.cpp        |    9 ++----
 lib/engine/videooutput/videooutput-core.h          |    7 +---
 lib/engine/videooutput/videooutput-manager.h       |    3 +-
 6 files changed, 15 insertions(+), 42 deletions(-)
---
diff --git a/lib/engine/components/x-videooutput/videooutput-manager-x.cpp b/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
index 6f51079..92ddd97 100644
--- a/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
+++ b/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
@@ -209,36 +209,20 @@ GMVideoOutputManager_x::setup_frame_display ()
 
   switch (current_frame.mode) {
   case Ekiga::VO_MODE_LOCAL:
-    Ekiga::Runtime::run_in_main
-      (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this,
-                    (unsigned) (current_frame.local_width * current_frame.zoom / 100),
-                    (unsigned) (current_frame.local_height * current_frame.zoom / 100),
-                    current_frame.mode));
+    Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this, (unsigned) (current_frame.local_width * current_frame.zoom / 100), (unsigned) (current_frame.local_height * current_frame.zoom / 100)));
     break;
   case Ekiga::VO_MODE_REMOTE:
   case Ekiga::VO_MODE_PIP:
-    Ekiga::Runtime::run_in_main
-      (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this,
-                    (unsigned) (current_frame.remote_width * current_frame.zoom / 100),
-                    (unsigned) (current_frame.remote_height * current_frame.zoom / 100),
-                    current_frame.mode));
+    Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this, (unsigned) (current_frame.remote_width * current_frame.zoom / 100), (unsigned) (current_frame.remote_height * current_frame.zoom / 100)));
     break;
   case Ekiga::VO_MODE_FULLSCREEN:
-    Ekiga::Runtime::run_in_main
-      (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this,
-                    176, 144, current_frame.mode));
+    Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this, 176, 144));
     break;
   case Ekiga::VO_MODE_PIP_WINDOW:
-    Ekiga::Runtime::run_in_main
-      (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this,
-                    176, 144, current_frame.mode));
+    Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this, 176, 144));
     break;
   case Ekiga::VO_MODE_REMOTE_EXT:
-    Ekiga::Runtime::run_in_main
-      (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this,
-                    (unsigned) (current_frame.ext_width * current_frame.zoom / 100),
-                    (unsigned) (current_frame.ext_height * current_frame.zoom / 100),
-                    current_frame.mode));
+    Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this, (unsigned) (current_frame.ext_width * current_frame.zoom / 100), (unsigned) (current_frame.ext_height * current_frame.zoom / 100)));
     break;
   case Ekiga::VO_MODE_UNSET:
   default:
@@ -551,10 +535,9 @@ GMVideoOutputManager_x::sync (UpdateRequired sync_required)
 
 void
 GMVideoOutputManager_x::size_changed_in_main (unsigned width,
-					      unsigned height,
-                                              Ekiga::VideoOutputMode mode)
+					      unsigned height)
 {
-  size_changed (width, height, mode);
+  size_changed (width, height);
 }
 
 void
diff --git a/lib/engine/components/x-videooutput/videooutput-manager-x.h b/lib/engine/components/x-videooutput/videooutput-manager-x.h
index 4eeb802..a5f20a7 100644
--- a/lib/engine/components/x-videooutput/videooutput-manager-x.h
+++ b/lib/engine/components/x-videooutput/videooutput-manager-x.h
@@ -95,8 +95,7 @@ protected:
 private:
 
   void size_changed_in_main (unsigned width,
-			     unsigned height,
-                             Ekiga::VideoOutputMode mode);
+			     unsigned height);
 
   void device_opened_in_main (Ekiga::VideoOutputAccel accel,
 			      Ekiga::VideoOutputMode mode,
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 3238fa6..40ce3ae 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -280,7 +280,6 @@ static void ekiga_call_window_set_video_size (EkigaCallWindow *cw,
 static void on_size_changed_cb (Ekiga::VideoOutputManager & /* manager */,
                                 unsigned width,
                                 unsigned height,
-                                G_GNUC_UNUSED Ekiga::VideoOutputMode mode,
                                 gpointer self);
 
 static void on_videoinput_device_opened_cb (Ekiga::VideoInputManager & /* manager */,
@@ -855,7 +854,6 @@ static void
 on_size_changed_cb (Ekiga::VideoOutputManager & /* manager */,
                     unsigned width,
                     unsigned height,
-                    G_GNUC_UNUSED Ekiga::VideoOutputMode mode,
                     gpointer self)
 {
   EkigaCallWindow *cw = EKIGA_CALL_WINDOW (self);
@@ -2230,7 +2228,7 @@ ekiga_call_window_connect_engine_signals (EkigaCallWindow *cw)
   conn = videooutput_core->device_error.connect (boost::bind (&on_videooutput_device_error_cb, _1, _2, (gpointer) cw));
   cw->priv->connections.push_back (conn);
 
-  conn = videooutput_core->size_changed.connect (boost::bind (&on_size_changed_cb, _1, _2, _3, _4, (gpointer) cw));
+  conn = videooutput_core->size_changed.connect (boost::bind (&on_size_changed_cb, _1, _2, _3, (gpointer) cw));
   cw->priv->connections.push_back (conn);
 
   conn = videooutput_core->fullscreen_mode_changed.connect (boost::bind (&on_fullscreen_mode_changed_cb, _1, _2, (gpointer) cw));
diff --git a/lib/engine/videooutput/videooutput-core.cpp b/lib/engine/videooutput/videooutput-core.cpp
index 2fb2faf..497c136 100644
--- a/lib/engine/videooutput/videooutput-core.cpp
+++ b/lib/engine/videooutput/videooutput-core.cpp
@@ -91,7 +91,7 @@ void VideoOutputCore::add_manager (VideoOutputManager &manager)
   manager.device_closed.connect (boost::bind (&VideoOutputCore::on_device_closed, this, &manager));
   manager.device_error.connect (boost::bind (&VideoOutputCore::on_device_error, this, _1, &manager));
   manager.fullscreen_mode_changed.connect (boost::bind (&VideoOutputCore::on_fullscreen_mode_changed, this, _1, &manager));
-  manager.size_changed.connect (boost::bind (&VideoOutputCore::on_size_changed, this, _1, _2, _3, &manager));
+  manager.size_changed.connect (boost::bind (&VideoOutputCore::on_size_changed, this, _1, _2, &manager));
 }
 
 
@@ -227,11 +227,8 @@ void VideoOutputCore::on_fullscreen_mode_changed ( VideoOutputFSToggle toggle, V
   fullscreen_mode_changed (*manager, toggle);
 }
 
-void VideoOutputCore::on_size_changed (unsigned width,
-                                       unsigned height,
-                                       VideoOutputMode mode,
-                                       VideoOutputManager *manager)
+void VideoOutputCore::on_size_changed ( unsigned width, unsigned height, VideoOutputManager *manager)
 {
-  size_changed (*manager, width, height, mode);
+  size_changed (*manager, width, height);
 }
 
diff --git a/lib/engine/videooutput/videooutput-core.h b/lib/engine/videooutput/videooutput-core.h
index 231d46e..b8968da 100644
--- a/lib/engine/videooutput/videooutput-core.h
+++ b/lib/engine/videooutput/videooutput-core.h
@@ -169,7 +169,7 @@ namespace Ekiga
       boost::signal1<void, VideoOutputManager &> device_closed;
       boost::signal2<void, VideoOutputManager &, VideoOutputErrorCodes> device_error;
       boost::signal2<void, VideoOutputManager &, VideoOutputFSToggle> fullscreen_mode_changed;
-      boost::signal4<void, VideoOutputManager &, unsigned, unsigned, VideoOutputMode> size_changed;
+      boost::signal3<void, VideoOutputManager &, unsigned, unsigned> size_changed;
 
 
   private:
@@ -181,10 +181,7 @@ namespace Ekiga
                              VideoOutputManager *manager);
       void on_device_closed (VideoOutputManager *manager);
       void on_device_error (VideoOutputErrorCodes error_code, VideoOutputManager *manager);
-      void on_size_changed (unsigned width,
-                            unsigned height,
-                            VideoOutputMode mode,
-                            VideoOutputManager *manager);
+      void on_size_changed ( unsigned width, unsigned height, VideoOutputManager *manager);
       void on_fullscreen_mode_changed (VideoOutputFSToggle toggle, VideoOutputManager *manager);
 
       std::set<VideoOutputManager *> managers;
diff --git a/lib/engine/videooutput/videooutput-manager.h b/lib/engine/videooutput/videooutput-manager.h
index cf94510..c9e22b5 100644
--- a/lib/engine/videooutput/videooutput-manager.h
+++ b/lib/engine/videooutput/videooutput-manager.h
@@ -134,9 +134,8 @@ namespace Ekiga
        * or when it is being zoomed in or out.
        * @param width the new width of the widget.
        * @param height the new height of the widget.
-       * @param mode the current frame mode.
        */
-      boost::signal3<void, unsigned, unsigned, VideoOutputMode> size_changed;
+      boost::signal2<void, unsigned, unsigned> size_changed;
 
   protected:  
       virtual void get_display_info (DisplayInfo &) { };