diff options
| author | Florian Jung <flo@windfisch.org> | 2011-09-10 17:06:00 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-09-10 17:06:00 +0000 |
| commit | 24f84a489364741eb3fc126a3f83d91a86b65e27 (patch) | |
| tree | 63a4e20aaf4a2ebd2462c91b574eddceeac31170 /muse2/al/sig.cpp | |
| parent | 38c5cccc7273247353264bb7dc97f42296d8e259 (diff) | |
| parent | 2120ea4f083228dde0d7307203391a4ec8f57e2d (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/sig.cpp')
| -rw-r--r-- | muse2/al/sig.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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 |