diff options
| author | David Robillard <d@drobilla.net> | 2007-01-09 23:24:54 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-01-09 23:24:54 +0000 |
| commit | 532f6aad4ac79ca15d69deccd18fca90e444c437 (patch) | |
| tree | 0d4ca5449af8eb48ad56e163efcab42c4656e8de /gtk2_ardour/editor_rulers.cc | |
| parent | ef6b25432d9c46d71b08c0f7d5f2686df428c4e8 (diff) | |
Merged with trunk R1283.
NOTE: Compiles, but broken (crash on adding MIDI track).
git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 9834ce16db..bc2328b524 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -338,11 +338,13 @@ Editor::popup_ruler_menu (nframes_t where, ItemType t) case MarkerBarItem: ruler_items.push_back (MenuElem (_("New location marker"), bind ( mem_fun(*this, &Editor::mouse_add_new_marker), where))); ruler_items.push_back (MenuElem (_("Clear all locations"), mem_fun(*this, &Editor::clear_markers))); + ruler_items.push_back (MenuElem (_("Unhide locations"), mem_fun(*this, &Editor::unhide_markers))); ruler_items.push_back (SeparatorElem ()); break; case RangeMarkerBarItem: //ruler_items.push_back (MenuElem (_("New Range"))); ruler_items.push_back (MenuElem (_("Clear all ranges"), mem_fun(*this, &Editor::clear_ranges))); + ruler_items.push_back (MenuElem (_("Unhide ranges"), mem_fun(*this, &Editor::unhide_ranges))); ruler_items.push_back (SeparatorElem ()); break; @@ -422,7 +424,7 @@ Editor::popup_ruler_menu (nframes_t where, ItemType t) mitem->set_active(true); } - editor_ruler_menu->popup (1, 0); + editor_ruler_menu->popup (1, gtk_get_current_event_time()); no_ruler_shown_update = false; } @@ -468,7 +470,7 @@ Editor::store_ruler_visibility () session->add_extra_xml (*node); session->set_dirty (); } - + void Editor::restore_ruler_visibility () { @@ -854,7 +856,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp if (range < (2 * session->frames_per_smpte_frame())) { /* 0 - 2 frames */ show_bits = true; mark_modulo = 20; - nmarks = 1 + 160; + nmarks = 1 + (2 * Config->get_subframes_per_frame()); } else if (range <= (fr / 4)) { /* 2 frames - 0.250 second */ show_frames = true; mark_modulo = 1; |