make autoscroll a bit easier to use, fix missing measure lines when moving the editor...

[ardour.git] / gtk2_ardour / analysis_window.cc

diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index f742afd7274a9a66ee901236919c3962e75d198c..d89c1068317ac357032c57437a967568bcc775bf 100644 (file)
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -221,7 +221,6 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
                Sample *buf    = (Sample *) malloc(sizeof(Sample) * fft_graph.windowSize());
                Sample *mixbuf = (Sample *) malloc(sizeof(Sample) * fft_graph.windowSize());
                float  *gain   = (float *)  malloc(sizeof(float) * fft_graph.windowSize());
-               char   *work   = (char *)   malloc(sizeof(char) * fft_graph.windowSize());
        
                Selection s = PublicEditor::instance().get_selection();
                TimeSelection ts = s.time;
@@ -261,7 +260,7 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
                                                        n = (*j).length() - i;
                                                }
                                
-                                               n = pl->read(buf, mixbuf, gain, work, (*j).start + i, n);
+                                               n = pl->read(buf, mixbuf, gain, (*j).start + i, n);
        
                                                if ( n < fft_graph.windowSize()) {
                                                        for (int j = n; j < fft_graph.windowSize(); j++) {
@@ -293,15 +292,15 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
                                        jack_nframes_t i = 0;
                                        int n;
 
-                                       while ( i < arv->region().length() ) {
+                                       while ( i < arv->region()->length() ) {
                                                // TODO: What about stereo+ channels? composite all to one, I guess
 
                                                n = fft_graph.windowSize();
-                                               if (i + n >= arv->region().length() ) {
-                                                       n = arv->region().length() - i;
+                                               if (i + n >= arv->region()->length() ) {
+                                                       n = arv->region()->length() - i;
                                                }
 
-                                               n = arv->audio_region().read_at(buf, mixbuf, gain, work, arv->region().position() + i, n);
+                                               n = arv->audio_region()->read_at(buf, mixbuf, gain, arv->region()->position() + i, n);
        
                                                if ( n < fft_graph.windowSize()) {
                                                        for (int j = n; j < fft_graph.windowSize(); j++) {
@@ -331,7 +330,6 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
        
                free(buf);
                free(mixbuf);
-               free(work);
 
                track_list_ready = true;
        } /* end lock */