resolve merge with master (?)

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index ea03c8590f7a6e3caf4a06a7e14a6bd8cefc31e6..f11611821f785c606bb3e22c3c0ca09ee58dc86d 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -72,7 +72,6 @@
 #include "ardour_window.h"
 #include "editing.h"
 #include "meterbridge.h"
-#include "nsm.h"
 #include "ui_config.h"
 #include "enums.h"
 #include "visibility_group.h"
@@ -83,7 +82,6 @@ class AddRouteDialog;
 class AddVideoDialog;
 class VideoTimeLine;
 class SystemExec;
-class ArdourStartup;
 class ArdourKeyboard;
 class AudioClock;
 class BigClockWindow;
@@ -98,6 +96,7 @@ class Mixer_UI;
 class PublicEditor;
 class RCOptionEditor;
 class RouteParams_UI;
+class SessionDialog;
 class SessionOptionEditor;
 class ShuttleControl;
 class Splash;
@@ -105,6 +104,7 @@ class SpeakerDialog;
 class ThemeManager;
 class TimeInfoBox;
 class MidiTracer;
+class NSM_Client;
 class LevelMeterHBox;
 class GlobalPortMatrixWindow;
 class GUIObjectState;
@@ -153,7 +153,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        bool get_smart_mode () const;
        
        int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = "");
-       int  build_session_from_nsd (const std::string& session_name, const std::string& session_path);
+        int  build_session_from_dialog (SessionDialog&, const std::string& session_name, const std::string& session_path);
        bool ask_about_loading_existing_session (const std::string& session_path);
 
        /// @return true if session was successfully unloaded.
@@ -312,11 +312,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void toggle_session_options_window ();
 
   private:
-       ArdourStartup*      _startup;
-       Gtk::Tooltips        _tooltips;
+       Gtk::Tooltips       _tooltips;
        NSM_Client          *nsm;
-       bool                 _was_dirty;
-        bool                 _mixer_on_top;
+       bool                _was_dirty;
+        bool                _mixer_on_top;
         bool first_time_engine_run;
 
        void goto_editor_window ();
@@ -331,8 +330,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        static ARDOUR_UI *theArdourUI;
 
-       void startup ();
-       void shutdown ();
+        int starting ();
 
        int  ask_about_saving_session (const std::vector<std::string>& actions);
 
@@ -584,6 +582,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 ();
@@ -603,6 +602,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
         WM::Proxy<About> about;
         WM::Proxy<LocationUIWindow> location_ui;
         WM::Proxy<RouteParams_UI> route_params;
+        WM::Proxy<EngineControl> audio_midi_setup;
 
         /* Windows/Dialogs that require a creator method */
 
@@ -693,7 +693,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        bool first_idle ();
 
-       void no_memory_warning ();
        void check_memory_locking ();
 
        bool check_audioengine();
@@ -723,7 +722,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 *);
 
@@ -747,8 +746,6 @@ 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);
 };