LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor editor tweaks: change order of range menu so more common operations are nearer the top. remove some unused/confusing options on the fft analyzer. remove some debug printouts. fix Insert Region From List and Fill Range with Selected Region which were broken 

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@9235 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Ben Loftis 2011-03-29 18:44:06 +00:00
parent 4b341006ef
commit 4006386d7b
4 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk2_ardour/analysis_window.cc
View File

@ -87,7 +87,7 @@ AnalysisWindow::AnalysisWindow() :
// "Signal source"
vbox.pack_start(source_selection_label, false, false);
//vbox.pack_start(source_selection_label, false, false);
{
Gtk::RadioButtonGroup group = source_selection_ranges_rb.get_group();
@ -95,8 +95,8 @@ AnalysisWindow::AnalysisWindow() :
source_selection_ranges_rb.set_active();
vbox.pack_start (source_selection_ranges_rb, false, false);
vbox.pack_start (source_selection_regions_rb, false, false);
//vbox.pack_start (source_selection_ranges_rb, false, false);
//vbox.pack_start (source_selection_regions_rb, false, false);
// "Selected ranges" radio
source_selection_ranges_rb.signal_toggled().connect (
@ -107,18 +107,18 @@ AnalysisWindow::AnalysisWindow() :
bind ( mem_fun(*this, &AnalysisWindow::source_selection_changed), &source_selection_regions_rb));
}
vbox.pack_start(hseparator1, false, false);
//vbox.pack_start(hseparator1, false, false);
// "Display model"
vbox.pack_start(display_model_label, false, false);
//vbox.pack_start(display_model_label, false, false);
{
Gtk::RadioButtonGroup group = display_model_composite_separate_rb.get_group();
display_model_composite_all_tracks_rb.set_group (group);
display_model_composite_separate_rb.set_active();
vbox.pack_start (display_model_composite_separate_rb, false, false);
vbox.pack_start (display_model_composite_all_tracks_rb, false, false);
//vbox.pack_start (display_model_composite_separate_rb, false, false);
//vbox.pack_start (display_model_composite_all_tracks_rb, false, false);
// "Composite graphs for all tracks"
display_model_composite_separate_rb.signal_toggled().connect (
@ -136,7 +136,7 @@ AnalysisWindow::AnalysisWindow() :
refresh_button.signal_clicked().connect ( bind ( mem_fun(*this, &AnalysisWindow::analyze_data), &refresh_button));
vbox.pack_start(refresh_button, false, false, 10);
vbox.pack_start(refresh_button, false, false);
// Feature checkboxes
@ -147,7 +147,7 @@ AnalysisWindow::AnalysisWindow() :
// normalize
show_normalized_button.signal_toggled().connect( mem_fun(*this, &AnalysisWindow::show_normalized_changed));
vbox.pack_start(show_normalized_button, false, false);
//vbox.pack_start(show_normalized_button, false, false);

4
gtk2_ardour/audio_streamview.cc
View File

@ -378,7 +378,7 @@ AudioStreamView::redisplay_diskstream ()
list<RegionView *>::iterator i, tmp;
list<CrossfadeView*>::iterator xi, tmpx;
cerr << "REDISPLAY diskstream\n";
// cerr << "REDISPLAY diskstream\n";
for (i = region_views.begin(); i != region_views.end(); ++i) {
(*i)->set_valid (false);
@ -426,7 +426,7 @@ AudioStreamView::redisplay_diskstream ()
/* now fix layering */
for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
cerr << "Layering call for " << (*i)->region()->name() << endl;
// cerr << "Layering call for " << (*i)->region()->name() << endl;
region_layered (*i);
}
}

10
gtk2_ardour/editor.cc
View File

@ -1892,7 +1892,7 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
items.push_back (MenuElem (_("Bounce"), mem_fun(*this, &Editor::bounce_region_selection)));
#ifdef FFT_ANALYSIS
items.push_back (MenuElem (_("Spectral Analysis"), mem_fun(*this, &Editor::analyze_region_selection)));
// items.push_back (MenuElem (_("Spectral Analysis"), mem_fun(*this, &Editor::analyze_region_selection)));
#endif
items.push_back (SeparatorElem());
@ -2088,6 +2088,10 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& items)
items.push_back (MenuElem (_("Play range"), mem_fun(*this, &Editor::play_selection)));
items.push_back (MenuElem (_("Loop range"), bind (mem_fun(*this, &Editor::set_loop_from_selection), true)));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Set loop from selection"), bind (mem_fun(*this, &Editor::set_loop_from_selection), false)));
items.push_back (MenuElem (_("Set punch from selection"), mem_fun(*this, &Editor::set_punch_from_selection)));
#ifdef FFT_ANALYSIS
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Spectral Analysis"), mem_fun(*this, &Editor::analyze_range_selection)));
@ -2104,10 +2108,6 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& items)
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Select all in range"), mem_fun(*this, &Editor::select_all_selectables_using_time_selection)));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Set loop from selection"), bind (mem_fun(*this, &Editor::set_loop_from_selection), false)));
items.push_back (MenuElem (_("Set punch from selection"), mem_fun(*this, &Editor::set_punch_from_selection)));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_location_from_selection)));
items.push_back (SeparatorElem());

27
gtk2_ardour/editor_ops.cc
View File

@ -1797,20 +1797,9 @@ Editor::temporal_zoom_region (bool both_axes)
(*t)->set_height (per_track_height);
}
/* hide irrelevant tracks */
no_route_list_redisplay = true;
controls_layout.property_height () = full_canvas_height - canvas_timebars_vsize;
vertical_adjustment.set_value ((*tracks.begin())->y_position );
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
if (find (tracks.begin(), tracks.end(), (*i)) == tracks.end()) {
hide_track_in_display (**i, true);
}
}
no_route_list_redisplay = false;
redisplay_route_list ();
vertical_adjustment.set_value (0);
no_save_visual = false;
}
@ -2302,9 +2291,7 @@ Editor::insert_region_list_selection (float times)
RouteTimeAxisView *tv = 0;
boost::shared_ptr<Playlist> playlist;
if (clicked_audio_trackview != 0) {
tv = clicked_audio_trackview;
} else if (!selection->tracks.empty()) {
if (!selection->tracks.empty()) {
if ((tv = dynamic_cast<RouteTimeAxisView*>(selection->tracks.front())) == 0) {
return;
}
@ -3113,8 +3100,10 @@ Editor::region_fill_selection ()
}
TreeModel::iterator i = region_list_display.get_selection()->get_selected();
boost::shared_ptr<Region> region = (*i)[region_list_columns.region];
TreeView::Selection::ListHandle_Path rows = selected->get_selected_rows ();
TreeIter iter = region_list_model->get_iter (*rows.begin());
boost::shared_ptr<Region> region = (*iter)[region_list_columns.region];
nframes64_t start = selection->time[clicked_selection].start;
nframes64_t end = selection->time[clicked_selection].end;
@ -3135,7 +3124,7 @@ Editor::region_fill_selection ()
continue;
}
XMLNode &before = playlist->get_state();
XMLNode &before = playlist->get_state();
playlist->add_region (RegionFactory::create (region), start, times);
session->add_command (new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
}