clean out cruft from CoreAudio Backend

diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc
index 4c522dcdd9df55666c8bc69070af07ec9094ea6d..60835e402bc035883252e413af284ace0d4542c4 100644 (file)
--- a/libs/backends/coreaudio/coreaudio_backend.cc
+++ b/libs/backends/coreaudio/coreaudio_backend.cc
@@ -39,7 +39,6 @@ static std::string s_instance_name;
 size_t CoreAudioBackend::_max_buffer_size = 8192;
 std::vector<std::string> CoreAudioBackend::_midi_options;
 std::vector<AudioBackend::DeviceStatus> CoreAudioBackend::_audio_device_status;
-std::vector<AudioBackend::DeviceStatus> CoreAudioBackend::_midi_device_status;
 
 
 /* static class instance access */
@@ -260,24 +259,6 @@ CoreAudioBackend::set_systemic_output_latency (uint32_t sl)
        return 0;
 }
 
-int
-CoreAudioBackend::set_systemic_midi_input_latency (std::string const device, uint32_t sl)
-{
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return -1;
-       nfo->systemic_input_latency = sl;
-       return 0;
-}
-
-int
-CoreAudioBackend::set_systemic_midi_output_latency (std::string const device, uint32_t sl)
-{
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return -1;
-       nfo->systemic_output_latency = sl;
-       return 0;
-}
-
 /* Retrieving parameters */
 std::string
 CoreAudioBackend::device_name () const
@@ -327,27 +308,7 @@ CoreAudioBackend::systemic_output_latency () const
        return _systemic_audio_output_latency;
 }
 
-uint32_t
-CoreAudioBackend::systemic_midi_input_latency (std::string const device) const
-{
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return 0;
-       return nfo->systemic_input_latency;
-}
-
-uint32_t
-CoreAudioBackend::systemic_midi_output_latency (std::string const device) const
-{
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return 0;
-       return nfo->systemic_output_latency;
-}
-
 /* MIDI */
-struct CoreAudioBackend::CoreMidiDeviceInfo *
-CoreAudioBackend::midi_device_info(std::string const name) const {
-       return 0;
-}
 
 std::vector<std::string>
 CoreAudioBackend::enumerate_midi_options () const
@@ -359,15 +320,6 @@ CoreAudioBackend::enumerate_midi_options () const
        return _midi_options;
 }
 
-std::vector<AudioBackend::DeviceStatus>
-CoreAudioBackend::enumerate_midi_devices () const
-{
-       _midi_device_status.clear();
-       std::map<std::string, std::string> devices;
-       //_midi_device_status.push_back (DeviceStatus (_("CoreMidi"), true));
-       return _midi_device_status;
-}
-
 int
 CoreAudioBackend::set_midi_option (const std::string& opt)
 {
@@ -384,23 +336,6 @@ CoreAudioBackend::midi_option () const
        return _midi_driver_option;
 }
 
-int
-CoreAudioBackend::set_midi_device_enabled (std::string const device, bool enable)
-{
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return -1;
-       nfo->enabled = enable;
-       return 0;
-}
-
-bool
-CoreAudioBackend::midi_device_enabled (std::string const device) const
-{
-       struct CoreMidiDeviceInfo * nfo = midi_device_info(device);
-       if (!nfo) return false;
-       return nfo->enabled;
-}
-
 void
 CoreAudioBackend::launch_control_app ()
 {
@@ -1309,6 +1244,7 @@ CoreAudioBackend::get_latency_range (PortEngine::PortHandle port, bool for_playb
                PBD::error << _("CoreBackendPort::get_latency_range (): invalid port.") << endmsg;
                r.min = 0;
                r.max = 0;
+               return r;
        }
        CoreBackendPort* p = static_cast<CoreBackendPort*>(port);
        assert(p);
@@ -1586,7 +1522,7 @@ CoreAudioBackend::process_callback (const uint32_t n_samples, const uint64_t hos
                CoreMidiBuffer* mbuf = static_cast<CoreMidiBuffer*>((*it)->get_buffer(0));
                mbuf->clear();
                uint64_t time_ns;
-               uint8_t data[64]; // match MaxAlsaEventSize in alsa_rawmidi.cc
+               uint8_t data[128]; // matches CoreMidi's MIDIPacket
                size_t size = sizeof(data);
                while (_midiio->recv_event (i, nominal_time, time_ns, data, size)) {
                        pframes_t time = floor((float) time_ns * _samplerate * 1e-9);

diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h
index 3bd2f6b0551254e93e3a5b2a919669ad36a7f41b..7ac8e1c6e1401c1b12869ef259a6e801dbf90c11 100644 (file)
--- a/libs/backends/coreaudio/coreaudio_backend.h
+++ b/libs/backends/coreaudio/coreaudio_backend.h
@@ -182,8 +182,8 @@ class CoreAudioBackend : public AudioBackend {
                int set_output_channels (uint32_t);
                int set_systemic_input_latency (uint32_t);
                int set_systemic_output_latency (uint32_t);
-               int set_systemic_midi_input_latency (std::string const, uint32_t);
-               int set_systemic_midi_output_latency (std::string const, uint32_t);
+               int set_systemic_midi_input_latency (std::string const, uint32_t) { return 0; }
+               int set_systemic_midi_output_latency (std::string const, uint32_t) { return 0; }
 
                int reset_device () { return 0; };
 
@@ -196,8 +196,8 @@ class CoreAudioBackend : public AudioBackend {
                uint32_t     output_channels () const;
                uint32_t     systemic_input_latency () const;
                uint32_t     systemic_output_latency () const;
-               uint32_t     systemic_midi_input_latency (std::string const) const;
-               uint32_t     systemic_midi_output_latency (std::string const) const;
+               uint32_t     systemic_midi_input_latency (std::string const) const { return 0; }
+               uint32_t     systemic_midi_output_latency (std::string const) const { return 0; }
 
                bool can_set_systemic_midi_latencies () const { return false; /* XXX */}
 
@@ -210,9 +210,15 @@ class CoreAudioBackend : public AudioBackend {
                int set_midi_option (const std::string&);
                std::string midi_option () const;
 
-               std::vector<DeviceStatus> enumerate_midi_devices () const;
-               int set_midi_device_enabled (std::string const, bool);
-               bool midi_device_enabled (std::string const) const;
+               std::vector<DeviceStatus> enumerate_midi_devices () const {
+                       return std::vector<AudioBackend::DeviceStatus> ();
+               }
+               int set_midi_device_enabled (std::string const, bool) {
+                       return true;
+               }
+               bool midi_device_enabled (std::string const) const {
+                       return false;
+               }
 
                // really private, but needing static access:
                int process_callback(uint32_t, uint64_t);
@@ -350,21 +356,6 @@ class CoreAudioBackend : public AudioBackend {
                /* coreaudio specific  */
                uint32_t name_to_id(std::string) const;
 
-               /* midi settings */
-               struct CoreMidiDeviceInfo {
-                       bool     enabled;
-                       uint32_t systemic_input_latency;
-                       uint32_t systemic_output_latency;
-                       CoreMidiDeviceInfo()
-                               : enabled (true)
-                               , systemic_input_latency (0)
-                               , systemic_output_latency (0)
-                       {}
-               };
-
-               mutable std::map<std::string, struct CoreMidiDeviceInfo *> _midi_devices;
-               struct CoreMidiDeviceInfo * midi_device_info(std::string const) const;
-
                /* processing */
                float  _dsp_load;
                uint64_t _processed_samples;