diff options
| author | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-04-11 22:24:05 +0200 |
| commit | 6ae4f104371ed433a79c8845de97428d964edd8b (patch) | |
| tree | 6955c57269b951e2e9d4b665c2687ed9e1670961 /gtk2_ardour/region_view.cc | |
| parent | ae2b39b2e346548e2bf9f6cb308d8bd0b9d64005 (diff) | |
| parent | 66ee2c8e597ca9a07d614cf56b4002e5303e3645 (diff) | |
Merge branch 'master' into cairocanvas
Conflicts:
gtk2_ardour/editor.h
gtk2_ardour/editor_canvas.cc
gtk2_ardour/wscript
Diffstat (limited to 'gtk2_ardour/region_view.cc')
| -rw-r--r-- | gtk2_ardour/region_view.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 8451497289..f0c2ee2721 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -387,12 +387,10 @@ RegionView::region_changed (const PropertyChange& what_changed) if (what_changed.contains (ARDOUR::Properties::locked)) { region_locked (); } -#ifdef WITH_VIDEOTIMELINE if (what_changed.contains (ARDOUR::Properties::locked)) { /* name will show locked status */ region_renamed (); } -#endif } void @@ -586,12 +584,10 @@ RegionView::make_name () const str += '{'; str += _region->name(); str += '}'; -#ifdef WITH_VIDEOTIMELINE } else if (_region->video_locked()) { str += '['; str += _region->name(); str += ']'; -#endif } else { str = _region->name(); } |