--- qsampler/trunk/src/qsamplerOptions.cpp	2004/06/04 18:34:58	106
+++ qsampler/trunk/src/qsamplerOptions.cpp	2005/02/20 19:13:33	395
@@ -24,7 +24,7 @@
 
 #include <qcombobox.h>
 
-#include "lscp/client.h"
+#include <lscp/client.h>
 
 #include "config.h"
 
@@ -46,17 +46,19 @@
     m_settings.beginGroup("/Server");
     sServerHost    = m_settings.readEntry("/ServerHost", "localhost");
     iServerPort    = m_settings.readNumEntry("/ServerPort", 8888);
-    iServerTimeout = m_settings.readNumEntry("/ServerTimeout", 500);
+    iServerTimeout = m_settings.readNumEntry("/ServerTimeout", 1000);
     bServerStart   = m_settings.readBoolEntry("/ServerStart", true);
     sServerCmdLine = m_settings.readEntry("/ServerCmdLine", "linuxsampler");
-    iStartDelay    = m_settings.readNumEntry("/StartDelay", 2);
+    iStartDelay    = m_settings.readNumEntry("/StartDelay", 3);
     m_settings.endGroup();
 
     // Load display options...
     m_settings.beginGroup("/Display");
     sDisplayFont     = m_settings.readEntry("/DisplayFont", QString::null);
+    bDisplayEffect   = m_settings.readBoolEntry("/DisplayEffect", true);
     bAutoRefresh     = m_settings.readBoolEntry("/AutoRefresh", true);
-    iAutoRefreshTime = m_settings.readNumEntry("/AutoRefreshTime", 1000);
+    iAutoRefreshTime = m_settings.readNumEntry("/AutoRefreshTime", 2000);
+    iMaxVolume       = m_settings.readNumEntry("/MaxVolume", 100);
     sMessagesFont    = m_settings.readEntry("/MessagesFont", QString::null);
     bMessagesLimit   = m_settings.readBoolEntry("/MessagesLimit", true);
     iMessagesLimitLines = m_settings.readNumEntry("/MessagesLimitLines", 1000);
@@ -64,6 +66,7 @@
     bStdoutCapture   = m_settings.readBoolEntry("/StdoutCapture", true);
     bCompletePath    = m_settings.readBoolEntry("/CompletePath", true);
     iMaxRecentFiles  = m_settings.readNumEntry("/MaxRecentFiles", 5);
+    bInstrumentNames = m_settings.readBoolEntry("/InstrumentNames", false);
     m_settings.endGroup();
 
     // And go into view options group.
@@ -90,6 +93,9 @@
     m_settings.beginGroup("/Default");
     sSessionDir    = m_settings.readEntry("/SessionDir", QString::null);
     sInstrumentDir = m_settings.readEntry("/InstrumentDir", QString::null);
+    sEngineName    = m_settings.readEntry("/EngineName", QString::null);
+    sAudioDriver   = m_settings.readEntry("/AudioDriver", QString::null);
+    sMidiDriver    = m_settings.readEntry("/MidiDriver", QString::null);
     m_settings.endGroup();
 }
 
@@ -118,8 +124,10 @@
     // Save display options.
     m_settings.beginGroup("/Display");
     m_settings.writeEntry("/DisplayFont", sDisplayFont);
+    m_settings.writeEntry("/DisplayEffect", bDisplayEffect);
     m_settings.writeEntry("/AutoRefresh", bAutoRefresh);
     m_settings.writeEntry("/AutoRefreshTime", iAutoRefreshTime);
+    m_settings.writeEntry("/MaxVolume", iMaxVolume);
     m_settings.writeEntry("/MessagesFont", sMessagesFont);
     m_settings.writeEntry("/MessagesLimit", bMessagesLimit);
     m_settings.writeEntry("/MessagesLimitLines", iMessagesLimitLines);
@@ -127,6 +135,7 @@
     m_settings.writeEntry("/StdoutCapture", bStdoutCapture);
     m_settings.writeEntry("/CompletePath", bCompletePath);
     m_settings.writeEntry("/MaxRecentFiles", iMaxRecentFiles);
+    m_settings.writeEntry("/InstrumentNames", bInstrumentNames);
     m_settings.endGroup();
 
     // View options group.
@@ -149,6 +158,9 @@
     m_settings.beginGroup("/Default");
     m_settings.writeEntry("/SessionDir", sSessionDir);
     m_settings.writeEntry("/InstrumentDir", sInstrumentDir);
+    m_settings.writeEntry("/EngineName", sEngineName);
+    m_settings.writeEntry("/AudioDriver", sAudioDriver);
+    m_settings.writeEntry("/MidiDriver", sMidiDriver);
     m_settings.endGroup();
 
     m_settings.endGroup();