diff options
| author | Robin Gareus <robin@gareus.org> | 2013-04-11 19:49:29 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-04-11 19:49:48 +0200 |
| commit | 66ee2c8e597ca9a07d614cf56b4002e5303e3645 (patch) | |
| tree | 9131785c3f5d4b419f127f9f6726b820d8de4fae /gtk2_ardour/ardour_ui.h | |
| parent | b7c617b0578ec7e8d75dcd604c316459d6ac0708 (diff) | |
enable videotimeline by default
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 40b71cea78..6300a352d5 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -65,9 +65,7 @@ #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" @@ -80,11 +78,9 @@ class About; class AddRouteDialog; -#ifdef WITH_VIDEOTIMELINE class AddVideoDialog; class VideoTimeLine; class SystemExec; -#endif class ArdourStartup; class ArdourKeyboard; class AudioClock; @@ -213,9 +209,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 (); @@ -226,14 +220,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, @@ -630,11 +623,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 */ |