[ekiga] Revert "videooutput: add another instance of DisplayInfo"

[Eugen Dedu <ededu src gnome org>]

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

    Revert "videooutput: add another instance of DisplayInfo"
    
    This reverts commit b9cc53b4ea0f794a281773e8020d937c9907be0a.

 .../videooutput-manager-common.h                   |   18 +++---------------
 lib/engine/videooutput/videooutput-core.cpp        |   11 -----------
 lib/engine/videooutput/videooutput-core.h          |    1 -
 lib/engine/videooutput/videooutput-manager.h       |    4 +---
 4 files changed, 4 insertions(+), 30 deletions(-)
---
diff --git a/lib/engine/components/common-videooutput/videooutput-manager-common.h b/lib/engine/components/common-videooutput/videooutput-manager-common.h
index c752b5f..7daaa29 100644
--- a/lib/engine/components/common-videooutput/videooutput-manager-common.h
+++ b/lib/engine/components/common-videooutput/videooutput-manager-common.h
@@ -117,17 +117,12 @@
                                   unsigned type,
                                   int devices_nbr);
 
-    virtual void set_display_info (const Ekiga::DisplayInfo & _display_info) {
+    virtual void set_display_info (const Ekiga::DisplayInfo & _display_info)
+    {
       PWaitAndSignal m(display_info_mutex);
       display_info = _display_info;
     };
 
-    virtual void set_ext_display_info (const Ekiga::DisplayInfo & _display_info) {
-      PWaitAndSignal m(ext_display_info_mutex);
-      ext_display_info = _display_info;
-    };
-
-
   protected:
     typedef struct {
       bool local;
@@ -215,17 +210,10 @@
           PWaitAndSignal m(display_info_mutex);
           _display_info = display_info;
     }
-
-    virtual void get_ext_display_info (Ekiga::DisplayInfo & _display_info) {
-          PWaitAndSignal m(ext_display_info_mutex);
-          _display_info = ext_display_info;
-    }
-
+  
     /* This variable has to be protected by display_info_mutex */
     Ekiga::DisplayInfo display_info;
-    Ekiga::DisplayInfo ext_display_info;
     PMutex display_info_mutex; /* To protect the DisplayInfo object */
-    PMutex ext_display_info_mutex; /* To protect the 2nd DisplayInfo object */
 
     PBYTEArray lframeStore;
     PBYTEArray rframeStore;
diff --git a/lib/engine/videooutput/videooutput-core.cpp b/lib/engine/videooutput/videooutput-core.cpp
index a784d4c..2fb2faf 100644
--- a/lib/engine/videooutput/videooutput-core.cpp
+++ b/lib/engine/videooutput/videooutput-core.cpp
@@ -201,17 +201,6 @@ void VideoOutputCore::set_display_info (const DisplayInfo & _display_info)
   }
 }
 
-void VideoOutputCore::set_ext_display_info (const DisplayInfo & _display_info)
-{
-  PWaitAndSignal m(core_mutex);
-
-  for (std::set<VideoOutputManager *>::iterator iter = managers.begin ();
-       iter != managers.end ();
-       iter++) {
-    (*iter)->set_ext_display_info (_display_info);
-  }
-}
-
 
 void VideoOutputCore::on_device_opened (VideoOutputAccel videooutput_accel,
                                         VideoOutputMode mode,
diff --git a/lib/engine/videooutput/videooutput-core.h b/lib/engine/videooutput/videooutput-core.h
index 2ff261d..231d46e 100644
--- a/lib/engine/videooutput/videooutput-core.h
+++ b/lib/engine/videooutput/videooutput-core.h
@@ -148,7 +148,6 @@ namespace Ekiga
                            int devices_nbr);
 
       void set_display_info (const DisplayInfo & _display_info);
-      void set_ext_display_info (const DisplayInfo & _display_info);
 
 
       /*** Statistics ***/
diff --git a/lib/engine/videooutput/videooutput-manager.h b/lib/engine/videooutput/videooutput-manager.h
index 5d819ac..cf94510 100644
--- a/lib/engine/videooutput/videooutput-manager.h
+++ b/lib/engine/videooutput/videooutput-manager.h
@@ -96,7 +96,6 @@ namespace Ekiga
                                    int devices_nbr) = 0;
 
       virtual void set_display_info (const DisplayInfo &) { };
-      virtual void set_ext_display_info (const DisplayInfo &) { };
 
 
       /*** API to act on VideoOutputDevice events ***/
@@ -139,9 +138,8 @@ namespace Ekiga
        */
       boost::signal3<void, unsigned, unsigned, VideoOutputMode> size_changed;
 
-  protected:
+  protected:  
       virtual void get_display_info (DisplayInfo &) { };
-      virtual void get_ext_display_info (DisplayInfo &) { };
     };
 
 /**