X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=d06a4c53e33ffe0aa908dc02453b0bf30df13bb2;hb=7e4f261853574a979865bddc94770600588f551e;hp=f59c4bc809a613fa0ed167d0aaf7bf97830c7470;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index f59c4bc809..d06a4c53e3 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -55,7 +55,7 @@ #include "audio_streamview.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -65,7 +65,7 @@ using namespace Gtk; using namespace Editing; AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas) - : AxisView(sess) + : SessionHandlePtr (sess) , RouteTimeAxisView(ed, sess, canvas) { } @@ -116,7 +116,7 @@ AudioTimeAxisView::set_route (boost::shared_ptr rt) if (_route->panner_shell()) { _route->panner_shell()->Changed.connect (*this, invalidator (*this), - boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context()); + boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context()); } /* map current state of the route */ @@ -207,8 +207,8 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool create_trim_automation_child (param, show); } else if (param.type() == PanWidthAutomation || - param.type() == PanElevationAutomation || - param.type() == PanAzimuthAutomation) { + param.type() == PanElevationAutomation || + param.type() == PanAzimuthAutomation) { ensure_pan_views (show); @@ -307,7 +307,7 @@ AudioTimeAxisView::update_control_names () } } - if (get_selected()) { + if (selected()) { controls_ebox.set_name (controls_base_selected_name); time_axis_frame.set_name (controls_base_selected_name); } else {