summaryrefslogtreecommitdiff
path: root/muse2/synti/fluidsynth/fluidsynthgui.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-10-08 13:47:24 +0000
committerFlorian Jung <flo@windfisch.org>2011-10-08 13:47:24 +0000
commita347445db32f51562aee5c6a786c312d1f612d2f (patch)
treeba3dc9a6e03eec2edf2c213b7f4d7e5e49903edc /muse2/synti/fluidsynth/fluidsynthgui.cpp
parent375d6a53630f364c6560eb40255a8cc4c0496b8c (diff)
parent5367067f7a36dce8a362dcc000d41ac581bffdfe (diff)
merged namespace changes. HOPEFULLY the last one.
Diffstat (limited to 'muse2/synti/fluidsynth/fluidsynthgui.cpp')
-rw-r--r--muse2/synti/fluidsynth/fluidsynthgui.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/muse2/synti/fluidsynth/fluidsynthgui.cpp b/muse2/synti/fluidsynth/fluidsynthgui.cpp
index 62d8e791..b6a3a4bd 100644
--- a/muse2/synti/fluidsynth/fluidsynthgui.cpp
+++ b/muse2/synti/fluidsynth/fluidsynthgui.cpp
@@ -66,8 +66,8 @@ FluidSynthGui::FluidSynthGui()
fluidLabel->setPixmap(QIcon(":/fluidsynth1.png").pixmap(124, 45));
FluidGrid->addWidget(fluidLabel, 2, 1, Qt::AlignHCenter);
- ChorusType->setItemIcon(0, QIcon(*sineIcon));
- ChorusType->setItemIcon(1, QIcon(*sawIcon));
+ ChorusType->setItemIcon(0, QIcon(*MusEGui::sineIcon));
+ ChorusType->setItemIcon(1, QIcon(*MusEGui::sawIcon));
//Connect socketnotifier to fifo
QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read);
@@ -240,10 +240,10 @@ void FluidSynthGui::sendLoadFont(QString filename)
// processEvent
//---------------------------------------------------------
-void FluidSynthGui::processEvent(const MidiPlayEvent& ev)
+void FluidSynthGui::processEvent(const MusECore::MidiPlayEvent& ev)
{
//Sysexes sent from the client
- if (ev.type() == ME_SYSEX) {
+ if (ev.type() == MusECore::ME_SYSEX) {
byte* data = ev.data();
switch (*data) {
case FS_LASTDIR_CHANGE:
@@ -308,7 +308,7 @@ void FluidSynthGui::processEvent(const MidiPlayEvent& ev)
}
//Controllers sent from the client:
else
- if(ev.type() == ME_CONTROLLER) {
+ if(ev.type() == MusECore::ME_CONTROLLER) {
int id = ev.dataA();
int val = ev.dataB();
switch (id) {
@@ -439,9 +439,9 @@ void FluidSynthGui::updateChannelListView()
QTableWidgetItem* chan_ = new QTableWidgetItem(chanstr);
channelListView->setItem(i, FS_CHANNEL_COL, chan_);
- QTableWidgetItem* sfid_ = new QTableWidgetItem(QIcon(*buttondownIcon), sfidstr);
+ QTableWidgetItem* sfid_ = new QTableWidgetItem(QIcon(*MusEGui::buttondownIcon), sfidstr);
channelListView->setItem(i, FS_SF_ID_COL, sfid_);
- QTableWidgetItem* drum_ = new QTableWidgetItem(QIcon(*buttondownIcon), drumchanstr);
+ QTableWidgetItem* drum_ = new QTableWidgetItem(QIcon(*MusEGui::buttondownIcon), drumchanstr);
channelListView->setItem(i, FS_DRUM_CHANNEL_COL, drum_);
}
channelListView->resizeColumnsToContents();