Merge branch 'master' into windows

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index f8b47bd3e8fb1fed9c79ef2a8fe7ae7b6b3537b0..64309c7e38d6772d35a24a9cf8858ced5bcf8355 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -90,6 +90,7 @@ class BigClockWindow;
 class BundleManager;
 class ButtonJoiner;
 class ConnectionEditor;
+class EngineControl;
 class KeyEditor;
 class LocationUIWindow;
 class MainClock;
@@ -302,15 +303,13 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void reenable_hide_loop_punch_ruler_if_appropriate ();
        void toggle_auto_return ();
        void toggle_click ();
-
+        void toggle_audio_midi_setup ();
        void toggle_session_auto_loop ();
-
        void toggle_rc_options_window ();
        void toggle_session_options_window ();
 
   private:
        ArdourStartup*      _startup;
-       ARDOUR::AudioEngine *engine;
        Gtk::Tooltips        _tooltips;
        NSM_Client          *nsm;
        bool                 _was_dirty;
@@ -668,9 +667,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        int pending_state_dialog ();
        int sr_mismatch_dialog (ARDOUR::framecnt_t, ARDOUR::framecnt_t);
 
-       void disconnect_from_jack ();
-       void reconnect_to_jack ();
-       void set_jack_buffer_size (ARDOUR::pframes_t);
+       void disconnect_from_engine ();
+       void reconnect_to_engine ();
+       void set_engine_buffer_size (ARDOUR::pframes_t);
 
        Gtk::MenuItem* jack_disconnect_item;
        Gtk::MenuItem* jack_reconnect_item;
@@ -725,7 +724,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void fontconfig_dialog ();
 
         int missing_file (ARDOUR::Session*s, std::string str, ARDOUR::DataType type);
-        int ambiguous_file (std::string file, std::string path, std::vector<std::string> hits);
+        int ambiguous_file (std::string file, std::vector<std::string> hits);
 
        bool click_button_clicked (GdkEventButton *);
 
@@ -748,6 +747,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
         std::string _announce_string;
         void check_announcements ();
+
+        EngineControl* _audio_midi_setup;
+        void launch_audio_midi_setup ();
+        int do_audio_midi_setup (uint32_t);
 };
 
 #endif /* __ardour_gui_h__ */