diff options
author | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
commit | e466ce40ad1ba591543020cb7c0aa15dbebef81e (patch) | |
tree | f8e43560917a0a70c48d32ac171e828472cfd794 /libs/backends/jack/jack_audiobackend.h | |
parent | 4fac237fdcf025c5fd5aafe207113abd6abb469b (diff) | |
parent | a901f28c6287ff99444d6a8afe67b71531a5f7d0 (diff) |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
Diffstat (limited to 'libs/backends/jack/jack_audiobackend.h')
-rw-r--r-- | libs/backends/jack/jack_audiobackend.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h index cb24835d5b..3c48be5ead 100644 --- a/libs/backends/jack/jack_audiobackend.h +++ b/libs/backends/jack/jack_audiobackend.h @@ -89,7 +89,7 @@ class JACKAudioBackend : public AudioBackend { std::string control_app_name () const; void launch_control_app (); - int start (); + int _start (bool for_latency_measurement); int stop (); int pause (); int freewheel (bool); @@ -149,6 +149,10 @@ class JACKAudioBackend : public AudioBackend { /* MIDI */ + std::vector<std::string> enumerate_midi_options () const; + int set_midi_option (const std::string&); + std::string midi_option () const; + int midi_event_get (pframes_t& timestamp, size_t& size, uint8_t** buf, void* port_buffer, uint32_t event_index); int midi_event_put (void* port_buffer, pframes_t timestamp, const uint8_t* buffer, size_t size); uint32_t get_midi_event_count (void* port_buffer); @@ -221,7 +225,7 @@ class JACKAudioBackend : public AudioBackend { void* process_thread (); static void* _start_process_thread (void*); - void setup_jack_startup_command (); + void setup_jack_startup_command (bool for_latency_measurement); /* pffooo */ @@ -237,6 +241,7 @@ class JACKAudioBackend : public AudioBackend { uint32_t _target_systemic_output_latency; uint32_t _current_sample_rate; uint32_t _current_buffer_size; + std::string _target_midi_option; typedef std::set<std::string> DeviceList; typedef std::map<std::string,DeviceList> DriverDeviceMap; |