merged the first bunch of orcans changes

STILL WAIT WITH COMMITTING NEW STUFF! i have to merge the rest as well!

this is a bit buggy (connect errors, not tested much), but doesn't
segfault immediately

6 files changed, 40 insertions, 15 deletions

diff --git a/muse2/synti/vam/CMakeLists.txt b/muse2/synti/vam/CMakeLists.txt
index 31f2a12a..1aad535a 100644
--- a/muse2/synti/vam/CMakeLists.txt
+++ b/muse2/synti/vam/CMakeLists.txt
@@ -3,10 +3,12 @@
 #  Linux Music Editor
 #  $Id:$
 #
-#  Copyright (C) 2002-2006 by Werner Schweer and others
+#  Copyright (C) 1999-2011 by Werner Schweer and others
 #
 #  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License version 2.
+#  it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
 #
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +16,9 @@
 #  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+#  along with this program; if not, write to the
+#  Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #=============================================================================
 
 ##
diff --git a/muse2/synti/vam/common_defs.h b/muse2/synti/vam/common_defs.h
index 59821a70..64c28ea8 100644
--- a/muse2/synti/vam/common_defs.h
+++ b/muse2/synti/vam/common_defs.h
@@ -1,3 +1,25 @@
+//=========================================================
+//  MusE
+//  Linux Music Editor
+//  $Id: ./synti/vam/common_defs.h $
+//
+//  Copyright (C) 1999-2011 by Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; version 2 of
+//  the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+//=========================================================
 #ifndef __VAM_UNIQUE_ID_H
 #define __VAM_UNIQUE_ID_H
 
diff --git a/muse2/synti/vam/vam.cpp b/muse2/synti/vam/vam.cpp
index 78328eb2..b473188f 100644
--- a/muse2/synti/vam/vam.cpp
+++ b/muse2/synti/vam/vam.cpp
@@ -22,8 +22,8 @@
 //
 // 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 or point your web browser to http://www.gnu.org.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+// 02111-1301, USA or point your web browser to http://www.gnu.org.
 //=========================================================
 
 #include <assert.h>
diff --git a/muse2/synti/vam/vam.h b/muse2/synti/vam/vam.h
index 72edd9f8..54f0e465 100644
--- a/muse2/synti/vam/vam.h
+++ b/muse2/synti/vam/vam.h
@@ -14,8 +14,8 @@
 //
 // 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 or point your web browser to http://www.gnu.org.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+// 02111-1301, USA or point your web browser to http://www.gnu.org.
 
 
 #ifndef __VAM_H
diff --git a/muse2/synti/vam/vamgui.cpp b/muse2/synti/vam/vamgui.cpp
index 34f8636c..0993087b 100644
--- a/muse2/synti/vam/vamgui.cpp
+++ b/muse2/synti/vam/vamgui.cpp
@@ -22,8 +22,8 @@
 //
 // 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 or point your web browser to http://www.gnu.org.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+// 02111-1301, USA or point your web browser to http://www.gnu.org.
 //=========================================================
 
 #include <unistd.h>
@@ -601,7 +601,7 @@ void VAMGui::loadPresetsPressed()
 {
 #if 1   // TODO
 	QString iname;
-	QString s(configPath);
+	QString s(MusEGlobal::configPath);
 	
 /*      QString filename = QFileDialog::getOpenFileName(lastdir, QString("*.[Ss][Ff]2"),
                                                       this,
@@ -716,7 +716,7 @@ void VAMGui::doSavePresets(const QString& fn, bool showWarning)
 void VAMGui::savePresetsPressed()
 {
 #if 1 // TODO
-	QString s(configPath);
+        QString s(MusEGlobal::configPath);
 	QString fn = QFileDialog::getSaveFileName(this, tr("MusE: Save VAM Presets"), 
                                                   s, "Presets (*.vam)");
 	if (fn.isEmpty())
@@ -734,7 +734,7 @@ void VAMGui::savePresetsToFilePressed()
 {
 	if (!presetFileName ) {
  
-      QString s(configPath);
+      QString s(MusEGlobal::configPath);
       QString fn = QFileDialog::getSaveFileName(this, tr("MusE: Save VAM Presets"), 
                                                 s, "Presets (*.vam)");
       presetFileName = new QString(fn);
diff --git a/muse2/synti/vam/vamgui.h b/muse2/synti/vam/vamgui.h
index b5906ae8..abee3c43 100644
--- a/muse2/synti/vam/vamgui.h
+++ b/muse2/synti/vam/vamgui.h
@@ -17,8 +17,8 @@
 //
 // 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 or point your web browser to http://www.gnu.org.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+// 02111-1301, USA or point your web browser to http://www.gnu.org.
 //=========================================================
 
 #ifndef __VAMGUI_H