smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

No-op: coding style.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8873 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-02-16 17:59:36 +00:00
parent 738b2b85f5
commit fbbddf78c9
1 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gtk2_ardour/time_axis_view.cc
View file

@ -73,12 +73,12 @@ int const TimeAxisView::_max_order = 512;
PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion; PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/) TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
: AxisView (sess), : AxisView (sess)
controls_table (2, 8), , controls_table (2, 8)
_size_menu (0), , _size_menu (0)
_y_position (0), , _y_position (0)
_editor (ed), , _editor (ed)
_order (0) , _order (0)
{ {
if (extra_height == 0) { if (extra_height == 0) {
compute_heights (); compute_heights ();
@ -390,11 +390,9 @@ TimeAxisView::step_height (bool bigger)
if (bigger) { if (bigger) {
if (height == preset_height(HeightSmall)) { if (height == preset_height(HeightSmall)) {
set_height_enum (HeightSmaller); set_height_enum (HeightSmaller);
} } else if (height == preset_height(HeightSmaller)) {
else if (height == preset_height(HeightSmaller)) {
set_height_enum (HeightNormal); set_height_enum (HeightNormal);
} } else {
else {
set_height (height + step); set_height (height + step);
} }
@ -405,11 +403,9 @@ TimeAxisView::step_height (bool bigger)
if (height <= preset_height (HeightSmaller) && height > preset_height (HeightSmall)) { if (height <= preset_height (HeightSmaller) && height > preset_height (HeightSmall)) {
set_height_enum (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); set_height_enum (HeightSmaller);
} } else {
else {
set_height (height - step); set_height (height - step);
} }
} }
@ -921,7 +917,7 @@ TimeAxisView::add_ghost (RegionView* rv)
{ {
GhostRegion* gr = rv->add_ghost (*this); GhostRegion* gr = rv->add_ghost (*this);
if(gr) { if (gr) {
ghosts.push_back(gr); ghosts.push_back(gr);
} }
} }
@ -1179,7 +1175,7 @@ std::pair<TimeAxisView*, layer_t>
TimeAxisView::covers_y_position (double y) TimeAxisView::covers_y_position (double y)
{ {
if (hidden()) { if (hidden()) {
return std::make_pair ( (TimeAxisView *) 0, 0); return std::make_pair ((TimeAxisView *) 0, 0);
} }
if (_y_position <= y && y < (_y_position + height)) { 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 bool