summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Schweer <ws.seh.de>2007-06-17 19:48:34 +0000
committerWerner Schweer <ws.seh.de>2007-06-17 19:48:34 +0000
commit788205306cafe1638c95a356ed5b32a5936ee140 (patch)
treeb20381f424f4a510c5eb234e742fb8a7a7ce43c2
parentf34a9d0b4d86c71a4e88b4f58947d46a7dd0afd5 (diff)
updates
-rw-r--r--muse/awl/knob.cpp2
-rw-r--r--muse/synti/libsynti/gui.cpp6
-rw-r--r--muse/synti/libsynti/mess.cpp1
-rw-r--r--muse/synti/zynaddsubfx/CMakeLists.txt6
4 files changed, 5 insertions, 10 deletions
diff --git a/muse/awl/knob.cpp b/muse/awl/knob.cpp
index dd45051a..ccc3988e 100644
--- a/muse/awl/knob.cpp
+++ b/muse/awl/knob.cpp
@@ -274,7 +274,7 @@ void Knob::paintEvent(QPaintEvent* ev)
//-----------------------------------------
if (!_text.isEmpty()) {
- p.drawText(ar, Qt::AlignBottom | Qt::AlignHCenter, _text);
+ p.drawText(rect(), Qt::AlignBottom | Qt::AlignHCenter, _text);
}
}
}
diff --git a/muse/synti/libsynti/gui.cpp b/muse/synti/libsynti/gui.cpp
index 092b094e..30fd177b 100644
--- a/muse/synti/libsynti/gui.cpp
+++ b/muse/synti/libsynti/gui.cpp
@@ -65,9 +65,6 @@ void MessGui::readMessage()
void MessGui::sendController(int ch, int idx, int val)
{
-// MidiEvent pe(0, ch, ME_CONTROLLER, idx, val);
-// sendEvent(pe);
-
sendEvent(MidiEvent(0, ch, ME_CONTROLLER, idx, val));
}
@@ -77,9 +74,6 @@ void MessGui::sendController(int ch, int idx, int val)
void MessGui::sendSysex(unsigned char* p, int n)
{
-// MidiEvent pe(0, 0, ME_SYSEX, p, n);
-// sendEvent(pe);
-
sendEvent(MidiEvent(0, ME_SYSEX, p, n));
}
diff --git a/muse/synti/libsynti/mess.cpp b/muse/synti/libsynti/mess.cpp
index 7ebcec65..9114edef 100644
--- a/muse/synti/libsynti/mess.cpp
+++ b/muse/synti/libsynti/mess.cpp
@@ -115,6 +115,7 @@ bool Mess::processEvent(const MidiEvent& ev)
case ME_SYSEX:
return sysex(ev.len(), ev.data());
case ME_CONTROLLER:
+printf("process controller %d\n", ev.dataA());
return setController(ev.channel(), ev.dataA(), ev.dataB());
}
return false;
diff --git a/muse/synti/zynaddsubfx/CMakeLists.txt b/muse/synti/zynaddsubfx/CMakeLists.txt
index ace41b7f..199dd539 100644
--- a/muse/synti/zynaddsubfx/CMakeLists.txt
+++ b/muse/synti/zynaddsubfx/CMakeLists.txt
@@ -58,7 +58,7 @@ add_library ( zynaddsubfx SHARED
DSP/FFTwrapper.C
DSP/Filter.C
DSP/FormantFilter.C
- DSP/SVFilter.C
+ DSP/SVFilter.C
Effects/Alienwah.C
Effects/Chorus.C
Effects/Distorsion.C
@@ -101,7 +101,7 @@ add_library ( zynaddsubfx SHARED
main.cpp
)
-# - tell cmake to name target zynaddsubfx.so instead of
+# - tell cmake to name target zynaddsubfx.so instead of
# libzynaddsubfx.so
#
@@ -111,7 +111,7 @@ set_target_properties ( zynaddsubfx
)
target_link_libraries( zynaddsubfx
- synti jack asound pthread fftw3 mxml
+ synti fftw3 mxml
m z fltk
)