diff options
| author | Florian Jung <flo@windfisch.org> | 2011-10-08 13:47:24 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-10-08 13:47:24 +0000 |
| commit | a347445db32f51562aee5c6a786c312d1f612d2f (patch) | |
| tree | ba3dc9a6e03eec2edf2c213b7f4d7e5e49903edc /muse2/synti/fluid/fluidgui.cpp | |
| parent | 375d6a53630f364c6560eb40255a8cc4c0496b8c (diff) | |
| parent | 5367067f7a36dce8a362dcc000d41ac581bffdfe (diff) | |
merged namespace changes. HOPEFULLY the last one.
Diffstat (limited to 'muse2/synti/fluid/fluidgui.cpp')
| -rw-r--r-- | muse2/synti/fluid/fluidgui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/muse2/synti/fluid/fluidgui.cpp b/muse2/synti/fluid/fluidgui.cpp index 9c13e81f..ec1c77b7 100644 --- a/muse2/synti/fluid/fluidgui.cpp +++ b/muse2/synti/fluid/fluidgui.cpp @@ -50,7 +50,7 @@ FLUIDGui::FLUIDGui() QSocketNotifier* s = new QSocketNotifier(readFd, QSocketNotifier::Read); connect(s, SIGNAL(activated(int)), SLOT(readMessage(int))); - fdialogButton->setIcon(QIcon(*openIcon)); + fdialogButton->setIcon(QIcon(*MusEGui::openIcon)); connect(fdialogButton, SIGNAL(clicked()), SLOT(soundFontFileDialog())); connect(loadButton, SIGNAL(clicked()), SLOT(loadFont())); @@ -102,10 +102,10 @@ void FLUIDGui::soundFontFileDialog() } } -void FLUIDGui::processEvent(const MidiPlayEvent& ev) +void FLUIDGui::processEvent(const MusECore::MidiPlayEvent& ev) { // p4.0.27 - if (ev.type() == ME_SYSEX) { + if (ev.type() == MusECore::ME_SYSEX) { const unsigned char* data = ev.data(); switch (*data) { case FS_SEND_SOUNDFONT_NAME: { |