summaryrefslogtreecommitdiff
path: root/gtk2_ardour/region_view.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-04-11 22:54:22 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-04-11 22:54:22 -0400
commitf208593249c7bc1f139809aa32c8aa6320782af0 (patch)
tree6a8d6bbd280e8ab7e651f82aa36a7ce0e638e5f6 /gtk2_ardour/region_view.cc
parent7caf517b27aa93df14519840224104fb8a1f12c1 (diff)
parent6ae4f104371ed433a79c8845de97428d964edd8b (diff)
Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas
Diffstat (limited to 'gtk2_ardour/region_view.cc')
-rw-r--r--gtk2_ardour/region_view.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 824026ff6e..a1350c04b0 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -388,12 +388,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
@@ -587,12 +585,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();
}