diff options
| author | David Robillard <d@drobilla.net> | 2009-02-16 05:13:05 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-16 05:13:05 +0000 |
| commit | 458c588e2c7dfe7c0e62647fb5e0d0c06cdf8f04 (patch) | |
| tree | 32ebd393dd6aae397a1e272ec51a6e2d548b704b /gtk2_ardour/automation_time_axis.cc | |
| parent | fb254fb2fc89f89142a2c991d9b09364ca1dac02 (diff) | |
Don't bind playlist_modified with a shared_ptr<Playlist> parameter.
Clean up.
git-svn-id: svn://localhost/ardour2/branches/3.0@4599 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index d46a3cdbaa..93418201ec 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -381,10 +381,8 @@ AutomationTimeAxisView::set_height (uint32_t h) { bool changed = (height != (uint32_t) h) || first_call_to_set_height; bool changed_between_small_and_normal = ( - (height < hNormal && h >= hNormal) || - (height >= hNormal || - h < hNormal) - ); + (height < hNormal && h >= hNormal) + || (height >= hNormal || h < hNormal) ); TimeAxisView* state_parent = get_parent_with_state (); assert(state_parent); @@ -515,20 +513,24 @@ AutomationTimeAxisView::build_display_menu () auto_state_menu->set_name ("ArdourContextMenu"); MenuList& as_items = auto_state_menu->items(); - as_items.push_back (CheckMenuElem (_("Manual"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off))); + as_items.push_back (CheckMenuElem (_("Manual"), bind ( + mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Off))); auto_off_item = dynamic_cast<CheckMenuItem*>(&as_items.back()); - as_items.push_back (CheckMenuElem (_("Play"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play))); + as_items.push_back (CheckMenuElem (_("Play"), bind ( + mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Play))); auto_play_item = dynamic_cast<CheckMenuItem*>(&as_items.back()); - as_items.push_back (CheckMenuElem (_("Write"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write))); + as_items.push_back (CheckMenuElem (_("Write"), bind ( + mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Write))); auto_write_item = dynamic_cast<CheckMenuItem*>(&as_items.back()); - as_items.push_back (CheckMenuElem (_("Touch"), - bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch))); + as_items.push_back (CheckMenuElem (_("Touch"), bind ( + mem_fun(*this, &AutomationTimeAxisView::set_automation_state), + (AutoState) Touch))); auto_touch_item = dynamic_cast<CheckMenuItem*>(&as_items.back()); items.push_back (MenuElem (_("State"), *auto_state_menu)); @@ -860,17 +862,6 @@ AutomationTimeAxisView::exited () _line->track_exited(); } -/*void -AutomationTimeAxisView::set_colors () -{ - for (list<GhostRegion*>::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) { - (*i)->set_colors(); - } - - if (_line) - _line->set_colors(); - }*/ - void AutomationTimeAxisView::color_handler () { |