summaryrefslogtreecommitdiff
path: root/muse2/muse/driver/alsamidi.h
diff options
context:
space:
mode:
authorOrcan Ogetbil <oget.fedora@gmail.com>2011-10-07 04:23:17 +0000
committerOrcan Ogetbil <oget.fedora@gmail.com>2011-10-07 04:23:17 +0000
commit5367067f7a36dce8a362dcc000d41ac581bffdfe (patch)
tree0407ed68b4470749820b5bc6fb06d43388a83e97 /muse2/muse/driver/alsamidi.h
parentf16b2037025918e32c5fd90527f76e1102e5ecb9 (diff)
clean residual namespace work. fix python control build.
Diffstat (limited to 'muse2/muse/driver/alsamidi.h')
-rw-r--r--muse2/muse/driver/alsamidi.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/muse2/muse/driver/alsamidi.h b/muse2/muse/driver/alsamidi.h
index 832d86d7..2054a7d3 100644
--- a/muse2/muse/driver/alsamidi.h
+++ b/muse2/muse/driver/alsamidi.h
@@ -45,8 +45,8 @@ class MidiAlsaDevice : public MidiDevice {
private:
// Special for ALSA midi device: Play event list is processed in the ALSA midi sequencer thread.
// Need this FIFO, to decouple from audio thread which adds events to the list.
- MusECore::MidiFifo playEventFifo;
- MusECore::MidiFifo stuckNotesFifo;
+ MidiFifo playEventFifo;
+ MidiFifo stuckNotesFifo;
volatile bool stopPending;
volatile bool seekPending;
@@ -57,7 +57,7 @@ class MidiAlsaDevice : public MidiDevice {
virtual int selectWfd();
bool putEvent(snd_seq_event_t*);
- virtual bool putMidiEvent(const MusECore::MidiPlayEvent&);
+ virtual bool putMidiEvent(const MidiPlayEvent&);
public:
MidiAlsaDevice(const snd_seq_addr_t&, const QString& name);
@@ -69,9 +69,9 @@ class MidiAlsaDevice : public MidiDevice {
virtual void writeRouting(int, Xml&) const;
virtual inline int deviceType() const { return ALSA_MIDI; }
// Schedule an event for playback. Returns false if event cannot be delivered.
- virtual bool addScheduledEvent(const MusECore::MidiPlayEvent& ev) { return !playEventFifo.put(ev); }
+ virtual bool addScheduledEvent(const MidiPlayEvent& ev) { return !playEventFifo.put(ev); }
// Add a stuck note. Returns false if event cannot be delivered.
- virtual bool addStuckNote(const MusECore::MidiPlayEvent& ev) { return !stuckNotesFifo.put(ev); }
+ virtual bool addStuckNote(const MidiPlayEvent& ev) { return !stuckNotesFifo.put(ev); }
// Play all events up to current frame.
virtual void processMidi();
virtual void handleStop();