move metronome/click button into main transport section. icon needs some work to...

[ardour.git] / gtk2_ardour / analysis_window.cc

diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index 273809a13d7480f575d24a80e4a90cfa0d3e1dd1..e93fad887cd01227e50022704af59db524637877 100644 (file)
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -79,7 +79,7 @@ AnalysisWindow::AnalysisWindow() :
 
 
        tlmodel->signal_row_changed().connect (
-                       mem_fun(*this, &AnalysisWindow::track_list_row_changed) );
+                       sigc::mem_fun(*this, &AnalysisWindow::track_list_row_changed) );
 
        fft_graph.set_analysis_window(this);
 
@@ -100,11 +100,11 @@ AnalysisWindow::AnalysisWindow() :
 
                // "Selected ranges" radio
                source_selection_ranges_rb.signal_toggled().connect (
-                               bind ( mem_fun(*this, &AnalysisWindow::source_selection_changed), &source_selection_ranges_rb));
+                               sigc::bind ( sigc::mem_fun(*this, &AnalysisWindow::source_selection_changed), &source_selection_ranges_rb));
 
                // "Selected regions" radio
                source_selection_regions_rb.signal_toggled().connect (
-                               bind ( mem_fun(*this, &AnalysisWindow::source_selection_changed), &source_selection_regions_rb));
+                               sigc::bind ( sigc::mem_fun(*this, &AnalysisWindow::source_selection_changed), &source_selection_regions_rb));
        }
 
        vbox.pack_start(hseparator1, false, false);
@@ -122,11 +122,11 @@ AnalysisWindow::AnalysisWindow() :
 
                // "Composite graphs for all tracks"
                display_model_composite_separate_rb.signal_toggled().connect (
-                               bind ( mem_fun(*this, &AnalysisWindow::display_model_changed), &display_model_composite_separate_rb));
+                               sigc::bind ( sigc::mem_fun(*this, &AnalysisWindow::display_model_changed), &display_model_composite_separate_rb));
 
                // "Composite graph of all tracks"
                display_model_composite_all_tracks_rb.signal_toggled().connect (
-                               bind ( mem_fun(*this, &AnalysisWindow::display_model_changed), &display_model_composite_all_tracks_rb));
+                               sigc::bind ( sigc::mem_fun(*this, &AnalysisWindow::display_model_changed), &display_model_composite_all_tracks_rb));
        }
 
        // Analyze button
@@ -134,7 +134,7 @@ AnalysisWindow::AnalysisWindow() :
        refresh_button.set_name("EditorGTKButton");
        refresh_button.set_label(_("Re-analyze data"));
 
-       refresh_button.signal_clicked().connect ( bind ( mem_fun(*this, &AnalysisWindow::analyze_data), &refresh_button));
+       refresh_button.signal_clicked().connect ( sigc::bind ( sigc::mem_fun(*this, &AnalysisWindow::analyze_data), &refresh_button));
 
        vbox.pack_start(refresh_button, false, false, 10);
 
@@ -142,11 +142,11 @@ AnalysisWindow::AnalysisWindow() :
        // Feature checkboxes
 
        // minmax
-       show_minmax_button.signal_toggled().connect( mem_fun(*this, &AnalysisWindow::show_minmax_changed));
+       show_minmax_button.signal_toggled().connect( sigc::mem_fun(*this, &AnalysisWindow::show_minmax_changed));
        vbox.pack_start(show_minmax_button, false, false);
 
        // normalize
-       show_normalized_button.signal_toggled().connect( mem_fun(*this, &AnalysisWindow::show_normalized_changed));
+       show_normalized_button.signal_toggled().connect( sigc::mem_fun(*this, &AnalysisWindow::show_normalized_changed));
        vbox.pack_start(show_normalized_button, false, false);
 
 
@@ -239,7 +239,7 @@ AnalysisWindow::analyze_data (Gtk::Button */*button*/)
 {
        track_list_ready = false;
        {
-               Glib::Mutex::Lock lm  (track_list_lock);
+               Glib::Threads::Mutex::Lock lm  (track_list_lock);
 
                // Empty track list & free old graphs
                clear_tracklist();
@@ -250,7 +250,7 @@ AnalysisWindow::analyze_data (Gtk::Button */*button*/)
                Sample *mixbuf = (Sample *) malloc(sizeof(Sample) * fft_graph.windowSize());
                float  *gain   = (float *)  malloc(sizeof(float) * fft_graph.windowSize());
 
-               Selection s = PublicEditor::instance().get_selection();
+               Selection& s (PublicEditor::instance().get_selection());
                TimeSelection ts = s.time;
                RegionSelection ars = s.regions;
 
@@ -278,9 +278,9 @@ AnalysisWindow::analyze_data (Gtk::Button */*button*/)
 
                                        int n;
                                        for (int channel = 0; channel < n_inputs; channel++) {
-                                               nframes_t x = 0;
+                                               framecnt_t x = 0;
 
-                                               while ( x < (*j).length() ) {
+                                               while (x < j->length()) {
                                                        // TODO: What about stereo+ channels? composite all to one, I guess
 
                                                        n = fft_graph.windowSize();
@@ -322,11 +322,11 @@ AnalysisWindow::analyze_data (Gtk::Button */*button*/)
                                        int n;
                                        for (int channel = 0; channel < n_inputs; channel++) {
 
-                                               nframes_t x = 0;
+                                               framecnt_t x = 0;
 
-                                               nframes_t length = arv->region()->length();
+                                               framecnt_t length = arv->region()->length();
 
-                                               while ( x < length ) {
+                                               while (x < length) {
                                                        // TODO: What about stereo+ channels? composite all to one, I guess
 
                                                        n = fft_graph.windowSize();
@@ -334,6 +334,7 @@ AnalysisWindow::analyze_data (Gtk::Button */*button*/)
                                                                n = length - x;
                                                        }
 
+                                                       memset (buf, 0, n * sizeof (Sample));
                                                        n = arv->audio_region()->read_at(buf, mixbuf, gain, arv->region()->position() + x, n, channel);
 
                                                        if (n == 0)