X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_rulers.cc;h=873e4919583a893962a43ce9bc46892d16eac154;hb=d69e177076aa10e19992c8f6133a8928c24c81e2;hp=dc62f669f88a495476a4f8a8bdaaf1facf2b7243;hpb=68e943265edf04e63a8e8b8f62bab20f99d9c637;p=ardour.git diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index dc62f669f8..873e491958 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,15 +17,18 @@ */ -#include // for sprintf, grrr +#define __STDC_FORMAT_MACROS 1 +#include // for sprintf, grrr #include +#include #include #include -#include -#include +#include "ardour/session.h" +#include "ardour/tempo.h" +#include "ardour/profile.h" #include #include "editor.h" @@ -33,10 +36,11 @@ #include "actions.h" #include "gtk-custom-hruler.h" #include "gui_thread.h" +#include "time_axis_view.h" +#include "editor_drag.h" #include "i18n.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -47,7 +51,7 @@ Editor *Editor::ruler_editor; /* the order here must match the "metric" enums in editor.h */ GtkCustomMetric Editor::ruler_metrics[4] = { - {1, Editor::_metric_get_smpte }, + {1, Editor::_metric_get_timecode }, {1, Editor::_metric_get_bbt }, {1, Editor::_metric_get_frames }, {1, Editor::_metric_get_minsec } @@ -58,38 +62,107 @@ 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(); - - _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]); - + + _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(); + + _timecode_ruler = gtk_custom_hruler_new (); + timecode_ruler = Glib::wrap (_timecode_ruler); + timecode_ruler->set_name ("TimecodeRuler"); + timecode_ruler->set_size_request (-1, (int)timebar_height); + gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_timecode_ruler), &ruler_metrics[ruler_metric_timecode]); + timecode_ruler->hide (); + timecode_ruler->set_no_show_all(); + timecode_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]); + 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; + + 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(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(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); + 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)); + 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)); + minsec_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press)); - visible_timebars = 7; /* 4 here, 3 in time_canvas */ - ruler_pressed_button = 0; + 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)); + 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)); + minsec_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll)); + + visible_timebars = 0; /*this will be changed below */ + canvas_timebars_vsize = 0; } bool @@ -142,54 +215,39 @@ Editor::ruler_scroll (GdkEventScroll* event) gint Editor::ruler_button_press (GdkEventButton* ev) { - if (session == 0) { + if (_session == 0) { return FALSE; } - ruler_pressed_button = ev->button; - // jlc: grab ev->window ? //Gtk::Main::grab_add (*minsec_ruler); Widget * grab_widget = 0; - if (smpte_ruler->is_realized() && ev->window == smpte_ruler->get_window()->gobj()) grab_widget = smpte_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 (minsec_ruler->is_realized() && ev->window == minsec_ruler->get_window()->gobj()) grab_widget = minsec_ruler; + 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 (minsec_ruler->is_realized() && ev->window == minsec_ruler->get_window()->gobj()) { + grab_widget = minsec_ruler; + } if (grab_widget) { grab_widget->add_modal_grab (); ruler_grabbed_widget = grab_widget; } - gint x,y; - Gdk::ModifierType state; - - /* need to use the correct x,y, the event lies */ - time_canvas_event_box.get_window()->get_pointer (x, y, state); - - nframes64_t where = leftmost_frame + pixel_to_frame (x); - - switch (ev->button) { - case 1: + 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 */ - snap_to (where); - playhead_cursor->set_position (where); + _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), reinterpret_cast (ev)); _dragging_playhead = true; - break; - - case 2: - /* edit point */ - snap_to (where); - break; - - default: - break; } return TRUE; @@ -198,46 +256,29 @@ Editor::ruler_button_press (GdkEventButton* ev) gint Editor::ruler_button_release (GdkEventButton* ev) { - gint x,y; - Gdk::ModifierType state; - - /* need to use the correct x,y, the event lies */ - time_canvas_event_box.get_window()->get_pointer (x, y, state); - - ruler_pressed_button = 0; - - if (session == 0) { + if (_session == 0) { return FALSE; } - stop_canvas_autoscroll(); - - nframes64_t where = leftmost_frame + pixel_to_frame (x); + gint x,y; + Gdk::ModifierType state; - switch (ev->button) { - case 1: - /* transport playhead */ + if (_drags->active ()) { + _drags->end_grab (reinterpret_cast (ev)); _dragging_playhead = false; - snap_to (where); - session->request_locate (where); - break; + } - case 2: - /* edit point */ - snap_to (where); - break; + if (ev->button == 3) { + /* need to use the correct x,y, the event lies */ + time_canvas_event_box.get_window()->get_pointer (x, y, state); - case 3: - /* popup menu */ + stop_canvas_autoscroll(); + + nframes64_t where = leftmost_frame + pixel_to_frame (x); snap_to (where); popup_ruler_menu (where); - - break; - default: - break; } - if (ruler_grabbed_widget) { ruler_grabbed_widget->remove_modal_grab(); ruler_grabbed_widget = 0; @@ -255,7 +296,7 @@ Editor::ruler_label_button_release (GdkEventButton* ev) m->popup (1, ev->time); } } - + return TRUE; } @@ -263,74 +304,14 @@ Editor::ruler_label_button_release (GdkEventButton* ev) gint Editor::ruler_mouse_motion (GdkEventMotion* ev) { - if (session == 0 || !ruler_pressed_button) { + if (_session == 0) { return FALSE; } - double wcx=0,wcy=0; - double cx=0,cy=0; - - gint x,y; - Gdk::ModifierType state; - - /* 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); - - nframes64_t where = leftmost_frame + pixel_to_frame (x); - - /// 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, 0); - } - } else if (frame < leftmost_frame) { - if (leftmost_frame > 0) { - start_canvas_autoscroll (-1, 0); - } - } - } else { - if (frame >= leftmost_frame && frame < rightmost_frame) { - stop_canvas_autoscroll (); - } - } - ////// - - snap_to (where); - - Cursor* cursor = 0; - - switch (ruler_pressed_button) { - case 1: - /* transport playhead */ - cursor = playhead_cursor; - break; - - case 2: - /* edit point */ - // EDIT CURSOR XXX do something useful - break; - - default: - break; + if (_drags->active ()) { + _drags->motion_handler (reinterpret_cast (ev), false); } - if (cursor) { - cursor->set_position (where); - - if (cursor == playhead_cursor) { - UpdateAllTransportClocks (cursor->current_frame); - } - } - return TRUE; } @@ -352,36 +333,36 @@ Editor::popup_ruler_menu (nframes64_t where, ItemType t) switch (t) { case MarkerBarItem: - 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 (MenuElem (_("New location marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, false, false))); + ruler_items.push_back (MenuElem (_("Clear all locations"), sigc::mem_fun(*this, &Editor::clear_markers))); + ruler_items.push_back (MenuElem (_("Unhide locations"), sigc::mem_fun(*this, &Editor::unhide_markers))); ruler_items.push_back (SeparatorElem ()); break; case RangeMarkerBarItem: //ruler_items.push_back (MenuElem (_("New Range"))); - ruler_items.push_back (MenuElem (_("Clear all ranges"), mem_fun(*this, &Editor::clear_ranges))); - ruler_items.push_back (MenuElem (_("Unhide ranges"), mem_fun(*this, &Editor::unhide_ranges))); + ruler_items.push_back (MenuElem (_("Clear all ranges"), sigc::mem_fun(*this, &Editor::clear_ranges))); + ruler_items.push_back (MenuElem (_("Unhide ranges"), sigc::mem_fun(*this, &Editor::unhide_ranges))); ruler_items.push_back (SeparatorElem ()); break; case TransportMarkerBarItem: 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))); + ruler_items.push_back (MenuElem (_("New CD track marker"), sigc::bind ( sigc::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 (_("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"), bind ( mem_fun(*this, &Editor::mouse_add_new_meter_event), where))); + ruler_items.push_back (MenuElem (_("New Meter"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_meter_event), where))); ruler_items.push_back (MenuElem (_("Clear meter"))); ruler_items.push_back (SeparatorElem ()); break; @@ -437,7 +418,7 @@ Editor::popup_ruler_menu (nframes64_t where, ItemType t) ruler_items.push_back (MenuElem (*action->create_menu_item())); } - editor_ruler_menu->popup (1, gtk_get_current_event_time()); + editor_ruler_menu->popup (1, gtk_get_current_event_time()); no_ruler_shown_update = false; } @@ -447,7 +428,7 @@ Editor::store_ruler_visibility () { XMLNode* node = new XMLNode(X_("RulerVisibility")); - node->add_property (X_("smpte"), ruler_timecode_action->get_active() ? "yes": "no"); + 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_("minsec"), ruler_minsec_action->get_active() ? "yes": "no"); @@ -458,87 +439,97 @@ Editor::store_ruler_visibility () 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 (); + _session->add_extra_xml (*node); + _session->set_dirty (); } -void +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; if (node) { - if ((prop = node->property ("smpte")) != 0) { - if (prop->value() == "yes") + if ((prop = node->property ("timecode")) != 0) { + if (string_is_affirmative (prop->value())) { ruler_timecode_action->set_active (true); - else + } else { ruler_timecode_action->set_active (false); + } } if ((prop = node->property ("bbt")) != 0) { - if (prop->value() == "yes") + if (string_is_affirmative (prop->value())) { ruler_bbt_action->set_active (true); - else + } else { ruler_bbt_action->set_active (false); + } } if ((prop = node->property ("frames")) != 0) { - if (prop->value() == "yes") + if (string_is_affirmative (prop->value())) { ruler_samples_action->set_active (true); - else + } else { ruler_samples_action->set_active (false); + } } if ((prop = node->property ("minsec")) != 0) { - if (prop->value() == "yes") + if (string_is_affirmative (prop->value())) { ruler_minsec_action->set_active (true); - else + } else { ruler_minsec_action->set_active (false); + } } if ((prop = node->property ("tempo")) != 0) { - if (prop->value() == "yes") + if (string_is_affirmative (prop->value())) { ruler_tempo_action->set_active (true); - else + } else { ruler_tempo_action->set_active (false); + } } if ((prop = node->property ("meter")) != 0) { - if (prop->value() == "yes") + if (string_is_affirmative (prop->value())) { ruler_meter_action->set_active (true); - else + } else { ruler_meter_action->set_active (false); + } } if ((prop = node->property ("marker")) != 0) { - if (prop->value() == "yes") + if (string_is_affirmative (prop->value())) { ruler_marker_action->set_active (true); - else + } else { ruler_marker_action->set_active (false); + } } if ((prop = node->property ("rangemarker")) != 0) { - if (prop->value() == "yes") + if (string_is_affirmative (prop->value())) { ruler_range_action->set_active (true); - else + } else { ruler_range_action->set_active (false); + } } if ((prop = node->property ("transportmarker")) != 0) { - if (prop->value() == "yes") + if (string_is_affirmative (prop->value())) { ruler_loop_punch_action->set_active (true); - else + } else { ruler_loop_punch_action->set_active (false); + } } if ((prop = node->property ("cdmarker")) != 0) { - if (prop->value() == "yes") + if (string_is_affirmative (prop->value())) { ruler_cd_marker_action->set_active (true); - else + } 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 + // 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); @@ -550,16 +541,13 @@ Editor::restore_ruler_visibility () } 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; if (no_ruler_shown_update) { return; @@ -567,225 +555,246 @@ Editor::update_ruler_visibility () visible_timebars = 0; - lab_children.clear(); - - // leave the last one (the time_canvas) intact - while (ruler_children.size() > 1) { - ruler_children.pop_front(); - } - - 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->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)); - 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)); - - 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)); - - ruler_children.insert (canvaspos, Element(*_ruler_separator, PACK_SHRINK, PACK_START)); - if (ruler_minsec_action->get_active()) { - lab_children.push_back (Element(minsec_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*minsec_ruler, PACK_SHRINK, PACK_START)); - visible_timebars++; + visible_rulers++; + minsec_label.show (); + minsec_ruler->show (); + } else { + minsec_label.hide (); + minsec_ruler->hide (); } if (ruler_timecode_action->get_active()) { - lab_children.push_back (Element(smpte_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*smpte_ruler, PACK_SHRINK, PACK_START)); - visible_timebars++; + visible_rulers++; + timecode_label.show (); + timecode_ruler->show (); + } else { + timecode_label.hide (); + timecode_ruler->hide (); } if (ruler_samples_action->get_active()) { - lab_children.push_back (Element(frame_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*frames_ruler, PACK_SHRINK, PACK_START)); - visible_timebars++; + visible_rulers++; + frame_label.show (); + frames_ruler->show (); + } else { + frame_label.hide (); + frames_ruler->hide (); } if (ruler_bbt_action->get_active()) { - lab_children.push_back (Element(bbt_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*bbt_ruler, PACK_SHRINK, PACK_START)); - visible_timebars++; - } - - double tbpos = 1.0; - double old_unit_pos ; - + visible_rulers++; + bbt_label.show (); + bbt_ruler->show (); + } else { + bbt_label.hide (); + bbt_ruler->hide (); + } + + 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()) { - lab_children.push_back (Element(meter_label, PACK_SHRINK, PACK_START)); - 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_tempo_action->get_active()) { - lab_children.push_back (Element(tempo_label, PACK_SHRINK, PACK_START)); 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 (!Profile->get_sae() && ruler_range_action->get_active()) { - lab_children.push_back (Element(range_mark_label, PACK_SHRINK, PACK_START)); 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 { + range_marker_bar_group->hide(); range_marker_group->hide(); + range_mark_label.hide(); } if (ruler_loop_punch_action->get_active()) { - lab_children.push_back (Element(transport_mark_label, PACK_SHRINK, PACK_START)); 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()) { - lab_children.push_back (Element(cd_mark_label, PACK_SHRINK, PACK_START)); 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 { + } 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(); } - + if (ruler_marker_action->get_active()) { - 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); } + 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 { + } 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 (); } - - time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars)); - time_canvas_event_box.queue_resize(); - compute_fixed_ruler_scale(); - update_fixed_rulers(); - time_canvas_event_box.show_all(); - time_button_frame.show_all(); + 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 (); + } - compute_current_bbt_points (leftmost_frame, leftmost_frame + (nframes64_t)(edit_packer.get_width() * frames_per_unit)); - compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + (nframes64_t)(edit_packer.get_width() * frames_per_unit)); + 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 -Editor::update_just_smpte () +Editor::update_just_timecode () { - ENSURE_GUI_THREAD(mem_fun(*this, &Editor::update_just_smpte)); - - if (session == 0) { + ENSURE_GUI_THREAD (*this, &Editor::update_just_timecode) + + if (_session == 0) { return; } nframes64_t rightmost_frame = leftmost_frame + current_page_frames(); 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()); + gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_timecode_ruler), leftmost_frame, rightmost_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_smpte_ruler_scale (leftmost_frame, leftmost_frame + (edit_packer.get_width() * frames_per_unit) ); + 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 + (edit_packer.get_width() * frames_per_unit) ); + set_minsec_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames() ); } } @@ -794,57 +803,57 @@ Editor::update_fixed_rulers () { nframes64_t rightmost_frame; - if (session == 0) { + if (_session == 0) { return; } - ruler_metrics[ruler_metric_smpte].units_per_pixel = frames_per_unit; + 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_minsec].units_per_pixel = frames_per_unit; - rightmost_frame = leftmost_frame + current_page_frames (); + 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_timecode_action->get_active()) { - gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_smpte_ruler), leftmost_frame, rightmost_frame, - leftmost_frame, session->current_end_frame()); + gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_timecode_ruler), leftmost_frame, rightmost_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()); + 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 () { - if (session == 0) { + if (_session == 0) { return; } 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()); } } /* Mark generation */ gint -Editor::_metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +Editor::_metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) { - return ruler_editor->metric_get_smpte (marks, lower, upper, maxchars); + return ruler_editor->metric_get_timecode (marks, lower, upper, maxchars); } gint @@ -866,17 +875,17 @@ Editor::_metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble u } void -Editor::set_smpte_ruler_scale (gdouble lower, gdouble upper) +Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper) { nframes64_t range; nframes64_t spacer; nframes64_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 ()))) { lower = lower - spacer; @@ -886,95 +895,95 @@ Editor::set_smpte_ruler_scale (gdouble lower, gdouble upper) upper = upper + spacer; range = (nframes64_t) floor (upper - lower); - if (range < (2 * session->frames_per_smpte_frame())) { /* 0 - 2 frames */ - smpte_ruler_scale = smpte_show_bits; - smpte_mark_modulo = 20; - smpte_nmarks = 2 + (2 * Config->get_subframes_per_frame()); + 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()); } else if (range <= (fr / 4)) { /* 2 frames - 0.250 second */ - smpte_ruler_scale = smpte_show_frames; - smpte_mark_modulo = 1; - smpte_nmarks = 2 + (range / (nframes64_t)session->frames_per_smpte_frame()); + timecode_ruler_scale = timecode_show_frames; + timecode_mark_modulo = 1; + timecode_nmarks = 2 + (range / (nframes64_t)_session->frames_per_timecode_frame()); } else if (range <= (fr / 2)) { /* 0.25-0.5 second */ - smpte_ruler_scale = smpte_show_frames; - smpte_mark_modulo = 2; - smpte_nmarks = 2 + (range / (nframes64_t)session->frames_per_smpte_frame()); + timecode_ruler_scale = timecode_show_frames; + timecode_mark_modulo = 2; + timecode_nmarks = 2 + (range / (nframes64_t)_session->frames_per_timecode_frame()); } else if (range <= fr) { /* 0.5-1 second */ - smpte_ruler_scale = smpte_show_frames; - smpte_mark_modulo = 5; - smpte_nmarks = 2 + (range / (nframes64_t)session->frames_per_smpte_frame()); + timecode_ruler_scale = timecode_show_frames; + timecode_mark_modulo = 5; + timecode_nmarks = 2 + (range / (nframes64_t)_session->frames_per_timecode_frame()); } else if (range <= 2 * fr) { /* 1-2 seconds */ - smpte_ruler_scale = smpte_show_frames; - smpte_mark_modulo = 10; - smpte_nmarks = 2 + (range / (nframes64_t)session->frames_per_smpte_frame()); + timecode_ruler_scale = timecode_show_frames; + timecode_mark_modulo = 10; + timecode_nmarks = 2 + (range / (nframes64_t)_session->frames_per_timecode_frame()); } else if (range <= 8 * fr) { /* 2-8 seconds */ - smpte_ruler_scale = smpte_show_seconds; - smpte_mark_modulo = 1; - smpte_nmarks = 2 + (range / fr); + timecode_ruler_scale = timecode_show_seconds; + timecode_mark_modulo = 1; + timecode_nmarks = 2 + (range / fr); } else if (range <= 16 * fr) { /* 8-16 seconds */ - smpte_ruler_scale = smpte_show_seconds; - smpte_mark_modulo = 2; - smpte_nmarks = 2 + (range / fr); + timecode_ruler_scale = timecode_show_seconds; + timecode_mark_modulo = 2; + timecode_nmarks = 2 + (range / fr); } else if (range <= 30 * fr) { /* 16-30 seconds */ - smpte_ruler_scale = smpte_show_seconds; - smpte_mark_modulo = 5; - smpte_nmarks = 2 + (range / fr); + timecode_ruler_scale = timecode_show_seconds; + timecode_mark_modulo = 5; + timecode_nmarks = 2 + (range / fr); } else if (range <= 60 * fr) { /* 30-60 seconds */ - smpte_ruler_scale = smpte_show_seconds; - smpte_mark_modulo = 5; - smpte_nmarks = 2 + (range / fr); + timecode_ruler_scale = timecode_show_seconds; + timecode_mark_modulo = 5; + timecode_nmarks = 2 + (range / fr); } else if (range <= 2 * 60 * fr) { /* 1-2 minutes */ - smpte_ruler_scale = smpte_show_seconds; - smpte_mark_modulo = 15; - smpte_nmarks = 2 + (range / fr); + timecode_ruler_scale = timecode_show_seconds; + timecode_mark_modulo = 15; + timecode_nmarks = 2 + (range / fr); } else if (range <= 4 * 60 * fr) { /* 2-4 minutes */ - smpte_ruler_scale = smpte_show_seconds; - smpte_mark_modulo = 30; - smpte_nmarks = 2 + (range / fr); + timecode_ruler_scale = timecode_show_seconds; + timecode_mark_modulo = 30; + timecode_nmarks = 2 + (range / fr); } else if (range <= 10 * 60 * fr) { /* 4-10 minutes */ - smpte_ruler_scale = smpte_show_minutes; - smpte_mark_modulo = 2; - smpte_nmarks = 2 + 10; + timecode_ruler_scale = timecode_show_minutes; + timecode_mark_modulo = 2; + timecode_nmarks = 2 + 10; } else if (range <= 30 * 60 * fr) { /* 10-30 minutes */ - smpte_ruler_scale = smpte_show_minutes; - smpte_mark_modulo = 5; - smpte_nmarks = 2 + 30; + timecode_ruler_scale = timecode_show_minutes; + timecode_mark_modulo = 5; + timecode_nmarks = 2 + 30; } else if (range <= 60 * 60 * fr) { /* 30 minutes - 1hr */ - smpte_ruler_scale = smpte_show_minutes; - smpte_mark_modulo = 10; - smpte_nmarks = 2 + 60; + timecode_ruler_scale = timecode_show_minutes; + timecode_mark_modulo = 10; + timecode_nmarks = 2 + 60; } else if (range <= 4 * 60 * 60 * fr) { /* 1 - 4 hrs*/ - smpte_ruler_scale = smpte_show_minutes; - smpte_mark_modulo = 30; - smpte_nmarks = 2 + (60 * 4); + timecode_ruler_scale = timecode_show_minutes; + timecode_mark_modulo = 30; + timecode_nmarks = 2 + (60 * 4); } else if (range <= 8 * 60 * 60 * fr) { /* 4 - 8 hrs*/ - smpte_ruler_scale = smpte_show_hours; - smpte_mark_modulo = 1; - smpte_nmarks = 2 + 8; + timecode_ruler_scale = timecode_show_hours; + timecode_mark_modulo = 1; + timecode_nmarks = 2 + 8; } else if (range <= 16 * 60 * 60 * fr) { /* 16-24 hrs*/ - smpte_ruler_scale = smpte_show_hours; - smpte_mark_modulo = 1; - smpte_nmarks = 2 + 24; + timecode_ruler_scale = timecode_show_hours; + timecode_mark_modulo = 1; + timecode_nmarks = 2 + 24; } else { - + /* not possible if nframes64_t is a 32 bit quantity */ - - smpte_ruler_scale = smpte_show_hours; - smpte_mark_modulo = 4; - smpte_nmarks = 2 + 24; + + timecode_ruler_scale = timecode_show_hours; + timecode_mark_modulo = 4; + timecode_nmarks = 2 + 24; } - + } gint -Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) { nframes_t pos; nframes64_t spacer; - SMPTE::Time smpte; + Timecode::Time timecode; gchar buf[16]; gint n; - if (session == 0) { + if (_session == 0) { return 0; } @@ -985,155 +994,155 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp } pos = (nframes_t) floor (lower); - - *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 < smpte_nmarks; n++) { - session->smpte_to_sample(smpte, pos, true /* use_offset */, true /* use_subframes */ ); - if ((smpte.subframes % smpte_mark_modulo) == 0) { - if (smpte.subframes == 0) { + + *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 */ ); + + for (n = 0; n < timecode_nmarks; n++) { + _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; - snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", smpte.negative ? "-" : "", smpte.hours, smpte.minutes, smpte.seconds, smpte.frames); + snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); } else { (*marks)[n].style = GtkCustomRulerMarkMinor; - snprintf (buf, sizeof(buf), ".%02u", smpte.subframes); + snprintf (buf, sizeof(buf), ".%02u", timecode.subframes); } } else { snprintf (buf, sizeof(buf)," "); (*marks)[n].style = GtkCustomRulerMarkMicro; - + } (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; // Increment subframes by one - SMPTE::increment_subframes( smpte ); + Timecode::increment_subframes( timecode, _session->config.get_subframes_per_frame() ); } break; - case smpte_show_seconds: - // Find smpte time of this sample (pos) - session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ ); + case timecode_show_seconds: + // Find timecode time of this sample (pos) + _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ ); // Go to next whole second down - SMPTE::seconds_floor( smpte ); + Timecode::seconds_floor( timecode ); - for (n = 0; n < smpte_nmarks; n++) { - session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ ); - if ((smpte.seconds % smpte_mark_modulo) == 0) { - if (smpte.seconds == 0) { + for (n = 0; n < timecode_nmarks; n++) { + _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; (*marks)[n].position = pos; } 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); + snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); } else { snprintf (buf, sizeof(buf)," "); (*marks)[n].style = GtkCustomRulerMarkMicro; (*marks)[n].position = pos; - + } (*marks)[n].label = g_strdup (buf); - SMPTE::increment_seconds( smpte ); + Timecode::increment_seconds( timecode, _session->config.get_subframes_per_frame() ); } break; - case smpte_show_minutes: - // Find smpte time of this sample (pos) - session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ ); + case timecode_show_minutes: + // Find timecode time of this sample (pos) + _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ ); // Go to next whole minute down - SMPTE::minutes_floor( smpte ); + Timecode::minutes_floor( timecode ); - for (n = 0; n < smpte_nmarks; n++) { - session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ ); - if ((smpte.minutes % smpte_mark_modulo) == 0) { - if (smpte.minutes == 0) { + for (n = 0; n < timecode_nmarks; n++) { + _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; } else { (*marks)[n].style = GtkCustomRulerMarkMinor; } - snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", smpte.negative ? "-" : "", smpte.hours, smpte.minutes, smpte.seconds, smpte.frames); + snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); } else { snprintf (buf, sizeof(buf)," "); (*marks)[n].style = GtkCustomRulerMarkMicro; - + } (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; - SMPTE::increment_minutes( smpte ); + Timecode::increment_minutes( timecode, _session->config.get_subframes_per_frame() ); } break; - case smpte_show_hours: - // Find smpte time of this sample (pos) - session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ ); + case timecode_show_hours: + // Find timecode time of this sample (pos) + _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ ); // Go to next whole hour down - SMPTE::hours_floor( smpte ); + Timecode::hours_floor( timecode ); - for (n = 0; n < smpte_nmarks; n++) { - session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ ); - if ((smpte.hours % smpte_mark_modulo) == 0) { + for (n = 0; n < timecode_nmarks; n++) { + _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", smpte.negative ? "-" : "", smpte.hours, smpte.minutes, smpte.seconds, smpte.frames); + snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); } else { snprintf (buf, sizeof(buf)," "); (*marks)[n].style = GtkCustomRulerMarkMicro; - + } (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; - SMPTE::increment_hours( smpte ); + Timecode::increment_hours( timecode, _session->config.get_subframes_per_frame() ); } break; - case smpte_show_frames: - // Find smpte time of this sample (pos) - session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ ); + case timecode_show_frames: + // Find timecode time of this sample (pos) + _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ ); // Go to next whole frame down - SMPTE::frames_floor( smpte ); + Timecode::frames_floor( timecode ); - for (n = 0; n < smpte_nmarks; n++) { - session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ ); - if ((smpte.frames % smpte_mark_modulo) == 0) { - if (smpte.frames == 0) { + for (n = 0; n < timecode_nmarks; n++) { + _session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ ); + if ((timecode.frames % timecode_mark_modulo) == 0) { + if (timecode.frames == 0) { (*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); + snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); } else { snprintf (buf, sizeof(buf)," "); (*marks)[n].style = GtkCustomRulerMarkMicro; (*marks)[n].position = pos; - + } (*marks)[n].label = g_strdup (buf); - SMPTE::increment( smpte ); + Timecode::increment( timecode, _session->config.get_subframes_per_frame() ); } break; } - - return smpte_nmarks; + + return timecode_nmarks; } void Editor::compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper) { - if (session == 0) { + if (_session == 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); + _session->bbt_time((jack_nframes_t) lower, lower_beat); + _session->bbt_time((jack_nframes_t) upper, upper_beat); uint32_t beats = 0; bbt_accent_modulo = 1; @@ -1142,23 +1151,58 @@ Editor::compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper) bbt_nmarks = 1; bbt_ruler_scale = bbt_over; - - switch (snap_type) { - case SnapToAThirdBeat: + + switch (_snap_type) { + 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 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; @@ -1201,7 +1245,7 @@ Editor::compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper) bbt_ruler_scale = bbt_show_ticks; } else { bbt_ruler_scale = bbt_show_ticks_detail; - } + } if ((bbt_ruler_scale == bbt_show_ticks_detail) && (lower_beat.beats == upper_beat.beats) && (upper_beat.ticks - lower_beat.ticks <= Meter::ticks_per_beat / 4)) { bbt_ruler_scale = bbt_show_ticks_super_detail; @@ -1209,9 +1253,9 @@ Editor::compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper) } 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) { + if (_session == 0) { return 0; } @@ -1249,14 +1293,14 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper (*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); + (*marks)[0].label = g_strdup (buf); helper_active = true; } else { @@ -1288,14 +1332,14 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper (*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); + (*marks)[0].label = g_strdup (buf); helper_active = true; } else { @@ -1313,24 +1357,24 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper (*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())); + + 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); @@ -1338,7 +1382,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper 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)) { @@ -1380,14 +1424,14 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper (*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); + (*marks)[0].label = g_strdup (buf); helper_active = true; } else { @@ -1405,24 +1449,24 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper (*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); - - frame_skip = (nframes64_t) floor (frame_skip_error = (session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute())); + + 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); @@ -1430,7 +1474,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper 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)) { @@ -1460,7 +1504,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper (*marks)[n].style = GtkCustomRulerMarkMicro; } i_am_accented = false; - n++; + n++; } } @@ -1477,14 +1521,14 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper (*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); + (*marks)[0].label = g_strdup (buf); helper_active = true; } else { @@ -1502,24 +1546,24 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper (*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); - - frame_skip = (nframes64_t) floor (frame_skip_error = (session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute())); + + 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); @@ -1527,7 +1571,7 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper 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)) { @@ -1550,14 +1594,14 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper } (*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++; + n++; } } @@ -1671,17 +1715,17 @@ Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper n++; } } - + break; } - return n; //return the actual number of marks made, since we might have skipped some from fractional time signatures + 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) +Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/) { nframes64_t mark_interval; nframes64_t pos; @@ -1691,31 +1735,31 @@ Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble up 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(); + if (mark_interval > _session->frame_rate()) { + mark_interval -= mark_interval % _session->frame_rate(); } else { - mark_interval = session->frame_rate() / (session->frame_rate() / mark_interval ) ; + 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) { - 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; } - + return nmarks; } static void sample_to_clock_parts ( nframes64_t sample, - nframes64_t sample_rate, + nframes64_t sample_rate, long *hrs_p, long *mins_p, long *secs_p, @@ -1727,7 +1771,7 @@ sample_to_clock_parts ( nframes64_t sample, long mins; long secs; long millisecs; - + left = sample; hrs = left / (sample_rate * 60 * 60); left -= hrs * sample_rate * 60 * 60; @@ -1752,11 +1796,11 @@ Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper) nframes64_t fr; nframes64_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 ()))) { @@ -1836,16 +1880,16 @@ Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper) minsec_ruler_scale = minsec_show_hours; minsec_mark_modulo = 2; } else { - + /* not possible if nframes64_t is a 32 bit quantity */ - + minsec_mark_interval = 4 * 60 * 60 * fr; /* show 4 hrs */ } minsec_nmarks = 2 + (range / minsec_mark_interval); } gint -Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars) +Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) { nframes64_t pos; nframes64_t spacer; @@ -1853,7 +1897,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble up gchar buf[16]; gint n; - if (session == 0) { + if (_session == 0) { return 0; } @@ -1869,7 +1913,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble up 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; @@ -1887,7 +1931,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble up 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; @@ -1905,7 +1949,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble up 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); @@ -1919,7 +1963,7 @@ Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble up 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;