moved "gen" one dir level up

4 files changed, 12 insertions, 8 deletions

diff --git a/muse/gen b/gen
index d702ac0f..6097c160 100755
--- a/muse/gen
+++ b/gen
@@ -11,18 +11,17 @@ if test ! -d build;
       mkdir build
       echo "+entering build directory"
       cd build
+
+      # HACK:
+      cp ../muse/all.h .
+
       echo "+calling cmake"
-      cmake ..
+      cmake ../muse
    else
       echo "+entering build directory"
       cd build
    fi
 
 echo "+start top level make..."
-
-#
-# HACK:
-cp ../all.h .
-
 make
 
diff --git a/muse/muse/audiotrack.cpp b/muse/muse/audiotrack.cpp
index fdeffafc..0d99a746 100644
--- a/muse/muse/audiotrack.cpp
+++ b/muse/muse/audiotrack.cpp
@@ -375,6 +375,10 @@ void AudioTrack::record()
 
 void AudioTrack::setChannels(int n)
       {
+      if (n > MAX_CHANNELS) {
+            fprintf(stderr, "too many channels!\n");
+            abort();
+            }
       Track::setChannels(n);
       if (_efxPipe)
             _efxPipe->setChannels(n);
diff --git a/muse/muse/wavetrack.cpp b/muse/muse/wavetrack.cpp
index b7a688d3..c3dce3f3 100644
--- a/muse/muse/wavetrack.cpp
+++ b/muse/muse/wavetrack.cpp
@@ -42,7 +42,7 @@ WaveTrack::WaveTrack()
       //
       // allocate prefetch buffer
       //
-      float* p = new float[FIFO_BUFFER * segmentSize * MAX_CHANNELS];
+      float* p   = new float[FIFO_BUFFER * segmentSize * MAX_CHANNELS];
       float** pp = new float*[FIFO_BUFFER * MAX_CHANNELS];
 
       for (int i = 0; i < FIFO_BUFFER; ++i) {
@@ -381,6 +381,7 @@ void WaveTrack::process()
 
 void WaveTrack::clone(WaveTrack* t)
       {
+printf("cline WaveTrack\n");
       QString name;
       for (int i = 1; ; ++i) {
             name.sprintf("%s-%d", t->name().toLatin1().data(), i);
diff --git a/muse/muse/widgets/CMakeLists.txt b/muse/muse/widgets/CMakeLists.txt
index c7854cc8..5bdaacdf 100644
--- a/muse/muse/widgets/CMakeLists.txt
+++ b/muse/muse/widgets/CMakeLists.txt
@@ -57,7 +57,7 @@ QT4_WRAP_UI (widget_ui_headers
 #      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/midisync.ui
 #      )
 
-ADD_FILE_DEPENDENCIES(moc_midisync.cxx ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h)
+# ADD_FILE_DEPENDENCIES(moc_midisync.cxx ${CMAKE_CURRENT_BINARY_DIR}/ui_midisync.h)
 
 add_library ( widgets STATIC 
       ${widget_ui_headers}