projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Desensitize playlist menu with >1 selected tracks.
[ardour.git]
/
gtk2_ardour
/
analysis_window.cc
diff --git
a/gtk2_ardour/analysis_window.cc
b/gtk2_ardour/analysis_window.cc
index 273809a13d7480f575d24a80e4a90cfa0d3e1dd1..afa277e8e44919e8bf96b5686f5af5dcba3aa7b6 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 (
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);
fft_graph.set_analysis_window(this);
@@
-100,11
+100,11
@@
AnalysisWindow::AnalysisWindow() :
// "Selected ranges" radio
source_selection_ranges_rb.signal_toggled().connect (
// "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 (
// "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);
}
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 (
// "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 (
// "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
}
// Analyze button
@@
-134,7
+134,7
@@
AnalysisWindow::AnalysisWindow() :
refresh_button.set_name("EditorGTKButton");
refresh_button.set_label(_("Re-analyze data"));
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);
vbox.pack_start(refresh_button, false, false, 10);
@@
-142,11
+142,11
@@
AnalysisWindow::AnalysisWindow() :
// Feature checkboxes
// minmax
// 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
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);
vbox.pack_start(show_normalized_button, false, false);
@@
-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());
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;
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++) {
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();
// 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++) {
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();
// TODO: What about stereo+ channels? composite all to one, I guess
n = fft_graph.windowSize();