summaryrefslogtreecommitdiff
path: root/muse2/synti/organ/organgui.cpp
diff options
context:
space:
mode:
authorOrcan Ogetbil <oget.fedora@gmail.com>2011-10-07 02:20:29 +0000
committerOrcan Ogetbil <oget.fedora@gmail.com>2011-10-07 02:20:29 +0000
commitf16b2037025918e32c5fd90527f76e1102e5ecb9 (patch)
tree0da3b7a29d13b5b826b291ccb2f2676d2e227b40 /muse2/synti/organ/organgui.cpp
parent42039e7f7f215f6008829d8c6be591c998f1228c (diff)
(hopefully) final huge namespace update.
Diffstat (limited to 'muse2/synti/organ/organgui.cpp')
-rw-r--r--muse2/synti/organ/organgui.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/muse2/synti/organ/organgui.cpp b/muse2/synti/organ/organgui.cpp
index e648a9e6..21f8e828 100644
--- a/muse2/synti/organ/organgui.cpp
+++ b/muse2/synti/organ/organgui.cpp
@@ -107,7 +107,7 @@ void OrganGui::ctrlChanged(int idx)
else if (ctrl->type == SynthGuiCtrl::SWITCH) {
val = ((QCheckBox*)(ctrl->editor))->isChecked();
}
- sendController(0, idx + CTRL_RPN14_OFFSET, val);
+ sendController(0, idx + MusECore::CTRL_RPN14_OFFSET, val);
}
//---------------------------------------------------------
@@ -185,9 +185,9 @@ void OrganGui::setParam(int param, int val)
// processEvent
//---------------------------------------------------------
-void OrganGui::processEvent(const MidiPlayEvent& ev)
+void OrganGui::processEvent(const MusECore::MidiPlayEvent& ev)
{
- if (ev.type() == ME_CONTROLLER)
+ if (ev.type() == MusECore::ME_CONTROLLER)
setParam(ev.dataA(), ev.dataB());
else
{