Add parent window argument to ARDOUR_UI::check_audioengine

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index c9f0866f2139a3d890e878d5f8749aa1a7f893c3..4f572157b1de33cfb27e2df317abc5cd8ecf47d7 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -67,21 +67,22 @@
 
 #include "video_timeline.h"
 
-#include "about.h"
+#include "add_route_dialog.h"
 #include "ardour_button.h"
 #include "ardour_dialog.h"
 #include "ardour_window.h"
 #include "editing.h"
-#include "engine_dialog.h"
-#include "export_video_dialog.h"
 #include "enums.h"
 #include "visibility_group.h"
 #include "window_manager.h"
 
-#include "add_route_dialog.h"
+#ifdef COMPILER_MSVC
+#include "about.h"
 #include "add_video_dialog.h"
 #include "big_clock_window.h"
 #include "bundle_manager.h"
+#include "engine_dialog.h"
+#include "export_video_dialog.h"
 #include "global_port_matrix.h"
 #include "keyeditor.h"
 #include "location_ui.h"
@@ -89,6 +90,22 @@
 #include "route_params_ui.h"
 #include "session_option_editor.h"
 #include "speaker_dialog.h"
+#else
+class About;
+class AddRouteDialog;
+class AddVideoDialog;
+class BigClockWindow;
+class BundleManager;
+class EngineControl;
+class ExportVideoDialog;
+class KeyEditor;
+class LocationUIWindow;
+class RCOptionEditor;
+class RouteParams_UI;
+class SessionOptionEditor;
+class SpeakerDialog;
+class GlobalPortMatrixWindow;
+#endif
 
 class VideoTimeLine;
 class ArdourKeyboard;
@@ -98,8 +115,6 @@ class ConnectionEditor;
 class MainClock;
 class Mixer_UI;
 class PublicEditor;
-class RCOptionEditor;
-class RouteParams_UI;
 class SaveAsDialog;
 class SessionDialog;
 class SessionOptionEditor;
@@ -187,8 +202,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void toggle_mixer_space();
        void toggle_keep_tearoffs();
 
-       Gtk::Tooltips& tooltips() { return _tooltips; }
-
        static PublicEditor* _instance;
 
        /** Emitted frequently with the audible frame, false, and the edit point as
@@ -281,6 +294,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        void show_ui_prefs ();
 
+       bool check_audioengine(Gtk::Window&);
+
        void update_tearoff_visibility ();
 
        void setup_profile ();
@@ -323,7 +338,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
   private:
        PublicEditor*        editor;
        Mixer_UI*            mixer;
-       Gtk::Tooltips       _tooltips;
        NSM_Client*          nsm;
        bool                _was_dirty;
         bool                _mixer_on_top;
@@ -707,7 +721,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        void check_memory_locking ();
 
-       bool check_audioengine();
        void audioengine_setup ();
 
        void display_message (const char *prefix, gint prefix_len,