--- qsampler/trunk/src/qsamplerOptions.cpp	2004/09/29 13:12:45	264
+++ qsampler/trunk/src/qsamplerOptions.cpp	2005/06/03 10:19:42	605
@@ -1,7 +1,7 @@
 // qsamplerOptions.cpp
 //
 /****************************************************************************
-   Copyright (C) 2003-2004, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2003-2005, 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
@@ -28,6 +28,10 @@
 
 #include "config.h"
 
+#ifdef CONFIG_LIBGIG
+#include <gig.h>
+#endif
+
 
 //-------------------------------------------------------------------------
 // qsamplerOptions - Prototype settings structure.
@@ -46,15 +50,16 @@
     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);
     iMaxVolume       = m_settings.readNumEntry("/MaxVolume", 100);
@@ -62,9 +67,11 @@
     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);
+    bInstrumentNames = m_settings.readBoolEntry("/InstrumentNames", false);
     m_settings.endGroup();
 
     // And go into view options group.
@@ -122,6 +129,7 @@
     // 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);
@@ -129,9 +137,11 @@
     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);
+    m_settings.writeEntry("/InstrumentNames", bInstrumentNames);
     m_settings.endGroup();
 
     // View options group.
@@ -251,7 +261,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;
         }