Merge branch 'waveview_caching_for_upstream' of https://github.com/nmains/ardour...

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 9944a5353cf824fe7c91c947e6dcc969bb40d36c..dfb2b72a1ebafee391e21c3a27256faf6ff496c6 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -63,6 +63,7 @@
 #include "ardour/utils.h"
 #include "ardour/plugin.h"
 #include "ardour/session_handle.h"
+#include "ardour/system_exec.h"
 
 #include "video_timeline.h"
 
@@ -73,7 +74,6 @@
 #include "editing.h"
 #include "engine_dialog.h"
 #include "meterbridge.h"
-#include "nsm.h"
 #include "ui_config.h"
 #include "enums.h"
 #include "visibility_group.h"
@@ -93,7 +93,6 @@
 #include "theme_manager.h"
 
 class VideoTimeLine;
-class SystemExec;
 class ArdourKeyboard;
 class AudioClock;
 class ButtonJoiner;
@@ -109,6 +108,7 @@ class ShuttleControl;
 class Splash;
 class TimeInfoBox;
 class MidiTracer;
+class NSM_Client;
 class LevelMeterHBox;
 class GUIObjectState;
 
@@ -174,6 +174,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        void new_midi_tracer_window ();
        void toggle_editing_space();
+       void toggle_mixer_space();
        void toggle_keep_tearoffs();
 
        Gtk::Tooltips& tooltips() { return _tooltips; }
@@ -585,6 +586,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        void snapshot_session (bool switch_to_it);
        void rename_session ();
+       void setup_order_hint ();
 
        Mixer_UI   *mixer;
        int         create_mixer ();
@@ -625,7 +627,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        static UIConfiguration *ui_config;
 
-       SystemExec *video_server_process;
+       ARDOUR::SystemExec *video_server_process;
 
        void handle_locations_change (ARDOUR::Location*);
 
@@ -665,6 +667,12 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void disk_speed_dialog_gone (int ignored_response, Gtk::MessageDialog*);
        void disk_overrun_handler ();
        void disk_underrun_handler ();
+       void gui_idle_handler ();
+
+       void cancel_plugin_scan ();
+       void cancel_plugin_timeout ();
+       void plugin_scan_dialog (std::string type, std::string plugin, bool);
+       void plugin_scan_timeout (int);
 
         void session_format_mismatch (std::string, std::string);
 
@@ -695,7 +703,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        bool first_idle ();
 
-       void no_memory_warning ();
        void check_memory_locking ();
 
        bool check_audioengine();