[ekiga/ds-clutter] VideoOutput: Dropped now useless setup method and GSettings code.



commit 9aa7eb0d0b34a2f6645469abcb0ed03aa21ef1fd
Author: Damien Sandras <dsandras beip be>
Date:   Wed Jan 8 22:00:51 2014 +0100

    VideoOutput: Dropped now useless setup method and GSettings code.
    
    This is now useless as everything is automatic for the user.

 lib/engine/engine.cpp                       |    1 -
 lib/engine/videooutput/videooutput-core.cpp |   24 ------------------------
 lib/engine/videooutput/videooutput-core.h   |    8 --------
 3 files changed, 0 insertions(+), 33 deletions(-)
---
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index 43487e4..4a03e70 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -180,7 +180,6 @@ engine_init (Ekiga::ServiceCorePtr service_core,
      code in question to do it itself
    */
 
-  videooutput_core->setup ();
   videoinput_core->setup ("any");
   audioinput_core->setup ();
   audiooutput_core->setup ();
diff --git a/lib/engine/videooutput/videooutput-core.cpp b/lib/engine/videooutput/videooutput-core.cpp
index a5d4da3..4772578 100644
--- a/lib/engine/videooutput/videooutput-core.cpp
+++ b/lib/engine/videooutput/videooutput-core.cpp
@@ -46,9 +46,6 @@ VideoOutputCore::VideoOutputCore ()
   PWaitAndSignal m(core_mutex);
 
   number_times_started = 0;
-
-  settings = new Settings (VIDEO_DISPLAY_SCHEMA);
-  settings->changed.connect (boost::bind (&VideoOutputCore::setup, this, _1));
 }
 
 VideoOutputCore::~VideoOutputCore ()
@@ -63,27 +60,6 @@ VideoOutputCore::~VideoOutputCore ()
   managers.clear();
 }
 
-void VideoOutputCore::setup (std::string setting)
-{
-  GSettings *s = settings->get_g_settings ();
-
-  if (setting.empty () || setting == "ext-zoom") {
-
-    /*
-    DisplayInfo display_info;
-
-    display_info.zoom = g_settings_get_int (s, "ext-zoom");
-    if ((display_info.zoom != 100) &&
-       (display_info.zoom != 50) &&
-       (display_info.zoom != 200)) {
-      display_info.zoom = 100;
-      g_settings_set_int (s, "ext-zoom", 100);
-    }
-*/
-    // FIXME
-    //set_ext_display_info(display_info);
-  }
-}
 
 void VideoOutputCore::add_manager (VideoOutputManager &manager)
 {
diff --git a/lib/engine/videooutput/videooutput-core.h b/lib/engine/videooutput/videooutput-core.h
index a0fdbb9..a4527b1 100644
--- a/lib/engine/videooutput/videooutput-core.h
+++ b/lib/engine/videooutput/videooutput-core.h
@@ -46,8 +46,6 @@
 #include <glib.h>
 #include <ptlib.h>
 
-#include "ekiga-settings.h"
-
 #include "videooutput-manager.h"
 
 namespace Ekiga
@@ -80,10 +78,6 @@ namespace Ekiga
       */
       ~VideoOutputCore ();
 
-      /** Set up core
-       */
-      void setup (std::string setting = "");
-
 
       /*** Service Implementation ***/
 
@@ -178,8 +172,6 @@ namespace Ekiga
       int number_times_started;
 
       PMutex core_mutex;
-
-      Settings* settings;
     };
 /**
  * @}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]