X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_rulers.cc;h=401bb5282b172cecc6c87b7daf96570876e1a5c5;hb=9e20a24db0f5697f8dbe647c7d9cf97bcc07e2dd;hp=6e2267bf62b1eca0d9750ee6a2c0d06390e7ed5b;hpb=ba4d1cd1c1d5e4b47e288cd83c81011e7399207b;p=ardour.git diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 6e2267bf62..401bb5282b 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -51,8 +51,9 @@ #include "time_axis_view.h" #include "editor_drag.h" #include "editor_cursors.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; @@ -122,19 +123,14 @@ void Editor::initialize_rulers () { ruler_grabbed_widget = 0; - /* Not really sure why we can't get this right in a cross-platform way, - but it seems hard. - */ -#ifdef __APPLE__ - Pango::FontDescription font (ARDOUR_UI::config()->get_SmallerFont()); -#else - Pango::FontDescription font (ARDOUR_UI::config()->get_SmallFont()); -#endif + + Pango::FontDescription font (UIConfiguration::instance().get_SmallerFont()); + _timecode_metric = new TimecodeMetric (this); _bbt_metric = new BBTMetric (this); _minsec_metric = new MinsecMetric (this); _samples_metric = new SamplesMetric (this); - + timecode_ruler = new ArdourCanvas::Ruler (_time_markers_group, *_timecode_metric, ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, timebar_height)); timecode_ruler->set_font_description (font); @@ -153,7 +149,7 @@ Editor::initialize_rulers () minsec_nmarks = 0; bbt_ruler = new ArdourCanvas::Ruler (_time_markers_group, *_bbt_metric, - ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, timebar_height)); + ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, timebar_height)); bbt_ruler->set_font_description (font); CANVAS_DEBUG_NAME (bbt_ruler, "bbt ruler"); timecode_nmarks = 0; @@ -179,7 +175,7 @@ Editor::initialize_rulers () minsec_ruler->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_event), minsec_ruler, MinsecRulerItem)); bbt_ruler->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_event), bbt_ruler, BBTRulerItem)); samples_ruler->Event.connect (sigc::bind (sigc::mem_fun (*this, &Editor::canvas_ruler_event), samples_ruler, SamplesRulerItem)); - + visible_timebars = 0; /*this will be changed below */ } @@ -197,7 +193,7 @@ Editor::ruler_label_button_release (GdkEventButton* ev) } void -Editor::popup_ruler_menu (framepos_t where, ItemType t) +Editor::popup_ruler_menu (samplepos_t where, ItemType t) { using namespace Menu_Helpers; @@ -213,56 +209,73 @@ Editor::popup_ruler_menu (framepos_t where, ItemType t) switch (t) { case MarkerBarItem: - ruler_items.push_back (MenuElem (_("New location marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, false, false))); + ruler_items.push_back (MenuElem (_("New location marker"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, false))); ruler_items.push_back (MenuElem (_("Clear all locations"), sigc::mem_fun(*this, &Editor::clear_markers))); ruler_items.push_back (MenuElem (_("Unhide locations"), sigc::mem_fun(*this, &Editor::unhide_markers))); - ruler_items.push_back (SeparatorElem ()); break; + case RangeMarkerBarItem: ruler_items.push_back (MenuElem (_("New range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_range), where))); ruler_items.push_back (MenuElem (_("Clear all ranges"), sigc::mem_fun(*this, &Editor::clear_ranges))); ruler_items.push_back (MenuElem (_("Unhide ranges"), sigc::mem_fun(*this, &Editor::unhide_ranges))); - ruler_items.push_back (SeparatorElem ()); - break; - case TransportMarkerBarItem: + case TransportMarkerBarItem: + ruler_items.push_back (MenuElem (_("New Loop range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_loop), where))); + ruler_items.push_back (MenuElem (_("New Punch range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_punch), where))); break; case CdMarkerBarItem: // TODO - ruler_items.push_back (MenuElem (_("New CD track marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, true, false))); + ruler_items.push_back (MenuElem (_("New CD track marker"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, true))); break; - case TempoBarItem: - ruler_items.push_back (MenuElem (_("New Tempo"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_tempo_event), where))); + ruler_items.push_back (MenuElem (_("New Tempo"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_add_new_tempo_event), where))); break; case MeterBarItem: - ruler_items.push_back (MenuElem (_("New Meter"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_meter_event), where))); + ruler_items.push_back (MenuElem (_("New Meter"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_add_new_meter_event), where))); break; case VideoBarItem: - ruler_items.push_back (MenuElem (_("Timeline height"))); - static_cast(&ruler_items.back())->set_sensitive(false); - ruler_items.push_back (CheckMenuElem (_("Large"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_video_timeline_height), 6))); + /* proper headings would be nice + * but AFAICT the only way to get them will be to define a + * special GTK style for insensitive Elements or subclass MenuItem + */ + //ruler_items.push_back (MenuElem (_("Timeline height"))); // heading + //static_cast(&ruler_items.back())->set_sensitive(false); + ruler_items.push_back (CheckMenuElem (_("Large"), sigc::bind (sigc::mem_fun(*this, &Editor::set_video_timeline_height), 6))); if (videotl_bar_height == 6) { static_cast(&ruler_items.back())->set_active(true);} - ruler_items.push_back (CheckMenuElem (_("Normal"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_video_timeline_height), 4))); + ruler_items.push_back (CheckMenuElem (_("Normal"), sigc::bind (sigc::mem_fun(*this, &Editor::set_video_timeline_height), 4))); if (videotl_bar_height == 4) { static_cast(&ruler_items.back())->set_active(true);} - ruler_items.push_back (CheckMenuElem (_("Small"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_video_timeline_height), 3))); + ruler_items.push_back (CheckMenuElem (_("Small"), sigc::bind (sigc::mem_fun(*this, &Editor::set_video_timeline_height), 3))); if (videotl_bar_height == 3) { static_cast(&ruler_items.back())->set_active(true);} - ruler_items.push_back (SeparatorElem ()); - ruler_items.push_back (MenuElem (_("Align Video Track"))); - static_cast(&ruler_items.back())->set_sensitive(false); + ruler_items.push_back (SeparatorElem ()); + //ruler_items.push_back (MenuElem (_("Align Video Track"))); // heading + //static_cast(&ruler_items.back())->set_sensitive(false); ruler_items.push_back (CheckMenuElem (_("Lock"))); { Gtk::CheckMenuItem* vtl_lock = static_cast(&ruler_items.back()); vtl_lock->set_active(is_video_timeline_locked()); vtl_lock->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_video_timeline_locked)); } + + ruler_items.push_back (SeparatorElem ()); + + //ruler_items.push_back (MenuElem (_("Video Monitor"))); // heading + //static_cast(&ruler_items.back())->set_sensitive(false); + ruler_items.push_back (CheckMenuElem (_("Video Monitor"))); + { + Gtk::CheckMenuItem* xjadeo_toggle = static_cast(&ruler_items.back()); + if (!ARDOUR_UI::instance()->video_timeline->found_xjadeo()) { + xjadeo_toggle->set_sensitive(false); + } + xjadeo_toggle->set_active(xjadeo_proc_action->get_active()); + xjadeo_toggle->signal_activate().connect (sigc::bind(sigc::mem_fun(*this, &Editor::toggle_xjadeo_proc), -1)); + } break; default: @@ -281,103 +294,60 @@ Editor::store_ruler_visibility () { XMLNode* node = new XMLNode(X_("RulerVisibility")); - node->add_property (X_("timecode"), ruler_timecode_action->get_active() ? "yes": "no"); - node->add_property (X_("bbt"), ruler_bbt_action->get_active() ? "yes": "no"); - node->add_property (X_("samples"), ruler_samples_action->get_active() ? "yes": "no"); - node->add_property (X_("minsec"), ruler_minsec_action->get_active() ? "yes": "no"); - node->add_property (X_("tempo"), ruler_tempo_action->get_active() ? "yes": "no"); - node->add_property (X_("meter"), ruler_meter_action->get_active() ? "yes": "no"); - node->add_property (X_("marker"), ruler_marker_action->get_active() ? "yes": "no"); - node->add_property (X_("rangemarker"), ruler_range_action->get_active() ? "yes": "no"); - node->add_property (X_("transportmarker"), ruler_loop_punch_action->get_active() ? "yes": "no"); - node->add_property (X_("cdmarker"), ruler_cd_marker_action->get_active() ? "yes": "no"); - node->add_property (X_("videotl"), ruler_video_action->get_active() ? "yes": "no"); + node->set_property (X_("timecode"), ruler_timecode_action->get_active()); + node->set_property (X_("bbt"), ruler_bbt_action->get_active()); + node->set_property (X_("samples"), ruler_samples_action->get_active()); + node->set_property (X_("minsec"), ruler_minsec_action->get_active()); + node->set_property (X_("tempo"), ruler_tempo_action->get_active()); + node->set_property (X_("meter"), ruler_meter_action->get_active()); + node->set_property (X_("marker"), ruler_marker_action->get_active()); + node->set_property (X_("rangemarker"), ruler_range_action->get_active()); + node->set_property (X_("transportmarker"), ruler_loop_punch_action->get_active()); + node->set_property (X_("cdmarker"), ruler_cd_marker_action->get_active()); + node->set_property (X_("videotl"), ruler_video_action->get_active()); _session->add_extra_xml (*node); - _session->set_dirty (); } void Editor::restore_ruler_visibility () { - XMLProperty* prop; XMLNode * node = _session->extra_xml (X_("RulerVisibility")); no_ruler_shown_update = true; + bool yn; if (node) { - if ((prop = node->property ("timecode")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_timecode_action->set_active (true); - } else { - ruler_timecode_action->set_active (false); - } + if (node->get_property ("timecode", yn)) { + ruler_timecode_action->set_active (yn); } - if ((prop = node->property ("bbt")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_bbt_action->set_active (true); - } else { - ruler_bbt_action->set_active (false); - } + if (node->get_property ("bbt", yn)) { + ruler_bbt_action->set_active (yn); } - if ((prop = node->property ("samples")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_samples_action->set_active (true); - } else { - ruler_samples_action->set_active (false); - } + if (node->get_property ("samples", yn)) { + ruler_samples_action->set_active (yn); } - if ((prop = node->property ("minsec")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_minsec_action->set_active (true); - } else { - ruler_minsec_action->set_active (false); - } + if (node->get_property ("minsec", yn)) { + ruler_minsec_action->set_active (yn); } - if ((prop = node->property ("tempo")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_tempo_action->set_active (true); - } else { - ruler_tempo_action->set_active (false); - } + if (node->get_property ("tempo", yn)) { + ruler_tempo_action->set_active (yn); } - if ((prop = node->property ("meter")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_meter_action->set_active (true); - } else { - ruler_meter_action->set_active (false); - } + if (node->get_property ("meter", yn)) { + ruler_meter_action->set_active (yn); } - if ((prop = node->property ("marker")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_marker_action->set_active (true); - } else { - ruler_marker_action->set_active (false); - } + if (node->get_property ("marker", yn)) { + ruler_marker_action->set_active (yn); } - if ((prop = node->property ("rangemarker")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_range_action->set_active (true); - } else { - ruler_range_action->set_active (false); - } + if (node->get_property ("rangemarker", yn)) { + ruler_range_action->set_active (yn); } - - if ((prop = node->property ("transportmarker")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_loop_punch_action->set_active (true); - } else { - ruler_loop_punch_action->set_active (false); - } + if (node->get_property ("transportmarker", yn)) { + ruler_loop_punch_action->set_active (yn); } - if ((prop = node->property ("cdmarker")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_cd_marker_action->set_active (true); - } else { - ruler_cd_marker_action->set_active (false); - } - + if (node->get_property ("cdmarker", yn)) { + ruler_cd_marker_action->set_active (yn); } else { // this _session doesn't yet know about the cdmarker ruler // as a benefit to the user who doesn't know the feature exists, show the ruler if @@ -392,12 +362,8 @@ Editor::restore_ruler_visibility () } } - if ((prop = node->property ("videotl")) != 0) { - if (string_is_affirmative (prop->value())) { - ruler_video_action->set_active (true); - } else { - ruler_video_action->set_active (false); - } + if (node->get_property ("videotl", yn)) { + ruler_video_action->set_active (yn); } } @@ -426,7 +392,7 @@ Editor::update_ruler_visibility () double tbgpos = 0.0; double old_unit_pos; -#ifdef GTKOSX +#ifdef __APPLE__ /* gtk update probs require this (damn) */ meter_label.hide(); tempo_label.hide(); @@ -527,7 +493,7 @@ Editor::update_ruler_visibility () tempo_label.hide(); } - if (!Profile->get_sae() && ruler_range_action->get_active()) { + if (ruler_range_action->get_active()) { old_unit_pos = range_marker_group->position().y; if (tbpos != old_unit_pos) { range_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos)); @@ -618,7 +584,7 @@ Editor::update_ruler_visibility () compute_fixed_ruler_scale (); update_fixed_rulers(); - redisplay_tempo (false); + redisplay_grid (false); /* Changing ruler visibility means that any lines on markers might need updating */ for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) { @@ -635,10 +601,10 @@ Editor::update_just_timecode () return; } - framepos_t rightmost_frame = leftmost_frame + current_page_samples(); + samplepos_t rightmost_sample = _leftmost_sample + current_page_samples(); if (ruler_timecode_action->get_active()) { - timecode_ruler->set_range (leftmost_frame, rightmost_frame); + timecode_ruler->set_range (_leftmost_sample, rightmost_sample); } } @@ -650,22 +616,22 @@ Editor::compute_fixed_ruler_scale () } if (ruler_timecode_action->get_active()) { - set_timecode_ruler_scale (leftmost_frame, leftmost_frame + current_page_samples()); + set_timecode_ruler_scale (_leftmost_sample, _leftmost_sample + current_page_samples()); } if (ruler_minsec_action->get_active()) { - set_minsec_ruler_scale (leftmost_frame, leftmost_frame + current_page_samples()); + set_minsec_ruler_scale (_leftmost_sample, _leftmost_sample + current_page_samples()); } if (ruler_samples_action->get_active()) { - set_samples_ruler_scale (leftmost_frame, leftmost_frame + current_page_samples()); + set_samples_ruler_scale (_leftmost_sample, _leftmost_sample + current_page_samples()); } } void Editor::update_fixed_rulers () { - framepos_t rightmost_frame; + samplepos_t rightmost_sample; if (_session == 0) { return; @@ -677,83 +643,83 @@ Editor::update_fixed_rulers () _samples_metric->units_per_pixel = samples_per_pixel; _minsec_metric->units_per_pixel = samples_per_pixel; - rightmost_frame = leftmost_frame + current_page_samples(); + rightmost_sample = _leftmost_sample + current_page_samples(); /* these force a redraw, which in turn will force execution of the metric callbacks to compute the relevant ticks to display. */ if (ruler_timecode_action->get_active()) { - timecode_ruler->set_range (leftmost_frame, rightmost_frame); + timecode_ruler->set_range (_leftmost_sample, rightmost_sample); } if (ruler_samples_action->get_active()) { - samples_ruler->set_range (leftmost_frame, rightmost_frame); + samples_ruler->set_range (_leftmost_sample, rightmost_sample); } if (ruler_minsec_action->get_active()) { - minsec_ruler->set_range (leftmost_frame, rightmost_frame); + minsec_ruler->set_range (_leftmost_sample, rightmost_sample); } } void -Editor::update_tempo_based_rulers (ARDOUR::TempoMap::BBTPointList::const_iterator& begin, - ARDOUR::TempoMap::BBTPointList::const_iterator& end) +Editor::update_tempo_based_rulers () { if (_session == 0) { return; } - compute_bbt_ruler_scale (leftmost_frame, leftmost_frame+current_page_samples(), - begin, end); - _bbt_metric->units_per_pixel = samples_per_pixel; if (ruler_bbt_action->get_active()) { - bbt_ruler->set_range (leftmost_frame, leftmost_frame+current_page_samples()); + bbt_ruler->set_range (_leftmost_sample, _leftmost_sample+current_page_samples()); } } + void -Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper) +Editor::set_timecode_ruler_scale (samplepos_t lower, samplepos_t upper) { - framepos_t spacer; - framepos_t fr; + using namespace std; + + samplepos_t spacer; + samplepos_t fr; if (_session == 0) { return; } - fr = _session->frame_rate(); + fr = _session->sample_rate(); - if (lower > (spacer = (framepos_t) (128 * Editor::get_current_zoom ()))) { + if (lower > (spacer = (samplepos_t) (128 * Editor::get_current_zoom ()))) { lower = lower - spacer; } else { lower = 0; } + upper = upper + spacer; - framecnt_t const range = upper - lower; + samplecnt_t const range = upper - lower; - if (range < (2 * _session->frames_per_timecode_frame())) { /* 0 - 2 frames */ + if (range < (2 * _session->samples_per_timecode_frame())) { /* 0 - 2 samples */ timecode_ruler_scale = timecode_show_bits; timecode_mark_modulo = 20; timecode_nmarks = 2 + (2 * _session->config.get_subframes_per_frame()); - } else if (range <= (fr / 4)) { /* 2 frames - 0.250 second */ - timecode_ruler_scale = timecode_show_frames; + } else if (range <= (fr / 4)) { /* 2 samples - 0.250 second */ + timecode_ruler_scale = timecode_show_samples; timecode_mark_modulo = 1; - timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (samplepos_t)_session->samples_per_timecode_frame()); } else if (range <= (fr / 2)) { /* 0.25-0.5 second */ - timecode_ruler_scale = timecode_show_frames; + timecode_ruler_scale = timecode_show_samples; timecode_mark_modulo = 2; - timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (samplepos_t)_session->samples_per_timecode_frame()); } else if (range <= fr) { /* 0.5-1 second */ - timecode_ruler_scale = timecode_show_frames; + timecode_ruler_scale = timecode_show_samples; timecode_mark_modulo = 5; - timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (samplepos_t)_session->samples_per_timecode_frame()); } else if (range <= 2 * fr) { /* 1-2 seconds */ - timecode_ruler_scale = timecode_show_frames; + timecode_ruler_scale = timecode_show_samples; timecode_mark_modulo = 10; - timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (samplepos_t)_session->samples_per_timecode_frame()); } else if (range <= 8 * fr) { /* 2-8 seconds */ timecode_ruler_scale = timecode_show_seconds; timecode_mark_modulo = 1; @@ -804,20 +770,30 @@ Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper) timecode_nmarks = 2 + 24; } else { - /* not possible if framepos_t is a 32 bit quantity */ + const samplecnt_t hours_in_range = range / (60 * 60 * fr); + const int text_width_rough_guess = 120; /* pixels, very very approximate guess at how wide the tick mark text is */ - timecode_ruler_scale = timecode_show_hours; - timecode_mark_modulo = 4; - timecode_nmarks = 2 + 24; - } + /* Normally we do not need to know anything about the width of the canvas + to set the ruler scale, because the caller has already determined + the width and set lower + upper arguments to this function to match that. + + But in this case, where the range defined by lower and uppper can vary + substantially (basically anything from 24hrs+ to several billion years) + trying to decide which tick marks to show does require us to know + about the available width. + */ + timecode_nmarks = _track_canvas->width() / text_width_rough_guess; + timecode_ruler_scale = timecode_show_many_hours; + timecode_mark_modulo = max ((samplecnt_t) 1, 1 + (hours_in_range / timecode_nmarks)); + } } void Editor::metric_get_timecode (std::vector& marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) { - framepos_t pos; - framecnt_t spacer; + samplepos_t pos; + samplecnt_t spacer; Timecode::Time timecode; gchar buf[16]; gint n; @@ -827,22 +803,20 @@ Editor::metric_get_timecode (std::vector& marks, gdou return; } - if (lower > (spacer = (framecnt_t)(128 * Editor::get_current_zoom ()))) { + if (lower > (spacer = (samplecnt_t)(128 * Editor::get_current_zoom ()))) { lower = lower - spacer; } else { lower = 0; } - pos = (framecnt_t) floor (lower); + pos = (samplecnt_t) floor (lower); switch (timecode_ruler_scale) { case timecode_show_bits: - // Find timecode time of this sample (pos) with subframe accuracy - _session->sample_to_timecode(pos, timecode, true /* use_offset */, true /* use_subframes */ ); - + _session->sample_to_timecode(pos, timecode, true /* use_offset */, true /* use_subframes */); for (n = 0; n < timecode_nmarks; n++) { - _session->timecode_to_sample(timecode, pos, true /* use_offset */, true /* use_subframes */ ); + _session->timecode_to_sample(timecode, pos, true /* use_offset */, true /* use_subframes */); if ((timecode.subframes % timecode_mark_modulo) == 0) { if (timecode.subframes == 0) { mark.style = ArdourCanvas::Ruler::Mark::Major; @@ -854,25 +828,48 @@ Editor::metric_get_timecode (std::vector& marks, gdou } else { snprintf (buf, sizeof(buf)," "); mark.style = ArdourCanvas::Ruler::Mark::Micro; - } mark.label = buf; mark.position = pos; - marks.push_back (mark); - // Increment subframes by one - Timecode::increment_subframes( timecode, _session->config.get_subframes_per_frame() ); + Timecode::increment_subframes (timecode, _session->config.get_subframes_per_frame()); } - break; + break; + + case timecode_show_samples: + // Find timecode time of this sample (pos) + _session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */); + // Go to next whole sample down + Timecode::frames_floot (timecode); + for (n = 0; n < timecode_nmarks; n++) { + _session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */); + if ((timecode.frames % timecode_mark_modulo) == 0) { + if (timecode.frames == 0) { + mark.style = ArdourCanvas::Ruler::Mark::Major; + } else { + mark.style = ArdourCanvas::Ruler::Mark::Minor; + } + mark.position = pos; + snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); + } else { + snprintf (buf, sizeof(buf)," "); + mark.style = ArdourCanvas::Ruler::Mark::Micro; + mark.position = pos; + } + mark.label = buf; + marks.push_back (mark); + Timecode::increment (timecode, _session->config.get_subframes_per_frame()); + } + break; + case timecode_show_seconds: // Find timecode time of this sample (pos) - _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ ); + _session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */); // Go to next whole second down - Timecode::seconds_floor( timecode ); - + Timecode::seconds_floor (timecode); for (n = 0; n < timecode_nmarks; n++) { - _session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ ); + _session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */); if ((timecode.seconds % timecode_mark_modulo) == 0) { if (timecode.seconds == 0) { mark.style = ArdourCanvas::Ruler::Mark::Major; @@ -886,22 +883,20 @@ Editor::metric_get_timecode (std::vector& marks, gdou snprintf (buf, sizeof(buf)," "); mark.style = ArdourCanvas::Ruler::Mark::Micro; mark.position = pos; - } mark.label = buf; marks.push_back (mark); - - Timecode::increment_seconds( timecode, _session->config.get_subframes_per_frame() ); + Timecode::increment_seconds (timecode, _session->config.get_subframes_per_frame()); } - break; + break; + case timecode_show_minutes: - // Find timecode time of this sample (pos) - _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ ); + //Find timecode time of this sample (pos) + _session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */); // Go to next whole minute down - Timecode::minutes_floor( timecode ); - + Timecode::minutes_floor (timecode); for (n = 0; n < timecode_nmarks; n++) { - _session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ ); + _session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */); if ((timecode.minutes % timecode_mark_modulo) == 0) { if (timecode.minutes == 0) { mark.style = ArdourCanvas::Ruler::Mark::Major; @@ -912,84 +907,78 @@ Editor::metric_get_timecode (std::vector& marks, gdou } else { snprintf (buf, sizeof(buf)," "); mark.style = ArdourCanvas::Ruler::Mark::Micro; - } mark.label = buf; mark.position = pos; marks.push_back (mark); - Timecode::increment_minutes( timecode, _session->config.get_subframes_per_frame() ); + Timecode::increment_minutes (timecode, _session->config.get_subframes_per_frame()); } - - break; + break; case timecode_show_hours: // Find timecode time of this sample (pos) - _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ ); + _session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */); // Go to next whole hour down - Timecode::hours_floor( timecode ); - + Timecode::hours_floor (timecode); for (n = 0; n < timecode_nmarks; n++) { - _session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ ); + _session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */); if ((timecode.hours % timecode_mark_modulo) == 0) { mark.style = ArdourCanvas::Ruler::Mark::Major; snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); } else { snprintf (buf, sizeof(buf)," "); mark.style = ArdourCanvas::Ruler::Mark::Micro; - } mark.label = buf; mark.position = pos; marks.push_back (mark); - Timecode::increment_hours( timecode, _session->config.get_subframes_per_frame() ); + Timecode::increment_hours (timecode, _session->config.get_subframes_per_frame()); } - break; - case timecode_show_frames: + break; + case timecode_show_many_hours: // Find timecode time of this sample (pos) - _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ ); - // Go to next whole frame down - Timecode::frames_floor( timecode ); + _session->sample_to_timecode (pos, timecode, true /* use_offset */, false /* use_subframes */); + // Go to next whole hour down + Timecode::hours_floor (timecode); - for (n = 0; n < timecode_nmarks; n++) { - _session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ ); - if ((timecode.frames % timecode_mark_modulo) == 0) { - if (timecode.frames == 0) { - mark.style = ArdourCanvas::Ruler::Mark::Major; - } else { - mark.style = ArdourCanvas::Ruler::Mark::Minor; - } - mark.position = pos; + for (n = 0; n < timecode_nmarks;) { + _session->timecode_to_sample (timecode, pos, true /* use_offset */, false /* use_subframes */); + if ((timecode.hours % timecode_mark_modulo) == 0) { + mark.style = ArdourCanvas::Ruler::Mark::Major; snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); - } else { - snprintf (buf, sizeof(buf)," "); - mark.style = ArdourCanvas::Ruler::Mark::Micro; + mark.label = buf; mark.position = pos; - + marks.push_back (mark); + ++n; } - mark.label = buf; - marks.push_back (mark); - Timecode::increment( timecode, _session->config.get_subframes_per_frame() ); + /* can't use Timecode::increment_hours() here because we may be traversing thousands of hours + * and doing it 1 hour at a time is just stupid (and slow). + */ + timecode.hours += timecode_mark_modulo - (timecode.hours % timecode_mark_modulo); } - - break; + break; } } - - void -Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper, - ARDOUR::TempoMap::BBTPointList::const_iterator begin, - ARDOUR::TempoMap::BBTPointList::const_iterator end) +Editor::compute_bbt_ruler_scale (samplepos_t lower, samplepos_t upper) { if (_session == 0) { return; } - TempoMap::BBTPointList::const_iterator i; + std::vector::const_iterator i; Timecode::BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler + double floor_lower_beat = floor(max (0.0, _session->tempo_map().beat_at_sample (lower))); + + if (floor_lower_beat < 0.0) { + floor_lower_beat = 0.0; + } - _session->bbt_time (lower, lower_beat); - _session->bbt_time (upper, upper_beat); + const samplecnt_t beat_before_lower_pos = _session->tempo_map().sample_at_beat (floor_lower_beat); + const samplecnt_t beat_after_upper_pos = _session->tempo_map().sample_at_beat (floor (max (0.0, _session->tempo_map().beat_at_sample (upper))) + 1.0); + + _session->bbt_time (beat_before_lower_pos, lower_beat); + _session->bbt_time (beat_after_upper_pos, upper_beat); uint32_t beats = 0; bbt_accent_modulo = 1; @@ -997,128 +986,139 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper, bbt_bars = 0; bbt_nmarks = 1; - bbt_ruler_scale = bbt_over; + bbt_ruler_scale = bbt_show_many; - switch (_snap_type) { - case SnapToBeatDiv2: + switch (_grid_type) { + case GridTypeBeatDiv2: bbt_beat_subdivision = 2; break; - case SnapToBeatDiv3: - bbt_beat_subdivision = 3; + case GridTypeBeatDiv3: + bbt_beat_subdivision = 3; break; - case SnapToBeatDiv4: - bbt_beat_subdivision = 4; + case GridTypeBeatDiv4: + bbt_beat_subdivision = 4; break; - case SnapToBeatDiv5: - bbt_beat_subdivision = 5; + case GridTypeBeatDiv5: + bbt_beat_subdivision = 5; bbt_accent_modulo = 2; // XXX YIKES break; - case SnapToBeatDiv6: - bbt_beat_subdivision = 6; + case GridTypeBeatDiv6: + bbt_beat_subdivision = 3; bbt_accent_modulo = 2; // XXX YIKES break; - case SnapToBeatDiv7: - bbt_beat_subdivision = 7; + case GridTypeBeatDiv7: + bbt_beat_subdivision = 7; bbt_accent_modulo = 2; // XXX YIKES break; - case SnapToBeatDiv8: - bbt_beat_subdivision = 8; + case GridTypeBeatDiv8: + bbt_beat_subdivision = 4; bbt_accent_modulo = 2; break; - case SnapToBeatDiv10: - bbt_beat_subdivision = 10; + case GridTypeBeatDiv10: + bbt_beat_subdivision = 5; bbt_accent_modulo = 2; // XXX YIKES break; - case SnapToBeatDiv12: - bbt_beat_subdivision = 12; + case GridTypeBeatDiv12: + bbt_beat_subdivision = 3; bbt_accent_modulo = 3; break; - case SnapToBeatDiv14: - bbt_beat_subdivision = 14; + case GridTypeBeatDiv14: + bbt_beat_subdivision = 7; bbt_accent_modulo = 3; // XXX YIKES! break; - case SnapToBeatDiv16: - bbt_beat_subdivision = 16; + case GridTypeBeatDiv16: + bbt_beat_subdivision = 4; bbt_accent_modulo = 4; break; - case SnapToBeatDiv20: - bbt_beat_subdivision = 20; + case GridTypeBeatDiv20: + bbt_beat_subdivision = 5; bbt_accent_modulo = 5; break; - case SnapToBeatDiv24: - bbt_beat_subdivision = 24; + case GridTypeBeatDiv24: + bbt_beat_subdivision = 6; bbt_accent_modulo = 6; break; - case SnapToBeatDiv28: - bbt_beat_subdivision = 28; + case GridTypeBeatDiv28: + bbt_beat_subdivision = 7; bbt_accent_modulo = 7; break; - case SnapToBeatDiv32: - bbt_beat_subdivision = 32; - bbt_accent_modulo = 8; - break; - case SnapToBeatDiv64: - bbt_beat_subdivision = 64; + case GridTypeBeatDiv32: + bbt_beat_subdivision = 4; bbt_accent_modulo = 8; break; - case SnapToBeatDiv128: - bbt_beat_subdivision = 128; - bbt_accent_modulo = 8; + case GridTypeBar: + case GridTypeBeat: + bbt_beat_subdivision = 4; break; - default: - bbt_beat_subdivision = 4; + case GridTypeNone: + case GridTypeTimecode: + case GridTypeMinSec: + case GridTypeCDFrame: + bbt_beat_subdivision = 4; break; } - if (distance (begin, end) == 0) { + const double ceil_upper_beat = floor (max (0.0, _session->tempo_map().beat_at_sample (upper))) + 1.0; + if (ceil_upper_beat == floor_lower_beat) { return; } - i = end; - i--; - if ((*i).beat >= (*begin).beat) { - bbt_bars = (*i).bar - (*begin).bar; - } else { - bbt_bars = (*i).bar - (*begin).bar - 1; - } - beats = distance (begin, end) - bbt_bars; + bbt_bars = _session->tempo_map().bbt_at_beat (ceil_upper_beat).bars - _session->tempo_map().bbt_at_beat (floor_lower_beat).bars; + + beats = (ceil_upper_beat - floor_lower_beat);// - bbt_bars; possible thinko; this fixes the problem (for me) where measure lines alternately appear&disappear while playing at certain zoom scales + double beat_density = ((beats + 1) * ((double) (upper - lower) / (double) (1 + beat_after_upper_pos - beat_before_lower_pos))) / 5.0; /* Only show the bar helper if there aren't many bars on the screen */ if ((bbt_bars < 2) || (beats < 5)) { - bbt_bar_helper_on = true; + bbt_bar_helper_on = true; + } + + //set upper limits on the beat_density based on the user's grid selection + if (_grid_type == GridTypeBar) { + beat_density = fmax (beat_density, 16.01); + } else if (_grid_type == GridTypeBeat) { + beat_density = fmax (beat_density, 4.01); + } else if (_grid_type == GridTypeBeatDiv2) { + beat_density = fmax (beat_density, 2.01); + } else if (_grid_type == GridTypeBeatDiv4) { + beat_density = fmax (beat_density, 1.001); + } else if (_grid_type == GridTypeBeatDiv8) { + beat_density = fmax (beat_density, 0.501); + } else if (_grid_type == GridTypeBeatDiv16) { + beat_density = fmax (beat_density, 0.2501); + } else if (_grid_type == GridTypeBeatDiv32) { + beat_density = fmax (beat_density, 0.12501); } - if (bbt_bars > 8192) { - bbt_ruler_scale = bbt_over; - } else if (bbt_bars > 1024) { + if (beat_density > 2048) { + bbt_ruler_scale = bbt_show_many; + } else if (beat_density > 512) { bbt_ruler_scale = bbt_show_64; - } else if (bbt_bars > 256) { + } else if (beat_density > 256) { bbt_ruler_scale = bbt_show_16; - } else if (bbt_bars > 64) { + } else if (beat_density > 64) { bbt_ruler_scale = bbt_show_4; - } else if (bbt_bars > 10) { - bbt_ruler_scale = bbt_show_1; - } else if (bbt_bars > 2) { - bbt_ruler_scale = bbt_show_beats; - } else if (bbt_bars > 0) { - bbt_ruler_scale = bbt_show_ticks; + } else if (beat_density > 16) { + bbt_ruler_scale = bbt_show_1; + } else if (beat_density > 4) { + bbt_ruler_scale = bbt_show_quarters; + } else if (beat_density > 2) { + bbt_ruler_scale = bbt_show_eighths; + } else if (beat_density > 1) { + bbt_ruler_scale = bbt_show_sixteenths; } else { - bbt_ruler_scale = bbt_show_ticks_detail; - } - - if ((bbt_ruler_scale == bbt_show_ticks_detail) && (lower_beat.beats == upper_beat.beats) && (upper_beat.ticks - lower_beat.ticks <= Timecode::BBT_Time::ticks_per_beat / 4)) { - bbt_ruler_scale = bbt_show_ticks_super_detail; + bbt_ruler_scale = bbt_show_thirtyseconds; } } -static void +static void edit_last_mark_label (std::vector& marks, const std::string& newlabel) { ArdourCanvas::Ruler::Mark copy = marks.back(); copy.label = newlabel; marks.pop_back (); marks.push_back (copy); -} +} void Editor::metric_get_bbt (std::vector& marks, gdouble lower, gdouble upper, gint /*maxchars*/) @@ -1127,38 +1127,34 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l return; } - TempoMap::BBTPointList::const_iterator i; + std::vector::const_iterator i; char buf[64]; gint n = 0; - framepos_t pos; + samplepos_t pos; Timecode::BBT_Time next_beat; - framepos_t next_beat_pos; uint32_t beats = 0; uint32_t tick = 0; uint32_t skip; uint32_t t; - framepos_t frame_skip; - double frame_skip_error; double bbt_position_of_helper; - double accumulated_error; bool i_am_accented = false; bool helper_active = false; ArdourCanvas::Ruler::Mark mark; - ARDOUR::TempoMap::BBTPointList::const_iterator begin; - ARDOUR::TempoMap::BBTPointList::const_iterator end; + std::vector grid; - compute_current_bbt_points (lower, upper, begin, end); + compute_current_bbt_points (grid, lower, upper); - if (distance (begin, end) == 0) { + if (distance (grid.begin(), grid.end()) == 0) { return; } switch (bbt_ruler_scale) { - case bbt_show_beats: - beats = distance (begin, end); + case bbt_show_quarters: + + beats = distance (grid.begin(), grid.end()); bbt_nmarks = beats + 2; mark.label = ""; @@ -1166,12 +1162,11 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l mark.style = ArdourCanvas::Ruler::Mark::Micro; marks.push_back (mark); - for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) { + for (n = 1, i = grid.begin(); n < bbt_nmarks && i != grid.end(); ++i) { - if ((*i).frame < lower && (bbt_bar_helper_on)) { + if ((*i).sample < lower && (bbt_bar_helper_on)) { snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat); edit_last_mark_label (marks, buf); - helper_active = true; } else { if ((*i).is_bar()) { @@ -1185,20 +1180,20 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l buf[0] = '\0'; } mark.label = buf; - mark.position = (*i).frame; + mark.position = (*i).sample; marks.push_back (mark); n++; } } break; - case bbt_show_ticks: + case bbt_show_eighths: - beats = distance (begin, end); + beats = distance (grid.begin(), grid.end()); bbt_nmarks = (beats + 2) * bbt_beat_subdivision; bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ()); - + // could do marks.assign() here to preallocate mark.label = ""; @@ -1206,70 +1201,45 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l mark.style = ArdourCanvas::Ruler::Mark::Micro; marks.push_back (mark); - for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) { + for (n = 1, i = grid.begin(); n < bbt_nmarks && i != grid.end(); ++i) { - if ((*i).frame < lower && (bbt_bar_helper_on)) { + if ((*i).sample < lower && (bbt_bar_helper_on)) { snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat); edit_last_mark_label (marks, buf); helper_active = true; } else { - if ((*i).is_bar()) { + if ((*i).is_bar()) { mark.style = ArdourCanvas::Ruler::Mark::Major; snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); } else { mark.style = ArdourCanvas::Ruler::Mark::Minor; snprintf (buf, sizeof(buf), "%" PRIu32, (*i).beat); } - if (((*i).frame < bbt_position_of_helper) && helper_active) { + if (((*i).sample < bbt_position_of_helper) && helper_active) { buf[0] = '\0'; } mark.label = buf; - mark.position = (*i).frame; + mark.position = (*i).sample; marks.push_back (mark); n++; } /* Add the tick marks */ + skip = Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision; + tick = skip; // the first non-beat tick + t = 0; + while (tick < Timecode::BBT_Time::ticks_per_beat && (n < bbt_nmarks)) { - /* Find the next beat */ - next_beat.beats = (*i).beat; - next_beat.bars = (*i).bar; - next_beat.ticks = 0; - - if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) { - next_beat.beats += 1; - } else { - next_beat.bars += 1; - next_beat.beats = 1; - } - - next_beat_pos = _session->tempo_map().frame_time(next_beat); - - frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute())); - frame_skip_error -= frame_skip; - skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision); - - pos = (*i).frame + frame_skip; - accumulated_error = frame_skip_error; - - tick = skip; - - for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) { + next_beat.beats = (*i).beat; + next_beat.bars = (*i).bar; + next_beat.ticks = tick; + pos = _session->tempo_map().sample_at_bbt (next_beat); - if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { + if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { i_am_accented = true; } - mark.label = ""; - - /* Error compensation for float to framepos_t*/ - accumulated_error += frame_skip_error; - if (accumulated_error > 1) { - pos += 1; - accumulated_error -= 1.0f; - } - mark.position = pos; if ((bbt_beat_subdivision > 4) && i_am_accented) { @@ -1279,28 +1249,31 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l } i_am_accented = false; marks.push_back (mark); - n++; + + tick += skip; + ++t; + ++n; } } break; - case bbt_show_ticks_detail: + case bbt_show_sixteenths: - beats = distance (begin, end); + beats = distance (grid.begin(), grid.end()); bbt_nmarks = (beats + 2) * bbt_beat_subdivision; - bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ()); + bbt_position_of_helper = lower + (3 * Editor::get_current_zoom ()); mark.label = ""; mark.position = lower; mark.style = ArdourCanvas::Ruler::Mark::Micro; marks.push_back (mark); - for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) { + for (n = 1, i = grid.begin(); n < bbt_nmarks && i != grid.end(); ++i) { - if ((*i).frame < lower && (bbt_bar_helper_on)) { - snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat); + if ((*i).sample < lower && (bbt_bar_helper_on)) { + snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat); edit_last_mark_label (marks, buf); helper_active = true; } else { @@ -1312,61 +1285,37 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l mark.style = ArdourCanvas::Ruler::Mark::Minor; snprintf (buf, sizeof(buf), "%" PRIu32, (*i).beat); } - if (((*i).frame < bbt_position_of_helper) && helper_active) { + if (((*i).sample < bbt_position_of_helper) && helper_active) { buf[0] = '\0'; } mark.label = buf; - mark.position = (*i).frame; + mark.position = (*i).sample; marks.push_back (mark); n++; } /* Add the tick marks */ + skip = Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision; + tick = skip; // the first non-beat tick - /* Find the next beat */ + t = 0; + while (tick < Timecode::BBT_Time::ticks_per_beat && (n < bbt_nmarks)) { - next_beat.beats = (*i).beat; - next_beat.bars = (*i).bar; - - if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) { - next_beat.beats += 1; - } else { - next_beat.bars += 1; - next_beat.beats = 1; - } - - next_beat_pos = _session->tempo_map().frame_time(next_beat); - - frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute())); - frame_skip_error -= frame_skip; - skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision); - - pos = (*i).frame + frame_skip; - accumulated_error = frame_skip_error; - - tick = skip; - - for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) { + next_beat.beats = (*i).beat; + next_beat.bars = (*i).bar; + next_beat.ticks = tick; + pos = _session->tempo_map().sample_at_bbt (next_beat); - if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { - i_am_accented = true; + if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { + i_am_accented = true; } - if (i_am_accented && (pos > bbt_position_of_helper)){ - snprintf (buf, sizeof(buf), "%" PRIu32, tick); + snprintf (buf, sizeof(buf), "%" PRIu32, tick); } else { buf[0] = '\0'; } mark.label = buf; - - /* Error compensation for float to framepos_t*/ - accumulated_error += frame_skip_error; - if (accumulated_error > 1) { - pos += 1; - accumulated_error -= 1.0f; - } - mark.position = pos; if ((bbt_beat_subdivision > 4) && i_am_accented) { @@ -1375,27 +1324,31 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l mark.style = ArdourCanvas::Ruler::Mark::Micro; } i_am_accented = false; - n++; + marks.push_back (mark); + + tick += skip; + ++t; + ++n; } } break; - case bbt_show_ticks_super_detail: + case bbt_show_thirtyseconds: - beats = distance (begin, end); + beats = distance (grid.begin(), grid.end()); bbt_nmarks = (beats + 2) * bbt_beat_subdivision; - bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ()); + bbt_position_of_helper = lower + (3 * Editor::get_current_zoom ()); mark.label = ""; mark.position = lower; mark.style = ArdourCanvas::Ruler::Mark::Micro; marks.push_back (mark); - for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) { + for (n = 1, i = grid.begin(); n < bbt_nmarks && i != grid.end(); ++i) { - if ((*i).frame < lower && (bbt_bar_helper_on)) { + if ((*i).sample < lower && (bbt_bar_helper_on)) { snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat); edit_last_mark_label (marks, buf); helper_active = true; @@ -1408,89 +1361,67 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l mark.style = ArdourCanvas::Ruler::Mark::Minor; snprintf (buf, sizeof(buf), "%" PRIu32, (*i).beat); } - if (((*i).frame < bbt_position_of_helper) && helper_active) { + if (((*i).sample < bbt_position_of_helper) && helper_active) { buf[0] = '\0'; } mark.label = buf; - mark.position = (*i).frame; + mark.position = (*i).sample; marks.push_back (mark); n++; } /* Add the tick marks */ - - /* Find the next beat */ + skip = Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision; next_beat.beats = (*i).beat; next_beat.bars = (*i).bar; + tick = skip; // the first non-beat tick + t = 0; + while (tick < Timecode::BBT_Time::ticks_per_beat && (n < bbt_nmarks)) { - if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) { - next_beat.beats += 1; - } else { - next_beat.bars += 1; - next_beat.beats = 1; - } - - next_beat_pos = _session->tempo_map().frame_time(next_beat); - - frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute())); - frame_skip_error -= frame_skip; - skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision); - - pos = (*i).frame + frame_skip; - accumulated_error = frame_skip_error; - - tick = skip; - - for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) { - - if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { - i_am_accented = true; - } - - if (pos > bbt_position_of_helper) { - snprintf (buf, sizeof(buf), "%" PRIu32, tick); - } else { - buf[0] = '\0'; - } + next_beat.ticks = tick; + pos = _session->tempo_map().sample_at_bbt (next_beat); + if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { + i_am_accented = true; + } - mark.label = buf; + if (pos > bbt_position_of_helper) { + snprintf (buf, sizeof(buf), "%" PRIu32, tick); + } else { + buf[0] = '\0'; + } - /* Error compensation for float to framepos_t*/ - accumulated_error += frame_skip_error; - if (accumulated_error > 1) { - pos += 1; - accumulated_error -= 1.0f; - } + mark.label = buf; + mark.position = pos; - mark.position = pos; + if ((bbt_beat_subdivision > 4) && i_am_accented) { + mark.style = ArdourCanvas::Ruler::Mark::Minor; + } else { + mark.style = ArdourCanvas::Ruler::Mark::Micro; + } + i_am_accented = false; + marks.push_back (mark); - if ((bbt_beat_subdivision > 4) && i_am_accented) { - mark.style = ArdourCanvas::Ruler::Mark::Minor; - } else { - mark.style = ArdourCanvas::Ruler::Mark::Micro; - } - i_am_accented = false; - marks.push_back (mark); - n++; + tick += skip; + ++t; + ++n; } } break; - case bbt_over: - bbt_nmarks = 1; - snprintf (buf, sizeof(buf), "cannot handle %" PRIu32 " bars", bbt_bars ); - mark.style = ArdourCanvas::Ruler::Mark::Major; - mark.label = buf; - mark.position = lower; - marks.push_back (mark); - - break; + case bbt_show_many: + bbt_nmarks = 1; + snprintf (buf, sizeof(buf), "cannot handle %" PRIu32 " bars", bbt_bars); + mark.style = ArdourCanvas::Ruler::Mark::Major; + mark.label = buf; + mark.position = lower; + marks.push_back (mark); + break; case bbt_show_64: - bbt_nmarks = (gint) (bbt_bars / 64) + 1; - for (n = 0, i = begin; i != end && n < bbt_nmarks; i++) { + bbt_nmarks = (gint) (bbt_bars / 64) + 1; + for (n = 0, i = grid.begin(); i != grid.end() && n < bbt_nmarks; i++) { if ((*i).is_bar()) { if ((*i).bar % 64 == 1) { if ((*i).bar % 256 == 1) { @@ -1505,7 +1436,7 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l } } mark.label = buf; - mark.position = (*i).frame; + mark.position = (*i).sample; marks.push_back (mark); ++n; } @@ -1514,23 +1445,23 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l break; case bbt_show_16: - bbt_nmarks = (bbt_bars / 16) + 1; - for (n = 0, i = begin; i != end && n < bbt_nmarks; i++) { - if ((*i).is_bar()) { + bbt_nmarks = (bbt_bars / 16) + 1; + for (n = 0, i = grid.begin(); i != grid.end() && n < bbt_nmarks; i++) { + if ((*i).is_bar()) { if ((*i).bar % 16 == 1) { - if ((*i).bar % 64 == 1) { - snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); + if ((*i).bar % 64 == 1) { + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); mark.style = ArdourCanvas::Ruler::Mark::Major; } else { buf[0] = '\0'; if ((*i).bar % 64 == 33) { - mark.style = ArdourCanvas::Ruler::Mark::Minor; + mark.style = ArdourCanvas::Ruler::Mark::Minor; } else { - mark.style = ArdourCanvas::Ruler::Mark::Micro; + mark.style = ArdourCanvas::Ruler::Mark::Micro; } } mark.label = buf; - mark.position = (*i).frame; + mark.position = (*i).sample; marks.push_back (mark); ++n; } @@ -1540,36 +1471,36 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l case bbt_show_4: bbt_nmarks = (bbt_bars / 4) + 1; - for (n = 0, i = begin; i != end && n < bbt_nmarks; ++i) { - if ((*i).is_bar()) { - if ((*i).bar % 4 == 1) { - if ((*i).bar % 16 == 1) { - snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); - mark.style = ArdourCanvas::Ruler::Mark::Major; - } else { - buf[0] = '\0'; - if ((*i).bar % 16 == 9) { - mark.style = ArdourCanvas::Ruler::Mark::Minor; + for (n = 0, i = grid.begin(); i != grid.end() && n < bbt_nmarks; ++i) { + if ((*i).is_bar()) { + if ((*i).bar % 4 == 1) { + if ((*i).bar % 16 == 1) { + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); + mark.style = ArdourCanvas::Ruler::Mark::Major; } else { - mark.style = ArdourCanvas::Ruler::Mark::Micro; + buf[0] = '\0'; + if ((*i).bar % 16 == 9) { + mark.style = ArdourCanvas::Ruler::Mark::Minor; + } else { + mark.style = ArdourCanvas::Ruler::Mark::Micro; + } } + mark.label = buf; + mark.position = (*i).sample; + marks.push_back (mark); + ++n; } - mark.label = buf; - mark.position = (*i).frame; - marks.push_back (mark); - ++n; - } } } break; case bbt_show_1: // default: - bbt_nmarks = bbt_bars + 2; - for (n = 0, i = begin; i != end && n < bbt_nmarks; ++i) { - if ((*i).is_bar()) { + bbt_nmarks = bbt_bars + 2; + for (n = 0, i = grid.begin(); i != grid.end() && n < bbt_nmarks; ++i) { + if ((*i).is_bar()) { if ((*i).bar % 4 == 1) { - snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); mark.style = ArdourCanvas::Ruler::Mark::Major; } else { buf[0] = '\0'; @@ -1580,7 +1511,7 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l } } mark.label = buf; - mark.position = (*i).frame; + mark.position = (*i).sample; marks.push_back (mark); ++n; } @@ -1591,7 +1522,7 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l } void -Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper) +Editor::set_samples_ruler_scale (samplepos_t lower, samplepos_t upper) { _samples_ruler_interval = (upper - lower) / 5; } @@ -1599,8 +1530,8 @@ Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper) void Editor::metric_get_samples (std::vector& marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) { - framepos_t pos; - framepos_t const ilower = (framepos_t) floor (lower); + samplepos_t pos; + samplepos_t const ilower = (samplepos_t) floor (lower); gchar buf[16]; gint nmarks; gint n; @@ -1621,15 +1552,14 @@ Editor::metric_get_samples (std::vector& marks, gdoub } static void -sample_to_clock_parts ( framepos_t sample, - framepos_t sample_rate, - long *hrs_p, - long *mins_p, - long *secs_p, - long *millisecs_p) - +sample_to_clock_parts (samplepos_t sample, + samplepos_t sample_rate, + long* hrs_p, + long* mins_p, + long* secs_p, + long* millisecs_p) { - framepos_t left; + samplepos_t left; long hrs; long mins; long secs; @@ -1653,108 +1583,132 @@ sample_to_clock_parts ( framepos_t sample, } void -Editor::set_minsec_ruler_scale (framepos_t lower, framepos_t upper) +Editor::set_minsec_ruler_scale (samplepos_t lower, samplepos_t upper) { - framepos_t fr; - framepos_t spacer; + samplepos_t fr = _session->sample_rate() * 1000; + samplepos_t spacer; if (_session == 0) { return; } - fr = _session->frame_rate() * 1000; /* to prevent 'flashing' */ - if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) { + if (lower > (spacer = (samplepos_t)(128 * Editor::get_current_zoom ()))) { lower -= spacer; } else { lower = 0; } upper += spacer; - framecnt_t const range = (upper - lower) * 1000; + samplecnt_t const range = (upper - lower) * 1000; - if (range < (fr / 50)) { - minsec_mark_interval = fr / 1000; /* show 1/1000 seconds */ - minsec_ruler_scale = minsec_show_frames; - minsec_mark_modulo = 10; - } else if (range <= (fr / 10)) { /* 0-0.1 second */ + if (range <= (fr / 10)) { /* 0-0.1 second */ minsec_mark_interval = fr / 1000; /* show 1/1000 seconds */ - minsec_ruler_scale = minsec_show_frames; + minsec_ruler_scale = minsec_show_msecs; minsec_mark_modulo = 10; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= (fr / 2)) { /* 0-0.5 second */ minsec_mark_interval = fr / 100; /* show 1/100 seconds */ - minsec_ruler_scale = minsec_show_frames; + minsec_ruler_scale = minsec_show_msecs; minsec_mark_modulo = 100; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= fr) { /* 0-1 second */ minsec_mark_interval = fr / 10; /* show 1/10 seconds */ - minsec_ruler_scale = minsec_show_frames; + minsec_ruler_scale = minsec_show_msecs; minsec_mark_modulo = 200; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 2 * fr) { /* 1-2 seconds */ minsec_mark_interval = fr / 10; /* show 1/10 seconds */ - minsec_ruler_scale = minsec_show_frames; + minsec_ruler_scale = minsec_show_msecs; minsec_mark_modulo = 500; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 8 * fr) { /* 2-5 seconds */ minsec_mark_interval = fr / 5; /* show 2 seconds */ - minsec_ruler_scale = minsec_show_frames; + minsec_ruler_scale = minsec_show_msecs; minsec_mark_modulo = 1000; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 16 * fr) { /* 8-16 seconds */ minsec_mark_interval = fr; /* show 1 seconds */ minsec_ruler_scale = minsec_show_seconds; minsec_mark_modulo = 2; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 30 * fr) { /* 10-30 seconds */ minsec_mark_interval = fr; /* show 1 seconds */ minsec_ruler_scale = minsec_show_seconds; - minsec_mark_modulo = 5; + minsec_mark_modulo = 5; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 60 * fr) { /* 30-60 seconds */ - minsec_mark_interval = fr; /* show 1 seconds */ - minsec_ruler_scale = minsec_show_seconds; - minsec_mark_modulo = 5; - } else if (range <= 2 * 60 * fr) { /* 1-2 minutes */ - minsec_mark_interval = 5 * fr; /* show 5 seconds */ - minsec_ruler_scale = minsec_show_seconds; - minsec_mark_modulo = 3; - } else if (range <= 4 * 60 * fr) { /* 4 minutes */ - minsec_mark_interval = 5 * fr; /* show 10 seconds */ - minsec_ruler_scale = minsec_show_seconds; - minsec_mark_modulo = 30; - } else if (range <= 10 * 60 * fr) { /* 10 minutes */ - minsec_mark_interval = 30 * fr; /* show 30 seconds */ - minsec_ruler_scale = minsec_show_seconds; - minsec_mark_modulo = 120; - } else if (range <= 30 * 60 * fr) { /* 10-30 minutes */ - minsec_mark_interval = 60 * fr; /* show 1 minute */ - minsec_ruler_scale = minsec_show_minutes; + minsec_mark_interval = fr; /* show 1 seconds */ + minsec_ruler_scale = minsec_show_seconds; + minsec_mark_modulo = 5; + minsec_nmarks = 2 + (range / minsec_mark_interval); + } else if (range <= 2 * 60 * fr) { /* 1-2 minutes */ + minsec_mark_interval = 5 * fr; /* show 5 seconds */ + minsec_ruler_scale = minsec_show_seconds; + minsec_mark_modulo = 3; + minsec_nmarks = 2 + (range / minsec_mark_interval); + } else if (range <= 4 * 60 * fr) { /* 4 minutes */ + minsec_mark_interval = 5 * fr; /* show 10 seconds */ + minsec_ruler_scale = minsec_show_seconds; + minsec_mark_modulo = 30; + minsec_nmarks = 2 + (range / minsec_mark_interval); + } else if (range <= 10 * 60 * fr) { /* 10 minutes */ + minsec_mark_interval = 30 * fr; /* show 30 seconds */ + minsec_ruler_scale = minsec_show_seconds; + minsec_mark_modulo = 120; + minsec_nmarks = 2 + (range / minsec_mark_interval); + } else if (range <= 30 * 60 * fr) { /* 10-30 minutes */ + minsec_mark_interval = 60 * fr; /* show 1 minute */ + minsec_ruler_scale = minsec_show_minutes; minsec_mark_modulo = 5; - } else if (range <= 60 * 60 * fr) { /* 30 minutes - 1hr */ - minsec_mark_interval = 2 * 60 * fr; /* show 2 minutes */ - minsec_ruler_scale = minsec_show_minutes; - minsec_mark_modulo = 10; - } else if (range <= 4 * 60 * 60 * fr) { /* 1 - 4 hrs*/ - minsec_mark_interval = 5 * 60 * fr; /* show 10 minutes */ - minsec_ruler_scale = minsec_show_minutes; - minsec_mark_modulo = 30; - } else if (range <= 8 * 60 * 60 * fr) { /* 4 - 8 hrs*/ - minsec_mark_interval = 20 * 60 * fr; /* show 20 minutes */ - minsec_ruler_scale = minsec_show_minutes; - minsec_mark_modulo = 60; - } else if (range <= 16 * 60 * 60 * fr) { /* 16-24 hrs*/ - minsec_mark_interval = 60 * 60 * fr; /* show 60 minutes */ - minsec_ruler_scale = minsec_show_hours; + minsec_nmarks = 2 + (range / minsec_mark_interval); + } else if (range <= 60 * 60 * fr) { /* 30 minutes - 1hr */ + minsec_mark_interval = 2 * 60 * fr; /* show 2 minutes */ + minsec_ruler_scale = minsec_show_minutes; + minsec_mark_modulo = 10; + minsec_nmarks = 2 + (range / minsec_mark_interval); + } else if (range <= 4 * 60 * 60 * fr) { /* 1 - 4 hrs*/ + minsec_mark_interval = 5 * 60 * fr; /* show 10 minutes */ + minsec_ruler_scale = minsec_show_minutes; + minsec_mark_modulo = 30; + minsec_nmarks = 2 + (range / minsec_mark_interval); + } else if (range <= 8 * 60 * 60 * fr) { /* 4 - 8 hrs*/ + minsec_mark_interval = 20 * 60 * fr; /* show 20 minutes */ + minsec_ruler_scale = minsec_show_minutes; + minsec_mark_modulo = 60; + minsec_nmarks = 2 + (range / minsec_mark_interval); + } else if (range <= 16 * 60 * 60 * fr) { /* 16-24 hrs*/ + minsec_mark_interval = 60 * 60 * fr; /* show 60 minutes */ + minsec_ruler_scale = minsec_show_hours; minsec_mark_modulo = 2; - } else { + minsec_nmarks = 2 + (range / minsec_mark_interval); + } else { + + const samplecnt_t hours_in_range = range / (60 * 60 * fr); + const int text_width_rough_guess = 70; /* pixels, very very approximate guess at how wide the tick mark text is */ + + /* Normally we do not need to know anything about the width of the canvas + to set the ruler scale, because the caller has already determined + the width and set lower + upper arguments to this function to match that. - /* not possible if framepos_t is a 32 bit quantity */ + But in this case, where the range defined by lower and uppper can vary + substantially (anything from 24hrs+ to several billion years) + trying to decide which tick marks to show does require us to know + about the available width. + */ - minsec_mark_interval = 4 * 60 * 60 * fr; /* show 4 hrs */ - } - minsec_nmarks = 2 + (range / minsec_mark_interval); + minsec_nmarks = _track_canvas->width() / text_width_rough_guess; + minsec_mark_modulo = max ((samplecnt_t) 1, 1 + (hours_in_range / minsec_nmarks)); + minsec_mark_interval = minsec_mark_modulo * (60 * 60 * fr); + minsec_ruler_scale = minsec_show_many_hours; + } } void -Editor::metric_get_minsec (std::vector& marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) +Editor::metric_get_minsec (std::vector& marks, gdouble lower, gdouble upper, gint /*maxchars*/) { - framepos_t pos; - framepos_t spacer; + samplepos_t pos; + samplepos_t spacer; long hrs, mins, secs, millisecs; gchar buf[16]; gint n; @@ -1765,77 +1719,70 @@ Editor::metric_get_minsec (std::vector& marks, gdoubl } /* to prevent 'flashing' */ - if (lower > (spacer = (framepos_t) (128 * Editor::get_current_zoom ()))) { + if (lower > (spacer = (samplepos_t) (128 * Editor::get_current_zoom ()))) { lower = lower - spacer; } else { lower = 0; } - pos = (((1000 * (framepos_t) floor(lower)) + (minsec_mark_interval/2))/minsec_mark_interval) * minsec_mark_interval; + if (minsec_mark_interval == 0) { //we got here too early; divide-by-zero imminent + return; + } + + pos = (((1000 * (samplepos_t) floor(lower)) + (minsec_mark_interval/2))/minsec_mark_interval) * minsec_mark_interval; + switch (minsec_ruler_scale) { - case minsec_show_seconds: - for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) { - sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); - if (secs % minsec_mark_modulo == 0) { - if (secs == 0) { + + case minsec_show_msecs: + for (n = 0; n < minsec_nmarks && n < upper; pos += minsec_mark_interval, ++n) { + sample_to_clock_parts (pos, _session->sample_rate(), &hrs, &mins, &secs, &millisecs); + if (millisecs % minsec_mark_modulo == 0) { + if (millisecs == 0) { mark.style = ArdourCanvas::Ruler::Mark::Major; } else { mark.style = ArdourCanvas::Ruler::Mark::Minor; } snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); - } else { + } else { buf[0] = '\0'; - mark.style = ArdourCanvas::Ruler::Mark::Micro; - } - mark.label = buf; + mark.style = ArdourCanvas::Ruler::Mark::Micro; + } + mark.label = buf; mark.position = pos/1000.0; marks.push_back (mark); } - break; - case minsec_show_minutes: + break; + + case minsec_show_seconds: for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) { - sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); - if (mins % minsec_mark_modulo == 0) { - if (mins == 0) { - mark.style = ArdourCanvas::Ruler::Mark::Major; - } else { - mark.style = ArdourCanvas::Ruler::Mark::Minor; - } - snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); - } else { - buf[0] = '\0'; - mark.style = ArdourCanvas::Ruler::Mark::Micro; - } - mark.label = buf; - mark.position = pos/1000.0; - marks.push_back (mark); - } - break; - case minsec_show_hours: - for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) { - sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); - if (hrs % minsec_mark_modulo == 0) { - mark.style = ArdourCanvas::Ruler::Mark::Major; - snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); - } else { + sample_to_clock_parts (pos, _session->sample_rate(), &hrs, &mins, &secs, &millisecs); + if (secs % minsec_mark_modulo == 0) { + if (secs == 0) { + mark.style = ArdourCanvas::Ruler::Mark::Major; + } else { + mark.style = ArdourCanvas::Ruler::Mark::Minor; + } + snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld", hrs, mins, secs); + } else { buf[0] = '\0'; - mark.style = ArdourCanvas::Ruler::Mark::Micro; - } - mark.label = buf; - mark.position = pos/1000.0; + mark.style = ArdourCanvas::Ruler::Mark::Micro; + } + mark.label = buf; + mark.position = pos/1000.0; marks.push_back (mark); - } - break; - case minsec_show_frames: + } + break; + + case minsec_show_minutes: for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) { - sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); - if (millisecs % minsec_mark_modulo == 0) { - if (millisecs == 0) { + sample_to_clock_parts (pos, _session->sample_rate(), &hrs, &mins, &secs, &millisecs); + if (mins % minsec_mark_modulo == 0) { + if (mins == 0) { mark.style = ArdourCanvas::Ruler::Mark::Major; } else { mark.style = ArdourCanvas::Ruler::Mark::Minor; } - snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); + snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld", hrs, mins, secs); } else { buf[0] = '\0'; mark.style = ArdourCanvas::Ruler::Mark::Micro; @@ -1844,6 +1791,37 @@ Editor::metric_get_minsec (std::vector& marks, gdoubl mark.position = pos/1000.0; marks.push_back (mark); } - break; + break; + + case minsec_show_hours: + for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) { + sample_to_clock_parts (pos, _session->sample_rate(), &hrs, &mins, &secs, &millisecs); + if (hrs % minsec_mark_modulo == 0) { + mark.style = ArdourCanvas::Ruler::Mark::Major; + snprintf (buf, sizeof(buf), "%02ld:%02ld", hrs, mins); + } else { + buf[0] = '\0'; + mark.style = ArdourCanvas::Ruler::Mark::Micro; + } + mark.label = buf; + mark.position = pos/1000.0; + marks.push_back (mark); + } + break; + + case minsec_show_many_hours: + for (n = 0; n < minsec_nmarks;) { + sample_to_clock_parts (pos, _session->sample_rate(), &hrs, &mins, &secs, &millisecs); + if (hrs % minsec_mark_modulo == 0) { + mark.style = ArdourCanvas::Ruler::Mark::Major; + snprintf (buf, sizeof(buf), "%02ld:00", hrs); + mark.label = buf; + mark.position = pos/1000.0; + marks.push_back (mark); + ++n; + } + pos += minsec_mark_interval; + } + break; } }