Better method for redrawing gain meter pixmaps upon theme change

[ardour.git] / gtk2_ardour / analysis_window.cc

diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index 163ac981b9391855c94f39a3af1b8e6e19cf79f0..957dde3d1fcbcd60daf2ef9e9b519c942632bd96 100644 (file)
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -16,7 +16,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <gtkmm2ext/gtk_ui.h>
@@ -61,7 +60,7 @@ AnalysisWindow::AnalysisWindow()
        tlmodel = Gtk::ListStore::create(tlcols);
        track_list.set_model (tlmodel);
        track_list.append_column(_("Track"), tlcols.trackname);
-       track_list.append_column_editable(_("Visible"), tlcols.visible);
+       track_list.append_column_editable(_("Show"), tlcols.visible);
        track_list.set_headers_visible(true);
        track_list.set_reorderable(false);
        track_list.get_selection()->set_mode (Gtk::SELECTION_NONE);
@@ -226,10 +225,9 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
                TimeSelection ts = s.time;
                RegionSelection ars = s.regions;
        
-       
                for (TrackSelection::iterator i = s.tracks.begin(); i != s.tracks.end(); ++i) {
-                       ARDOUR::AudioPlaylist *pl
-                               = dynamic_cast<ARDOUR::AudioPlaylist*>((*i)->playlist());
+                       boost::shared_ptr<AudioPlaylist> pl
+                               = boost::dynamic_pointer_cast<AudioPlaylist>((*i)->playlist());
 
                        if (!pl)
                                continue;
@@ -246,7 +244,7 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
                        if (source_selection_ranges_rb.get_active()) {
 //                             cerr << "Analyzing ranges on track " << *&rui->route().name() << endl;
                                
-                               for (std::list<ARDOUR::AudioRange>::iterator j = ts.begin(); j != ts.end(); ++j) {
+                               for (std::list<AudioRange>::iterator j = ts.begin(); j != ts.end(); ++j) {
 
                                        nframes_t i = 0;
                                        int n;
@@ -278,7 +276,7 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
                                
                                TimeAxisView *current_axis = (*i);
                                
-                               for (std::set<RegionView *>::iterator j = ars.begin(); j != ars.end(); ++j) {
+                               for (RegionSelection::iterator j = ars.begin(); j != ars.end(); ++j) {
                                        // Check that the region is actually audio (so we can analyze it)
                                        AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*j);
                                        if (!arv)