From f8e0a9c3555c5f513c2ca3c580f54a2b96af6993 Mon Sep 17 00:00:00 2001
From: Werner Schweer <ws.seh.de>
Date: Tue, 20 Jun 2006 12:18:13 +0000
Subject: moved "gen" one dir level up

---
 gen                              | 27 +++++++++++++++++++++++++++
 muse/gen                         | 28 ----------------------------
 muse/muse/audiotrack.cpp         |  4 ++++
 muse/muse/wavetrack.cpp          |  3 ++-
 muse/muse/widgets/CMakeLists.txt |  2 +-
 5 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100755 gen
 delete mode 100755 muse/gen

diff --git a/gen b/gen
new file mode 100755
index 00000000..6097c160
--- /dev/null
+++ b/gen
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+#
+#  out of source build of MusE
+#     all generated files go into subdirectory "build"
+#
+
+if test ! -d build; 
+   then
+      echo "+creating build directory"
+      mkdir build
+      echo "+entering build directory"
+      cd build
+
+      # HACK:
+      cp ../muse/all.h .
+
+      echo "+calling cmake"
+      cmake ../muse
+   else
+      echo "+entering build directory"
+      cd build
+   fi
+
+echo "+start top level make..."
+make
+
diff --git a/muse/gen b/muse/gen
deleted file mode 100755
index d702ac0f..00000000
--- a/muse/gen
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-#
-#  out of source build of MusE
-#     all generated files go into subdirectory "build"
-#
-
-if test ! -d build; 
-   then
-      echo "+creating build directory"
-      mkdir build
-      echo "+entering build directory"
-      cd build
-      echo "+calling cmake"
-      cmake ..
-   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}
-- 
cgit v1.2.3