Use PBD::ffs for portability

[ardour.git] / gtk2_ardour / audio_time_axis.cc

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index eca908eeb41d6922fe036724880a09a84efdc03e..994f167014ef726a6078a039014709ecf6bdb699 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -36,19 +36,10 @@
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
-#include "ardour/amp.h"
-#include "ardour/audioplaylist.h"
 #include "ardour/event_type_map.h"
-#include "ardour/location.h"
 #include "ardour/pannable.h"
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
-#include "ardour/playlist.h"
-#include "ardour/processor.h"
-#include "ardour/profile.h"
-#include "ardour/session.h"
-#include "ardour/session_playlist.h"
-#include "ardour/utils.h"
 
 #include "ardour_button.h"
 #include "ardour_ui.h"
@@ -67,8 +58,6 @@
 #include "audio_streamview.h"
 #include "utils.h"
 
-#include "ardour/audio_track.h"
-
 #include "i18n.h"
 
 using namespace std;
@@ -116,7 +105,7 @@ AudioTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                create_automation_child (GainAutomation, false);
        }
 
-       if (_route->panner()) {
+       if (_route->panner_shell()) {
                _route->panner_shell()->Changed.connect (*this, invalidator (*this),
                                                          boost::bind (&AudioTimeAxisView::ensure_pan_views, this, false), gui_context());
        }
@@ -179,7 +168,6 @@ void
 AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show)
 {
        if (param.type() == NullAutomation) {
-               cerr << "WARNING: Attempt to create NullAutomation child, ignoring" << endl;
                return;
        }
 
@@ -399,14 +387,14 @@ AudioTimeAxisView::build_automation_action_menu (bool for_selection)
        MenuList& automation_items = automation_action_menu->items ();
 
        automation_items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &AudioTimeAxisView::update_gain_track_visibility)));
-       gain_automation_item = dynamic_cast<CheckMenuItem*> (&automation_items.back ());
+       gain_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&automation_items.back ());
        gain_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && 
                                          (gain_track && string_is_affirmative (gain_track->gui_property ("visible"))));
 
        _main_automation_menu_map[Evoral::Parameter(GainAutomation)] = gain_automation_item;
 
        automation_items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &AudioTimeAxisView::update_pan_track_visibility)));
-       pan_automation_item = dynamic_cast<CheckMenuItem*> (&automation_items.back ());
+       pan_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&automation_items.back ());
        pan_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) &&
                                         (!pan_tracks.empty() && string_is_affirmative (pan_tracks.front()->gui_property ("visible"))));