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

11 files changed, 57 insertions, 34 deletions

diff --git a/muse2/al/CMakeLists.txt b/muse2/al/CMakeLists.txt
index 55e729ab..12d52746 100644
--- a/muse2/al/CMakeLists.txt
+++ b/muse2/al/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
 #=============================================================================
 
 include(${PROJECT_SOURCE_DIR}/pch.txt)
diff --git a/muse2/al/al.cpp b/muse2/al/al.cpp
index 38cc301a..3d9044c7 100644
--- a/muse2/al/al.cpp
+++ b/muse2/al/al.cpp
@@ -3,10 +3,12 @@
 //  Audio Utility Library
 //  $Id: al.cpp,v 1.1.2.2 2009/12/06 01:39:33 terminator356 Exp $
 //
-//  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; 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
@@ -15,7 +17,7 @@
 //
 //  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.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //=============================================================================
 
 #include "al.h"
diff --git a/muse2/al/al.h b/muse2/al/al.h
index 6f4a07cb..71550def 100644
--- a/muse2/al/al.h
+++ b/muse2/al/al.h
@@ -3,10 +3,12 @@
 //  Audio Utility Library
 //  $Id: al.h,v 1.1.2.2 2009/12/06 01:39:33 terminator356 Exp $
 //
-//  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; 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
@@ -15,7 +17,7 @@
 //
 //  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.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //=============================================================================
 
 #ifndef __AL_H__
diff --git a/muse2/al/dsp.cpp b/muse2/al/dsp.cpp
index fa9fa18b..5c23a458 100644
--- a/muse2/al/dsp.cpp
+++ b/muse2/al/dsp.cpp
@@ -3,10 +3,12 @@
 //  Audio Utility Library
 //  $Id: dsp.cpp,v 1.1.2.1 2009/12/06 01:39:33 terminator356 Exp $
 //
-//  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; 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
@@ -15,7 +17,7 @@
 //
 //  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.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //=============================================================================
 
 #include <stdio.h>
@@ -135,7 +137,7 @@ void initDsp()
             }
       // fall through to not hardware optimized routines
 #endif
-      if(debugMsg)
+      if(MusEGlobal::debugMsg)
         printf("Muse: using unoptimized non-SSE dsp routines\n");
       dsp = new Dsp();
       }
diff --git a/muse2/al/dsp.h b/muse2/al/dsp.h
index f88a0122..a0056772 100644
--- a/muse2/al/dsp.h
+++ b/muse2/al/dsp.h
@@ -3,10 +3,12 @@
 //  Audio Utility Library
 //  $Id: dsp.h,v 1.1.2.1 2009/12/06 01:39:33 terminator356 Exp $
 //
-//  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; 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
@@ -15,7 +17,7 @@
 //
 //  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.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //=============================================================================
 
 #ifndef __DSP_H__
diff --git a/muse2/al/dspSSE.cpp b/muse2/al/dspSSE.cpp
index a345e308..996fa5eb 100644
--- a/muse2/al/dspSSE.cpp
+++ b/muse2/al/dspSSE.cpp
@@ -9,7 +9,9 @@
 //    	Original author Sampo Savolainen
 //
 //  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; 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
@@ -18,7 +20,7 @@
 //
 //  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.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //======================================================================
 
 #; void x86_sse_mix_buffers_with_gain (float *dst, float *src, long nframes, float gain);
diff --git a/muse2/al/dspXMM.cpp b/muse2/al/dspXMM.cpp
index 99893c3f..b6e071d4 100644
--- a/muse2/al/dspXMM.cpp
+++ b/muse2/al/dspXMM.cpp
@@ -9,7 +9,9 @@
 //    	Original author Sampo Savolainen
 //
 //  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; 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
@@ -18,7 +20,7 @@
 //
 //  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.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //======================================================================
 
 
diff --git a/muse2/al/sig.cpp b/muse2/al/sig.cpp
index 293a5b3e..8521fb5b 100644
--- a/muse2/al/sig.cpp
+++ b/muse2/al/sig.cpp
@@ -3,10 +3,12 @@
 //  Audio Utility Library
 //  $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; 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
@@ -15,7 +17,7 @@
 //
 //  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.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //=============================================================================
 
 
@@ -260,7 +262,7 @@ int SigList::ticks_beat(int n) const
       {
       
       ///int m = AL::division;
-      int m = config.division;
+      int m = MusEConfig::config.division;
       
       switch (n) {
             case  1:  m <<= 2; break;           // 1536
diff --git a/muse2/al/sig.h b/muse2/al/sig.h
index 618cd53c..f5010822 100644
--- a/muse2/al/sig.h
+++ b/muse2/al/sig.h
@@ -3,10 +3,12 @@
 //  Audio Utility Library
 //  $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; 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
@@ -15,7 +17,7 @@
 //
 //  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.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //=============================================================================
 
 #ifndef __SIG_H__
diff --git a/muse2/al/xml.cpp b/muse2/al/xml.cpp
index 96489307..ac8cb4c4 100644
--- a/muse2/al/xml.cpp
+++ b/muse2/al/xml.cpp
@@ -3,10 +3,12 @@
 //  Audio Utility Library
 //  $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; 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
@@ -15,7 +17,7 @@
 //
 //  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.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //=============================================================================
 
 #include "xml.h"
diff --git a/muse2/al/xml.h b/muse2/al/xml.h
index a72c1ac5..98d55cbb 100644
--- a/muse2/al/xml.h
+++ b/muse2/al/xml.h
@@ -3,10 +3,12 @@
 //  Audio Utility Library
 //  $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; 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
@@ -15,7 +17,7 @@
 //
 //  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.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //=============================================================================
 
 #ifndef __XML_H__