diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-16 02:57:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-16 02:57:22 +0000 |
| commit | f16caf535c3e7a697c7464ecc153bce1b341d0ef (patch) | |
| tree | de359f3e2ef8d30d070cff3476bcea7d185596cb /gtk2_ardour/automation_time_axis.cc | |
| parent | adacfd9b24fb0ac7c4029cd659d21107eb7a2208 (diff) | |
get editor.cc to compile
git-svn-id: svn://localhost/trunk/ardour2@99 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 5339b0a02e..9e3fb09a4a 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -4,13 +4,13 @@ #include "automation_time_axis.h" #include "automation_line.h" #include "public_editor.h" -#include "canvas-simplerect.h" -#include "canvas-waveview.h" +#include "simplerect.h" #include "selection.h" #include "ghostregion.h" #include "rgb_macros.h" #include "automation_selectable.h" #include "point_selection.h" +#include "canvas_impl.h" #include "i18n.h" @@ -34,10 +34,12 @@ static const gchar * small_x_xpm[] = { " ", " "}; -AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& rent, Widget* p, std::string nom, std::string state_name, std::string nomparent) +AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& rent, + ArdourCanvas::Canvas& canvas, std::string nom, + std::string state_name, std::string nomparent) : AxisView (s), - TimeAxisView (s, e, &rent, p), + TimeAxisView (s, e, &rent, canvas), route (r), _name (nom), _state_name (state_name), @@ -63,7 +65,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit // "outline_what", (guint32) (0x1|0x2|0x8), // "fill_color_rgba", color_map[cAutomationTrackFill], // NULL); - base_rect = new Gnome::Canvas::SimpleRect(*canvas_display); + base_rect = new SimpleRect(*canvas_display); base_rect->set_property ("x1", 0.0); base_rect->set_property ("y1", 0.0); base_rect->set_property ("x2", 1000000.0); |