From 5e9c7c569718d06931a502e0b30401f4680e35f5 Mon Sep 17 00:00:00 2001
From: jmarshallnz <jcmarsha@gmail.com>
Date: Mon, 31 Mar 2014 17:59:02 +1300
Subject: Merge pull request #4463 from jmarshallnz/osx_vsync_always

[osx] vsync should default to always
---
 system/settings/freebsd.xml  | 10 +++++++++-
 system/settings/linux.xml    |  5 +++++
 system/settings/rbp.xml      |  5 -----
 system/settings/settings.xml |  5 ++++-
 system/settings/win32.xml    |  5 -----
 5 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'system')

diff --git a/system/settings/freebsd.xml b/system/settings/freebsd.xml
index ccc0c81a0d..3e5915e917 100644
--- a/system/settings/freebsd.xml
+++ b/system/settings/freebsd.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings>
-
+  <section id="system">
+    <category id="videoscreen">
+      <group id="3">
+        <setting id="videoscreen.vsync">
+          <default>3</default> <!-- VSYNC_DRIVER -->
+        </setting>
+      </group>
+    </category>
+  </section>
 </settings>
diff --git a/system/settings/linux.xml b/system/settings/linux.xml
index a6b8d44378..14104a0f5b 100644
--- a/system/settings/linux.xml
+++ b/system/settings/linux.xml
@@ -7,6 +7,11 @@
           <visible>false</visible>
         </setting>
       </group>
+      <group id="3">
+        <setting id="videoscreen.vsync">
+          <default>3</default> <!-- VSYNC_DRIVER -->
+        </setting>
+      </group>
     </category>
     <category id="input">
       <group id="2">
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
index 6f5889f5c2..2b7d0a636b 100644
--- a/system/settings/rbp.xml
+++ b/system/settings/rbp.xml
@@ -48,11 +48,6 @@
           <control type="edit" format="integer" />
         </setting>
       </group>
-      <group id="3">
-        <setting id="videoscreen.vsync">
-          <default>2</default> <!-- VSYNC_ALWAYS -->
-        </setting>
-      </group>
     </category>
     <category id="audiooutput">
       <group id="1">
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 042c09ec33..42ddb22d70 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -2326,10 +2326,13 @@
       <group id="3">
         <setting id="videoscreen.vsync" type="integer" label="13105" help="36356">
           <level>2</level>
-          <default>3</default> <!-- VSYNC_DRIVER -->
+          <default>2</default> <!-- VSYNC_ALWAYS -->
           <constraints>
             <options>verticalsyncs</options>
           </constraints>
+          <updates>
+            <update type="change" />
+          </updates>
           <control type="spinner" format="string" />
         </setting>
         <setting id="videoscreen.guicalibration" type="action" label="214" help="36357">
diff --git a/system/settings/win32.xml b/system/settings/win32.xml
index 987f974ec6..5895062f26 100644
--- a/system/settings/win32.xml
+++ b/system/settings/win32.xml
@@ -38,11 +38,6 @@
           <requirement negated="true">HAS_GL</requirement>
         </setting>
       </group>
-      <group id="3">
-        <setting id="videoscreen.vsync">
-          <default>2</default> <!-- VSYNC_ALWAYS -->
-        </setting>
-      </group>
     </category>
     <category id="audiooutput" label="772" help="36360">
       <group id="1">
-- 
cgit v1.2.3