X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_rulers.cc;h=4daf57d3aed482abb3bc945572c8d8ec2c639c31;hb=6001b8d28dd764bada8b9198a5f91e0a2f5251f6;hp=3674ce3c9078f05d48342dd33068194f6a4e06f3;hpb=ad4919ce920a1a588c9ecd3d822dacfb93d74bb7;p=ardour.git diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 3674ce3c90..4daf57d3ae 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -24,8 +24,8 @@ #include -#include -#include +#include "ardour/tempo.h" +#include "ardour/profile.h" #include #include "editor.h" @@ -33,6 +33,7 @@ #include "actions.h" #include "gtk-custom-hruler.h" #include "gui_thread.h" +#include "time_axis_view.h" #include "i18n.h" @@ -58,37 +59,106 @@ 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]); - + 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]); + 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(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)); - visible_timebars = 1; /*this will be changed below */ + 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)); + + visible_timebars = 0; /*this will be changed below */ ruler_pressed_button = 0; canvas_timebars_vsize = 0; } @@ -438,7 +508,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; } @@ -473,66 +543,76 @@ Editor::restore_ruler_visibility () if (node) { if ((prop = node->property ("smpte")) != 0) { - if (prop->value() == "yes") + if (prop->value() == "yes") { 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 (prop->value() == "yes") { 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 (prop->value() == "yes") { 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 (prop->value() == "yes") { 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 (prop->value() == "yes") { 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 (prop->value() == "yes") { 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 (prop->value() == "yes") { 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 (prop->value() == "yes") { 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 (prop->value() == "yes") { 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 (prop->value() == "yes") { 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 @@ -551,17 +631,12 @@ 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_lab_children = ruler_label_vbox.children(); - BoxList & ruler_children = time_canvas_vbox.children(); int visible_rulers = 0; if (no_ruler_shown_update) { @@ -570,98 +645,56 @@ Editor::update_ruler_visibility () visible_timebars = 0; - lab_children.clear(); - ruler_lab_children.clear(); - - // leave the last one (the time_canvas) intact - while (ruler_children.size() > 0) { - 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()) { - ruler_lab_children.push_back (Element(minsec_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*minsec_ruler, PACK_SHRINK, PACK_START)); visible_rulers++; + minsec_label.show (); + minsec_ruler->show (); + } else { + minsec_label.hide (); + minsec_ruler->hide (); } if (ruler_timecode_action->get_active()) { - ruler_lab_children.push_back (Element(smpte_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*smpte_ruler, PACK_SHRINK, PACK_START)); visible_rulers++; + smpte_label.show (); + smpte_ruler->show (); + } else { + smpte_label.hide (); + smpte_ruler->hide (); } if (ruler_samples_action->get_active()) { - ruler_lab_children.push_back (Element(frame_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*frames_ruler, PACK_SHRINK, PACK_START)); visible_rulers++; + frame_label.show (); + frames_ruler->show (); + } else { + frame_label.hide (); + frames_ruler->hide (); } if (ruler_bbt_action->get_active()) { - ruler_lab_children.push_back (Element(bbt_label, PACK_SHRINK, PACK_START)); - ruler_children.insert (canvaspos, Element(*bbt_ruler, PACK_SHRINK, PACK_START)); 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; - - if (ruler_meter_action->get_active()) { - lab_children.push_back (Element(meter_label, PACK_SHRINK, PACK_START)); +#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); @@ -669,19 +702,20 @@ Editor::update_ruler_visibility () 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 { 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); @@ -692,16 +726,17 @@ Editor::update_ruler_visibility () } tempo_bar_group->show(); tempo_group->show(); + tempo_label.show(); tbpos += timebar_height; tbgpos += timebar_height; visible_timebars++; } 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); @@ -712,16 +747,18 @@ Editor::update_ruler_visibility () } 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); @@ -732,16 +769,17 @@ Editor::update_ruler_visibility () } transport_marker_bar_group->show(); transport_marker_group->show(); + transport_mark_label.show(); tbpos += timebar_height; tbgpos += timebar_height; visible_timebars++; } 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); @@ -752,6 +790,7 @@ Editor::update_ruler_visibility () } cd_marker_bar_group->show(); cd_marker_group->show(); + cd_mark_label.show(); tbpos += timebar_height; tbgpos += timebar_height; visible_timebars++; @@ -760,12 +799,12 @@ Editor::update_ruler_visibility () } 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); @@ -776,40 +815,43 @@ Editor::update_ruler_visibility () } 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_pos_delta < 0 && (vertical_adjustment.get_value() + canvas_height) >= vertical_adjustment.get_upper()) { - /*if we're at the bottom of the canvas, don't move the _trackview_grooup*/ - vertical_adjustment.set_upper(vertical_adjustment.get_upper() + 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 { - vertical_adjustment.set_upper(vertical_adjustment.get_upper() + vertical_pos_delta); - _trackview_group->move (0, vertical_pos_delta); + _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 (); + } + + 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 (); } - ruler_label_vbox.set_size_request (-1, (int)(timebar_height * visible_rulers)); + ruler_label_vbox.set_size_request (-1, (int)(timebar_height * visible_rulers)); time_canvas_vbox.set_size_request (-1,-1); - time_canvas_event_box.queue_resize(); - compute_fixed_ruler_scale(); - update_fixed_rulers(); -// redisplay_tempo (false); - - time_canvas_event_box.show_all(); - ruler_label_event_box.show_all(); - time_button_event_box.show_all(); - - 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)); + update_fixed_rulers(); redisplay_tempo (false); } @@ -838,11 +880,11 @@ Editor::compute_fixed_ruler_scale () } if (ruler_timecode_action->get_active()) { - set_smpte_ruler_scale (leftmost_frame, leftmost_frame + (edit_packer.get_width() * frames_per_unit) ); + 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 + (edit_packer.get_width() * frames_per_unit) ); + set_minsec_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames() ); } } @@ -859,7 +901,7 @@ Editor::update_fixed_rulers () 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. @@ -946,7 +988,7 @@ Editor::set_smpte_ruler_scale (gdouble lower, gdouble upper) 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()); + smpte_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; @@ -1069,7 +1111,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp (*marks)[n].position = pos; // Increment subframes by one - SMPTE::increment_subframes( smpte ); + SMPTE::increment_subframes( smpte, session->config.get_subframes_per_frame() ); } break; case smpte_show_seconds: @@ -1096,7 +1138,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp } (*marks)[n].label = g_strdup (buf); - SMPTE::increment_seconds( smpte ); + SMPTE::increment_seconds( smpte, session->config.get_subframes_per_frame() ); } break; case smpte_show_minutes: @@ -1121,7 +1163,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp } (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; - SMPTE::increment_minutes( smpte ); + SMPTE::increment_minutes( smpte, session->config.get_subframes_per_frame() ); } break; @@ -1144,7 +1186,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp (*marks)[n].label = g_strdup (buf); (*marks)[n].position = pos; - SMPTE::increment_hours( smpte ); + SMPTE::increment_hours( smpte, session->config.get_subframes_per_frame() ); } break; case smpte_show_frames: @@ -1170,7 +1212,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp } (*marks)[n].label = g_strdup (buf); - SMPTE::increment( smpte ); + SMPTE::increment( smpte, session->config.get_subframes_per_frame() ); } break;