smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 17:16:38 +01:00
Code Issues Projects Releases Wiki Activity

make fit-selected-tracks operate on tracks with selected regions IF no tracks are selected

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9026 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-03-02 02:46:19 +00:00
parent 50858919d3
commit 786028a20a
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/editor_actions.cc
View file

@ -420,7 +420,7 @@ Editor::register_actions ()
act = ActionManager::register_action (editor_actions, "fit-tracks", _("Fit Selected Tracks"), sigc::mem_fun(*this, &Editor::fit_selected_tracks)); act = ActionManager::register_action (editor_actions, "fit-tracks", _("Fit Selected Tracks"), sigc::mem_fun(*this, &Editor::fit_selected_tracks));
ActionManager::session_sensitive_actions.push_back (act); ActionManager::session_sensitive_actions.push_back (act);
ActionManager::track_selection_sensitive_actions.push_back (act);
act = ActionManager::register_action (editor_actions, "track-height-largest", _("Largest"), sigc::bind ( act = ActionManager::register_action (editor_actions, "track-height-largest", _("Largest"), sigc::bind (
sigc::mem_fun(*this, &Editor::set_track_height), HeightLargest)); sigc::mem_fun(*this, &Editor::set_track_height), HeightLargest));
ActionManager::session_sensitive_actions.push_back (act); ActionManager::session_sensitive_actions.push_back (act);

16
gtk2_ardour/editor_ops.cc
View file

@ -6214,7 +6214,21 @@ Editor::insert_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt,
void void
Editor::fit_selected_tracks () Editor::fit_selected_tracks ()
{ {
fit_tracks (selection->tracks); if (!selection->tracks.empty()) {
fit_tracks (selection->tracks);
} else {
TrackViewList tvl;
/* no selected tracks - use tracks with selected regions */
for (RegionSelection::iterator r = selection->regions.begin(); r != selection->regions.end(); ++r) {
tvl.push_back (&(*r)->get_time_axis_view ());
}
if (!tvl.empty()) {
fit_tracks (tvl);
}
}
} }
void void

3
gtk2_ardour/panner_ui.cc
View file

@ -435,9 +435,8 @@ PannerUI::update_pan_sensitive ()
{ {
bool const sensitive = !(_panner->pannable()->automation_state() & Play); bool const sensitive = !(_panner->pannable()->automation_state() & Play);
#ifdef PANNER_HACKS
pan_vbox.set_sensitive (sensitive); pan_vbox.set_sensitive (sensitive);
#endif
if (big_window) { if (big_window) {
big_window->set_sensitive (sensitive); big_window->set_sensitive (sensitive);
} }