From da285fc57dfda8c33ca0da967bcc40cd1e608ca4 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Fri, 11 May 2007 02:54:43 +0000 Subject: Conditionally compile CMT additions, enabled by default. git-svn-id: svn://localhost/ardour2/trunk@1833 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 3 ++- gtk2_ardour/SConscript | 31 +++++++++++++++++++------------ gtk2_ardour/ardour_ui_ed.cc | 4 ++-- gtk2_ardour/editor.cc | 12 ++++++------ gtk2_ardour/editor.h | 6 ++++-- gtk2_ardour/editor_canvas.cc | 16 ++++++++++++++-- gtk2_ardour/editor_items.h | 6 +++--- gtk2_ardour/editor_mouse.cc | 29 +++++++++++++++-------------- gtk2_ardour/public_editor.h | 15 ++++++++++----- 9 files changed, 75 insertions(+), 47 deletions(-) diff --git a/SConstruct b/SConstruct index cf4215a908..bc491edbbc 100644 --- a/SConstruct +++ b/SConstruct @@ -45,7 +45,8 @@ opts.AddOptions( BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0), BoolOption('VST', 'Compile with support for VST', 0), BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), - BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1) + BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1), + BoolOption('CMT', 'Compile with support for CMT Additions', 1) ) #---------------------------------------------------------------------- diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index c25a1dd1b1..dd15dd7cc0 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -102,7 +102,6 @@ automation_time_axis.cc midi_time_axis.cc midi_streamview.cc axis_view.cc -canvas-imageframe.c canvas-simpleline.c simpleline.cc canvas-simplerect.c @@ -124,7 +123,6 @@ editor_cursors.cc editor_edit_groups.cc editor_export_audio.cc editor_hscroller.cc -editor_imageframe.cc editor_keyboard.cc editor_keys.cc editor_markers.cc @@ -149,21 +147,12 @@ gain_meter.cc ghostregion.cc gtk-custom-hruler.c gtk-custom-ruler.c -imageframe.cc -imageframe_socket_handler.cc -imageframe_time_axis.cc -imageframe_time_axis_group.cc -imageframe_time_axis_view.cc -imageframe_view.cc io_selector.cc keyboard.cc ladspa_pluginui.cc location_ui.cc main.cc marker.cc -marker_time_axis.cc -marker_time_axis_view.cc -marker_view.cc mixer_strip.cc mixer_ui.cc new_session_dialog.cc @@ -202,7 +191,6 @@ route_time_axis.cc time_selection.cc utils.cc version.cc -visual_time_axis.cc waveview.cc """) @@ -246,6 +234,25 @@ if env['VST']: extra_sources += vst_files gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst") +cmt_files=Split(""" +canvas-imageframe.c +editor_imageframe.cc +imageframe.cc +imageframe_socket_handler.cc +imageframe_time_axis.cc +imageframe_time_axis_group.cc +imageframe_time_axis_view.cc +imageframe_view.cc +marker_time_axis.cc +marker_time_axis_view.cc +marker_view.cc +visual_time_axis.cc +""") + +if env['CMT']: + extra_sources += cmt_files + gtkardour.Append (CCFLAGS="-DWITH_CMT") + if gtkardour['AUDIOUNITS']: extra_sources += audiounit_files gtkardour.Append(CCFLAGS='-DHAVE_AUDIOUNITS') diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 2cf6750812..22ef689a0b 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -108,7 +108,7 @@ ARDOUR_UI::install_actions () ActionManager::session_sensitive_actions.push_back (act); - /* */ +#ifdef WITH_CMT PathScanner scanner; vector* results = scanner (getenv ("PATH"), "AniComp", false, false); @@ -121,7 +121,7 @@ ARDOUR_UI::install_actions () delete results; } - /* */ +#endif act = ActionManager::register_action (main_actions, X_("Snapshot"), _("Snapshot"), mem_fun(*this, &ARDOUR_UI::snapshot_session)); ActionManager::session_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 6d9d6581af..95a42d15f1 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -81,9 +81,9 @@ #include "i18n.h" -/* */ +#ifdef WITH_CMT #include "imageframe_socket_handler.h" -/* */ +#endif using namespace std; using namespace sigc; @@ -206,9 +206,9 @@ Editor::Editor () automation_mode_button (_("mode")), global_automation_button (_("automation")), - /* */ +#ifdef WITH_CMT image_socket_listener(0), - /* */ +#endif /* nudge */ @@ -740,7 +740,7 @@ Editor::Editor () Editor::~Editor() { - /* */ +#ifdef WITH_CMT if(image_socket_listener) { if(image_socket_listener->is_connected()) @@ -751,7 +751,7 @@ Editor::~Editor() delete image_socket_listener ; image_socket_listener = 0 ; } - /* */ +#endif } void diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index cb78ccc344..b103e32e5e 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -142,11 +142,13 @@ class Editor : public PublicEditor void step_mouse_mode (bool next); Editing::MouseMode current_mouse_mode () const { return mouse_mode; } +#ifdef WITH_CMT void add_imageframe_time_axis(const std::string & track_name, void*) ; void add_imageframe_marker_time_axis(const std::string & track_name, TimeAxisView* marked_track, void*) ; void connect_to_image_compositor() ; void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) ; TimeAxisView* get_named_time_axis(const std::string & name) ; +#endif void consider_auditioning (boost::shared_ptr); void hide_a_region (boost::shared_ptr); @@ -1731,7 +1733,7 @@ class Editor : public PublicEditor bool _xfade_visibility; - /* */ +#ifdef WITH_CMT void handle_new_imageframe_time_axis_view(const string & track_name, void* src) ; void handle_new_imageframe_marker_time_axis_view(const string & track_name, TimeAxisView* marked_track) ; @@ -1770,7 +1772,7 @@ class Editor : public PublicEditor void popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas::Item* ifv, bool with_frame) ; ImageFrameSocketHandler* image_socket_listener ; - /* */ +#endif void toggle_xfade_active (boost::weak_ptr); void toggle_xfade_length (boost::weak_ptr); diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 6b3b62b06e..704c87ca33 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -28,11 +28,9 @@ #include "waveview.h" #include "simplerect.h" #include "simpleline.h" -#include "imageframe.h" #include "waveview_p.h" #include "simplerect_p.h" #include "simpleline_p.h" -#include "imageframe_p.h" #include "canvas_impl.h" #include "editing.h" #include "rgb_macros.h" @@ -40,6 +38,11 @@ #include "time_axis_view.h" #include "audio_time_axis.h" +#ifdef WITH_CMT +#include "imageframe.h" +#include "imageframe_p.h" +#endif + #include "i18n.h" using namespace std; @@ -61,7 +64,10 @@ extern "C" GType gnome_canvas_simpleline_get_type(void); GType gnome_canvas_simplerect_get_type(void); GType gnome_canvas_waveview_get_type(void); + +#ifdef WITH_CMT GType gnome_canvas_imageframe_get_type(void); +#endif } @@ -72,14 +78,20 @@ static void ardour_canvas_type_init() Glib::wrap_register(gnome_canvas_simpleline_get_type(), &Gnome::Canvas::SimpleLine_Class::wrap_new); Glib::wrap_register(gnome_canvas_simplerect_get_type(), &Gnome::Canvas::SimpleRect_Class::wrap_new); Glib::wrap_register(gnome_canvas_waveview_get_type(), &Gnome::Canvas::WaveView_Class::wrap_new); + +#ifdef WITH_CMT Glib::wrap_register(gnome_canvas_imageframe_get_type(), &Gnome::Canvas::ImageFrame_Class::wrap_new); +#endif // Register the gtkmm gtypes: (void) Gnome::Canvas::WaveView::get_type(); (void) Gnome::Canvas::SimpleLine::get_type(); (void) Gnome::Canvas::SimpleRect::get_type(); + +#ifdef WITH_CMT (void) Gnome::Canvas::ImageFrame::get_type(); +#endif } void diff --git a/gtk2_ardour/editor_items.h b/gtk2_ardour/editor_items.h index 921c1a51eb..ad1d63b5bf 100644 --- a/gtk2_ardour/editor_items.h +++ b/gtk2_ardour/editor_items.h @@ -52,7 +52,7 @@ enum ItemType { FadeOutItem, FadeOutHandleItem, - /* */ +#ifdef WITH_CMT MarkerViewItem, MarkerTimeAxisItem, MarkerViewHandleStartItem, @@ -61,8 +61,8 @@ enum ItemType { ImageFrameTimeAxisItem, ImageFrameHandleStartItem, ImageFrameHandleEndItem, - /* */ - +#endif + CrossfadeViewItem, /* don't remove this */ diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 647ce8f805..e2be04a570 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -555,7 +555,7 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp start_rubberband_select (item, event); break; - /* */ +#ifdef WITH_CMT case ImageFrameHandleStartItem: imageframe_start_handle_op(item, event) ; return(true) ; @@ -572,16 +572,13 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp markerview_item_end_handle_op(item, event) ; return(true) ; break ; - /* */ - - /* */ case MarkerViewItem: start_markerview_grab(item, event) ; break ; case ImageFrameItem: start_imageframe_grab(item, event) ; break ; - /* */ +#endif case MarkerBarItem: @@ -844,7 +841,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT tm_marker_context_menu (&event->button, item); break; - /* */ +#ifdef WITH_CMT case ImageFrameItem: popup_imageframe_edit_menu(1, event->button.time, item, true) ; break ; @@ -857,8 +854,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case MarkerTimeAxisItem: popup_marker_time_axis_edit_menu(1, event->button.time, item, false) ; break ; - /* */ - +#endif default: break; @@ -1140,12 +1136,13 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ case StartSelectionTrimItem: case EndSelectionTrimItem: - /* */ + +#ifdef WITH_CMT case ImageFrameHandleStartItem: case ImageFrameHandleEndItem: case MarkerViewHandleStartItem: case MarkerViewHandleEndItem: - /* */ +#endif if (is_drawable()) { track_canvas.get_window()->set_cursor (*trimmer_cursor); @@ -1295,12 +1292,14 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ case EndSelectionTrimItem: case EditCursorItem: case PlayheadCursorItem: - /* */ + +#ifdef WITH_CMT case ImageFrameHandleStartItem: case ImageFrameHandleEndItem: case MarkerViewHandleStartItem: case MarkerViewHandleEndItem: - /* */ +#endif + if (is_drawable()) { track_canvas.get_window()->set_cursor (*current_canvas_cursor); } @@ -1466,12 +1465,14 @@ Editor::motion_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item case PanAutomationLineItem: case FadeInHandleItem: case FadeOutHandleItem: - /* */ + +#ifdef WITH_CMT case ImageFrameHandleStartItem: case ImageFrameHandleEndItem: case MarkerViewHandleStartItem: case MarkerViewHandleEndItem: - /* */ +#endif + if (drag_info.item && (event->motion.state & Gdk::BUTTON1_MASK || (event->motion.state & Gdk::BUTTON2_MASK))) { if (!from_autoscroll) { diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index da8e4211a8..26335bef3b 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -92,11 +92,6 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway virtual void set_mouse_mode (Editing::MouseMode, bool force = false) = 0; virtual void step_mouse_mode (bool next) = 0; virtual Editing::MouseMode current_mouse_mode () const = 0; - virtual void add_imageframe_time_axis(const std::string & track_name, void*) = 0; - virtual void add_imageframe_marker_time_axis(const std::string & track_name, TimeAxisView* marked_track, void*) = 0; - virtual void connect_to_image_compositor() = 0; - virtual void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) = 0; - virtual TimeAxisView* get_named_time_axis(const std::string & name) = 0; virtual void consider_auditioning (boost::shared_ptr) = 0; virtual void set_show_waveforms (bool yn) = 0; virtual bool show_waveforms() const = 0; @@ -156,6 +151,14 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway virtual void restore_editing_space() = 0; virtual nframes_t edit_cursor_position(bool sync) = 0; +#ifdef WITH_CMT + virtual void add_imageframe_time_axis(const std::string & track_name, void*) = 0; + virtual void add_imageframe_marker_time_axis(const std::string & track_name, TimeAxisView* marked_track, void*) = 0; + virtual void connect_to_image_compositor() = 0; + virtual void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) = 0; + virtual TimeAxisView* get_named_time_axis(const std::string & name) = 0; +#endif + sigc::signal ZoomFocusChanged; sigc::signal ZoomChanged; sigc::signal Resized; @@ -192,6 +195,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway virtual bool canvas_range_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0; virtual bool canvas_transport_marker_bar_event (GdkEvent* event, ArdourCanvas::Item*) = 0; +#ifdef WITH_CMT virtual bool canvas_imageframe_item_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0; virtual bool canvas_imageframe_view_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameTimeAxis*) = 0; virtual bool canvas_imageframe_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,ImageFrameView*) = 0; @@ -200,6 +204,7 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway virtual bool canvas_markerview_item_view_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0; virtual bool canvas_markerview_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0; virtual bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0; +#endif static PublicEditor* _instance; -- cgit v1.2.3