Fix spacey tabs.

git-svn-id: svn://localhost/ardour2/branches/3.0@10197 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2011-10-07 20:09:01 +00:00
parent 4383cce993
commit bbcb8125b7

View file

@ -451,8 +451,7 @@ Editor::get_equivalent_regions (RegionSelection & basis, PBD::PropertyID prop) c
mapover_tracks ( mapover_tracks (
sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), *i, &eq), sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), *i, &eq),
&(*i)->get_time_axis_view(), prop &(*i)->get_time_axis_view(), prop);
);
for (vector<RegionView*>::iterator j = eq.begin(); j != eq.end(); ++j) { for (vector<RegionView*>::iterator j = eq.begin(); j != eq.end(); ++j) {
equivalent.add (*j); equivalent.add (*j);
@ -804,7 +803,7 @@ Editor::set_selected_regionview_from_click (bool press, Selection::Operation op,
} }
} }
out: out:
return commit; return commit;
} }
@ -1104,13 +1103,13 @@ Editor::sensitize_the_right_region_actions ()
if (have_envelope_visible && !have_envelope_invisible) { if (have_envelope_visible && !have_envelope_invisible) {
Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-visible"))->set_active (); Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-visible"))->set_active ();
} else if (have_envelope_visible && have_envelope_invisible) { } else if (have_envelope_visible && have_envelope_invisible) {
// _region_actions->get_action("toggle-region-gain-envelope-visible")->set_inconsistent (); // _region_actions->get_action("toggle-region-gain-envelope-visible")->set_inconsistent ();
} }
if (have_envelope_active && !have_envelope_inactive) { if (have_envelope_active && !have_envelope_inactive) {
Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-active"))->set_active (); Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-gain-envelope-active"))->set_active ();
} else if (have_envelope_active && have_envelope_inactive) { } else if (have_envelope_active && have_envelope_inactive) {
// _region_actions->get_action("toggle-region-gain-envelope-active")->set_inconsistent (); // _region_actions->get_action("toggle-region-gain-envelope-active")->set_inconsistent ();
} }
} else { } else {
@ -1129,23 +1128,23 @@ Editor::sensitize_the_right_region_actions ()
Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock"))->set_active (have_locked && !have_unlocked); Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock"))->set_active (have_locked && !have_unlocked);
if (have_locked && have_unlocked) { if (have_locked && have_unlocked) {
// _region_actions->get_action("toggle-region-lock")->set_inconsistent (); // _region_actions->get_action("toggle-region-lock")->set_inconsistent ();
} }
Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock-style"))->set_active (have_position_lock_style_music && !have_position_lock_style_audio); Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-lock-style"))->set_active (have_position_lock_style_music && !have_position_lock_style_audio);
if (have_position_lock_style_music && have_position_lock_style_audio) { if (have_position_lock_style_music && have_position_lock_style_audio) {
// _region_actions->get_action("toggle-region-lock-style")->set_inconsistent (); // _region_actions->get_action("toggle-region-lock-style")->set_inconsistent ();
} }
Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-mute"))->set_active (have_muted && !have_unmuted); Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-region-mute"))->set_active (have_muted && !have_unmuted);
if (have_muted && have_unmuted) { if (have_muted && have_unmuted) {
// _region_actions->get_action("toggle-region-mute")->set_inconsistent (); // _region_actions->get_action("toggle-region-mute")->set_inconsistent ();
} }
Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-opaque-region"))->set_active (have_opaque && !have_non_opaque); Glib::RefPtr<ToggleAction>::cast_dynamic (_region_actions->get_action("toggle-opaque-region"))->set_active (have_opaque && !have_non_opaque);
if (have_opaque && have_non_opaque) { if (have_opaque && have_non_opaque) {
// _region_actions->get_action("toggle-opaque-region")->set_inconsistent (); // _region_actions->get_action("toggle-opaque-region")->set_inconsistent ();
} }
if (!have_not_at_natural_position) { if (!have_not_at_natural_position) {
@ -1311,9 +1310,7 @@ Editor::invert_selection ()
* within the region are already selected. * within the region are already selected.
*/ */
void void
Editor::select_all_within ( Editor::select_all_within (framepos_t start, framepos_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op, bool preserve_if_selected)
framepos_t start, framepos_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op, bool preserve_if_selected
)
{ {
list<Selectable*> found; list<Selectable*> found;