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_utils.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_utils.h')
| -rw-r--r-- | libs/backends/jack/jack_utils.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/backends/jack/jack_utils.h b/libs/backends/jack/jack_utils.h index a7521ad1c4..ee8575c5c8 100644 --- a/libs/backends/jack/jack_utils.h +++ b/libs/backends/jack/jack_utils.h @@ -180,6 +180,8 @@ namespace ARDOUR { */ bool get_jack_default_server_path (std::string& server_path); + typedef std::vector<std::pair<std::string,std::string> > MidiOptions; + /** * @return The name of the jack server config file */ @@ -228,8 +230,11 @@ namespace ARDOUR { std::string midi_driver; }; + std::vector<std::string> enumerate_midi_options (); + int set_midi_option (ARDOUR::JackCommandLineOptions&, const std::string& opt); + /** * @return true if able to build a valid command line based on options */ - bool get_jack_command_line_string (JackCommandLineOptions& options, std::string& command_line); + bool get_jack_command_line_string (JackCommandLineOptions& options, std::string& command_line, bool for_latency_measurement); } |