--- qsampler/trunk/src/qsamplerOptions.cpp	2005/02/20 19:13:33	395
+++ qsampler/trunk/src/qsamplerOptions.cpp	2006/12/17 22:29:29	980
@@ -1,7 +1,7 @@
 // qsamplerOptions.cpp
 //
 /****************************************************************************
-   Copyright (C) 2003-2004, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2006, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -13,20 +13,22 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 *****************************************************************************/
 
-#include "qsamplerOptions.h"
 #include "qsamplerAbout.h"
+#include "qsamplerOptions.h"
 
 #include <qcombobox.h>
 
 #include <lscp/client.h>
 
-#include "config.h"
+#ifdef CONFIG_LIBGIG
+#include <gig.h>
+#endif
 
 
 //-------------------------------------------------------------------------
@@ -57,12 +59,13 @@
     sDisplayFont     = m_settings.readEntry("/DisplayFont", QString::null);
     bDisplayEffect   = m_settings.readBoolEntry("/DisplayEffect", true);
     bAutoRefresh     = m_settings.readBoolEntry("/AutoRefresh", true);
-    iAutoRefreshTime = m_settings.readNumEntry("/AutoRefreshTime", 2000);
+    iAutoRefreshTime = m_settings.readNumEntry("/AutoRefreshTime", 1000);
     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);
     bConfirmRemove   = m_settings.readBoolEntry("/ConfirmRemove", true);
+    bKeepOnTop       = m_settings.readBoolEntry("/KeepOnTop", true);
     bStdoutCapture   = m_settings.readBoolEntry("/StdoutCapture", true);
     bCompletePath    = m_settings.readBoolEntry("/CompletePath", true);
     iMaxRecentFiles  = m_settings.readNumEntry("/MaxRecentFiles", 5);
@@ -96,6 +99,11 @@
     sEngineName    = m_settings.readEntry("/EngineName", QString::null);
     sAudioDriver   = m_settings.readEntry("/AudioDriver", QString::null);
     sMidiDriver    = m_settings.readEntry("/MidiDriver", QString::null);
+    iMidiMap       = m_settings.readNumEntry("/MidiMap", 0);
+    iMidiBank      = m_settings.readNumEntry("/MidiBank", 0);
+    iMidiProg      = m_settings.readNumEntry("/MidiProg", 0);
+    iVolume        = m_settings.readNumEntry("/Volume", 100);
+    iLoadMode      = m_settings.readNumEntry("/Loadmode", 0);
     m_settings.endGroup();
 }
 
@@ -132,6 +140,7 @@
     m_settings.writeEntry("/MessagesLimit", bMessagesLimit);
     m_settings.writeEntry("/MessagesLimitLines", iMessagesLimitLines);
     m_settings.writeEntry("/ConfirmRemove", bConfirmRemove);
+    m_settings.writeEntry("/KeepOnTop", bKeepOnTop);
     m_settings.writeEntry("/StdoutCapture", bStdoutCapture);
     m_settings.writeEntry("/CompletePath", bCompletePath);
     m_settings.writeEntry("/MaxRecentFiles", iMaxRecentFiles);
@@ -161,6 +170,11 @@
     m_settings.writeEntry("/EngineName", sEngineName);
     m_settings.writeEntry("/AudioDriver", sAudioDriver);
     m_settings.writeEntry("/MidiDriver", sMidiDriver);
+    m_settings.writeEntry("/MidiMap", iMidiMap);
+    m_settings.writeEntry("/MidiBank", iMidiBank);
+    m_settings.writeEntry("/MidiProg", iMidiProg);
+    m_settings.writeEntry("/Volume", iVolume);
+    m_settings.writeEntry("/Loadmode", iLoadMode);
     m_settings.endGroup();
 
     m_settings.endGroup();
@@ -255,7 +269,10 @@
         }
         else if (sArg == "-v" || sArg == "--version") {
             fprintf(stderr, "Qt: %s\n", qVersion());
-            fprintf(stderr, "liblscp: %s\n", ::lscp_client_version());
+#ifdef CONFIG_LIBGIG
+			fprintf(stderr, "%s: %s\n", gig::libraryName().c_str(), gig::libraryVersion().c_str());
+#endif            
+            fprintf(stderr, "%s: %s\n", ::lscp_client_package(), ::lscp_client_version());
             fprintf(stderr, "qsampler: %s\n", QSAMPLER_VERSION);
             return false;
         }