diff options
author | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
commit | bb9cc45cd22af67ac275a5e73accbe14fee664d8 (patch) | |
tree | e52977d3eae6ff07b856088041a080a2fa3e5b79 /gtk2_ardour/mixer_group_tabs.cc | |
parent | 8c4ce1e2ce35571aed5a686671431fdfffae7f8c (diff) |
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent...
git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_group_tabs.cc')
-rw-r--r-- | gtk2_ardour/mixer_group_tabs.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index aaaefae17d..f466381d2b 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ MixerGroupTabs::MixerGroupTabs (Mixer_UI* m) _mixer (m), _menu (0) { - + } @@ -43,7 +43,7 @@ list<GroupTabs::Tab> MixerGroupTabs::compute_tabs () const { list<Tab> tabs; - + Tab tab; tab.from = 0; tab.group = 0; @@ -94,7 +94,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const } else { cairo_set_source_rgba (cr, 1, 1, 1, 0.2); } - + cairo_arc (cr, tab.from + arc_radius, _height, arc_radius, M_PI, 3 * M_PI / 2); cairo_line_to (cr, tab.to - arc_radius, 0); cairo_arc (cr, tab.to - arc_radius, _height, arc_radius, 3 * M_PI / 2, 2 * M_PI); @@ -123,37 +123,37 @@ void MixerGroupTabs::reflect_tabs (list<Tab> const & tabs) { list<Tab>::const_iterator j = tabs.begin (); - + int32_t x = 0; TreeModel::Children rows = _mixer->track_model->children (); for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) { MixerStrip* s = (*i)[_mixer->track_columns.strip]; - + if (s->route()->is_master() || s->route()->is_control() || !s->marked_for_display()) { continue; } - + if (j == tabs.end()) { - + /* already run out of tabs, so no edit group */ s->route()->set_route_group (0, this); - + } else { - + if (x >= j->to) { /* this tab finishes before this track starts, so onto the next tab */ ++j; } - + double const h = x + s->get_width() / 2; - + if (j->from < h && j->to > h) { s->route()->set_route_group (j->group, this); } else { s->route()->set_route_group (0, this); } - + } x += s->get_width (); @@ -166,12 +166,12 @@ MixerGroupTabs::get_menu (RouteGroup* g) if (g == 0) { return 0; } - + using namespace Menu_Helpers; - + delete _menu; _menu = new Menu; - + MenuList& items = _menu->items (); items.push_back (MenuElem (_("Edit..."), bind (mem_fun (*this, &MixerGroupTabs::edit_group), g))); items.push_back (MenuElem (_("Subgroup"), bind (mem_fun (*this, &MixerGroupTabs::make_subgroup), g))); |