summaryrefslogtreecommitdiffstats
path: root/src/libs/engine
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-01-23 23:56:35 +0000
committerDavid Robillard <d@drobilla.net>2007-01-23 23:56:35 +0000
commit5ad91e71d8e4ac5cce567009eb17e98750c289f1 (patch)
treeca36d60b3cb2f14558959b73bba3839f54128e54 /src/libs/engine
parent86637e192ca87a2c0562122b371dacdfc0572c70 (diff)
downloadingen-5ad91e71d8e4ac5cce567009eb17e98750c289f1.tar.gz
ingen-5ad91e71d8e4ac5cce567009eb17e98750c289f1.tar.bz2
ingen-5ad91e71d8e4ac5cce567009eb17e98750c289f1.zip
Alsa MIDI compilation fixes.
git-svn-id: http://svn.drobilla.net/lad/ingen@270 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/engine')
-rw-r--r--src/libs/engine/AlsaMidiDriver.cpp2
-rw-r--r--src/libs/engine/AlsaMidiDriver.h12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/engine/AlsaMidiDriver.cpp b/src/libs/engine/AlsaMidiDriver.cpp
index 3d1ebbd2..1c2401ed 100644
--- a/src/libs/engine/AlsaMidiDriver.cpp
+++ b/src/libs/engine/AlsaMidiDriver.cpp
@@ -130,7 +130,7 @@ AlsaMidiPort::prepare_block(const SampleCount block_start, const SampleCount blo
size_t event_size = 0; // decoded length of Alsa event in bytes
int timestamp = 0;
- while (!_events.is_empty() && _events.front().time.tick < block_end) {
+ while (!_events.empty() && _events.front().time.tick < block_end) {
assert(nu_events < _patch_port->buffer_size());
ev = &_events.front();
message = &_patch_port->buffer(0)->data()[nu_events];
diff --git a/src/libs/engine/AlsaMidiDriver.h b/src/libs/engine/AlsaMidiDriver.h
index 414b524f..ce0df093 100644
--- a/src/libs/engine/AlsaMidiDriver.h
+++ b/src/libs/engine/AlsaMidiDriver.h
@@ -55,11 +55,11 @@ public:
DuplexPort<MidiMessage>* patch_port() const { return _patch_port; }
private:
- AlsaMidiDriver* _driver;
- DuplexPort<MidiMessage>* _patch_port;
- int _port_id;
- unsigned char** _midi_pool; ///< Pool of raw MIDI events for MidiMessage::buffer
- SRSWQueue<snd_seq_event_t> _events;
+ AlsaMidiDriver* _driver;
+ DuplexPort<MidiMessage>* _patch_port;
+ int _port_id;
+ unsigned char** _midi_pool; ///< Pool of raw MIDI events for MidiMessage::buffer
+ Raul::SRSWQueue<snd_seq_event_t> _events;
};
@@ -89,7 +89,7 @@ public:
{ return new AlsaMidiPort(this, patch_port); }
void add_port(DriverPort* port);
- DriverPort* remove_port(const Path& path);
+ DriverPort* remove_port(const Raul::Path& path);
snd_seq_t* seq_handle() const { return _seq_handle; }
snd_midi_event_t* event_coder() const { return _event_coder; }