diff options
| author | David Robillard <d@drobilla.net> | 2008-02-16 22:43:18 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-16 22:43:18 +0000 |
| commit | 8aa9508c82f32efcf9c7c00e2c9e76268d4dddce (patch) | |
| tree | 1fb1a5e7eef6684c0a5bb49be492612c71796fc4 /gtk2_ardour/ardour_ui.h | |
| parent | 1b657585572298d1a69a7b43e611f59b7e185df3 (diff) | |
Merge with 2.0-ongoing R3071.
git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 01e53c7d54..2bc2736183 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -198,6 +198,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI void do_transport_locate (nframes_t position); void halt_on_xrun_message (); + void xrun_handler (nframes_t); + void create_xrun_marker (nframes_t); AudioClock primary_clock; AudioClock secondary_clock; @@ -236,9 +238,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI void set_native_file_header_format (ARDOUR::HeaderFormat sf); void set_native_file_data_format (ARDOUR::SampleFormat sf); - void set_keybindings_path (std::string path); - void save_keybindings (); - void setup_profile (); void setup_theme (); @@ -601,10 +600,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI void connect_dependents_to_session (ARDOUR::Session *); void we_have_dependents (); - std::string keybindings_path; - std::string user_keybindings_path; - - void setup_keybindings (); void setup_session_options (); guint32 last_key_press_time; @@ -725,6 +720,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI void toggle_VerifyRemoveLastCapture(); void toggle_PeriodicSafetyBackups(); void toggle_StopRecordingOnXrun(); + void toggle_CreateXrunMarker(); void toggle_StopTransportAtEndOfSession(); void toggle_GainReduceFastTransport(); void toggle_LatchedSolo(); @@ -758,7 +754,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI void toggle_control_protocol (ARDOUR::ControlProtocolInfo*); void toggle_control_protocol_feedback (ARDOUR::ControlProtocolInfo*, const char* group_name, std::string action_name); - bool can_save_keybindings; bool first_idle (); void no_memory_warning (); |