[ekiga/ds-clutter] VideoOutput: Removed useless keys and related code.

[Damien Sandras <dsandras src gnome org>]

commit 7360cd30392b5d9ab14552a5efad8e9db29d1aeb
Author: Damien Sandras <dsandras beip be>
Date:   Tue Dec 31 16:49:44 2013 +0100

    VideoOutput: Removed useless keys and related code.

 lib/engine/videooutput/videooutput-core.cpp |    6 +-----
 org.gnome.ekiga.gschema.xml.in.in           |   15 ---------------
 2 files changed, 1 insertions(+), 20 deletions(-)
---
diff --git a/lib/engine/videooutput/videooutput-core.cpp b/lib/engine/videooutput/videooutput-core.cpp
index a379ab9..5f215b3 100644
--- a/lib/engine/videooutput/videooutput-core.cpp
+++ b/lib/engine/videooutput/videooutput-core.cpp
@@ -84,17 +84,13 @@ void VideoOutputCore::setup (std::string setting)
     //set_ext_display_info(display_info);
   }
 
-  if (setting.empty () || setting == "stay-on-top" || setting == "disable-hw-accel"
-      || setting == "allow-pip-sw-scaling" || setting == "sw-scaling-algorithm") {
+  if (setting.empty () || setting == "stay-on-top")
 
     PTRACE(4, "VideoOutputCore\tUpdating Video Settings");
     /*
     DisplayInfo display_info;
 
     display_info.on_top = g_settings_get_boolean (s, "stay-on-top");
-    display_info.disable_hw_accel = g_settings_get_boolean (s, "disable-hw-accel");
-    display_info.allow_pip_sw_scaling = g_settings_get_boolean (s,"allow-pip-sw-scaling");
-    display_info.sw_scaling_algorithm = g_settings_get_int (s, "sw-scaling-algorithm");
     if (display_info.sw_scaling_algorithm > 3) {
       display_info.sw_scaling_algorithm = 0;
       g_settings_set_int (s, "sw-scaling-algorithm", 0);
diff --git a/org.gnome.ekiga.gschema.xml.in.in b/org.gnome.ekiga.gschema.xml.in.in
index 3b4546d..13e569d 100644
--- a/org.gnome.ekiga.gschema.xml.in.in
+++ b/org.gnome.ekiga.gschema.xml.in.in
@@ -289,21 +289,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org gnome  
PACKAGE_NAME@.general.user-interface.video-display" 
path="/org/gnome/@PACKAGE_NAME@/general/user-interface/video-display/">
-    <key name="disable-hw-accel" type="b">
-      <default>false</default>
-      <_summary>Disable video hardware acceleration</_summary>
-      <_description>This key disables DirectX (on win32) and XVideo (on Linux) video hardware 
acceleration</_description>
-    </key>
-    <key name="allow-pip-sw-scaling" type="b">
-      <default>true</default>
-      <_summary>Allow picture-in-picture software scaling</_summary>
-      <_description>Allow Ekiga to fall back to software scaling the picture-in-picture if hardware support 
is not available. If this is set to false, Ekiga will not try to open the PIP if hardware support is not 
available.</_description>
-    </key>
-    <key name="sw-scaling-algorithm" type="i">
-      <default>0</default>
-      <_summary>Specify the software scaling algorithm</_summary>
-      <_description>Specify the software scaling algorithm: 0: nearest neighbor, 1: nearest neighbor with 
box filter, 2: bilinear filtering, 3: hyperbolic filtering. Does not apply on windows systems.</_description>
-    </key>
     <key name="stay-on-top" type="b">
       <default>true</default>
       <_summary>Place windows displaying video above other windows during calls</_summary>