X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=72af2f846cec8282b9250e82bc5b995c3f4015ac;hb=4423945643bf1a6d2196f1e5882e5fe4bcb6d8cf;hp=6a9a32eac5d9295b0e5972574e883a0374ebbd96;hpb=8125ea590986a3301f91b44aafeebd784c2ee6b4;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 6a9a32eac5..72af2f846c 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -32,16 +32,15 @@ #include "pbd/memento_command.h" #include "gtkmm2ext/gtk_ui.h" -#include "gtkmm2ext/selector.h" -#include "gtkmm2ext/bindable_button.h" #include "gtkmm2ext/utils.h" +#include "widgets/ardour_button.h" + #include "ardour/event_type_map.h" #include "ardour/pannable.h" #include "ardour/panner.h" #include "ardour/panner_shell.h" -#include "ardour_button.h" #include "audio_time_axis.h" #include "automation_line.h" #include "enums.h" @@ -49,16 +48,16 @@ #include "automation_time_axis.h" #include "keyboard.h" #include "playlist_selector.h" -#include "prompter.h" #include "public_editor.h" #include "audio_region_view.h" #include "audio_streamview.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; +using namespace ArdourWidgets; using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; @@ -116,7 +115,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 +206,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);