summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_rulers.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-11-19 01:53:39 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-11-19 01:53:39 +0000
commited9bdd08945def40da97448af36301452b1b01df (patch)
tree27bf90fb296cde7cd12920657cd2f3f05d71b3f1 /gtk2_ardour/editor_rulers.cc
parent86f7d4ef8735134fcb2a0abd065381370d028ab1 (diff)
a ton of changes based on discussions at SAE; to be documented later
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2694 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
-rw-r--r--gtk2_ardour/editor_rulers.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index bb18ffd2ce..b0791f789a 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -164,9 +164,7 @@ Editor::ruler_button_press (GdkEventButton* ev)
case 2:
/* edit point */
- if (snap_type != Editing::SnapToEditPoint) {
- snap_to (where);
- }
+ snap_to (where);
break;
default:
@@ -205,9 +203,7 @@ Editor::ruler_button_release (GdkEventButton* ev)
case 2:
/* edit point */
- if (snap_type != Editing::SnapToEditPoint) {
- snap_to (where);
- }
+ snap_to (where);
break;
case 3:
@@ -379,7 +375,7 @@ Editor::popup_ruler_menu (nframes_t where, ItemType t)
mitem->set_active(true);
}
- ruler_items.push_back (CheckMenuElem (_("Frames"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_frames)));
+ ruler_items.push_back (CheckMenuElem (_("Samples"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_frames)));
mitem = (CheckMenuItem *) &ruler_items.back();
if (ruler_shown[ruler_metric_frames]) {
mitem->set_active(true);