Add bbt_add that does not take Metric parameter.

[ardour.git] / libs / midi++2 / coremidi_midiport.cc

diff --git a/libs/midi++2/coremidi_midiport.cc b/libs/midi++2/coremidi_midiport.cc
index 2cd98239ece74b4edb2aae7ec5e81f6c26c93d35..e950da294909600724b9cca160f9fc44f9e47d90 100644 (file)
--- a/libs/midi++2/coremidi_midiport.cc
+++ b/libs/midi++2/coremidi_midiport.cc
@@ -21,12 +21,11 @@
 #include <fcntl.h>
 #include <cerrno>
 
-#include <midi++/coremidi_midiport.h>
-#include <midi++/types.h>
-#include <midi++/port_request.h>
+#include "midi++/coremidi_midiport.h"
+#include "midi++/types.h"
 #include <mach/mach_time.h>
 
-#include <pbd/pthread_utils.h>
+#include "pbd/pthread_utils.h"
 
 using namespace std;
 using namespace MIDI;
@@ -36,15 +35,15 @@ MIDITimeStamp CoreMidi_MidiPort::MIDIGetCurrentHostTime()
        return mach_absolute_time();
 }
 
-CoreMidi_MidiPort::CoreMidi_MidiPort (PortRequest &req) : Port (req)
+CoreMidi_MidiPort::CoreMidi_MidiPort (const XMLNode& node) : Port (node)
 {
+       Descriptor desc (node);
+
        firstrecv = true;
        int err;
-       if (0 == (err = Open(req))) {
+       if (0 == (err = Open(desc))) {
                _ok = true;
-               req.status = PortRequest::OK;
-       } else
-               req.status = PortRequest::Unknown;
+       }
 }
 
 CoreMidi_MidiPort::~CoreMidi_MidiPort () {Close();}
@@ -56,10 +55,10 @@ void CoreMidi_MidiPort::Close ()
        if (midi_client) MIDIClientDispose(midi_client);
 }
 
-int CoreMidi_MidiPort::write (byte *msg, size_t msglen, timestamp_t timestamp) 
+int CoreMidi_MidiPort::write (byte *msg, size_t msglen, timestamp_t ignored)   
 {
        OSStatus err;
-    MIDIPacketList* pktlist = (MIDIPacketList*)midi_buffer;
+       MIDIPacketList* pktlist = (MIDIPacketList*)midi_buffer;
        MIDIPacket* packet = MIDIPacketListInit(pktlist);
        packet = MIDIPacketListAdd(pktlist,sizeof(midi_buffer),packet,MIDIGetCurrentHostTime(),msglen,msg);
        
@@ -77,21 +76,21 @@ int CoreMidi_MidiPort::write (byte *msg, size_t msglen, timestamp_t timestamp)
        }
 }
 
-int CoreMidi_MidiPort::Open (PortRequest &req)
+int CoreMidi_MidiPort::Open (const Descriptor& desc)
 {
        OSStatus err;
        CFStringRef coutputStr;
        string str;
-
-       coutputStr = CFStringCreateWithCString(0, req.devname, CFStringGetSystemEncoding());
+       
+       coutputStr = CFStringCreateWithCString(0, desc.device.c_str(), CFStringGetSystemEncoding());
        err = MIDIClientCreate(coutputStr, 0, 0, &midi_client);
        CFRelease(coutputStr);
-    if (!midi_client) {
+       if (!midi_client) {
                //error << "Cannot open CoreMidi client : " << err << endmsg.
-        goto error;
-    }
+               goto error;
+       }
        
-       str = req.tagname + string("_in");
+       str = desc.tag + string("_in");
        coutputStr = CFStringCreateWithCString(0, str.c_str(), CFStringGetSystemEncoding());
        err = MIDIDestinationCreate(midi_client, coutputStr, read_proc, this, &midi_destination);
        CFRelease(coutputStr);
@@ -100,7 +99,7 @@ int CoreMidi_MidiPort::Open (PortRequest &req)
                goto error;
        }
        
-       str = req.tagname + string("_out");
+       str = desc.tag + string("_out");
        coutputStr = CFStringCreateWithCString(0, str.c_str(), CFStringGetSystemEncoding());
        err = MIDISourceCreate(midi_client, coutputStr, &midi_source);
        CFRelease(coutputStr);
@@ -123,7 +122,7 @@ void CoreMidi_MidiPort::read_proc (const MIDIPacketList *pktlist, void *refCon,
 
     if (driver->firstrecv) {
            driver->firstrecv = false;
-           PBD::ThreadCreated (pthread_self(), "COREMIDI");
+           PBD::notify_gui_about_thread_creation (pthread_self(), "COREMIDI");
     }
 
     for (unsigned int i = 0; i < pktlist->numPackets; ++i) {
@@ -142,3 +141,10 @@ void CoreMidi_MidiPort::read_proc (const MIDIPacketList *pktlist, void *refCon,
     }
 }
 
+int
+CoreMidi_MidiPort::discover (vector<PortSet>& ports)
+{
+       /* XXX do dynamic port discovery here */
+
+       return 0;
+}