X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_rulers.cc;h=0998b86bd9526aa33b4855d7529a9dd63d4189a7;hb=b034d9d05a64bf7f9f8a6465dee5441388fce6c5;hp=577d62c52afe9d45cbb82412ecb4753ecc8e5072;hpb=0e705129fd420140b1711133fc4d3b9ac4b616d8;p=ardour.git diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 577d62c52a..0998b86bd9 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -22,13 +22,18 @@ #include -#include +#include + +#include "ardour/tempo.h" +#include "ardour/profile.h" #include #include "editor.h" #include "editing.h" +#include "actions.h" #include "gtk-custom-hruler.h" #include "gui_thread.h" +#include "time_axis_view.h" #include "i18n.h" @@ -54,49 +59,84 @@ Editor::initialize_rulers () { ruler_editor = this; ruler_grabbed_widget = 0; - + _ruler_separator = new Gtk::HSeparator(); _ruler_separator->set_size_request(-1, 2); + _ruler_separator->set_name("TimebarPadding"); _ruler_separator->show(); + _minsec_ruler = gtk_custom_hruler_new (); + minsec_ruler = Glib::wrap (_minsec_ruler); + minsec_ruler->set_name ("MinSecRuler"); + minsec_ruler->set_size_request (-1, (int)timebar_height); + gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_minsec_ruler), &ruler_metrics[ruler_metric_minsec]); + minsec_ruler->hide (); + minsec_ruler->set_no_show_all(); + _smpte_ruler = gtk_custom_hruler_new (); smpte_ruler = Glib::wrap (_smpte_ruler); smpte_ruler->set_name ("SMPTERuler"); smpte_ruler->set_size_request (-1, (int)timebar_height); gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_smpte_ruler), &ruler_metrics[ruler_metric_smpte]); - ruler_shown[ruler_metric_smpte] = true; - + smpte_ruler->hide (); + smpte_ruler->set_no_show_all(); + smpte_nmarks = 0; + _bbt_ruler = gtk_custom_hruler_new (); bbt_ruler = Glib::wrap (_bbt_ruler); bbt_ruler->set_name ("BBTRuler"); bbt_ruler->set_size_request (-1, (int)timebar_height); gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_bbt_ruler), &ruler_metrics[ruler_metric_bbt]); - ruler_shown[ruler_metric_bbt] = true; + bbt_ruler->hide (); + 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(); - _minsec_ruler = gtk_custom_hruler_new (); - minsec_ruler = Glib::wrap (_minsec_ruler); - minsec_ruler->set_name ("MinSecRuler"); - minsec_ruler->set_size_request (-1, (int)timebar_height); - gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_minsec_ruler), &ruler_metrics[ruler_metric_minsec]); + _bbt_ruler = gtk_custom_hruler_new (); + bbt_ruler = Glib::wrap (_bbt_ruler); + bbt_ruler->set_name ("BBTRuler"); + bbt_ruler->set_size_request (-1, (int)timebar_height); + gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_bbt_ruler), &ruler_metrics[ruler_metric_bbt]); + bbt_ruler->hide (); + bbt_ruler->set_no_show_all(); + minsec_ruler->hide (); + minsec_ruler->set_no_show_all(); + minsec_nmarks = 0; - ruler_shown[ruler_time_meter] = true; - ruler_shown[ruler_time_tempo] = true; - ruler_shown[ruler_time_marker] = true; - ruler_shown[ruler_time_range_marker] = true; - ruler_shown[ruler_time_transport_marker] = true; - ruler_shown[ruler_metric_frames] = false; - ruler_shown[ruler_metric_minsec] = false; - - smpte_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - bbt_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - frames_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - minsec_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + using namespace Box_Helpers; + BoxList & ruler_lab_children = ruler_label_vbox.children(); + BoxList & ruler_children = time_canvas_vbox.children(); + BoxList & lab_children = time_button_vbox.children(); + + BoxList::iterator canvaspos = ruler_children.begin(); + + lab_children.push_back (Element(meter_label, PACK_SHRINK, PACK_START)); + lab_children.push_back (Element(tempo_label, PACK_SHRINK, PACK_START)); + lab_children.push_back (Element(range_mark_label, PACK_SHRINK, PACK_START)); + 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)); + + 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(smpte_label, PACK_SHRINK, PACK_START)); + ruler_children.insert (canvaspos, Element(*smpte_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(bbt_label, PACK_SHRINK, PACK_START)); + ruler_children.insert (canvaspos, Element(*bbt_ruler, PACK_SHRINK, PACK_START)); + + smpte_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); + minsec_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK); smpte_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); bbt_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); @@ -112,9 +152,61 @@ Editor::initialize_rulers () bbt_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); frames_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); minsec_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); - - visible_timebars = 7; /* 4 here, 3 in time_canvas */ + + smpte_ruler->signal_scroll_event().connect (mem_fun(*this, &Editor::ruler_scroll)); + bbt_ruler->signal_scroll_event().connect (mem_fun(*this, &Editor::ruler_scroll)); + frames_ruler->signal_scroll_event().connect (mem_fun(*this, &Editor::ruler_scroll)); + minsec_ruler->signal_scroll_event().connect (mem_fun(*this, &Editor::ruler_scroll)); + + visible_timebars = 0; /*this will be changed below */ ruler_pressed_button = 0; + canvas_timebars_vsize = 0; +} + +bool +Editor::ruler_scroll (GdkEventScroll* event) +{ + nframes64_t xdelta; + int direction = event->direction; + bool handled = false; + + switch (direction) { + case GDK_SCROLL_UP: + temporal_zoom_step (true); + handled = true; + break; + + case GDK_SCROLL_DOWN: + temporal_zoom_step (false); + handled = true; + break; + + case GDK_SCROLL_LEFT: + xdelta = (current_page_frames() / 2); + if (leftmost_frame > xdelta) { + reset_x_origin (leftmost_frame - xdelta); + } else { + reset_x_origin (0); + } + handled = true; + break; + + case GDK_SCROLL_RIGHT: + xdelta = (current_page_frames() / 2); + if (max_frames - xdelta > leftmost_frame) { + reset_x_origin (leftmost_frame + xdelta); + } else { + reset_x_origin (max_frames - current_page_frames()); + } + handled = true; + break; + + default: + /* what? */ + break; + } + + return handled; } @@ -147,22 +239,24 @@ Editor::ruler_button_press (GdkEventButton* ev) /* need to use the correct x,y, the event lies */ time_canvas_event_box.get_window()->get_pointer (x, y, state); - nframes_t where = leftmost_frame + pixel_to_frame (x); + nframes64_t where = leftmost_frame + pixel_to_frame (x); switch (ev->button) { case 1: - /* transport playhead */ + // Since we will locate the playhead on button release, cancel any running + // auditions. + if (session->is_auditioning()) { + session->cancel_audition (); + } + /* playhead cursor */ snap_to (where); - session->request_locate (where); + playhead_cursor->set_position (where); + _dragging_playhead = true; break; case 2: - /* edit cursor */ - if (snap_type != Editing::SnapToEditCursor) { - snap_to (where); - } - edit_cursor->set_position (where); - edit_cursor_clock.set (where); + /* edit point */ + snap_to (where); break; default: @@ -187,25 +281,21 @@ Editor::ruler_button_release (GdkEventButton* ev) return FALSE; } - hide_verbose_canvas_cursor(); stop_canvas_autoscroll(); - nframes_t where = leftmost_frame + pixel_to_frame (x); + nframes64_t where = leftmost_frame + pixel_to_frame (x); switch (ev->button) { case 1: /* transport playhead */ + _dragging_playhead = false; snap_to (where); session->request_locate (where); break; case 2: - /* edit cursor */ - if (snap_type != Editing::SnapToEditCursor) { - snap_to (where); - } - edit_cursor->set_position (where); - edit_cursor_clock.set (where); + /* edit point */ + snap_to (where); break; case 3: @@ -230,9 +320,11 @@ Editor::ruler_button_release (GdkEventButton* ev) gint Editor::ruler_label_button_release (GdkEventButton* ev) { - if (ev->button == 3) - { - popup_ruler_menu(); + if (ev->button == 3) { + Gtk::Menu* m= dynamic_cast (ActionManager::get_widget (X_("/RulerMenuPopup"))); + if (m) { + m->popup (1, ev->time); + } } return TRUE; @@ -246,7 +338,7 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev) return FALSE; } - double wcx=0,wcy=0; + double wcx=0,wcy=0; double cx=0,cy=0; gint x,y; @@ -255,26 +347,25 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev) /* need to use the correct x,y, the event lies */ time_canvas_event_box.get_window()->get_pointer (x, y, state); + + track_canvas->c2w (x, y, wcx, wcy); + track_canvas->w2c (wcx, wcy, cx, cy); - track_canvas.c2w (x, y, wcx, wcy); - track_canvas.w2c (wcx, wcy, cx, cy); - - nframes_t where = leftmost_frame + pixel_to_frame (x); + nframes64_t where = leftmost_frame + pixel_to_frame (x); - /// ripped from maybe_autoscroll - nframes_t one_page = (nframes_t) rint (canvas_width * frames_per_unit); - nframes_t rightmost_frame = leftmost_frame + one_page; + /// ripped from maybe_autoscroll, and adapted to work here + nframes64_t rightmost_frame = leftmost_frame + current_page_frames (); jack_nframes_t frame = pixel_to_frame (cx); if (autoscroll_timeout_tag < 0) { if (frame > rightmost_frame) { if (rightmost_frame < max_frames) { - start_canvas_autoscroll (1); + start_canvas_autoscroll (1, 0); } } else if (frame < leftmost_frame) { if (leftmost_frame > 0) { - start_canvas_autoscroll (-1); + start_canvas_autoscroll (-1, 0); } } } else { @@ -295,23 +386,20 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev) break; case 2: - /* edit cursor */ - cursor = edit_cursor; + /* edit point */ + // EDIT CURSOR XXX do something useful break; default: break; } - if (cursor) - { + if (cursor) { cursor->set_position (where); - if (cursor == edit_cursor) { - edit_cursor_clock.set (where); + if (cursor == playhead_cursor) { + UpdateAllTransportClocks (cursor->current_frame); } - - show_verbose_time_cursor (where, 10, cx, 0); } return TRUE; @@ -319,7 +407,7 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev) void -Editor::popup_ruler_menu (nframes_t where, ItemType t) +Editor::popup_ruler_menu (nframes64_t where, ItemType t) { using namespace Menu_Helpers; @@ -333,13 +421,9 @@ Editor::popup_ruler_menu (nframes_t where, ItemType t) editor_ruler_menu->set_name ("ArdourContextMenu"); ruler_items.clear(); - CheckMenuItem * mitem; - - no_ruler_shown_update = true; - switch (t) { case MarkerBarItem: - ruler_items.push_back (MenuElem (_("New location marker"), bind ( mem_fun(*this, &Editor::mouse_add_new_marker), where))); + ruler_items.push_back (MenuElem (_("New location marker"), bind ( mem_fun(*this, &Editor::mouse_add_new_marker), where, false, false))); ruler_items.push_back (MenuElem (_("Clear all locations"), mem_fun(*this, &Editor::clear_markers))); ruler_items.push_back (MenuElem (_("Unhide locations"), mem_fun(*this, &Editor::unhide_markers))); ruler_items.push_back (SeparatorElem ()); @@ -354,7 +438,13 @@ Editor::popup_ruler_menu (nframes_t where, ItemType t) case TransportMarkerBarItem: break; + + case CdMarkerBarItem: + // TODO + ruler_items.push_back (MenuElem (_("New CD track marker"), bind ( mem_fun(*this, &Editor::mouse_add_new_marker), where, true, false))); + break; + case TempoBarItem: ruler_items.push_back (MenuElem (_("New Tempo"), bind ( mem_fun(*this, &Editor::mouse_add_new_tempo_event), where))); ruler_items.push_back (MenuElem (_("Clear tempo"))); @@ -370,89 +460,57 @@ Editor::popup_ruler_menu (nframes_t where, ItemType t) default: break; } - - ruler_items.push_back (CheckMenuElem (_("Min:Secs"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_minsec))); - mitem = (CheckMenuItem *) &ruler_items.back(); - if (ruler_shown[ruler_metric_minsec]) { - mitem->set_active(true); - } - ruler_items.push_back (CheckMenuElem (X_("Timecode"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_smpte))); - mitem = (CheckMenuItem *) &ruler_items.back(); - if (ruler_shown[ruler_metric_smpte]) { - mitem->set_active(true); - } + Glib::RefPtr action; - ruler_items.push_back (CheckMenuElem (_("Frames"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_frames))); - mitem = (CheckMenuItem *) &ruler_items.back(); - if (ruler_shown[ruler_metric_frames]) { - mitem->set_active(true); + action = ActionManager::get_action ("Rulers", "toggle-minsec-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); } - - ruler_items.push_back (CheckMenuElem (_("Bars:Beats"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_bbt))); - mitem = (CheckMenuItem *) &ruler_items.back(); - if (ruler_shown[ruler_metric_bbt]) { - mitem->set_active(true); + if (!Profile->get_sae()) { + action = ActionManager::get_action ("Rulers", "toggle-timecode-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); + } } - - ruler_items.push_back (SeparatorElem ()); - - ruler_items.push_back (CheckMenuElem (_("Meter"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_time_meter))); - mitem = (CheckMenuItem *) &ruler_items.back(); - if (ruler_shown[ruler_time_meter]) { - mitem->set_active(true); + action = ActionManager::get_action ("Rulers", "toggle-samples-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); } - - ruler_items.push_back (CheckMenuElem (_("Tempo"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_time_tempo))); - mitem = (CheckMenuItem *) &ruler_items.back(); - if (ruler_shown[ruler_time_tempo]) { - mitem->set_active(true); + action = ActionManager::get_action ("Rulers", "toggle-bbt-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); } - - ruler_items.push_back (CheckMenuElem (_("Location Markers"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_time_marker))); - mitem = (CheckMenuItem *) &ruler_items.back(); - if (ruler_shown[ruler_time_marker]) { - mitem->set_active(true); + action = ActionManager::get_action ("Rulers", "toggle-meter-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); } - - ruler_items.push_back (CheckMenuElem (_("Range Markers"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_time_range_marker))); - mitem = (CheckMenuItem *) &ruler_items.back(); - if (ruler_shown[ruler_time_range_marker]) { - mitem->set_active(true); - } - - ruler_items.push_back (CheckMenuElem (_("Loop/Punch Ranges"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_time_transport_marker))); - mitem = (CheckMenuItem *) &ruler_items.back(); - if (ruler_shown[ruler_time_transport_marker]) { - mitem->set_active(true); - } - - editor_ruler_menu->popup (1, gtk_get_current_event_time()); - - no_ruler_shown_update = false; -} - -void -Editor::ruler_toggled (int ruler) -{ - if (!session) return; - if (ruler < 0 || ruler >= (int) sizeof(ruler_shown)) return; - - if (no_ruler_shown_update) return; - - if (ruler_shown[ruler]) { - if (visible_timebars <= 1) { - // must always have 1 visible - return; + action = ActionManager::get_action ("Rulers", "toggle-tempo-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); + } + if (!Profile->get_sae()) { + action = ActionManager::get_action ("Rulers", "toggle-range-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); } } - - ruler_shown[ruler] = !ruler_shown[ruler]; + action = ActionManager::get_action ("Rulers", "toggle-loop-punch-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); + } + action = ActionManager::get_action ("Rulers", "toggle-cd-marker-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); + } + action = ActionManager::get_action ("Rulers", "toggle-marker-ruler"); + if (action) { + ruler_items.push_back (MenuElem (*action->create_menu_item())); + } - update_ruler_visibility (); + editor_ruler_menu->popup (1, gtk_get_current_event_time()); - // update session extra RulerVisibility - store_ruler_visibility (); + no_ruler_shown_update = false; } void @@ -460,15 +518,16 @@ Editor::store_ruler_visibility () { XMLNode* node = new XMLNode(X_("RulerVisibility")); - node->add_property (X_("smpte"), ruler_shown[ruler_metric_smpte] ? "yes": "no"); - node->add_property (X_("bbt"), ruler_shown[ruler_metric_bbt] ? "yes": "no"); - node->add_property (X_("frames"), ruler_shown[ruler_metric_frames] ? "yes": "no"); - node->add_property (X_("minsec"), ruler_shown[ruler_metric_minsec] ? "yes": "no"); - node->add_property (X_("tempo"), ruler_shown[ruler_time_tempo] ? "yes": "no"); - node->add_property (X_("meter"), ruler_shown[ruler_time_meter] ? "yes": "no"); - node->add_property (X_("marker"), ruler_shown[ruler_time_marker] ? "yes": "no"); - node->add_property (X_("rangemarker"), ruler_shown[ruler_time_range_marker] ? "yes": "no"); - node->add_property (X_("transportmarker"), ruler_shown[ruler_time_transport_marker] ? "yes": "no"); + node->add_property (X_("smpte"), 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_("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"); session->add_extra_xml (*node); session->set_dirty (); @@ -480,240 +539,320 @@ Editor::restore_ruler_visibility () XMLProperty* prop; XMLNode * node = session->extra_xml (X_("RulerVisibility")); + no_ruler_shown_update = true; + if (node) { if ((prop = node->property ("smpte")) != 0) { - if (prop->value() == "yes") - ruler_shown[ruler_metric_smpte] = true; - else - ruler_shown[ruler_metric_smpte] = false; + if (prop->value() == "yes") { + ruler_timecode_action->set_active (true); + } else { + ruler_timecode_action->set_active (false); + } } if ((prop = node->property ("bbt")) != 0) { - if (prop->value() == "yes") - ruler_shown[ruler_metric_bbt] = true; - else - ruler_shown[ruler_metric_bbt] = false; + if (prop->value() == "yes") { + ruler_bbt_action->set_active (true); + } else { + ruler_bbt_action->set_active (false); + } } if ((prop = node->property ("frames")) != 0) { - if (prop->value() == "yes") - ruler_shown[ruler_metric_frames] = true; - else - ruler_shown[ruler_metric_frames] = false; + if (prop->value() == "yes") { + ruler_samples_action->set_active (true); + } else { + ruler_samples_action->set_active (false); + } } if ((prop = node->property ("minsec")) != 0) { - if (prop->value() == "yes") - ruler_shown[ruler_metric_minsec] = true; - else - ruler_shown[ruler_metric_minsec] = false; + if (prop->value() == "yes") { + ruler_minsec_action->set_active (true); + } else { + ruler_minsec_action->set_active (false); + } } if ((prop = node->property ("tempo")) != 0) { - if (prop->value() == "yes") - ruler_shown[ruler_time_tempo] = true; - else - ruler_shown[ruler_time_tempo] = false; + if (prop->value() == "yes") { + ruler_tempo_action->set_active (true); + } else { + ruler_tempo_action->set_active (false); + } } if ((prop = node->property ("meter")) != 0) { - if (prop->value() == "yes") - ruler_shown[ruler_time_meter] = true; - else - ruler_shown[ruler_time_meter] = false; + if (prop->value() == "yes") { + ruler_meter_action->set_active (true); + } else { + ruler_meter_action->set_active (false); + } } if ((prop = node->property ("marker")) != 0) { - if (prop->value() == "yes") - ruler_shown[ruler_time_marker] = true; - else - ruler_shown[ruler_time_marker] = false; + if (prop->value() == "yes") { + ruler_marker_action->set_active (true); + } else { + ruler_marker_action->set_active (false); + } } if ((prop = node->property ("rangemarker")) != 0) { - if (prop->value() == "yes") - ruler_shown[ruler_time_range_marker] = true; - else - ruler_shown[ruler_time_range_marker] = false; + if (prop->value() == "yes") { + ruler_range_action->set_active (true); + } else { + ruler_range_action->set_active (false); + } } + if ((prop = node->property ("transportmarker")) != 0) { - if (prop->value() == "yes") - ruler_shown[ruler_time_transport_marker] = true; - else - ruler_shown[ruler_time_transport_marker] = false; + if (prop->value() == "yes") { + ruler_loop_punch_action->set_active (true); + } else { + ruler_loop_punch_action->set_active (false); + } + } + + if ((prop = node->property ("cdmarker")) != 0) { + if (prop->value() == "yes") { + ruler_cd_marker_action->set_active (true); + } else { + ruler_cd_marker_action->set_active (false); + } + + } 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 + // any cd marks exist + ruler_cd_marker_action->set_active (false); + 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); + break; + } + } } } + no_ruler_shown_update = false; update_ruler_visibility (); } - void Editor::update_ruler_visibility () { - using namespace Box_Helpers; - BoxList & lab_children = time_button_vbox.children(); - BoxList & ruler_children = time_canvas_vbox.children(); + int visible_rulers = 0; - visible_timebars = 0; - - lab_children.clear(); - - // leave the last one (the time_canvas) intact - while (ruler_children.size() > 1) { - ruler_children.pop_front(); + if (no_ruler_shown_update) { + return; } - BoxList::iterator canvaspos = ruler_children.begin(); - - _smpte_ruler = gtk_custom_hruler_new (); - smpte_ruler = Glib::wrap (_smpte_ruler); - smpte_ruler->set_name ("SMPTERuler"); - smpte_ruler->set_size_request (-1, (int)timebar_height); - gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_smpte_ruler), &ruler_metrics[ruler_metric_smpte]); - - _bbt_ruler = gtk_custom_hruler_new (); - bbt_ruler = Glib::wrap (_bbt_ruler); - bbt_ruler->set_name ("BBTRuler"); - bbt_ruler->set_size_request (-1, (int)timebar_height); - gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_bbt_ruler), &ruler_metrics[ruler_metric_bbt]); - - _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]); - - _minsec_ruler = gtk_custom_hruler_new (); - minsec_ruler = Glib::wrap (_minsec_ruler); - minsec_ruler->set_name ("MinSecRuler"); - minsec_ruler->set_size_request (-1, (int)timebar_height); - gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_minsec_ruler), &ruler_metrics[ruler_metric_minsec]); - - - smpte_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - bbt_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - frames_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - minsec_ruler->set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - - smpte_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); - bbt_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); - frames_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); - minsec_ruler->signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_button_release)); - - smpte_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); - bbt_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); - frames_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); - minsec_ruler->signal_button_press_event().connect (mem_fun(*this, &Editor::ruler_button_press)); - - smpte_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); - bbt_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); - frames_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); - minsec_ruler->signal_motion_notify_event().connect (mem_fun(*this, &Editor::ruler_mouse_motion)); + visible_timebars = 0; - ruler_children.insert (canvaspos, Element(*_ruler_separator, PACK_SHRINK, PACK_START)); - - if (ruler_shown[ruler_metric_minsec]) { - lab_children.push_back (Element(minsec_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*minsec_ruler, PACK_SHRINK, PACK_START)); - visible_timebars++; + if (ruler_minsec_action->get_active()) { + visible_rulers++; + minsec_label.show (); + minsec_ruler->show (); + } else { + minsec_label.hide (); + minsec_ruler->hide (); } - if (ruler_shown[ruler_metric_smpte]) { - lab_children.push_back (Element(smpte_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*smpte_ruler, PACK_SHRINK, PACK_START)); - visible_timebars++; + if (ruler_timecode_action->get_active()) { + visible_rulers++; + smpte_label.show (); + smpte_ruler->show (); + } else { + smpte_label.hide (); + smpte_ruler->hide (); } - if (ruler_shown[ruler_metric_frames]) { - lab_children.push_back (Element(frame_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*frames_ruler, PACK_SHRINK, PACK_START)); - visible_timebars++; + if (ruler_samples_action->get_active()) { + visible_rulers++; + frame_label.show (); + frames_ruler->show (); + } else { + frame_label.hide (); + frames_ruler->hide (); } - if (ruler_shown[ruler_metric_bbt]) { - lab_children.push_back (Element(bbt_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*bbt_ruler, PACK_SHRINK, PACK_START)); - visible_timebars++; + if (ruler_bbt_action->get_active()) { + visible_rulers++; + bbt_label.show (); + bbt_ruler->show (); + } else { + bbt_label.hide (); + bbt_ruler->hide (); } - double tbpos = 1.0; - double old_unit_pos ; - - if (ruler_shown[ruler_time_meter]) { - lab_children.push_back (Element(meter_label, PACK_SHRINK, PACK_START)); - + double tbpos = 0.0; + double tbgpos = 0.0; + double old_unit_pos; + +#ifdef GTKOSX + /* gtk update probs require this (damn) */ + meter_label.hide(); + tempo_label.hide(); + range_mark_label.hide(); + transport_mark_label.hide(); + cd_mark_label.hide(); + mark_label.hide(); +#endif + if (ruler_meter_action->get_active()) { old_unit_pos = meter_group->property_y(); if (tbpos != old_unit_pos) { meter_group->move ( 0.0, tbpos - old_unit_pos); } + old_unit_pos = meter_bar_group->property_y(); + if (tbgpos != old_unit_pos) { + meter_bar_group->move ( 0.0, tbgpos - old_unit_pos); + } + meter_bar_group->show(); meter_group->show(); + meter_label.show(); tbpos += timebar_height; + tbgpos += timebar_height; visible_timebars++; - } - else { + } else { + meter_bar_group->hide(); meter_group->hide(); + meter_label.hide(); } - if (ruler_shown[ruler_time_tempo]) { - lab_children.push_back (Element(tempo_label, PACK_SHRINK, PACK_START)); + if (ruler_tempo_action->get_active()) { old_unit_pos = tempo_group->property_y(); if (tbpos != old_unit_pos) { tempo_group->move(0.0, tbpos - old_unit_pos); } + old_unit_pos = tempo_bar_group->property_y(); + if (tbgpos != old_unit_pos) { + tempo_bar_group->move ( 0.0, tbgpos - old_unit_pos); + } + tempo_bar_group->show(); tempo_group->show(); + tempo_label.show(); tbpos += timebar_height; + tbgpos += timebar_height; visible_timebars++; - } - else { + } else { + tempo_bar_group->hide(); tempo_group->hide(); + tempo_label.hide(); } - if (ruler_shown[ruler_time_marker]) { - lab_children.push_back (Element(mark_label, PACK_SHRINK, PACK_START)); - old_unit_pos = marker_group->property_y(); - if (tbpos != old_unit_pos) { - marker_group->move ( 0.0, tbpos - old_unit_pos); - } - marker_group->show(); - tbpos += timebar_height; - visible_timebars++; - } - else { - marker_group->hide(); - } - - if (ruler_shown[ruler_time_range_marker]) { - lab_children.push_back (Element(range_mark_label, PACK_SHRINK, PACK_START)); + if (!Profile->get_sae() && ruler_range_action->get_active()) { old_unit_pos = range_marker_group->property_y(); if (tbpos != old_unit_pos) { range_marker_group->move (0.0, tbpos - old_unit_pos); } + old_unit_pos = range_marker_bar_group->property_y(); + if (tbgpos != old_unit_pos) { + range_marker_bar_group->move (0.0, tbgpos - old_unit_pos); + } + range_marker_bar_group->show(); range_marker_group->show(); + range_mark_label.show(); + tbpos += timebar_height; + tbgpos += timebar_height; visible_timebars++; - } - else { + } else { + range_marker_bar_group->hide(); range_marker_group->hide(); + range_mark_label.hide(); } - if (ruler_shown[ruler_time_transport_marker]) { - lab_children.push_back (Element(transport_mark_label, PACK_SHRINK, PACK_START)); + if (ruler_loop_punch_action->get_active()) { old_unit_pos = transport_marker_group->property_y(); if (tbpos != old_unit_pos) { transport_marker_group->move ( 0.0, tbpos - old_unit_pos); } + old_unit_pos = transport_marker_bar_group->property_y(); + if (tbgpos != old_unit_pos) { + transport_marker_bar_group->move ( 0.0, tbgpos - old_unit_pos); + } + transport_marker_bar_group->show(); transport_marker_group->show(); + transport_mark_label.show(); tbpos += timebar_height; + tbgpos += timebar_height; visible_timebars++; - } - else { + } else { + transport_marker_bar_group->hide(); transport_marker_group->hide(); + transport_mark_label.hide(); + } + + if (ruler_cd_marker_action->get_active()) { + old_unit_pos = cd_marker_group->property_y(); + if (tbpos != old_unit_pos) { + cd_marker_group->move (0.0, tbpos - old_unit_pos); + } + old_unit_pos = cd_marker_bar_group->property_y(); + if (tbgpos != old_unit_pos) { + cd_marker_bar_group->move (0.0, tbgpos - old_unit_pos); + } + cd_marker_bar_group->show(); + cd_marker_group->show(); + cd_mark_label.show(); + tbpos += timebar_height; + tbgpos += timebar_height; + visible_timebars++; + // make sure all cd markers show up in their respective places + update_cd_marker_display(); + } else { + cd_marker_bar_group->hide(); + cd_marker_group->hide(); + cd_mark_label.hide(); + // make sure all cd markers show up in their respective places + update_cd_marker_display(); } - time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars)); - time_canvas_event_box.queue_resize(); + if (ruler_marker_action->get_active()) { + old_unit_pos = marker_group->property_y(); + if (tbpos != old_unit_pos) { + marker_group->move ( 0.0, tbpos - old_unit_pos); + } + old_unit_pos = marker_bar_group->property_y(); + if (tbgpos != old_unit_pos) { + marker_bar_group->move ( 0.0, tbgpos - old_unit_pos); + } + marker_bar_group->show(); + marker_group->show(); + mark_label.show(); + tbpos += timebar_height; + tbgpos += timebar_height; + visible_timebars++; + } else { + marker_bar_group->hide(); + marker_group->hide(); + mark_label.hide(); + } + + 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; + vertical_adjustment.set_upper(vertical_adjustment.get_upper() + vertical_pos_delta); + full_canvas_height += vertical_pos_delta; + + if (vertical_adjustment.get_value() != 0 && (vertical_adjustment.get_value() + canvas_height >= full_canvas_height)) { + /*if we're at the bottom of the canvas, don't move the _trackview_group*/ + vertical_adjustment.set_value (full_canvas_height - canvas_height + 1); + } else { + _trackview_group->property_y () = - get_trackview_group_vertical_offset (); + _background_group->property_y () = - get_trackview_group_vertical_offset (); + _trackview_group->move (0, 0); + _background_group->move (0, 0); + last_trackview_group_vertical_offset = get_trackview_group_vertical_offset (); + } - update_fixed_rulers(); - //update_tempo_based_rulers(); - tempo_map_changed(Change (0), false); + gdouble bottom_track_pos = vertical_adjustment.get_value() + canvas_height - canvas_timebars_vsize; + std::pair const p = trackview_by_y_position (bottom_track_pos); + if (p.first) { + p.first->clip_to_viewport (); + } - time_canvas_event_box.show_all(); - time_button_frame.show_all(); + ruler_label_vbox.set_size_request (-1, (int)(timebar_height * visible_rulers)); + time_canvas_vbox.set_size_request (-1,-1); + + update_fixed_rulers(); + redisplay_tempo (false); } void @@ -725,55 +864,60 @@ Editor::update_just_smpte () return; } - /* XXX Note the potential loss of accuracy here as we convert from - an uint32_t (or larger) to a float ... what to do ? - */ - - nframes_t page = (nframes_t) floor (canvas_width * frames_per_unit); - nframes_t rightmost_frame = leftmost_frame + page; + nframes64_t rightmost_frame = leftmost_frame + current_page_frames(); - if (ruler_shown[ruler_metric_smpte]) { + if (ruler_timecode_action->get_active()) { gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_smpte_ruler), leftmost_frame, rightmost_frame, leftmost_frame, session->current_end_frame()); } } void -Editor::update_fixed_rulers () +Editor::compute_fixed_ruler_scale () { - nframes_t rightmost_frame; - if (session == 0) { return; } - /* XXX Note the potential loss of accuracy here as we convert from - an uint32_t (or larger) to a float ... what to do ? - */ + if (ruler_timecode_action->get_active()) { + set_smpte_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() ); + } +} + +void +Editor::update_fixed_rulers () +{ + nframes64_t rightmost_frame; - nframes_t page = (nframes_t) floor (canvas_width * frames_per_unit); + if (session == 0) { + return; + } ruler_metrics[ruler_metric_smpte].units_per_pixel = frames_per_unit; ruler_metrics[ruler_metric_frames].units_per_pixel = frames_per_unit; ruler_metrics[ruler_metric_minsec].units_per_pixel = frames_per_unit; - rightmost_frame = leftmost_frame + page; + rightmost_frame = leftmost_frame + current_page_frames(); /* these force a redraw, which in turn will force execution of the metric callbacks to compute the relevant ticks to display. */ - if (ruler_shown[ruler_metric_smpte]) { + if (ruler_timecode_action->get_active()) { gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_smpte_ruler), leftmost_frame, rightmost_frame, leftmost_frame, session->current_end_frame()); } - if (ruler_shown[ruler_metric_frames]) { + 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()); } - if (ruler_shown[ruler_metric_minsec]) { + 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()); } @@ -786,15 +930,10 @@ Editor::update_tempo_based_rulers () return; } - /* XXX Note the potential loss of accuracy here as we convert from - an uint32_t (or larger) to a float ... what to do ? - */ - - nframes_t page = (nframes_t) floor (canvas_width * frames_per_unit); ruler_metrics[ruler_metric_bbt].units_per_pixel = frames_per_unit; - - if (ruler_shown[ruler_metric_bbt]) { - gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_bbt_ruler), leftmost_frame, leftmost_frame+page, + + 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()); } } @@ -825,126 +964,137 @@ Editor::_metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble u return ruler_editor->metric_get_minsec (marks, lower, upper, maxchars); } -gint -Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +void +Editor::set_smpte_ruler_scale (gdouble lower, gdouble upper) { - nframes_t range; - nframes_t pos; - nframes_t spacer; - nframes_t fr; - SMPTE::Time smpte; - gchar buf[16]; - gint nmarks = 0; - gint n; - bool show_bits = false; - bool show_frames = false; - bool show_seconds = false; - bool show_minutes = false; - bool show_hours = false; - int mark_modulo; + nframes64_t range; + nframes64_t spacer; + nframes64_t fr; if (session == 0) { - return 0; + return; } fr = session->frame_rate(); - if (lower > (spacer = (nframes_t)(128 * Editor::get_current_zoom ()))) { + if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) { lower = lower - spacer; } else { lower = 0; } upper = upper + spacer; - range = (nframes_t) floor (upper - lower); + range = (nframes64_t) floor (upper - lower); if (range < (2 * session->frames_per_smpte_frame())) { /* 0 - 2 frames */ - show_bits = true; - mark_modulo = 20; - nmarks = 1 + (2 * Config->get_subframes_per_frame()); + smpte_ruler_scale = smpte_show_bits; + smpte_mark_modulo = 20; + smpte_nmarks = 2 + (2 * Config->get_subframes_per_frame()); } else if (range <= (fr / 4)) { /* 2 frames - 0.250 second */ - show_frames = true; - mark_modulo = 1; - nmarks = 1 + (range / (nframes_t)session->frames_per_smpte_frame()); + smpte_ruler_scale = smpte_show_frames; + smpte_mark_modulo = 1; + smpte_nmarks = 2 + (range / (nframes64_t)session->frames_per_smpte_frame()); } else if (range <= (fr / 2)) { /* 0.25-0.5 second */ - show_frames = true; - mark_modulo = 2; - nmarks = 1 + (range / (nframes_t)session->frames_per_smpte_frame()); + smpte_ruler_scale = smpte_show_frames; + smpte_mark_modulo = 2; + smpte_nmarks = 2 + (range / (nframes64_t)session->frames_per_smpte_frame()); } else if (range <= fr) { /* 0.5-1 second */ - show_frames = true; - mark_modulo = 5; - nmarks = 1 + (range / (nframes_t)session->frames_per_smpte_frame()); + smpte_ruler_scale = smpte_show_frames; + smpte_mark_modulo = 5; + smpte_nmarks = 2 + (range / (nframes64_t)session->frames_per_smpte_frame()); } else if (range <= 2 * fr) { /* 1-2 seconds */ - show_frames = true; - mark_modulo = 10; - nmarks = 1 + (range / (nframes_t)session->frames_per_smpte_frame()); + smpte_ruler_scale = smpte_show_frames; + smpte_mark_modulo = 10; + smpte_nmarks = 2 + (range / (nframes64_t)session->frames_per_smpte_frame()); } else if (range <= 8 * fr) { /* 2-8 seconds */ - show_seconds = true; - mark_modulo = 1; - nmarks = 1 + (range / fr); + smpte_ruler_scale = smpte_show_seconds; + smpte_mark_modulo = 1; + smpte_nmarks = 2 + (range / fr); } else if (range <= 16 * fr) { /* 8-16 seconds */ - show_seconds = true; - mark_modulo = 2; - nmarks = 1 + (range / fr); + smpte_ruler_scale = smpte_show_seconds; + smpte_mark_modulo = 2; + smpte_nmarks = 2 + (range / fr); } else if (range <= 30 * fr) { /* 16-30 seconds */ - show_seconds = true; - mark_modulo = 5; - nmarks = 1 + (range / fr); + smpte_ruler_scale = smpte_show_seconds; + smpte_mark_modulo = 5; + smpte_nmarks = 2 + (range / fr); } else if (range <= 60 * fr) { /* 30-60 seconds */ - show_seconds = true; - mark_modulo = 5; - nmarks = 1 + (range / fr); + smpte_ruler_scale = smpte_show_seconds; + smpte_mark_modulo = 5; + smpte_nmarks = 2 + (range / fr); } else if (range <= 2 * 60 * fr) { /* 1-2 minutes */ - show_seconds = true; - mark_modulo = 20; - nmarks = 1 + (range / fr); + smpte_ruler_scale = smpte_show_seconds; + smpte_mark_modulo = 15; + smpte_nmarks = 2 + (range / fr); } else if (range <= 4 * 60 * fr) { /* 2-4 minutes */ - show_seconds = true; - mark_modulo = 30; - nmarks = 1 + (range / fr); + smpte_ruler_scale = smpte_show_seconds; + smpte_mark_modulo = 30; + smpte_nmarks = 2 + (range / fr); } else if (range <= 10 * 60 * fr) { /* 4-10 minutes */ - show_minutes = true; - mark_modulo = 2; - nmarks = 1 + 10; + smpte_ruler_scale = smpte_show_minutes; + smpte_mark_modulo = 2; + smpte_nmarks = 2 + 10; } else if (range <= 30 * 60 * fr) { /* 10-30 minutes */ - show_minutes = true; - mark_modulo = 5; - nmarks = 1 + 30; + smpte_ruler_scale = smpte_show_minutes; + smpte_mark_modulo = 5; + smpte_nmarks = 2 + 30; } else if (range <= 60 * 60 * fr) { /* 30 minutes - 1hr */ - show_minutes = true; - mark_modulo = 10; - nmarks = 1 + 60; + smpte_ruler_scale = smpte_show_minutes; + smpte_mark_modulo = 10; + smpte_nmarks = 2 + 60; } else if (range <= 4 * 60 * 60 * fr) { /* 1 - 4 hrs*/ - show_minutes = true; - mark_modulo = 30; - nmarks = 1 + (60 * 4); + smpte_ruler_scale = smpte_show_minutes; + smpte_mark_modulo = 30; + smpte_nmarks = 2 + (60 * 4); } else if (range <= 8 * 60 * 60 * fr) { /* 4 - 8 hrs*/ - show_hours = true; - mark_modulo = 1; - nmarks = 1 + 8; + smpte_ruler_scale = smpte_show_hours; + smpte_mark_modulo = 1; + smpte_nmarks = 2 + 8; } else if (range <= 16 * 60 * 60 * fr) { /* 16-24 hrs*/ - show_hours = true; - mark_modulo = 1; - nmarks = 1 + 24; + smpte_ruler_scale = smpte_show_hours; + smpte_mark_modulo = 1; + smpte_nmarks = 2 + 24; } else { - /* not possible if nframes_t is a 32 bit quantity */ + /* not possible if nframes64_t is a 32 bit quantity */ - show_hours = true; - mark_modulo = 4; - nmarks = 1 + 24; + smpte_ruler_scale = smpte_show_hours; + smpte_mark_modulo = 4; + smpte_nmarks = 2 + 24; } +} + +gint +Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +{ + nframes_t pos; + nframes64_t spacer; + SMPTE::Time smpte; + gchar buf[16]; + gint n; + + if (session == 0) { + return 0; + } + + if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) { + lower = lower - spacer; + } else { + lower = 0; + } + pos = (nframes_t) floor (lower); - *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks); - - if (show_bits) { + *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * smpte_nmarks); + switch (smpte_ruler_scale) { + case smpte_show_bits: + // Find smpte time of this sample (pos) with subframe accuracy session->sample_to_smpte(pos, smpte, true /* use_offset */, true /* use_subframes */ ); - for (n = 0; n < nmarks; n++) { + for (n = 0; n < smpte_nmarks; n++) { session->smpte_to_sample(smpte, pos, true /* use_offset */, true /* use_subframes */ ); - if ((smpte.subframes % mark_modulo) == 0) { + if ((smpte.subframes % smpte_mark_modulo) == 0) { if (smpte.subframes == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor; snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", smpte.negative ? "-" : "", smpte.hours, smpte.minutes, smpte.seconds, smpte.frames); @@ -963,15 +1113,16 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp // Increment subframes by one SMPTE::increment_subframes( smpte ); } - } else if (show_seconds) { + break; + case smpte_show_seconds: // Find smpte time of this sample (pos) session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ ); // Go to next whole second down SMPTE::seconds_floor( smpte ); - for (n = 0; n < nmarks; n++) { + for (n = 0; n < smpte_nmarks; n++) { session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ ); - if ((smpte.seconds % mark_modulo) == 0) { + if ((smpte.seconds % smpte_mark_modulo) == 0) { if (smpte.seconds == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor; (*marks)[n].position = pos; @@ -989,15 +1140,16 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp (*marks)[n].label = g_strdup (buf); SMPTE::increment_seconds( smpte ); } - } else if (show_minutes) { + break; + case smpte_show_minutes: // Find smpte time of this sample (pos) session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ ); // Go to next whole minute down SMPTE::minutes_floor( smpte ); - for (n = 0; n < nmarks; n++) { + for (n = 0; n < smpte_nmarks; n++) { session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ ); - if ((smpte.minutes % mark_modulo) == 0) { + if ((smpte.minutes % smpte_mark_modulo) == 0) { if (smpte.minutes == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor; } else { @@ -1013,15 +1165,17 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp (*marks)[n].position = pos; SMPTE::increment_minutes( smpte ); } - } else if (show_hours) { + + break; + case smpte_show_hours: // Find smpte time of this sample (pos) session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ ); // Go to next whole hour down SMPTE::hours_floor( smpte ); - for (n = 0; n < nmarks; n++) { + for (n = 0; n < smpte_nmarks; n++) { session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ ); - if ((smpte.hours % mark_modulo) == 0) { + if ((smpte.hours % smpte_mark_modulo) == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor; snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", smpte.negative ? "-" : "", smpte.hours, smpte.minutes, smpte.seconds, smpte.frames); } else { @@ -1034,16 +1188,21 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp SMPTE::increment_hours( smpte ); } - } else { // show_frames + break; + case smpte_show_frames: // Find smpte time of this sample (pos) session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ ); // Go to next whole frame down SMPTE::frames_floor( smpte ); - for (n = 0; n < nmarks; n++) { + for (n = 0; n < smpte_nmarks; n++) { session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ ); - if ((smpte.frames % mark_modulo) == 0) { - (*marks)[n].style = GtkCustomRulerMarkMajor; + if ((smpte.frames % smpte_mark_modulo) == 0) { + if (smpte.frames == 0) { + (*marks)[n].style = GtkCustomRulerMarkMajor; + } else { + (*marks)[n].style = GtkCustomRulerMarkMinor; + } (*marks)[n].position = pos; snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", smpte.negative ? "-" : "", smpte.hours, smpte.minutes, smpte.seconds, smpte.frames); } else { @@ -1055,40 +1214,34 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp (*marks)[n].label = g_strdup (buf); SMPTE::increment( smpte ); } + + break; } - return nmarks; + return smpte_nmarks; } -gint -Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +void +Editor::compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper) { if (session == 0) { - return 0; + return; } - TempoMap::BBTPointList::iterator i; + 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; - uint32_t bars = 0; - uint32_t desirable_marks; - uint32_t magic_accent_number = 1; - gint nmarks; - char buf[64]; - gint n = 0; - nframes_t pos; - bool bar_helper_on = true; - - BBT_Time next_beat; - nframes_t next_beat_pos; - - if ((desirable_marks = maxchars / 7) == 0) { - return 0; - } - /* align the tick marks to whatever we're snapping to... */ + bbt_accent_modulo = 1; + bbt_bar_helper_on = false; + bbt_bars = 0; + bbt_nmarks = 1; + bbt_ruler_scale = bbt_over; + switch (snap_type) { case SnapToAThirdBeat: bbt_beat_subdivision = 3; @@ -1098,180 +1251,432 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper break; case SnapToAEighthBeat: bbt_beat_subdivision = 8; - magic_accent_number = 2; + bbt_accent_modulo = 2; break; case SnapToASixteenthBeat: bbt_beat_subdivision = 16; - magic_accent_number = 4; + bbt_accent_modulo = 4; break; case SnapToAThirtysecondBeat: bbt_beat_subdivision = 32; - magic_accent_number = 8; + bbt_accent_modulo = 8; break; default: - bbt_beat_subdivision = 4; + bbt_beat_subdivision = 4; break; } if (current_bbt_points == 0 || current_bbt_points->empty()) { - return 0; + return; } i = current_bbt_points->end(); i--; - bars = (*i).bar - (*current_bbt_points->begin()).bar; - beats = current_bbt_points->size() - bars; + if ((*i).beat >= (*current_bbt_points->begin()).beat) { + bbt_bars = (*i).bar - (*current_bbt_points->begin()).bar; + } else { + bbt_bars = (*i).bar - (*current_bbt_points->begin()).bar - 1; + } + beats = current_bbt_points->size() - bbt_bars; /*Only show the bar helper if there aren't many bars on the screen */ - if (bars > 1) { - bar_helper_on = false; + if ((bbt_bars < 2) || (beats < 5)) { + bbt_bar_helper_on = true; } - if (desirable_marks > (beats / 4)) { + if (bbt_bars > 8192) { + bbt_ruler_scale = bbt_over; + } else if (bbt_bars > 1024) { + bbt_ruler_scale = bbt_show_64; + } else if (bbt_bars > 256) { + bbt_ruler_scale = bbt_show_16; + } else if (bbt_bars > 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 { + bbt_ruler_scale = bbt_show_ticks_detail; + } - /* we're in beat land...*/ + 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)) { + bbt_ruler_scale = bbt_show_ticks_super_detail; + } +} - uint32_t tick = 0; - uint32_t skip; - uint32_t t; - nframes_t frame_skip; - double frame_skip_error; - double accumulated_error; - double position_of_helper; - bool i_am_accented = false; - bool we_need_ticks = false; - bool helper_active = false; - - position_of_helper = lower + (30 * Editor::get_current_zoom ()); +gint +Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +{ + if (session == 0) { + return 0; + } - if (desirable_marks >= (beats)) { - nmarks = (beats * bbt_beat_subdivision) + 1; - we_need_ticks = true; - } else { - nmarks = beats + 1; + TempoMap::BBTPointList::iterator i; + + char buf[64]; + gint n = 0; + nframes64_t pos; + BBT_Time next_beat; + nframes64_t next_beat_pos; + uint32_t beats = 0; + + uint32_t tick = 0; + uint32_t skip; + uint32_t t; + nframes64_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()) { + return 0; + } + + switch (bbt_ruler_scale) { + + case bbt_show_beats: + beats = current_bbt_points->size(); + bbt_nmarks = beats + 2; + + *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks); + + (*marks)[0].label = g_strdup(" "); + (*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; + } + 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) { + (*marks)[n].style = GtkCustomRulerMarkMajor; + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); + } else if (((*i).beat % 2 == 1)) { + (*marks)[n].style = GtkCustomRulerMarkMinor; + snprintf (buf, sizeof(buf), " "); + } else { + (*marks)[n].style = GtkCustomRulerMarkMicro; + snprintf (buf, sizeof(buf), " "); + } + (*marks)[n].label = g_strdup (buf); + (*marks)[n].position = (*i).frame; + n++; + } } + break; + + case bbt_show_ticks: - *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks); + beats = current_bbt_points->size(); + bbt_nmarks = (beats + 2) * bbt_beat_subdivision; + + bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ()); + *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks); (*marks)[0].label = g_strdup(" "); (*marks)[0].position = lower; (*marks)[0].style = GtkCustomRulerMarkMicro; - for (n = 1, i = current_bbt_points->begin(); n < nmarks && i != current_bbt_points->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).frame < lower && (bar_helper_on)) { - snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat); - (*marks)[0].label = g_strdup (buf); - helper_active = true; + if ((*i).beat == 1) { + (*marks)[n].style = GtkCustomRulerMarkMajor; + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); + } else { + (*marks)[n].style = GtkCustomRulerMarkMinor; + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).beat); + } + if (((*i).frame < bbt_position_of_helper) && helper_active) { + snprintf (buf, sizeof(buf), " "); + } + (*marks)[n].label = g_strdup (buf); + (*marks)[n].position = (*i).frame; + n++; + } + + /* Add the tick marks */ + + /* Find the next beat */ + next_beat.beats = (*i).beat; + next_beat.bars = (*i).bar; + next_beat.ticks = 0; + + if ((*i).meter->beats_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 = (nframes64_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); - if ((*i).type == TempoMap::Bar) { - if (((*i).frame < position_of_helper) && helper_active) { - snprintf (buf, sizeof(buf), " "); - } else { - snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); - } - (*marks)[n].label = g_strdup (buf); - (*marks)[n].position = (*i).frame; - (*marks)[n].style = GtkCustomRulerMarkMajor; - n++; - - } else if (((*i).type == TempoMap::Beat) && ((*i).beat > 1)) { - ((((*i).frame < position_of_helper) && bar_helper_on) || !we_need_ticks) ? - snprintf (buf, sizeof(buf), " ") : snprintf (buf, sizeof(buf), "%" PRIu32, (*i).beat); - if (((*i).beat % 2 == 1) || we_need_ticks) { - (*marks)[n].style = GtkCustomRulerMarkMinor; - } else { - (*marks)[n].style = GtkCustomRulerMarkMicro; - } - (*marks)[n].label = g_strdup (buf); - (*marks)[n].position = (*i).frame; - n++; - } + 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) { + + if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { + i_am_accented = true; + } + + snprintf (buf, sizeof(buf), " "); + (*marks)[n].label = g_strdup (buf); + + /* Error compensation for float to nframes64_t*/ + accumulated_error += frame_skip_error; + if (accumulated_error > 1) { + pos += 1; + accumulated_error -= 1.0f; + } + + (*marks)[n].position = pos; + + if ((bbt_beat_subdivision > 4) && i_am_accented) { + (*marks)[n].style = GtkCustomRulerMarkMinor; + } else { + (*marks)[n].style = GtkCustomRulerMarkMicro; + } + i_am_accented = false; + n++; } + } + break; - /* Add the tick marks */ + case bbt_show_ticks_detail: - if (we_need_ticks && (*i).type == TempoMap::Beat) { + beats = current_bbt_points->size(); + bbt_nmarks = (beats + 2) * bbt_beat_subdivision; - /* Find the next beat */ + bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ()); + *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks); - next_beat.beats = (*i).beat; - next_beat.bars = (*i).bar; + (*marks)[0].label = g_strdup(" "); + (*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; + } + 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).meter->beats_per_bar() > (next_beat.beats + 1)) { - next_beat.beats += 1; + if ((*i).beat == 1) { + (*marks)[n].style = GtkCustomRulerMarkMajor; + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); } else { + (*marks)[n].style = GtkCustomRulerMarkMinor; + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).beat); + } + if (((*i).frame < bbt_position_of_helper) && helper_active) { + snprintf (buf, sizeof(buf), " "); + } + (*marks)[n].label = g_strdup (buf); + (*marks)[n].position = (*i).frame; + n++; + } + + /* Add the tick marks */ + + /* Find the next beat */ + + next_beat.beats = (*i).beat; + next_beat.bars = (*i).bar; + + if ((*i).meter->beats_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_error -= frame_skip; + skip = (uint32_t) (Meter::ticks_per_beat / bbt_beat_subdivision); - frame_skip = (nframes_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); + pos = (*i).frame + frame_skip; + accumulated_error = frame_skip_error; - 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) { - tick = skip; - - for (t = 0; (tick < Meter::ticks_per_beat) && (n < 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 (t % magic_accent_number == (magic_accent_number - 1)) { - i_am_accented = true; - } - if (Editor::get_current_zoom () > 32) { - snprintf (buf, sizeof(buf), " "); - } else if ((Editor::get_current_zoom () > 8) && !i_am_accented) { - snprintf (buf, sizeof(buf), " "); - } else if (bar_helper_on && (pos < position_of_helper)) { - snprintf (buf, sizeof(buf), " "); - } else { - snprintf (buf, sizeof(buf), "%" PRIu32, tick); - } + if (i_am_accented && (pos > bbt_position_of_helper)){ + snprintf (buf, sizeof(buf), "%" PRIu32, tick); + } else { + snprintf (buf, sizeof(buf), " "); + } - (*marks)[n].label = g_strdup (buf); + (*marks)[n].label = g_strdup (buf); - /* Error compensation for float to nframes_t*/ - accumulated_error += frame_skip_error; - if (accumulated_error > 1) { - pos += 1; - accumulated_error -= 1.0f; - } + /* Error compensation for float to nframes64_t*/ + accumulated_error += frame_skip_error; + if (accumulated_error > 1) { + pos += 1; + accumulated_error -= 1.0f; + } - (*marks)[n].position = pos; + (*marks)[n].position = pos; - if ((bbt_beat_subdivision > 4) && i_am_accented) { - (*marks)[n].style = GtkCustomRulerMarkMinor; - } else { - (*marks)[n].style = GtkCustomRulerMarkMicro; - } - i_am_accented = false; - n++; - + if ((bbt_beat_subdivision > 4) && i_am_accented) { + (*marks)[n].style = GtkCustomRulerMarkMinor; + } else { + (*marks)[n].style = GtkCustomRulerMarkMicro; } + i_am_accented = false; + n++; } } - return n; //return the actual number of marks made, since we might have skipped some fro fractional time signatures - } else { + break; + + case bbt_show_ticks_super_detail: + + beats = current_bbt_points->size(); + bbt_nmarks = (beats + 2) * bbt_beat_subdivision; + + bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ()); + *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks); + + (*marks)[0].label = g_strdup(" "); + (*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; + } + 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) { + (*marks)[n].style = GtkCustomRulerMarkMajor; + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); + } else { + (*marks)[n].style = GtkCustomRulerMarkMinor; + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).beat); + } + if (((*i).frame < bbt_position_of_helper) && helper_active) { + snprintf (buf, sizeof(buf), " "); + } + (*marks)[n].label = g_strdup (buf); + (*marks)[n].position = (*i).frame; + n++; + } + + /* Add the tick marks */ - /* we're in bar land */ + /* Find the next beat */ - if (desirable_marks < (bars / 256)) { - nmarks = 1; - *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks); - snprintf (buf, sizeof(buf), "too many bars... (currently %" PRIu32 ")", bars ); + next_beat.beats = (*i).beat; + next_beat.bars = (*i).bar; + + if ((*i).meter->beats_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 = (nframes64_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); + + 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) { + + 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 { + snprintf (buf, sizeof(buf), " "); + } + + (*marks)[n].label = g_strdup (buf); + + /* Error compensation for float to nframes64_t*/ + accumulated_error += frame_skip_error; + if (accumulated_error > 1) { + pos += 1; + accumulated_error -= 1.0f; + } + + (*marks)[n].position = pos; + + if ((bbt_beat_subdivision > 4) && i_am_accented) { + (*marks)[n].style = GtkCustomRulerMarkMinor; + } else { + (*marks)[n].style = GtkCustomRulerMarkMicro; + } + i_am_accented = false; + n++; + } + } + + break; + + case bbt_over: + bbt_nmarks = 1; + *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks); + snprintf (buf, sizeof(buf), "cannot handle %" PRIu32 " bars", bbt_bars ); (*marks)[0].style = GtkCustomRulerMarkMajor; (*marks)[0].label = g_strdup (buf); (*marks)[0].position = lower; - } else if (desirable_marks < (uint32_t)(nmarks = (gint) (bars / 64) + 1)) { - *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks); - for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < nmarks; i++) { + n = 1; + + break; + + 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) { if ((*i).bar % 64 == 1) { if ((*i).bar % 256 == 1) { @@ -1291,83 +1696,96 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper } } } - } else if (desirable_marks < (uint32_t)(nmarks = (bars / 16) + 1)) { - *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks); - for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < nmarks; i++) { - if ((*i).type == TempoMap::Bar) { - if ((*i).bar % 16 == 1) { - if ((*i).bar % 64 == 1) { - snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); - (*marks)[n].style = GtkCustomRulerMarkMajor; - } else { - snprintf (buf, sizeof(buf), " "); - if ((*i).bar % 64 == 33) { - (*marks)[n].style = GtkCustomRulerMarkMinor; - } else { - (*marks)[n].style = GtkCustomRulerMarkMicro; - } - } - (*marks)[n].label = g_strdup (buf); - (*marks)[n].position = (*i).frame; - n++; + break; + + 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) { + if ((*i).bar % 16 == 1) { + if ((*i).bar % 64 == 1) { + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); + (*marks)[n].style = GtkCustomRulerMarkMajor; + } else { + snprintf (buf, sizeof(buf), " "); + if ((*i).bar % 64 == 33) { + (*marks)[n].style = GtkCustomRulerMarkMinor; + } else { + (*marks)[n].style = GtkCustomRulerMarkMicro; } } + (*marks)[n].label = g_strdup (buf); + (*marks)[n].position = (*i).frame; + n++; + } } - } else if (desirable_marks < (uint32_t)(nmarks = (bars / 4) + 1)){ - *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks); - for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < nmarks; ++i) { - if ((*i).type == TempoMap::Bar) { - if ((*i).bar % 4 == 1) { - if ((*i).bar % 16 == 1) { - snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); - (*marks)[n].style = GtkCustomRulerMarkMajor; - } else { - snprintf (buf, sizeof(buf), " "); - if ((*i).bar % 16 == 9) { - (*marks)[n].style = GtkCustomRulerMarkMinor; - } else { - (*marks)[n].style = GtkCustomRulerMarkMicro; - } - } - (*marks)[n].label = g_strdup (buf); - (*marks)[n].position = (*i).frame; - n++; + } + break; + + 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) { + if ((*i).bar % 4 == 1) { + if ((*i).bar % 16 == 1) { + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); + (*marks)[n].style = GtkCustomRulerMarkMajor; + } else { + snprintf (buf, sizeof(buf), " "); + if ((*i).bar % 16 == 9) { + (*marks)[n].style = GtkCustomRulerMarkMinor; + } else { + (*marks)[n].style = GtkCustomRulerMarkMicro; } } + (*marks)[n].label = g_strdup (buf); + (*marks)[n].position = (*i).frame; + n++; + } + } + } + break; + + case bbt_show_1: + // 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) { + if ((*i).bar % 4 == 1) { + snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); + (*marks)[n].style = GtkCustomRulerMarkMajor; + } else { + snprintf (buf, sizeof(buf), " "); + if ((*i).bar % 4 == 3) { + (*marks)[n].style = GtkCustomRulerMarkMinor; + } else { + (*marks)[n].style = GtkCustomRulerMarkMicro; + } + } + (*marks)[n].label = g_strdup (buf); + (*marks)[n].position = (*i).frame; + n++; } - } else { - nmarks = bars + 1; - *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks ); - for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < nmarks; i++) { - if ((*i).type == TempoMap::Bar) { - if ((*i).bar % 4 == 1) { - snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar); - (*marks)[n].style = GtkCustomRulerMarkMajor; - } else { - snprintf (buf, sizeof(buf), " "); - if ((*i).bar % 4 == 3) { - (*marks)[n].style = GtkCustomRulerMarkMinor; - } else { - (*marks)[n].style = GtkCustomRulerMarkMicro; - } - } - (*marks)[n].label = g_strdup (buf); - (*marks)[n].position = (*i).frame; - n++; - } - } - } - return n; + } + + break; + } + + return n; //return the actual number of marks made, since we might have skipped some from fractional time signatures + } gint Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) { - nframes_t mark_interval; - nframes_t pos; - nframes_t ilower = (nframes_t) floor (lower); - nframes_t iupper = (nframes_t) floor (upper); + nframes64_t mark_interval; + nframes64_t pos; + nframes64_t ilower = (nframes64_t) floor (lower); + nframes64_t iupper = (nframes64_t) floor (upper); gchar buf[16]; gint nmarks; gint n; @@ -1385,7 +1803,7 @@ Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble up nmarks = 5; *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks); for (n = 0, pos = ilower; n < nmarks; pos += mark_interval, ++n) { - snprintf (buf, sizeof(buf), "%u", pos); + snprintf (buf, sizeof(buf), "%" PRIi64, pos); (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; (*marks)[n].style = GtkCustomRulerMarkMajor; @@ -1395,15 +1813,15 @@ Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble up } static void -sample_to_clock_parts ( nframes_t sample, - nframes_t sample_rate, +sample_to_clock_parts ( nframes64_t sample, + nframes64_t sample_rate, long *hrs_p, long *mins_p, long *secs_p, long *millisecs_p) { - nframes_t left; + nframes64_t left; long hrs; long mins; long secs; @@ -1426,117 +1844,132 @@ sample_to_clock_parts ( nframes_t sample, return; } -gint -Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +void +Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper) { - nframes_t range; - nframes_t fr; - nframes_t mark_interval; - nframes_t pos; - nframes_t spacer; - long hrs, mins, secs, millisecs; - gchar buf[16]; - gint nmarks; - gint n; - gint mark_modulo = 100; - bool show_seconds = false; - bool show_minutes = false; - bool show_hours = false; - nframes_t ilower = (nframes_t) floor (lower); - nframes_t iupper = (nframes_t) floor (upper); + nframes64_t range; + nframes64_t fr; + nframes64_t spacer; if (session == 0) { - return 0; + return; } fr = session->frame_rate(); /* to prevent 'flashing' */ - if (lower > (spacer = (nframes_t)(128 * Editor::get_current_zoom ()))) { - lower = lower - spacer; + if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) { + lower -= spacer; } else { lower = 0; } - upper = upper + spacer; - range = iupper - ilower; + upper += spacer; + range = (nframes64_t) (upper - lower); if (range < (fr / 50)) { - mark_interval = fr / 100; /* show 1/100 seconds */ - mark_modulo = 10; + 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 */ - mark_interval = fr / 50; /* show 1/50 seconds */ - mark_modulo = 20; + minsec_mark_interval = fr / 1000; /* show 1/1000 seconds */ + minsec_ruler_scale = minsec_show_frames; + minsec_mark_modulo = 10; } else if (range <= (fr / 2)) { /* 0-0.5 second */ - mark_interval = fr / 20; /* show 1/20 seconds */ - mark_modulo = 100; + minsec_mark_interval = fr / 100; /* show 1/100 seconds */ + minsec_ruler_scale = minsec_show_frames; + minsec_mark_modulo = 100; } else if (range <= fr) { /* 0-1 second */ - mark_interval = fr / 10; /* show 1/10 seconds */ - mark_modulo = 200; + minsec_mark_interval = fr / 10; /* show 1/10 seconds */ + minsec_ruler_scale = minsec_show_frames; + minsec_mark_modulo = 200; } else if (range <= 2 * fr) { /* 1-2 seconds */ - mark_interval = fr / 2; /* show 1/2 seconds */ - mark_modulo = 500; + minsec_mark_interval = fr / 10; /* show 1/10 seconds */ + minsec_ruler_scale = minsec_show_frames; + minsec_mark_modulo = 500; } else if (range <= 8 * fr) { /* 2-5 seconds */ - mark_interval = fr / 5; /* show 2 seconds */ - mark_modulo = 1000; + minsec_mark_interval = fr / 5; /* show 2 seconds */ + minsec_ruler_scale = minsec_show_frames; + minsec_mark_modulo = 1000; } else if (range <= 16 * fr) { /* 8-16 seconds */ - mark_interval = fr; /* show 1 seconds */ - show_seconds = true; - mark_modulo = 5; + minsec_mark_interval = fr; /* show 1 seconds */ + minsec_ruler_scale = minsec_show_seconds; + minsec_mark_modulo = 2; } else if (range <= 30 * fr) { /* 10-30 seconds */ - mark_interval = fr; /* show 10 seconds */ - show_seconds = true; - mark_modulo = 5; + minsec_mark_interval = fr; /* show 1 seconds */ + minsec_ruler_scale = minsec_show_seconds; + minsec_mark_modulo = 5; } else if (range <= 60 * fr) { /* 30-60 seconds */ - mark_interval = 5 * fr; /* show 5 seconds */ - show_seconds = true; - mark_modulo = 3; + 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 */ - mark_interval = 5 * fr; /* show 5 seconds */ - show_seconds = true; - mark_modulo = 3; + 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 */ - mark_interval = 10 * fr; /* show 10 seconds */ - show_seconds = true; - mark_modulo = 30; + 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 */ - mark_interval = 30 * fr; /* show 30 seconds */ - show_seconds = true; - mark_modulo = 60; + 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 */ - mark_interval = 60 * fr; /* show 1 minute */ - show_minutes = true; - mark_modulo = 5; + 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 */ - mark_interval = 2 * 60 * fr; /* show 2 minutes */ - show_minutes = true; - mark_modulo = 10; + 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*/ - mark_interval = 5 * 60 * fr; /* show 10 minutes */ - show_minutes = true; - mark_modulo = 30; + 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*/ - mark_interval = 20 * 60 * fr; /* show 20 minutes */ - show_minutes = true; - mark_modulo = 60; + 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*/ - mark_interval = 60 * 60 * fr; /* show 60 minutes */ - show_hours = true; - mark_modulo = 2; + minsec_mark_interval = 60 * 60 * fr; /* show 60 minutes */ + minsec_ruler_scale = minsec_show_hours; + minsec_mark_modulo = 2; } else { - /* not possible if nframes_t is a 32 bit quantity */ + /* not possible if nframes64_t is a 32 bit quantity */ - mark_interval = 4 * 60 * 60 * fr; /* show 4 hrs */ + minsec_mark_interval = 4 * 60 * 60 * fr; /* show 4 hrs */ } + minsec_nmarks = 2 + (range / minsec_mark_interval); +} - nmarks = 1 + (range / mark_interval); - *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks); - pos = ((ilower + (mark_interval/2))/mark_interval) * mark_interval; - - if (show_seconds) { - for (n = 0; n < nmarks; pos += mark_interval, ++n) { - sample_to_clock_parts (pos, fr, &hrs, &mins, &secs, &millisecs); - if (secs % mark_modulo == 0) { +gint +Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +{ + nframes64_t pos; + nframes64_t spacer; + long hrs, mins, secs, millisecs; + gchar buf[16]; + gint n; + + if (session == 0) { + return 0; + } + + /* to prevent 'flashing' */ + if (lower > (spacer = (nframes64_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; + 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) { (*marks)[n].style = GtkCustomRulerMarkMajor; } else { @@ -1550,10 +1983,11 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble up (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; } - } else if (show_minutes) { - for (n = 0; n < nmarks; pos += mark_interval, ++n) { - sample_to_clock_parts (pos, fr, &hrs, &mins, &secs, &millisecs); - if (mins % mark_modulo == 0) { + 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 (mins % minsec_mark_modulo == 0) { if (mins == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor; } else { @@ -1567,10 +2001,11 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble up (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; } - } else if (show_hours) { - for (n = 0; n < nmarks; pos += mark_interval, ++n) { - sample_to_clock_parts (pos, fr, &hrs, &mins, &secs, &millisecs); - if (hrs % mark_modulo == 0) { + 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) { (*marks)[n].style = GtkCustomRulerMarkMajor; snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); } else { @@ -1580,11 +2015,12 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble up (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; } - } else { - for (n = 0; n < nmarks; pos += mark_interval, ++n) { - sample_to_clock_parts (pos, fr, &hrs, &mins, &secs, &millisecs); - if (millisecs % mark_modulo == 0) { - if (millisecs == 0) { + 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); + if (millisecs % minsec_mark_modulo == 0) { + if (secs == 0) { (*marks)[n].style = GtkCustomRulerMarkMajor; } else { (*marks)[n].style = GtkCustomRulerMarkMinor; @@ -1597,7 +2033,8 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble up (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; } + break; } - return nmarks; + return minsec_nmarks; }