summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse/CMakeLists.txt6
-rw-r--r--muse/ChangeLog2
-rw-r--r--muse/awl/ltest.cpp2
-rw-r--r--muse/awl/posedit.cpp3
-rw-r--r--muse/awl/sigedit.cpp3
-rw-r--r--muse/muse/synth.cpp5
6 files changed, 13 insertions, 8 deletions
diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt
index e924b465..bd5a66ea 100644
--- a/muse/CMakeLists.txt
+++ b/muse/CMakeLists.txt
@@ -21,8 +21,8 @@
project(muse)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.1)
-set(CMAKE_BUILD_TYPE Debug)
-# set(CMAKE_BUILD_TYPE Release)
+# set(CMAKE_BUILD_TYPE Debug)
+set(CMAKE_BUILD_TYPE Release)
set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
@@ -43,7 +43,7 @@ option ( ENABLE_VST "enable VST/win support" OFF)
option ( ENABLE_FLUID "enable fluidsynth softsynth plugins" ON)
# for debugging the make system uncomment next line:
-#set(CMAKE_VERBOSE_MAKEFILE ON)
+# set(CMAKE_VERBOSE_MAKEFILE ON)
set(QT_USE_QTXML TRUE)
set(QT_USE_QTDESIGNER TRUE)
diff --git a/muse/ChangeLog b/muse/ChangeLog
index 0400c853..b9c1ba5d 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,3 +1,5 @@
+28.8 (ws)
+ * fixed: playing synti from midi track
22.8 (rj)
* playing with midi plugins, one new example plugin: trigg
29.7 (ws)
diff --git a/muse/awl/ltest.cpp b/muse/awl/ltest.cpp
index 340d9a11..f5b742e4 100644
--- a/muse/awl/ltest.cpp
+++ b/muse/awl/ltest.cpp
@@ -5,7 +5,7 @@
// main
//---------------------------------------------------------
-int main(int argc, char* argv[])
+int main(int /*argc*/, char* /*argv*/[])
{
printf("Hello MusE\n");
new KnobPlugin;
diff --git a/muse/awl/posedit.cpp b/muse/awl/posedit.cpp
index 4c195452..4f8b19b2 100644
--- a/muse/awl/posedit.cpp
+++ b/muse/awl/posedit.cpp
@@ -284,7 +284,8 @@ void PosEdit::fixup(QString& input) const
QValidator::State PosEdit::validate(QString&,int&) const
{
- printf("validate\n");
+ // TODO
+// printf("validate\n");
return QValidator::Acceptable;
}
diff --git a/muse/awl/sigedit.cpp b/muse/awl/sigedit.cpp
index 8ba16b54..6493ad6c 100644
--- a/muse/awl/sigedit.cpp
+++ b/muse/awl/sigedit.cpp
@@ -147,7 +147,8 @@ void SigEdit::fixup(QString& input) const
QValidator::State SigEdit::validate(QString&,int&) const
{
- printf("validate\n");
+ // TODO
+ // printf("validate\n");
return QValidator::Acceptable;
}
diff --git a/muse/muse/synth.cpp b/muse/muse/synth.cpp
index b302e246..0c2285c6 100644
--- a/muse/muse/synth.cpp
+++ b/muse/muse/synth.cpp
@@ -503,7 +503,8 @@ iMPEvent MessSynthIF::getData(MPEventList* el, iMPEvent i, unsigned pos, int por
// printf("\t510: frame=%d endPos=%d curPos=%d pos=%d\n", frame, endPos, curPos, pos);
if (frame >= endPos)
break;
- if (frame > curPos) { // Several following notes during same segmentsize?
+ if (frame > curPos) {
+ // Several following notes during same segmentsize?
_mess->process(buffer, curPos-pos, frame - curPos);
curPos = frame; // don't process this piece again
}
@@ -544,7 +545,7 @@ void SynthI::collectInputData()
while (!_eventFifo.isEmpty())
_playEvents.add(_eventFifo.get());
iMPEvent ie = _playEvents.begin();
- unsigned pos = 0;
+ unsigned pos = audio->pos().frame();
_sif->getData(&_playEvents, ie, pos, channels(), segmentSize, buffer);
_playEvents.clear();
}