Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 6c7edff1ba437fb4189e2b8778d375bc5c7659de..a24fe16a7c071e9d84a8a6cbf49cd9acde65f8c0 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -35,7 +35,6 @@
 #include <list>
 #include <cmath>
 
-#include <libgnomecanvasmm/canvas.h>
 
 #include "pbd/xml++.h"
 #include "pbd/controllable.h"
@@ -65,13 +64,12 @@
 #include "ardour/plugin.h"
 #include "ardour/session_handle.h"
 
-#ifdef WITH_VIDEOTIMELINE
 #include "video_timeline.h"
-#endif
 
 #include "ardour_dialog.h"
 #include "ardour_button.h"
 #include "editing.h"
+#include "nsm.h"
 #include "ui_config.h"
 #include "window_proxy.h"
 #include "enums.h"
@@ -79,11 +77,9 @@
 
 class About;
 class AddRouteDialog;
-#ifdef WITH_VIDEOTIMELINE
 class AddVideoDialog;
 class VideoTimeLine;
 class SystemExec;
-#endif
 class ArdourStartup;
 class ArdourKeyboard;
 class AudioClock;
@@ -212,9 +208,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        TimeInfoBox* time_info_box;
 
-#ifdef WITH_VIDEOTIMELINE
        VideoTimeLine *video_timeline;
-#endif
 
        void store_clock_modes ();
        void restore_clock_modes ();
@@ -225,14 +219,13 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void add_route (Gtk::Window* float_window);
         void add_routes_part_two ();
         void add_routes_thread ();
-#ifdef WITH_VIDEOTIMELINE
+
        void add_video (Gtk::Window* float_window);
        void remove_video ();
        void start_video_server_menu (Gtk::Window* float_window);
        bool start_video_server (Gtk::Window* float_window, bool popup_msg);
        void stop_video_server (bool ask_confirm=false);
        void flush_videotimeline_cache (bool localcacheonly=false);
-#endif
 
        void session_add_audio_track (
                int input_channels,
@@ -310,6 +303,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        ArdourStartup*      _startup;
        ARDOUR::AudioEngine *engine;
        Gtk::Tooltips        _tooltips;
+       NSM_Client          *nsm;
+       bool                 _was_dirty;
 
        void goto_editor_window ();
        void goto_mixer_window ();
@@ -627,11 +622,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        AddRouteDialog *add_route_dialog;
 
-#ifdef WITH_VIDEOTIMELINE
        /* video dialog */
+
        AddVideoDialog *add_video_dialog;
        SystemExec *video_server_process;
-#endif
 
        /* Keyboard Handling */