summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libs/engine/AlsaMidiDriver.cpp4
-rw-r--r--src/libs/engine/AlsaMidiDriver.h20
2 files changed, 12 insertions, 12 deletions
diff --git a/src/libs/engine/AlsaMidiDriver.cpp b/src/libs/engine/AlsaMidiDriver.cpp
index 3d592a45..1a97b823 100644
--- a/src/libs/engine/AlsaMidiDriver.cpp
+++ b/src/libs/engine/AlsaMidiDriver.cpp
@@ -25,7 +25,7 @@
#include "Maid.h"
#include "AudioDriver.h"
#include "MidiMessage.h"
-#include "TypedPort.h"
+#include "DuplexPort.h"
#ifdef HAVE_LASH
#include "LashDriver.h"
#endif
@@ -36,7 +36,7 @@ namespace Om {
//// AlsaMidiPort ////
-AlsaMidiPort::AlsaMidiPort(AlsaMidiDriver* driver, TypedPort<MidiMessage>* port)
+AlsaMidiPort::AlsaMidiPort(AlsaMidiDriver* driver, DuplexPort<MidiMessage>* port)
: DriverPort(),
ListNode<AlsaMidiPort*>(this),
m_driver(driver),
diff --git a/src/libs/engine/AlsaMidiDriver.h b/src/libs/engine/AlsaMidiDriver.h
index 504794ca..38f51df2 100644
--- a/src/libs/engine/AlsaMidiDriver.h
+++ b/src/libs/engine/AlsaMidiDriver.h
@@ -27,7 +27,7 @@ namespace Om {
class Node;
class SetPortValueEvent;
class AlsaMidiDriver;
-template <typename T> class TypedPort;
+template <typename T> class DuplexPort;
static const int MAX_MIDI_EVENT_SIZE = 3;
@@ -39,7 +39,7 @@ static const int MAX_MIDI_EVENT_SIZE = 3;
class AlsaMidiPort : public DriverPort, public ListNode<AlsaMidiPort*>
{
public:
- AlsaMidiPort(AlsaMidiDriver* driver, TypedPort<MidiMessage>* port);
+ AlsaMidiPort(AlsaMidiDriver* driver, DuplexPort<MidiMessage>* port);
virtual ~AlsaMidiPort();
void event(snd_seq_event_t* const ev);
@@ -50,19 +50,19 @@ public:
void remove_from_driver();
void set_name(const string& name);
- int port_id() const { return m_port_id; }
- TypedPort<MidiMessage>* patch_port() const { return m_patch_port; }
+ int port_id() const { return m_port_id; }
+ DuplexPort<MidiMessage>* patch_port() const { return m_patch_port; }
private:
// Prevent copies (undefined)
AlsaMidiPort(const AlsaMidiPort&);
AlsaMidiPort& operator=(const AlsaMidiPort&);
- AlsaMidiDriver* m_driver;
- TypedPort<MidiMessage>* m_patch_port;
- int m_port_id;
- unsigned char** m_midi_pool; ///< Pool of raw MIDI events for MidiMessage::buffer
- Queue<snd_seq_event_t> m_events;
+ AlsaMidiDriver* m_driver;
+ DuplexPort<MidiMessage>* m_patch_port;
+ int m_port_id;
+ unsigned char** m_midi_pool; ///< Pool of raw MIDI events for MidiMessage::buffer
+ Queue<snd_seq_event_t> m_events;
};
@@ -86,7 +86,7 @@ public:
void prepare_block(const samplecount block_start, const samplecount block_end);
- DriverPort* create_port(TypedPort<MidiMessage>* patch_port)
+ DriverPort* create_port(DuplexPort<MidiMessage>* patch_port)
{ return new AlsaMidiPort(this, patch_port); }
snd_seq_t* seq_handle() const { return m_seq_handle; }