X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_rulers.cc;h=2752f96553e68fed20ee1779f61d32408beee2b7;hb=741f9de3f7dda286181419c33cfe361a4f75c775;hp=be806eb36620c5a52bb349ea117b60face61b710;hpb=8687895abba4209a6de8d8a8fc1bda5996f0d875;p=ardour.git diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index be806eb366..2752f96553 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -17,7 +17,10 @@ */ -#define __STDC_FORMAT_MACROS 1 +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + #include // for sprintf, grrr #include #include @@ -29,7 +32,8 @@ #include "ardour/session.h" #include "ardour/tempo.h" #include "ardour/profile.h" -#include + +#include "gtkmm2ext/gtk_ui.h" #include "editor.h" #include "editing.h" @@ -38,6 +42,7 @@ #include "gui_thread.h" #include "time_axis_view.h" #include "editor_drag.h" +#include "editor_cursors.h" #include "i18n.h" @@ -53,7 +58,7 @@ Editor *Editor::ruler_editor; GtkCustomMetric Editor::ruler_metrics[4] = { {1, Editor::_metric_get_timecode }, {1, Editor::_metric_get_bbt }, - {1, Editor::_metric_get_frames }, + {1, Editor::_metric_get_samples }, {1, Editor::_metric_get_minsec } }; @@ -94,13 +99,13 @@ Editor::initialize_rulers () bbt_ruler->set_no_show_all(); bbt_nmarks = 0; - _frames_ruler = gtk_custom_hruler_new (); - frames_ruler = Glib::wrap (_frames_ruler); - frames_ruler->set_name ("FramesRuler"); - frames_ruler->set_size_request (-1, (int)timebar_height); - gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_frames_ruler), &ruler_metrics[ruler_metric_frames]); - frames_ruler->hide (); - frames_ruler->set_no_show_all(); + _samples_ruler = gtk_custom_hruler_new (); + samples_ruler = Glib::wrap (_samples_ruler); + samples_ruler->set_name ("SamplesRuler"); + samples_ruler->set_size_request (-1, (int) timebar_height); + gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER (_samples_ruler), &ruler_metrics[ruler_metric_samples]); + samples_ruler->hide (); + samples_ruler->set_no_show_all (); _bbt_ruler = gtk_custom_hruler_new (); bbt_ruler = Glib::wrap (_bbt_ruler); @@ -126,39 +131,40 @@ Editor::initialize_rulers () lab_children.push_back (Element(transport_mark_label, PACK_SHRINK, PACK_START)); lab_children.push_back (Element(cd_mark_label, PACK_SHRINK, PACK_START)); lab_children.push_back (Element(mark_label, PACK_SHRINK, PACK_START)); + lab_children.push_back (Element(videotl_label, PACK_SHRINK, PACK_START)); ruler_lab_children.push_back (Element(minsec_label, PACK_SHRINK, PACK_START)); ruler_children.insert (canvaspos, Element(*minsec_ruler, PACK_SHRINK, PACK_START)); ruler_lab_children.push_back (Element(timecode_label, PACK_SHRINK, PACK_START)); ruler_children.insert (canvaspos, Element(*timecode_ruler, PACK_SHRINK, PACK_START)); - ruler_lab_children.push_back (Element(frame_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*frames_ruler, PACK_SHRINK, PACK_START)); + ruler_lab_children.push_back (Element(samples_label, PACK_SHRINK, PACK_START)); + ruler_children.insert (canvaspos, Element (*samples_ruler, PACK_SHRINK, PACK_START)); ruler_lab_children.push_back (Element(bbt_label, PACK_SHRINK, PACK_START)); ruler_children.insert (canvaspos, Element(*bbt_ruler, PACK_SHRINK, PACK_START)); timecode_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); bbt_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); - frames_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); + samples_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); minsec_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); timecode_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release)); bbt_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release)); - frames_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release)); + samples_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release)); minsec_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release)); timecode_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); bbt_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); - frames_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); + samples_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); minsec_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); timecode_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion)); bbt_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion)); - frames_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion)); + samples_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion)); minsec_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion)); timecode_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); bbt_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); - frames_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); + samples_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); minsec_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); visible_timebars = 0; /*this will be changed below */ @@ -168,18 +174,18 @@ Editor::initialize_rulers () bool Editor::ruler_scroll (GdkEventScroll* event) { - nframes64_t xdelta; + framepos_t xdelta; int direction = event->direction; bool handled = false; switch (direction) { case GDK_SCROLL_UP: - temporal_zoom_step (true); + temporal_zoom_step (false); handled = true; break; case GDK_SCROLL_DOWN: - temporal_zoom_step (false); + temporal_zoom_step (true); handled = true; break; @@ -195,10 +201,10 @@ Editor::ruler_scroll (GdkEventScroll* event) case GDK_SCROLL_RIGHT: xdelta = (current_page_frames() / 2); - if (max_frames - xdelta > leftmost_frame) { + if (max_framepos - xdelta > leftmost_frame) { reset_x_origin (leftmost_frame + xdelta); } else { - reset_x_origin (max_frames - current_page_frames()); + reset_x_origin (max_framepos - current_page_frames()); } handled = true; break; @@ -212,23 +218,21 @@ Editor::ruler_scroll (GdkEventScroll* event) } -gint +bool Editor::ruler_button_press (GdkEventButton* ev) { - if (session == 0) { - return FALSE; + if (_session == 0) { + return false; } - // jlc: grab ev->window ? - //Gtk::Main::grab_add (*minsec_ruler); Widget * grab_widget = 0; if (timecode_ruler->is_realized() && ev->window == timecode_ruler->get_window()->gobj()) { grab_widget = timecode_ruler; } else if (bbt_ruler->is_realized() && ev->window == bbt_ruler->get_window()->gobj()) { grab_widget = bbt_ruler; - } else if (frames_ruler->is_realized() && ev->window == frames_ruler->get_window()->gobj()) { - grab_widget = frames_ruler; + } else if (samples_ruler->is_realized() && ev->window == samples_ruler->get_window()->gobj()) { + grab_widget = samples_ruler; } else if (minsec_ruler->is_realized() && ev->window == minsec_ruler->get_window()->gobj()) { grab_widget = minsec_ruler; } @@ -241,34 +245,30 @@ Editor::ruler_button_press (GdkEventButton* ev) if (ev->button == 1) { // Since we will locate the playhead on button release, cancel any running // auditions. - if (session->is_auditioning()) { - session->cancel_audition (); + if (_session->is_auditioning()) { + _session->cancel_audition (); } /* playhead cursor */ - assert (_drag == 0); - _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false); - _drag->start_grab (reinterpret_cast (ev)); + _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), reinterpret_cast (ev)); _dragging_playhead = true; } - return TRUE; + return true; } -gint +bool Editor::ruler_button_release (GdkEventButton* ev) { - if (session == 0) { - return FALSE; + if (_session == 0) { + return false; } gint x,y; Gdk::ModifierType state; - if (_drag) { - _drag->end_grab (reinterpret_cast (ev)); - delete _drag; - _drag = 0; + if (_drags->active ()) { + _drags->end_grab (reinterpret_cast (ev)); _dragging_playhead = false; } @@ -278,7 +278,7 @@ Editor::ruler_button_release (GdkEventButton* ev) stop_canvas_autoscroll(); - nframes64_t where = leftmost_frame + pixel_to_frame (x); + framepos_t where = leftmost_frame + pixel_to_frame (x); snap_to (where); popup_ruler_menu (where); } @@ -288,40 +288,40 @@ Editor::ruler_button_release (GdkEventButton* ev) ruler_grabbed_widget = 0; } - return TRUE; + return true; } -gint +bool Editor::ruler_label_button_release (GdkEventButton* ev) { if (ev->button == 3) { - Gtk::Menu* m= dynamic_cast (ActionManager::get_widget (X_("/RulerMenuPopup"))); + Gtk::Menu* m = dynamic_cast (ActionManager::get_widget (X_("/RulerMenuPopup"))); if (m) { m->popup (1, ev->time); } } - return TRUE; + return true; } -gint +bool Editor::ruler_mouse_motion (GdkEventMotion* ev) { - if (session == 0) { - return FALSE; + if (_session == 0) { + return false; } - if (_drag) { - _drag->motion_handler (reinterpret_cast (ev), false); + if (_drags->active ()) { + _drags->motion_handler (reinterpret_cast (ev), false); } - return TRUE; + return true; } void -Editor::popup_ruler_menu (nframes64_t where, ItemType t) +Editor::popup_ruler_menu (framepos_t where, ItemType t) { using namespace Menu_Helpers; @@ -343,7 +343,7 @@ Editor::popup_ruler_menu (nframes64_t where, ItemType t) ruler_items.push_back (SeparatorElem ()); break; case RangeMarkerBarItem: - //ruler_items.push_back (MenuElem (_("New Range"))); + 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 ()); @@ -361,13 +361,35 @@ Editor::popup_ruler_menu (nframes64_t where, ItemType t) 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 (_("Clear tempo"))); ruler_items.push_back (SeparatorElem ()); 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 (_("Clear meter"))); + ruler_items.push_back (SeparatorElem ()); + 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))); + 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))); + 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))); + 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 (CheckMenuElem (_("Lock"))); + { + 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 ()); break; @@ -421,6 +443,10 @@ Editor::popup_ruler_menu (nframes64_t where, ItemType t) if (action) { ruler_items.push_back (MenuElem (*action->create_menu_item())); } + action = ActionManager::get_action ("Rulers", "toggle-video-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); + } editor_ruler_menu->popup (1, gtk_get_current_event_time()); @@ -434,7 +460,7 @@ Editor::store_ruler_visibility () 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_("frames"), ruler_samples_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"); @@ -442,16 +468,17 @@ Editor::store_ruler_visibility () 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"); - session->add_extra_xml (*node); - session->set_dirty (); + _session->add_extra_xml (*node); + _session->set_dirty (); } void Editor::restore_ruler_visibility () { XMLProperty* prop; - XMLNode * node = session->extra_xml (X_("RulerVisibility")); + XMLNode * node = _session->extra_xml (X_("RulerVisibility")); no_ruler_shown_update = true; @@ -470,7 +497,7 @@ Editor::restore_ruler_visibility () ruler_bbt_action->set_active (false); } } - if ((prop = node->property ("frames")) != 0) { + if ((prop = node->property ("samples")) != 0) { if (string_is_affirmative (prop->value())) { ruler_samples_action->set_active (true); } else { @@ -529,11 +556,11 @@ Editor::restore_ruler_visibility () } } else { - // this session doesn't yet know about the cdmarker ruler + // 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 // any cd marks exist ruler_cd_marker_action->set_active (false); - const Locations::LocationList & locs = session->locations()->list(); + const Locations::LocationList & locs = _session->locations()->list(); for (Locations::LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) { if ((*i)->is_cd_marker()) { ruler_cd_marker_action->set_active (true); @@ -542,6 +569,14 @@ 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); + } + } + } no_ruler_shown_update = false; @@ -579,11 +614,11 @@ Editor::update_ruler_visibility () if (ruler_samples_action->get_active()) { visible_rulers++; - frame_label.show (); - frames_ruler->show (); + samples_label.show (); + samples_ruler->show (); } else { - frame_label.hide (); - frames_ruler->hide (); + samples_label.hide (); + samples_ruler->hide (); } if (ruler_bbt_action->get_active()) { @@ -607,6 +642,7 @@ Editor::update_ruler_visibility () transport_mark_label.hide(); cd_mark_label.hide(); mark_label.hide(); + videotl_label.hide(); #endif if (ruler_meter_action->get_active()) { old_unit_pos = meter_group->property_y(); @@ -739,6 +775,29 @@ Editor::update_ruler_visibility () mark_label.hide(); } + if (ruler_video_action->get_active()) { + old_unit_pos = videotl_group->property_y(); + if (tbpos != old_unit_pos) { + videotl_group->move ( 0.0, tbpos - old_unit_pos); + } + old_unit_pos = videotl_bar_group->property_y(); + if (tbgpos != old_unit_pos) { + videotl_bar_group->move ( 0.0, tbgpos - old_unit_pos); + } + videotl_bar_group->show(); + videotl_group->show(); + videotl_label.show(); + tbpos += timebar_height * videotl_bar_height; + tbgpos += timebar_height * videotl_bar_height; + visible_timebars+=videotl_bar_height; + queue_visual_videotimeline_update(); + } else { + videotl_bar_group->hide(); + videotl_group->hide(); + videotl_label.hide(); + update_video_timeline(true); + } + gdouble old_canvas_timebars_vsize = canvas_timebars_vsize; canvas_timebars_vsize = (timebar_height * visible_timebars) - 1; gdouble vertical_pos_delta = canvas_timebars_vsize - old_canvas_timebars_vsize; @@ -765,8 +824,14 @@ Editor::update_ruler_visibility () ruler_label_vbox.set_size_request (-1, (int)(timebar_height * visible_rulers)); time_canvas_vbox.set_size_request (-1,-1); + compute_fixed_ruler_scale (); update_fixed_rulers(); redisplay_tempo (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) { + i->second->setup_lines (); + } } void @@ -774,45 +839,51 @@ Editor::update_just_timecode () { ENSURE_GUI_THREAD (*this, &Editor::update_just_timecode) - if (session == 0) { + if (_session == 0) { return; } - nframes64_t rightmost_frame = leftmost_frame + current_page_frames(); + framepos_t rightmost_frame = leftmost_frame + current_page_frames(); if (ruler_timecode_action->get_active()) { gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_timecode_ruler), leftmost_frame, rightmost_frame, - leftmost_frame, session->current_end_frame()); + leftmost_frame, _session->current_end_frame()); } } void Editor::compute_fixed_ruler_scale () { - if (session == 0) { + if (_session == 0) { return; } if (ruler_timecode_action->get_active()) { - set_timecode_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames() ); + set_timecode_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames()); } if (ruler_minsec_action->get_active()) { - set_minsec_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames() ); + set_minsec_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames()); + } + + if (ruler_samples_action->get_active()) { + set_samples_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames()); } } void Editor::update_fixed_rulers () { - nframes64_t rightmost_frame; + framepos_t rightmost_frame; - if (session == 0) { + if (_session == 0) { return; } + compute_fixed_ruler_scale (); + ruler_metrics[ruler_metric_timecode].units_per_pixel = frames_per_unit; - ruler_metrics[ruler_metric_frames].units_per_pixel = frames_per_unit; + ruler_metrics[ruler_metric_samples].units_per_pixel = frames_per_unit; ruler_metrics[ruler_metric_minsec].units_per_pixel = frames_per_unit; rightmost_frame = leftmost_frame + current_page_frames(); @@ -823,32 +894,36 @@ Editor::update_fixed_rulers () if (ruler_timecode_action->get_active()) { gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_timecode_ruler), leftmost_frame, rightmost_frame, - leftmost_frame, session->current_end_frame()); + leftmost_frame, _session->current_end_frame()); } if (ruler_samples_action->get_active()) { - gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_frames_ruler), leftmost_frame, rightmost_frame, - leftmost_frame, session->current_end_frame()); + gtk_custom_ruler_set_range (GTK_CUSTOM_RULER (_samples_ruler), leftmost_frame, rightmost_frame, + leftmost_frame, _session->current_end_frame()); } if (ruler_minsec_action->get_active()) { gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_minsec_ruler), leftmost_frame, rightmost_frame, - leftmost_frame, session->current_end_frame()); + leftmost_frame, _session->current_end_frame()); } } void -Editor::update_tempo_based_rulers () +Editor::update_tempo_based_rulers (ARDOUR::TempoMap::BBTPointList::const_iterator& begin, + ARDOUR::TempoMap::BBTPointList::const_iterator& end) { - if (session == 0) { + if (_session == 0) { return; } + compute_bbt_ruler_scale (leftmost_frame, leftmost_frame+current_page_frames(), + begin, end); + ruler_metrics[ruler_metric_bbt].units_per_pixel = frames_per_unit; if (ruler_bbt_action->get_active()) { gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_bbt_ruler), leftmost_frame, leftmost_frame+current_page_frames(), - leftmost_frame, session->current_end_frame()); + leftmost_frame, _session->current_end_frame()); } } @@ -867,9 +942,9 @@ Editor::_metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble uppe } gint -Editor::_metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +Editor::_metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) { - return ruler_editor->metric_get_frames (marks, lower, upper, maxchars); + return ruler_editor->metric_get_samples (marks, lower, upper, maxchars); } gint @@ -879,46 +954,45 @@ Editor::_metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble u } void -Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper) +Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper) { - nframes64_t range; - nframes64_t spacer; - nframes64_t fr; + framepos_t spacer; + framepos_t fr; - if (session == 0) { + if (_session == 0) { return; } - fr = session->frame_rate(); + fr = _session->frame_rate(); - if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) { + if (lower > (spacer = (framepos_t) (128 * Editor::get_current_zoom ()))) { lower = lower - spacer; } else { lower = 0; } upper = upper + spacer; - range = (nframes64_t) floor (upper - lower); + framecnt_t const range = upper - lower; - if (range < (2 * session->frames_per_timecode_frame())) { /* 0 - 2 frames */ + if (range < (2 * _session->frames_per_timecode_frame())) { /* 0 - 2 frames */ timecode_ruler_scale = timecode_show_bits; timecode_mark_modulo = 20; - timecode_nmarks = 2 + (2 * session->config.get_subframes_per_frame()); + 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; timecode_mark_modulo = 1; - timecode_nmarks = 2 + (range / (nframes64_t)session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); } else if (range <= (fr / 2)) { /* 0.25-0.5 second */ timecode_ruler_scale = timecode_show_frames; timecode_mark_modulo = 2; - timecode_nmarks = 2 + (range / (nframes64_t)session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); } else if (range <= fr) { /* 0.5-1 second */ timecode_ruler_scale = timecode_show_frames; timecode_mark_modulo = 5; - timecode_nmarks = 2 + (range / (nframes64_t)session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); } else if (range <= 2 * fr) { /* 1-2 seconds */ timecode_ruler_scale = timecode_show_frames; timecode_mark_modulo = 10; - timecode_nmarks = 2 + (range / (nframes64_t)session->frames_per_timecode_frame()); + timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame()); } else if (range <= 8 * fr) { /* 2-8 seconds */ timecode_ruler_scale = timecode_show_seconds; timecode_mark_modulo = 1; @@ -969,7 +1043,7 @@ Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper) timecode_nmarks = 2 + 24; } else { - /* not possible if nframes64_t is a 32 bit quantity */ + /* not possible if framepos_t is a 32 bit quantity */ timecode_ruler_scale = timecode_show_hours; timecode_mark_modulo = 4; @@ -981,33 +1055,33 @@ Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper) gint Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) { - nframes_t pos; - nframes64_t spacer; + framepos_t pos; + framecnt_t spacer; Timecode::Time timecode; gchar buf[16]; gint n; - if (session == 0) { + if (_session == 0) { return 0; } - if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) { + if (lower > (spacer = (framecnt_t)(128 * Editor::get_current_zoom ()))) { lower = lower - spacer; } else { lower = 0; } - pos = (nframes_t) floor (lower); + pos = (framecnt_t) floor (lower); *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * timecode_nmarks); 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) { (*marks)[n].style = GtkCustomRulerMarkMajor; @@ -1025,17 +1099,17 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble (*marks)[n].position = pos; // 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; 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 ); 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) { (*marks)[n].style = GtkCustomRulerMarkMajor; @@ -1052,17 +1126,17 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble } (*marks)[n].label = g_strdup (buf); - Timecode::increment_seconds( timecode, session->config.get_subframes_per_frame() ); + Timecode::increment_seconds( timecode, _session->config.get_subframes_per_frame() ); } break; case timecode_show_minutes: // 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 minute down 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) { (*marks)[n].style = GtkCustomRulerMarkMajor; @@ -1077,18 +1151,19 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble } (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; - Timecode::increment_minutes( timecode, session->config.get_subframes_per_frame() ); + + Timecode::increment_minutes( timecode, _session->config.get_subframes_per_frame() ); } 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 ); 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) { (*marks)[n].style = GtkCustomRulerMarkMajor; snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); @@ -1100,17 +1175,17 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; - 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: // 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 frame down Timecode::frames_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.frames % timecode_mark_modulo) == 0) { if (timecode.frames == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor; @@ -1126,7 +1201,7 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble } (*marks)[n].label = g_strdup (buf); - Timecode::increment( timecode, session->config.get_subframes_per_frame() ); + Timecode::increment( timecode, _session->config.get_subframes_per_frame() ); } break; @@ -1137,124 +1212,179 @@ Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble void -Editor::compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper) +Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper, + ARDOUR::TempoMap::BBTPointList::const_iterator begin, + ARDOUR::TempoMap::BBTPointList::const_iterator end) { - if (session == 0) { - return; - } - TempoMap::BBTPointList::iterator i; - BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler + if (_session == 0) { + return; + } + + TempoMap::BBTPointList::const_iterator i; + Timecode::BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler - session->bbt_time((jack_nframes_t) lower, lower_beat); - session->bbt_time((jack_nframes_t) upper, upper_beat); - uint32_t beats = 0; + _session->bbt_time (lower, lower_beat); + _session->bbt_time (upper, upper_beat); + uint32_t beats = 0; bbt_accent_modulo = 1; bbt_bar_helper_on = false; - bbt_bars = 0; - bbt_nmarks = 1; + bbt_bars = 0; + bbt_nmarks = 1; bbt_ruler_scale = bbt_over; switch (_snap_type) { - case SnapToAThirdBeat: + case SnapToBeatDiv2: + bbt_beat_subdivision = 2; + break; + case SnapToBeatDiv3: bbt_beat_subdivision = 3; break; - case SnapToAQuarterBeat: + case SnapToBeatDiv4: bbt_beat_subdivision = 4; break; - case SnapToAEighthBeat: + case SnapToBeatDiv5: + bbt_beat_subdivision = 5; + bbt_accent_modulo = 2; // XXX YIKES + break; + case SnapToBeatDiv6: + bbt_beat_subdivision = 6; + bbt_accent_modulo = 2; // XXX YIKES + break; + case SnapToBeatDiv7: + bbt_beat_subdivision = 7; + bbt_accent_modulo = 2; // XXX YIKES + break; + case SnapToBeatDiv8: bbt_beat_subdivision = 8; bbt_accent_modulo = 2; break; - case SnapToASixteenthBeat: + case SnapToBeatDiv10: + bbt_beat_subdivision = 10; + bbt_accent_modulo = 2; // XXX YIKES + break; + case SnapToBeatDiv12: + bbt_beat_subdivision = 12; + bbt_accent_modulo = 3; + break; + case SnapToBeatDiv14: + bbt_beat_subdivision = 14; + bbt_accent_modulo = 3; // XXX YIKES! + break; + case SnapToBeatDiv16: bbt_beat_subdivision = 16; bbt_accent_modulo = 4; break; - case SnapToAThirtysecondBeat: + case SnapToBeatDiv20: + bbt_beat_subdivision = 20; + bbt_accent_modulo = 5; + break; + case SnapToBeatDiv24: + bbt_beat_subdivision = 24; + bbt_accent_modulo = 6; + break; + case SnapToBeatDiv28: + bbt_beat_subdivision = 28; + bbt_accent_modulo = 7; + break; + case SnapToBeatDiv32: bbt_beat_subdivision = 32; bbt_accent_modulo = 8; break; + case SnapToBeatDiv64: + bbt_beat_subdivision = 64; + bbt_accent_modulo = 8; + break; + case SnapToBeatDiv128: + bbt_beat_subdivision = 128; + bbt_accent_modulo = 8; + break; default: bbt_beat_subdivision = 4; break; } - if (current_bbt_points == 0 || current_bbt_points->empty()) { + if (distance (begin, end) == 0) { return; } - i = current_bbt_points->end(); + i = end; i--; - if ((*i).beat >= (*current_bbt_points->begin()).beat) { - bbt_bars = (*i).bar - (*current_bbt_points->begin()).bar; + if ((*i).beat >= (*begin).beat) { + bbt_bars = (*i).bar - (*begin).bar; } else { - bbt_bars = (*i).bar - (*current_bbt_points->begin()).bar - 1; + bbt_bars = (*i).bar - (*begin).bar - 1; } - beats = current_bbt_points->size() - bbt_bars; + beats = distance (begin, end) - bbt_bars; - /*Only show the bar helper if there aren't many bars on the screen */ + /* 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; } if (bbt_bars > 8192) { - bbt_ruler_scale = bbt_over; + bbt_ruler_scale = bbt_over; } else if (bbt_bars > 1024) { - bbt_ruler_scale = bbt_show_64; + bbt_ruler_scale = bbt_show_64; } else if (bbt_bars > 256) { - bbt_ruler_scale = bbt_show_16; + bbt_ruler_scale = bbt_show_16; } else if (bbt_bars > 64) { - bbt_ruler_scale = bbt_show_4; + bbt_ruler_scale = bbt_show_4; } else if (bbt_bars > 10) { - bbt_ruler_scale = bbt_show_1; + bbt_ruler_scale = bbt_show_1; } else if (bbt_bars > 2) { - bbt_ruler_scale = bbt_show_beats; + bbt_ruler_scale = bbt_show_beats; } else if (bbt_bars > 0) { - bbt_ruler_scale = bbt_show_ticks; + bbt_ruler_scale = bbt_show_ticks; } else { - bbt_ruler_scale = bbt_show_ticks_detail; + 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 <= Meter::ticks_per_beat / 4)) { + 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; } } gint -Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) +Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/) { - if (session == 0) { - return 0; - } + if (_session == 0) { + return 0; + } - TempoMap::BBTPointList::iterator i; + TempoMap::BBTPointList::const_iterator i; - char buf[64]; - gint n = 0; - nframes64_t pos; - BBT_Time next_beat; - nframes64_t next_beat_pos; - uint32_t beats = 0; + char buf[64]; + gint n = 0; + framepos_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; - nframes64_t frame_skip; + 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; - if (current_bbt_points == 0 || current_bbt_points->empty()) { + ARDOUR::TempoMap::BBTPointList::const_iterator begin; + ARDOUR::TempoMap::BBTPointList::const_iterator end; + + compute_current_bbt_points (lower, upper, begin, end); + + if (distance (begin, end) == 0) { return 0; } switch (bbt_ruler_scale) { case bbt_show_beats: - beats = current_bbt_points->size(); + beats = distance (begin, end); bbt_nmarks = beats + 2; *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks); @@ -1262,18 +1392,16 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp (*marks)[0].label = g_strdup(" "); (*marks)[0].position = lower; (*marks)[0].style = GtkCustomRulerMarkMicro; + + for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) { - for (n = 1, i = current_bbt_points->begin(); n < bbt_nmarks && i != current_bbt_points->end(); ++i) { - if ((*i).type != TempoMap::Beat) { - continue; - } if ((*i).frame < lower && (bbt_bar_helper_on)) { snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat); (*marks)[0].label = g_strdup (buf); helper_active = true; } else { - if ((*i).beat == 1) { + if ((*i).is_bar()) { (*marks)[n].style = GtkCustomRulerMarkMajor; snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); } else if (((*i).beat % 2 == 1)) { @@ -1292,7 +1420,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp case bbt_show_ticks: - beats = current_bbt_points->size(); + beats = distance (begin, end); bbt_nmarks = (beats + 2) * bbt_beat_subdivision; bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ()); @@ -1302,17 +1430,15 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp (*marks)[0].position = lower; (*marks)[0].style = GtkCustomRulerMarkMicro; - for (n = 1, i = current_bbt_points->begin(); n < bbt_nmarks && i != current_bbt_points->end(); ++i) { - if ((*i).type != TempoMap::Beat) { - continue; - } + for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) { + if ((*i).frame < lower && (bbt_bar_helper_on)) { snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat); (*marks)[0].label = g_strdup (buf); helper_active = true; } else { - if ((*i).beat == 1) { + if ((*i).is_bar()) { (*marks)[n].style = GtkCustomRulerMarkMajor; snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); } else { @@ -1334,25 +1460,25 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp next_beat.bars = (*i).bar; next_beat.ticks = 0; - if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) { + 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); + next_beat_pos = _session->tempo_map().frame_time(next_beat); - frame_skip = (nframes64_t) floor (frame_skip_error = (session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute())); + 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) (Meter::ticks_per_beat / bbt_beat_subdivision); + 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 < Meter::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) { + 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; @@ -1361,7 +1487,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp snprintf (buf, sizeof(buf), " "); (*marks)[n].label = g_strdup (buf); - /* Error compensation for float to nframes64_t*/ + /* Error compensation for float to framepos_t*/ accumulated_error += frame_skip_error; if (accumulated_error > 1) { pos += 1; @@ -1384,7 +1510,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp case bbt_show_ticks_detail: - beats = current_bbt_points->size(); + beats = distance (begin, end); bbt_nmarks = (beats + 2) * bbt_beat_subdivision; bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ()); @@ -1394,17 +1520,15 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp (*marks)[0].position = lower; (*marks)[0].style = GtkCustomRulerMarkMicro; - for (n = 1, i = current_bbt_points->begin(); n < bbt_nmarks && i != current_bbt_points->end(); ++i) { - if ((*i).type != TempoMap::Beat) { - continue; - } + for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) { + if ((*i).frame < lower && (bbt_bar_helper_on)) { snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat); (*marks)[0].label = g_strdup (buf); helper_active = true; } else { - if ((*i).beat == 1) { + if ((*i).is_bar()) { (*marks)[n].style = GtkCustomRulerMarkMajor; snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); } else { @@ -1426,25 +1550,25 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp next_beat.beats = (*i).beat; next_beat.bars = (*i).bar; - if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) { + 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); + next_beat_pos = _session->tempo_map().frame_time(next_beat); - frame_skip = (nframes64_t) floor (frame_skip_error = (session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute())); + 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) (Meter::ticks_per_beat / bbt_beat_subdivision); + 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 < Meter::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) { + 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; @@ -1458,7 +1582,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp (*marks)[n].label = g_strdup (buf); - /* Error compensation for float to nframes64_t*/ + /* Error compensation for float to framepos_t*/ accumulated_error += frame_skip_error; if (accumulated_error > 1) { pos += 1; @@ -1481,7 +1605,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp case bbt_show_ticks_super_detail: - beats = current_bbt_points->size(); + beats = distance (begin, end); bbt_nmarks = (beats + 2) * bbt_beat_subdivision; bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ()); @@ -1491,17 +1615,15 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp (*marks)[0].position = lower; (*marks)[0].style = GtkCustomRulerMarkMicro; - for (n = 1, i = current_bbt_points->begin(); n < bbt_nmarks && i != current_bbt_points->end(); ++i) { - if ((*i).type != TempoMap::Beat) { - continue; - } + for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) { + if ((*i).frame < lower && (bbt_bar_helper_on)) { snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat); (*marks)[0].label = g_strdup (buf); helper_active = true; } else { - if ((*i).beat == 1) { + if ((*i).is_bar()) { (*marks)[n].style = GtkCustomRulerMarkMajor; snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); } else { @@ -1523,25 +1645,25 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp next_beat.beats = (*i).beat; next_beat.bars = (*i).bar; - if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) { + 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); + next_beat_pos = _session->tempo_map().frame_time(next_beat); - frame_skip = (nframes64_t) floor (frame_skip_error = (session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute())); + 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) (Meter::ticks_per_beat / bbt_beat_subdivision); + 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 < Meter::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) { + 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; @@ -1555,7 +1677,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp (*marks)[n].label = g_strdup (buf); - /* Error compensation for float to nframes64_t*/ + /* Error compensation for float to framepos_t*/ accumulated_error += frame_skip_error; if (accumulated_error > 1) { pos += 1; @@ -1590,8 +1712,8 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp case bbt_show_64: bbt_nmarks = (gint) (bbt_bars / 64) + 1; *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks); - for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < bbt_nmarks; i++) { - if ((*i).type == TempoMap::Bar) { + for (n = 0, i = begin; i != end && n < bbt_nmarks; i++) { + if ((*i).is_bar()) { if ((*i).bar % 64 == 1) { if ((*i).bar % 256 == 1) { snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); @@ -1615,8 +1737,8 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp case bbt_show_16: bbt_nmarks = (bbt_bars / 16) + 1; *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks); - for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < bbt_nmarks; i++) { - if ((*i).type == TempoMap::Bar) { + for (n = 0, i = begin; i != 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); @@ -1640,8 +1762,8 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp case bbt_show_4: bbt_nmarks = (bbt_bars / 4) + 1; *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks); - for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < bbt_nmarks; ++i) { - if ((*i).type == TempoMap::Bar) { + 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); @@ -1666,8 +1788,8 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp // default: bbt_nmarks = bbt_bars + 2; *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks ); - for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < bbt_nmarks; i++) { - if ((*i).type == TempoMap::Bar) { + for (n = 0, i = begin; i != end && n < bbt_nmarks; i++) { + if ((*i).is_bar()) { if ((*i).bar % 4 == 1) { snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); (*marks)[n].style = GtkCustomRulerMarkMajor; @@ -1693,30 +1815,28 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upp } +void +Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper) +{ + _samples_ruler_interval = (upper - lower) / 5; +} + gint -Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/) +Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) { - nframes64_t mark_interval; - nframes64_t pos; - nframes64_t ilower = (nframes64_t) floor (lower); - nframes64_t iupper = (nframes64_t) floor (upper); + framepos_t pos; + framepos_t const ilower = (framepos_t) floor (lower); gchar buf[16]; gint nmarks; gint n; - if (session == 0) { + if (_session == 0) { return 0; } - mark_interval = (iupper - ilower) / 5; - if (mark_interval > session->frame_rate()) { - mark_interval -= mark_interval % session->frame_rate(); - } else { - mark_interval = session->frame_rate() / (session->frame_rate() / mark_interval ) ; - } nmarks = 5; *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks); - for (n = 0, pos = ilower; n < nmarks; pos += mark_interval, ++n) { + for (n = 0, pos = ilower; n < nmarks; pos += _samples_ruler_interval, ++n) { snprintf (buf, sizeof(buf), "%" PRIi64, pos); (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; @@ -1727,15 +1847,15 @@ Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble up } static void -sample_to_clock_parts ( nframes64_t sample, - nframes64_t sample_rate, +sample_to_clock_parts ( framepos_t sample, + framepos_t sample_rate, long *hrs_p, long *mins_p, long *secs_p, long *millisecs_p) { - nframes64_t left; + framepos_t left; long hrs; long mins; long secs; @@ -1759,26 +1879,25 @@ sample_to_clock_parts ( nframes64_t sample, } void -Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper) +Editor::set_minsec_ruler_scale (framepos_t lower, framepos_t upper) { - nframes64_t range; - nframes64_t fr; - nframes64_t spacer; + framepos_t fr; + framepos_t spacer; - if (session == 0) { + if (_session == 0) { return; } - fr = session->frame_rate(); + fr = _session->frame_rate(); /* to prevent 'flashing' */ - if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) { + if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) { lower -= spacer; } else { lower = 0; } upper += spacer; - range = (nframes64_t) (upper - lower); + framecnt_t const range = upper - lower; if (range < (fr / 50)) { minsec_mark_interval = fr / 1000; /* show 1/1000 seconds */ @@ -1850,7 +1969,7 @@ Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper) minsec_mark_modulo = 2; } else { - /* not possible if nframes64_t is a 32 bit quantity */ + /* not possible if framepos_t is a 32 bit quantity */ minsec_mark_interval = 4 * 60 * 60 * fr; /* show 4 hrs */ } @@ -1860,29 +1979,29 @@ Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper) gint Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) { - nframes64_t pos; - nframes64_t spacer; + framepos_t pos; + framepos_t spacer; long hrs, mins, secs, millisecs; gchar buf[16]; gint n; - if (session == 0) { + if (_session == 0) { return 0; } /* to prevent 'flashing' */ - if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) { + if (lower > (spacer = (framepos_t) (128 * Editor::get_current_zoom ()))) { lower = lower - spacer; } else { lower = 0; } *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * minsec_nmarks); - pos = ((((nframes64_t) floor(lower)) + (minsec_mark_interval/2))/minsec_mark_interval) * minsec_mark_interval; + pos = ((((framepos_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); + sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); if (secs % minsec_mark_modulo == 0) { if (secs == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor; @@ -1900,7 +2019,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /* 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); + sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); if (mins % minsec_mark_modulo == 0) { if (mins == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor; @@ -1918,7 +2037,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /* 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); + sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); if (hrs % minsec_mark_modulo == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor; snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); @@ -1932,7 +2051,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /* break; case minsec_show_frames: for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) { - sample_to_clock_parts (pos, session->frame_rate(), &hrs, &mins, &secs, &millisecs); + sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); if (millisecs % minsec_mark_modulo == 0) { if (secs == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor;