summaryrefslogtreecommitdiff
path: root/muse2/al/dsp.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-09-10 17:06:00 +0000
committerFlorian Jung <flo@windfisch.org>2011-09-10 17:06:00 +0000
commit24f84a489364741eb3fc126a3f83d91a86b65e27 (patch)
tree63a4e20aaf4a2ebd2462c91b574eddceeac31170 /muse2/al/dsp.cpp
parent38c5cccc7273247353264bb7dc97f42296d8e259 (diff)
parent2120ea4f083228dde0d7307203391a4ec8f57e2d (diff)
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
Diffstat (limited to 'muse2/al/dsp.cpp')
-rw-r--r--muse2/al/dsp.cpp10
1 files changed, 6 insertions, 4 deletions
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();
}