summaryrefslogtreecommitdiff
path: root/gtk2_ardour/time_axis_view.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-02-16 17:59:36 +0000
committerCarl Hetherington <carl@carlh.net>2011-02-16 17:59:36 +0000
commitfbbddf78c9441cc717d4294b07d95c1c998cfccd (patch)
treef8510e321514163f8019f07e5712356436920ffb /gtk2_ardour/time_axis_view.cc
parent738b2b85f5a1126adc2ce2f368e1b2066582fa21 (diff)
No-op: coding style.
git-svn-id: svn://localhost/ardour2/branches/3.0@8873 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
-rw-r--r--gtk2_ardour/time_axis_view.cc30
1 files changed, 13 insertions, 17 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 136f6a85ba..7c47d5a5e0 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -73,12 +73,12 @@ int const TimeAxisView::_max_order = 512;
PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
- : AxisView (sess),
- controls_table (2, 8),
- _size_menu (0),
- _y_position (0),
- _editor (ed),
- _order (0)
+ : AxisView (sess)
+ , controls_table (2, 8)
+ , _size_menu (0)
+ , _y_position (0)
+ , _editor (ed)
+ , _order (0)
{
if (extra_height == 0) {
compute_heights ();
@@ -390,11 +390,9 @@ TimeAxisView::step_height (bool bigger)
if (bigger) {
if (height == preset_height(HeightSmall)) {
set_height_enum (HeightSmaller);
- }
- else if (height == preset_height(HeightSmaller)) {
+ } else if (height == preset_height(HeightSmaller)) {
set_height_enum (HeightNormal);
- }
- else {
+ } else {
set_height (height + step);
}
@@ -405,11 +403,9 @@ TimeAxisView::step_height (bool bigger)
if (height <= preset_height (HeightSmaller) && height > preset_height (HeightSmall)) {
set_height_enum (HeightSmall);
- }
- else if (height <= preset_height (HeightNormal) && height > preset_height (HeightSmaller)) {
+ } else if (height <= preset_height (HeightNormal) && height > preset_height (HeightSmaller)) {
set_height_enum (HeightSmaller);
- }
- else {
+ } else {
set_height (height - step);
}
}
@@ -921,7 +917,7 @@ TimeAxisView::add_ghost (RegionView* rv)
{
GhostRegion* gr = rv->add_ghost (*this);
- if(gr) {
+ if (gr) {
ghosts.push_back(gr);
}
}
@@ -1179,7 +1175,7 @@ std::pair<TimeAxisView*, layer_t>
TimeAxisView::covers_y_position (double y)
{
if (hidden()) {
- return std::make_pair ( (TimeAxisView *) 0, 0);
+ return std::make_pair ((TimeAxisView *) 0, 0);
}
if (_y_position <= y && y < (_y_position + height)) {
@@ -1207,7 +1203,7 @@ TimeAxisView::covers_y_position (double y)
}
}
- return std::make_pair ( (TimeAxisView *) 0, 0);
+ return std::make_pair ((TimeAxisView *) 0, 0);
}
bool