From 4c5bb66bd7e6f68b3d92729f17ea981d2435e2aa Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 2 Jan 2015 16:01:04 -0800
Subject: [PATCH] Add audio output buffer size to preferences

---
 interface/src/ui/PreferencesDialog.cpp |   7 +
 interface/ui/preferencesDialog.ui      | 281 ++++++++++++++++++-------
 2 files changed, 211 insertions(+), 77 deletions(-)

diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index 7baacd3d5a..947f6dea70 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -135,6 +135,8 @@ void PreferencesDialog::loadPreferences() {
     ui.windowSecondsForDesiredReductionSpin->setValue(streamSettings._windowSecondsForDesiredReduction);
     ui.repetitionWithFadeCheckBox->setChecked(streamSettings._repetitionWithFade);
 
+    ui.outputBufferSizeSpinner->setValue(Application::getInstance()->getAudio()->getOutputBufferSize());
+
     ui.realWorldFieldOfViewSpin->setValue(menuInstance->getRealWorldFieldOfView());
 
     ui.fieldOfViewSpin->setValue(menuInstance->getFieldOfView());
@@ -245,9 +247,14 @@ void PreferencesDialog::savePreferences() {
     streamSettings._windowSecondsForDesiredReduction = ui.windowSecondsForDesiredReductionSpin->value();
     streamSettings._repetitionWithFade = ui.repetitionWithFadeCheckBox->isChecked();
 
+    Audio* audio = Application::getInstance()->getAudio();
+
     Menu::getInstance()->setReceivedAudioStreamSettings(streamSettings);
+    audio->setReceivedAudioStreamSettings(streamSettings);
     Application::getInstance()->getAudio()->setReceivedAudioStreamSettings(streamSettings);
 
+    QMetaObject::invokeMethod(audio, "setOutputBufferSize", Q_ARG(int, ui.outputBufferSizeSpinner->value()));
+
     Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());
 
     Application::getInstance()->bumpSettings();
diff --git a/interface/ui/preferencesDialog.ui b/interface/ui/preferencesDialog.ui
index 0108437c1f..864f8aa282 100644
--- a/interface/ui/preferencesDialog.ui
+++ b/interface/ui/preferencesDialog.ui
@@ -59,9 +59,9 @@
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>0</y>
-      <width>500</width>
-      <height>1386</height>
+      <y>-690</y>
+      <width>485</width>
+      <height>1499</height>
      </rect>
     </property>
     <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -1126,6 +1126,185 @@
        </item>
       </layout>
      </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_6">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>7</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>7</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_5">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="text">
+          <string>Faceshift eye detection</string>
+         </property>
+         <property name="indent">
+          <number>0</number>
+         </property>
+         <property name="buddy">
+          <cstring>faceshiftEyeDeflectionSider</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_6">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QSlider" name="faceshiftEyeDeflectionSider">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>130</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_999">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>7</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>7</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_999">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="text">
+          <string>Faceshift hostname</string>
+         </property>
+         <property name="indent">
+          <number>0</number>
+         </property>
+         <property name="buddy">
+          <cstring>faceshiftHostnameEdit</cstring>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_999">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="faceshiftHostnameEdit">
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
+         <property name="placeholderText">
+          <string>localhost</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QLabel" name="voxelsTitleLabel_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>18</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color:#29967e</string>
+       </property>
+       <property name="text">
+        <string>Audio</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QCheckBox" name="dynamicJitterBuffersCheckBox">
        <property name="sizePolicy">
@@ -1651,7 +1830,7 @@
       </widget>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_6">
+      <layout class="QHBoxLayout" name="horizontalLayout_23">
        <property name="spacing">
         <number>0</number>
        </property>
@@ -1664,26 +1843,26 @@
        <property name="bottomMargin">
         <number>7</number>
        </property>
-       <item>
-        <widget class="QLabel" name="label_5">
+       <item alignment="Qt::AlignLeft">
+        <widget class="QLabel" name="label_20">
          <property name="font">
           <font>
            <family>Arial</family>
           </font>
          </property>
          <property name="text">
-          <string>Faceshift eye detection</string>
+          <string>Output Buffer Size (Frames)</string>
          </property>
          <property name="indent">
           <number>0</number>
          </property>
          <property name="buddy">
-          <cstring>faceshiftEyeDeflectionSider</cstring>
+          <cstring>windowSecondsForDesiredReductionSpin</cstring>
          </property>
         </widget>
        </item>
        <item>
-        <spacer name="horizontalSpacer_6">
+        <spacer name="horizontalSpacer_25">
          <property name="font">
           <font>
            <family>Arial</family>
@@ -1701,7 +1880,7 @@
         </spacer>
        </item>
        <item>
-        <widget class="QSlider" name="faceshiftEyeDeflectionSider">
+        <widget class="QSpinBox" name="outputBufferSizeSpinner">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
@@ -1710,86 +1889,34 @@
          </property>
          <property name="minimumSize">
           <size>
-           <width>130</width>
+           <width>100</width>
            <height>0</height>
           </size>
          </property>
+         <property name="maximumSize">
+          <size>
+           <width>70</width>
+           <height>16777215</height>
+          </size>
+         </property>
          <property name="font">
           <font>
            <family>Arial</family>
           </font>
          </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>20</number>
+         </property>
+         <property name="value">
+          <number>1</number>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_999">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>7</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>7</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="label_999">
-         <property name="font">
-          <font>
-           <family>Arial</family>
-          </font>
-         </property>
-         <property name="text">
-          <string>Faceshift hostname</string>
-         </property>
-         <property name="indent">
-          <number>0</number>
-         </property>
-         <property name="buddy">
-          <cstring>faceshiftHostnameEdit</cstring>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_999">
-         <property name="font">
-          <font>
-           <family>Arial</family>
-          </font>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="faceshiftHostnameEdit">
-           <property name="font">
-            <font>
-             <family>Arial</family>
-            </font>
-           </property>
-           <property name="layoutDirection">
-            <enum>Qt::LeftToRight</enum>
-           </property>
-           <property name="styleSheet">
-            <string notr="true"/>
-           </property>
-           <property name="placeholderText">
-            <string>localhost</string>
-           </property>
-          </widget>
-       </item>
-      </layout>
-     </item>   
      <item>
       <widget class="QLabel" name="voxelsTitleLabel">
        <property name="sizePolicy">