/*
- 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
*/
-#include <cstdio> // for sprintf, grrr
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
+#include <cstdio> // for sprintf, grrr
#include <cmath>
+#include <inttypes.h>
#include <string>
-#include <ardour/tempo.h>
-#include <gtkmm2ext/gtk_ui.h>
+#include <gtk/gtkaction.h>
+
+#include "canvas/group.h"
+
+#include "ardour/session.h"
+#include "ardour/tempo.h"
+#include "ardour/profile.h"
+
+#include "gtkmm2ext/gtk_ui.h"
#include "editor.h"
#include "editing.h"
+#include "actions.h"
#include "gtk-custom-hruler.h"
#include "gui_thread.h"
+#include "time_axis_view.h"
+#include "editor_drag.h"
+#include "editor_cursors.h"
#include "i18n.h"
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
/* 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_samples },
{1, Editor::_metric_get_minsec }
};
{
ruler_editor = this;
ruler_grabbed_widget = 0;
-
- _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;
-
- _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;
- _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]);
+ _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();
+
+ _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;
+
+ _samples_ruler = gtk_custom_hruler_new ();
+ samples_ruler = Glib::wrap (_samples_ruler);
+ samples_ruler->set_name ("SamplesRuler");
+ samples_ruler->set_size_request (-1, (int) timebar_height);
+ gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER (_samples_ruler), &ruler_metrics[ruler_metric_samples]);
+ samples_ruler->hide ();
+ samples_ruler->set_no_show_all ();
+
+ _bbt_ruler = gtk_custom_hruler_new ();
+ bbt_ruler = Glib::wrap (_bbt_ruler);
+ 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_bars_vbox.children();
- 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);
-
- 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 = 7; /* 4 here, 3 in time_canvas */
- ruler_pressed_button = 0;
+ 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));
+ lab_children.push_back (Element(videotl_label, PACK_SHRINK, PACK_START));
+
+ ruler_lab_children.push_back (Element(minsec_label, PACK_SHRINK, PACK_START));
+ ruler_children.insert (canvaspos, Element(*minsec_ruler, PACK_SHRINK, PACK_START));
+ ruler_lab_children.push_back (Element(timecode_label, PACK_SHRINK, PACK_START));
+ ruler_children.insert (canvaspos, Element(*timecode_ruler, PACK_SHRINK, PACK_START));
+ ruler_lab_children.push_back (Element(samples_label, PACK_SHRINK, PACK_START));
+ ruler_children.insert (canvaspos, Element (*samples_ruler, PACK_SHRINK, PACK_START));
+ ruler_lab_children.push_back (Element(bbt_label, PACK_SHRINK, PACK_START));
+ ruler_children.insert (canvaspos, Element(*bbt_ruler, PACK_SHRINK, PACK_START));
+
+ timecode_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
+ bbt_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
+ samples_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
+ minsec_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
+
+ timecode_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
+ bbt_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
+ samples_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
+ minsec_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
+
+ timecode_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
+ bbt_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
+ samples_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
+ minsec_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
+
+ timecode_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
+ bbt_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
+ samples_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
+ minsec_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
+
+ timecode_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
+ bbt_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
+ samples_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
+ minsec_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
+
+ visible_timebars = 0; /*this will be changed below */
}
+bool
+Editor::ruler_scroll (GdkEventScroll* event)
+{
+ framepos_t xdelta;
+ int direction = event->direction;
+ bool handled = false;
+
+ switch (direction) {
+ case GDK_SCROLL_UP:
+ temporal_zoom_step (false);
+ handled = true;
+ break;
+
+ case GDK_SCROLL_DOWN:
+ temporal_zoom_step (true);
+ handled = true;
+ break;
-gint
+ 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_framepos - xdelta > leftmost_frame) {
+ reset_x_origin (leftmost_frame + xdelta);
+ } else {
+ reset_x_origin (max_framepos - current_page_frames());
+ }
+ handled = true;
+ break;
+
+ default:
+ /* what? */
+ break;
+ }
+
+ return handled;
+}
+
+
+bool
Editor::ruler_button_press (GdkEventButton* ev)
{
- if (session == 0) {
- return FALSE;
+ 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 (samples_ruler->is_realized() && ev->window == samples_ruler->get_window()->gobj()) {
+ grab_widget = samples_ruler;
+ } else if (minsec_ruler->is_realized() && ev->window == minsec_ruler->get_window()->gobj()) {
+ grab_widget = minsec_ruler;
+ }
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);
-
- nframes_t where = leftmost_frame + pixel_to_frame (x);
-
- switch (ev->button) {
- case 1:
- /* transport playhead */
- snap_to (where);
- session->request_locate (where);
- break;
-
- case 2:
- /* edit cursor */
- if (snap_type != Editing::SnapToEditCursor) {
- snap_to (where);
+ if (ev->button == 1) {
+ // Since we will locate the playhead on button release, cancel any running
+ // auditions.
+ if (_session->is_auditioning()) {
+ _session->cancel_audition ();
}
- edit_cursor->set_position (where);
- edit_cursor_clock.set (where);
- break;
- default:
- break;
+ /* playhead cursor */
+ _drags->set (new CursorDrag (this, &playhead_cursor->track_canvas_item (), false), reinterpret_cast<GdkEvent *> (ev));
+ _dragging_playhead = true;
}
- return TRUE;
+ return true;
}
-gint
+bool
Editor::ruler_button_release (GdkEventButton* ev)
{
+ if (_session == 0) {
+ return false;
+ }
+
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) {
- return FALSE;
+ if (_drags->active ()) {
+ _drags->end_grab (reinterpret_cast<GdkEvent*> (ev));
+ _dragging_playhead = false;
}
- hide_verbose_canvas_cursor();
- stop_canvas_autoscroll();
-
- nframes_t where = leftmost_frame + pixel_to_frame (x);
-
- switch (ev->button) {
- case 1:
- /* transport playhead */
- snap_to (where);
- session->request_locate (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 2:
- /* edit cursor */
- if (snap_type != Editing::SnapToEditCursor) {
- snap_to (where);
- }
- edit_cursor->set_position (where);
- edit_cursor_clock.set (where);
- break;
+ stop_canvas_autoscroll();
- case 3:
- /* popup menu */
+ framepos_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;
}
- return TRUE;
+ return true;
}
-gint
+bool
Editor::ruler_label_button_release (GdkEventButton* ev)
{
- if (ev->button == 3)
- {
- popup_ruler_menu();
+ if (ev->button == 3) {
+ Gtk::Menu* m = dynamic_cast<Gtk::Menu*> (ActionManager::get_widget (X_("/RulerMenuPopup")));
+ if (m) {
+ m->popup (1, ev->time);
+ }
}
-
- return TRUE;
+
+ return true;
}
-gint
+bool
Editor::ruler_mouse_motion (GdkEventMotion* ev)
{
- if (session == 0 || !ruler_pressed_button) {
- 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);
-
- nframes_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;
-
- 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);
- }
- } else if (frame < leftmost_frame) {
- if (leftmost_frame > 0) {
- start_canvas_autoscroll (-1);
- }
- }
- } else {
- if (frame >= leftmost_frame && frame < rightmost_frame) {
- stop_canvas_autoscroll ();
- }
+ if (_session == 0) {
+ return false;
}
- //////
-
- snap_to (where);
-
- Cursor* cursor = 0;
-
- switch (ruler_pressed_button) {
- case 1:
- /* transport playhead */
- cursor = playhead_cursor;
- break;
-
- case 2:
- /* edit cursor */
- cursor = edit_cursor;
- break;
- default:
- break;
+ if (_drags->active ()) {
+ _drags->motion_handler (reinterpret_cast<GdkEvent*> (ev), false);
}
- if (cursor)
- {
- cursor->set_position (where);
-
- if (cursor == edit_cursor) {
- edit_cursor_clock.set (where);
- }
-
- show_verbose_time_cursor (where, 10, cx, 0);
- }
-
- return TRUE;
+ return true;
}
void
-Editor::popup_ruler_menu (nframes_t where, ItemType t)
+Editor::popup_ruler_menu (framepos_t where, ItemType t)
{
using namespace Menu_Helpers;
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 (_("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 (_("New range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_range), where)));
+ ruler_items.push_back (MenuElem (_("Clear all ranges"), sigc::mem_fun(*this, &Editor::clear_ranges)));
+ ruler_items.push_back (MenuElem (_("Unhide ranges"), sigc::mem_fun(*this, &Editor::unhide_ranges)));
ruler_items.push_back (SeparatorElem ());
break;
case TransportMarkerBarItem:
break;
-
+
+ case CdMarkerBarItem:
+ // TODO
+ ruler_items.push_back (MenuElem (_("New CD track marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, true, false)));
+ 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")));
+ ruler_items.push_back (MenuElem (_("New Tempo"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_tempo_event), where)));
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 (_("Clear meter")));
+ ruler_items.push_back (MenuElem (_("New Meter"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_meter_event), where)));
+ ruler_items.push_back (SeparatorElem ());
+ break;
+
+ case VideoBarItem:
+ ruler_items.push_back (MenuElem (_("Timeline height")));
+ static_cast<MenuItem*>(&ruler_items.back())->set_sensitive(false);
+ ruler_items.push_back (CheckMenuElem (_("Large"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_video_timeline_height), 6)));
+ if (videotl_bar_height == 6) { static_cast<CheckMenuItem*>(&ruler_items.back())->set_active(true);}
+ ruler_items.push_back (CheckMenuElem (_("Normal"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_video_timeline_height), 4)));
+ if (videotl_bar_height == 4) { static_cast<CheckMenuItem*>(&ruler_items.back())->set_active(true);}
+ ruler_items.push_back (CheckMenuElem (_("Small"), sigc::bind ( sigc::mem_fun(*this, &Editor::set_video_timeline_height), 3)));
+ if (videotl_bar_height == 3) { static_cast<CheckMenuItem*>(&ruler_items.back())->set_active(true);}
+ ruler_items.push_back (SeparatorElem ());
+
+ ruler_items.push_back (MenuElem (_("Align Video Track")));
+ static_cast<MenuItem*>(&ruler_items.back())->set_sensitive(false);
+
+ ruler_items.push_back (CheckMenuElem (_("Lock")));
+ {
+ CheckMenuItem* vtl_lock = static_cast<CheckMenuItem*>(&ruler_items.back());
+ vtl_lock->set_active(is_video_timeline_locked());
+ vtl_lock->signal_activate().connect (sigc::mem_fun(*this, &Editor::toggle_video_timeline_locked));
+ }
+
ruler_items.push_back (SeparatorElem ());
break;
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> 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()));
+ }
+ action = ActionManager::get_action ("Rulers", "toggle-video-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
{
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");
-
- session->add_extra_xml (*node);
- session->set_dirty ();
+ node->add_property (X_("timecode"), ruler_timecode_action->get_active() ? "yes": "no");
+ node->add_property (X_("bbt"), ruler_bbt_action->get_active() ? "yes": "no");
+ node->add_property (X_("samples"), ruler_samples_action->get_active() ? "yes": "no");
+ node->add_property (X_("minsec"), ruler_minsec_action->get_active() ? "yes": "no");
+ node->add_property (X_("tempo"), ruler_tempo_action->get_active() ? "yes": "no");
+ node->add_property (X_("meter"), ruler_meter_action->get_active() ? "yes": "no");
+ node->add_property (X_("marker"), ruler_marker_action->get_active() ? "yes": "no");
+ node->add_property (X_("rangemarker"), ruler_range_action->get_active() ? "yes": "no");
+ node->add_property (X_("transportmarker"), ruler_loop_punch_action->get_active() ? "yes": "no");
+ node->add_property (X_("cdmarker"), ruler_cd_marker_action->get_active() ? "yes": "no");
+ node->add_property (X_("videotl"), ruler_video_action->get_active() ? "yes": "no");
+
+ _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")
- ruler_shown[ruler_metric_smpte] = true;
- else
- ruler_shown[ruler_metric_smpte] = false;
+ if ((prop = node->property ("timecode")) != 0) {
+ if (string_is_affirmative (prop->value())) {
+ ruler_timecode_action->set_active (true);
+ } else {
+ ruler_timecode_action->set_active (false);
+ }
}
if ((prop = node->property ("bbt")) != 0) {
- if (prop->value() == "yes")
- ruler_shown[ruler_metric_bbt] = true;
- else
- ruler_shown[ruler_metric_bbt] = false;
+ if (string_is_affirmative (prop->value())) {
+ 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 = node->property ("samples")) != 0) {
+ if (string_is_affirmative (prop->value())) {
+ 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 (string_is_affirmative (prop->value())) {
+ 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 (string_is_affirmative (prop->value())) {
+ 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 (string_is_affirmative (prop->value())) {
+ 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 (string_is_affirmative (prop->value())) {
+ 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 (string_is_affirmative (prop->value())) {
+ 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 (string_is_affirmative (prop->value())) {
+ ruler_loop_punch_action->set_active (true);
+ } else {
+ ruler_loop_punch_action->set_active (false);
+ }
+ }
+
+ if ((prop = node->property ("cdmarker")) != 0) {
+ if (string_is_affirmative (prop->value())) {
+ ruler_cd_marker_action->set_active (true);
+ } else {
+ ruler_cd_marker_action->set_active (false);
+ }
+
+ } 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;
+ }
+ }
+ }
+
+ if ((prop = node->property ("videotl")) != 0) {
+ if (string_is_affirmative (prop->value())) {
+ ruler_video_action->set_active (true);
+ } else {
+ ruler_video_action->set_active (false);
+ }
}
}
+ no_ruler_shown_update = false;
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]);
+ visible_timebars = 0;
-
- 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));
-
-
- 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++;
+ timecode_label.show ();
+ timecode_ruler->show ();
+ } else {
+ timecode_label.hide ();
+ timecode_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++;
+ samples_label.show ();
+ samples_ruler->show ();
+ } else {
+ samples_label.hide ();
+ samples_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 = 0.0;
- double old_unit_pos ;
-
- if (ruler_shown[ruler_time_meter]) {
- lab_children.push_back (Element(meter_label, PACK_SHRINK, PACK_START));
-
- old_unit_pos = meter_group->property_y();
+ 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();
+ videotl_label.hide();
+#endif
+ if (ruler_meter_action->get_active()) {
+ old_unit_pos = meter_group->position().y;
if (tbpos != old_unit_pos) {
- meter_group->move ( 0.0, tbpos - old_unit_pos);
+ meter_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
+ }
+ old_unit_pos = meter_bar_group->position().y;
+ if (tbgpos != old_unit_pos) {
+ meter_bar_group->move (ArdourCanvas::Duple (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));
- old_unit_pos = tempo_group->property_y();
+
+ if (ruler_tempo_action->get_active()) {
+ old_unit_pos = tempo_group->position().y;
if (tbpos != old_unit_pos) {
- tempo_group->move(0.0, tbpos - old_unit_pos);
+ tempo_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
+ }
+ old_unit_pos = tempo_bar_group->position().y;
+ if (tbgpos != old_unit_pos) {
+ tempo_bar_group->move (ArdourCanvas::Duple (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 (!Profile->get_sae() && ruler_range_action->get_active()) {
+ old_unit_pos = range_marker_group->position().y;
if (tbpos != old_unit_pos) {
- marker_group->move ( 0.0, tbpos - old_unit_pos);
+ range_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
- marker_group->show();
+ old_unit_pos = range_marker_bar_group->position().y;
+ if (tbgpos != old_unit_pos) {
+ range_marker_bar_group->move (ArdourCanvas::Duple (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();
}
- else {
- marker_group->hide();
- }
-
- if (ruler_shown[ruler_time_range_marker]) {
- lab_children.push_back (Element(range_mark_label, PACK_SHRINK, PACK_START));
- old_unit_pos = range_marker_group->property_y();
+
+ if (ruler_loop_punch_action->get_active()) {
+ old_unit_pos = transport_marker_group->position().y;
if (tbpos != old_unit_pos) {
- range_marker_group->move (0.0, tbpos - old_unit_pos);
+ transport_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
- range_marker_group->show();
+ old_unit_pos = transport_marker_bar_group->position().y;
+ if (tbgpos != old_unit_pos) {
+ transport_marker_bar_group->move (ArdourCanvas::Duple (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 {
+ transport_marker_bar_group->hide();
+ transport_marker_group->hide();
+ transport_mark_label.hide();
}
- else {
- range_marker_group->hide();
+
+ if (ruler_cd_marker_action->get_active()) {
+ old_unit_pos = cd_marker_group->position().y;
+ if (tbpos != old_unit_pos) {
+ cd_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
+ }
+ old_unit_pos = cd_marker_bar_group->position().y;
+ if (tbgpos != old_unit_pos) {
+ cd_marker_bar_group->move (ArdourCanvas::Duple (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();
}
- if (ruler_shown[ruler_time_transport_marker]) {
- lab_children.push_back (Element(transport_mark_label, PACK_SHRINK, PACK_START));
- old_unit_pos = transport_marker_group->property_y();
+ if (ruler_marker_action->get_active()) {
+ old_unit_pos = marker_group->position().y;
if (tbpos != old_unit_pos) {
- transport_marker_group->move ( 0.0, tbpos - old_unit_pos);
+ marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
- transport_marker_group->show();
+ old_unit_pos = marker_bar_group->position().y;
+ if (tbgpos != old_unit_pos) {
+ marker_bar_group->move (ArdourCanvas::Duple (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();
}
- else {
- transport_marker_group->hide();
+
+ if (ruler_video_action->get_active()) {
+ old_unit_pos = videotl_group->position().y;
+ if (tbpos != old_unit_pos) {
+ videotl_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
+ }
+ old_unit_pos = videotl_bar_group->position().y;
+ if (tbgpos != old_unit_pos) {
+ videotl_bar_group->move (ArdourCanvas::Duple (0.0, tbgpos - old_unit_pos));
+ }
+ videotl_bar_group->show();
+ videotl_group->show();
+ videotl_label.show();
+ tbpos += timebar_height * videotl_bar_height;
+ tbgpos += timebar_height * videotl_bar_height;
+ visible_timebars+=videotl_bar_height;
+ queue_visual_videotimeline_update();
+ } else {
+ videotl_bar_group->hide();
+ videotl_group->hide();
+ videotl_label.hide();
+ update_video_timeline(true);
}
-
- time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars));
- time_canvas_event_box.queue_resize();
-
+
+ ruler_label_vbox.set_size_request (-1, (int)(timebar_height * visible_rulers));
+ time_canvas_vbox.set_size_request (-1,-1);
+
+ compute_fixed_ruler_scale ();
update_fixed_rulers();
- //update_tempo_based_rulers();
- tempo_map_changed(Change (0), false);
+ redisplay_tempo (false);
- time_canvas_event_box.show_all();
- time_button_event_box.show_all();
+ /* Changing ruler visibility means that any lines on markers might need updating */
+ for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) {
+ i->second->setup_lines ();
+ }
}
void
-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;
}
- /* 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;
+ framepos_t rightmost_frame = leftmost_frame + current_page_frames();
- if (ruler_shown[ruler_metric_smpte]) {
- gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_smpte_ruler), leftmost_frame, rightmost_frame,
- leftmost_frame, session->current_end_frame());
+ if (ruler_timecode_action->get_active()) {
+ gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_timecode_ruler), leftmost_frame, rightmost_frame,
+ leftmost_frame, _session->current_end_frame());
}
}
void
-Editor::update_fixed_rulers ()
+Editor::compute_fixed_ruler_scale ()
{
- nframes_t rightmost_frame;
-
- if (session == 0) {
+ 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_timecode_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
+ }
- nframes_t page = (nframes_t) floor (canvas_width * frames_per_unit);
+ if (ruler_minsec_action->get_active()) {
+ set_minsec_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
+ }
- 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;
+ if (ruler_samples_action->get_active()) {
+ set_samples_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
+ }
+}
- rightmost_frame = leftmost_frame + page;
+void
+Editor::update_fixed_rulers ()
+{
+ framepos_t rightmost_frame;
+
+ if (_session == 0) {
+ return;
+ }
+
+ compute_fixed_ruler_scale ();
+
+ ruler_metrics[ruler_metric_timecode].units_per_pixel = frames_per_pixel;
+ ruler_metrics[ruler_metric_samples].units_per_pixel = frames_per_pixel;
+ ruler_metrics[ruler_metric_minsec].units_per_pixel = frames_per_pixel;
+
+ 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]) {
- gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_smpte_ruler), leftmost_frame, rightmost_frame,
- leftmost_frame, session->current_end_frame());
+ if (ruler_timecode_action->get_active()) {
+ gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_timecode_ruler), leftmost_frame, rightmost_frame,
+ leftmost_frame, _session->current_end_frame());
}
-
- if (ruler_shown[ruler_metric_frames]) {
- gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_frames_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 (_samples_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());
+ leftmost_frame, _session->current_end_frame());
}
-}
+}
void
-Editor::update_tempo_based_rulers ()
+Editor::update_tempo_based_rulers (ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+ ARDOUR::TempoMap::BBTPointList::const_iterator& end)
{
- if (session == 0) {
+ if (_session == 0) {
return;
}
- /* XXX Note the potential loss of accuracy here as we convert from
- an uint32_t (or larger) to a float ... what to do ?
- */
+ compute_bbt_ruler_scale (leftmost_frame, leftmost_frame+current_page_frames(),
+ begin, end);
- nframes_t page = (nframes_t) floor (canvas_width * frames_per_unit);
- ruler_metrics[ruler_metric_bbt].units_per_pixel = frames_per_unit;
+ ruler_metrics[ruler_metric_bbt].units_per_pixel = frames_per_pixel;
- if (ruler_shown[ruler_metric_bbt]) {
- gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_bbt_ruler), leftmost_frame, leftmost_frame+page,
- leftmost_frame, session->current_end_frame());
+ 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());
}
}
/* 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
}
gint
-Editor::_metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
+Editor::_metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
{
- return ruler_editor->metric_get_frames (marks, lower, upper, maxchars);
+ return ruler_editor->metric_get_samples (marks, lower, upper, maxchars);
}
gint
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_timecode_ruler_scale (framepos_t lower, framepos_t 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;
-
- if (session == 0) {
- return 0;
+ framepos_t spacer;
+ framepos_t fr;
+
+ if (_session == 0) {
+ return;
}
- fr = session->frame_rate();
+ fr = _session->frame_rate();
- if (lower > (spacer = (nframes_t)(128 * Editor::get_current_zoom ()))) {
+ if (lower > (spacer = (framepos_t) (128 * Editor::get_current_zoom ()))) {
lower = lower - spacer;
} else {
lower = 0;
}
upper = upper + spacer;
- range = (nframes_t) floor (upper - lower);
+ framecnt_t const range = 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());
+ 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 */
- show_frames = true;
- mark_modulo = 1;
- nmarks = 1 + (range / (nframes_t)session->frames_per_smpte_frame());
+ timecode_ruler_scale = timecode_show_frames;
+ timecode_mark_modulo = 1;
+ timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_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());
+ timecode_ruler_scale = timecode_show_frames;
+ timecode_mark_modulo = 2;
+ timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_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());
+ timecode_ruler_scale = timecode_show_frames;
+ timecode_mark_modulo = 5;
+ timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_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());
+ timecode_ruler_scale = timecode_show_frames;
+ timecode_mark_modulo = 10;
+ timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame());
} else if (range <= 8 * fr) { /* 2-8 seconds */
- show_seconds = true;
- mark_modulo = 1;
- nmarks = 1 + (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 */
- show_seconds = true;
- mark_modulo = 2;
- nmarks = 1 + (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 */
- show_seconds = true;
- mark_modulo = 5;
- nmarks = 1 + (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 */
- show_seconds = true;
- mark_modulo = 5;
- nmarks = 1 + (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 */
- show_seconds = true;
- mark_modulo = 20;
- nmarks = 1 + (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 */
- show_seconds = true;
- mark_modulo = 30;
- nmarks = 1 + (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 */
- show_minutes = true;
- mark_modulo = 2;
- nmarks = 1 + 10;
+ timecode_ruler_scale = timecode_show_minutes;
+ timecode_mark_modulo = 2;
+ timecode_nmarks = 2 + 10;
} else if (range <= 30 * 60 * fr) { /* 10-30 minutes */
- show_minutes = true;
- mark_modulo = 5;
- nmarks = 1 + 30;
+ timecode_ruler_scale = timecode_show_minutes;
+ timecode_mark_modulo = 5;
+ timecode_nmarks = 2 + 30;
} else if (range <= 60 * 60 * fr) { /* 30 minutes - 1hr */
- show_minutes = true;
- mark_modulo = 10;
- nmarks = 1 + 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*/
- show_minutes = true;
- mark_modulo = 30;
- nmarks = 1 + (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*/
- show_hours = true;
- mark_modulo = 1;
- nmarks = 1 + 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*/
- show_hours = true;
- mark_modulo = 1;
- nmarks = 1 + 24;
+ timecode_ruler_scale = timecode_show_hours;
+ timecode_mark_modulo = 1;
+ timecode_nmarks = 2 + 24;
+ } else {
+
+ /* not possible if framepos_t is a 32 bit quantity */
+
+ timecode_ruler_scale = timecode_show_hours;
+ timecode_mark_modulo = 4;
+ timecode_nmarks = 2 + 24;
+ }
+
+}
+
+gint
+Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
+{
+ framepos_t pos;
+ framecnt_t spacer;
+ Timecode::Time timecode;
+ gchar buf[16];
+ gint n;
+
+ if (_session == 0) {
+ return 0;
+ }
+
+ if (lower > (spacer = (framecnt_t)(128 * Editor::get_current_zoom ()))) {
+ lower = lower - spacer;
} else {
-
- /* not possible if nframes_t is a 32 bit quantity */
-
- show_hours = true;
- mark_modulo = 4;
- nmarks = 1 + 24;
- }
-
- pos = (nframes_t) floor (lower);
-
- *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
-
- if (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++) {
- session->smpte_to_sample(smpte, pos, true /* use_offset */, true /* use_subframes */ );
- if ((smpte.subframes % mark_modulo) == 0) {
- if (smpte.subframes == 0) {
+ lower = 0;
+ }
+
+ pos = (framecnt_t) floor (lower);
+
+ *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * timecode_nmarks);
+ switch (timecode_ruler_scale) {
+ case timecode_show_bits:
+
+ // Find timecode time of this sample (pos) with subframe accuracy
+ _session->sample_to_timecode(pos, timecode, true /* use_offset */, true /* use_subframes */ );
+
+ 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() );
}
- } else if (show_seconds) {
- // Find smpte time of this sample (pos)
- session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ );
+ break;
+ 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 < nmarks; n++) {
- session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ );
- if ((smpte.seconds % 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() );
}
- } else if (show_minutes) {
- // Find smpte time of this sample (pos)
- session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ );
+ break;
+ 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 < nmarks; n++) {
- session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ );
- if ((smpte.minutes % 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() );
}
- } else if (show_hours) {
- // Find smpte time of this sample (pos)
- session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ );
+
+ break;
+ 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 < nmarks; n++) {
- session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ );
- if ((smpte.hours % 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() );
}
- } else { // show_frames
- // Find smpte time of this sample (pos)
- session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ );
+ break;
+ 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 < nmarks; n++) {
- session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ );
- if ((smpte.frames % mark_modulo) == 0) {
- (*marks)[n].style = GtkCustomRulerMarkMajor;
+ 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 nmarks;
+
+ return timecode_nmarks;
}
-gint
-Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
+void
+Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper,
+ ARDOUR::TempoMap::BBTPointList::const_iterator begin,
+ ARDOUR::TempoMap::BBTPointList::const_iterator end)
{
- if (session == 0) {
- return 0;
- }
+ if (_session == 0) {
+ return;
+ }
- TempoMap::BBTPointList::iterator i;
+ TempoMap::BBTPointList::const_iterator i;
+ Timecode::BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler
- 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;
- }
+ _session->bbt_time (lower, lower_beat);
+ _session->bbt_time (upper, upper_beat);
+ uint32_t beats = 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;
- switch (snap_type) {
- case SnapToAThirdBeat:
+ bbt_ruler_scale = bbt_over;
+
+ 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;
- magic_accent_number = 2;
+ 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;
- magic_accent_number = 4;
+ bbt_accent_modulo = 4;
+ break;
+ case SnapToBeatDiv20:
+ bbt_beat_subdivision = 20;
+ bbt_accent_modulo = 5;
+ break;
+ case SnapToBeatDiv24:
+ bbt_beat_subdivision = 24;
+ bbt_accent_modulo = 6;
break;
- case SnapToAThirtysecondBeat:
+ case SnapToBeatDiv28:
+ bbt_beat_subdivision = 28;
+ bbt_accent_modulo = 7;
+ break;
+ case SnapToBeatDiv32:
bbt_beat_subdivision = 32;
- magic_accent_number = 8;
+ bbt_accent_modulo = 8;
+ break;
+ case SnapToBeatDiv64:
+ bbt_beat_subdivision = 64;
+ bbt_accent_modulo = 8;
+ break;
+ case SnapToBeatDiv128:
+ bbt_beat_subdivision = 128;
+ bbt_accent_modulo = 8;
break;
default:
- bbt_beat_subdivision = 4;
+ bbt_beat_subdivision = 4;
break;
}
- if (current_bbt_points == 0 || current_bbt_points->empty()) {
- return 0;
+ if (distance (begin, end) == 0) {
+ return;
}
- i = current_bbt_points->end();
+ i = end;
i--;
- bars = (*i).bar - (*current_bbt_points->begin()).bar;
- beats = current_bbt_points->size() - bars;
-
- /*Only show the bar helper if there aren't many bars on the screen */
- if (bars > 1) {
- bar_helper_on = false;
- }
-
- if (desirable_marks > (beats / 4)) {
-
- /* we're in beat land...*/
-
- 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 ());
-
- if (desirable_marks >= (beats)) {
- nmarks = (beats * bbt_beat_subdivision) + 1;
- we_need_ticks = true;
- } else {
- nmarks = beats + 1;
- }
+ if ((*i).beat >= (*begin).beat) {
+ bbt_bars = (*i).bar - (*begin).bar;
+ } else {
+ bbt_bars = (*i).bar - (*begin).bar - 1;
+ }
+ beats = distance (begin, end) - bbt_bars;
+
+ /* Only show the bar helper if there aren't many bars on the screen */
+ if ((bbt_bars < 2) || (beats < 5)) {
+ bbt_bar_helper_on = true;
+ }
+
+ if (bbt_bars > 8192) {
+ bbt_ruler_scale = bbt_over;
+ } 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;
+ }
+
+ if ((bbt_ruler_scale == bbt_show_ticks_detail) && (lower_beat.beats == upper_beat.beats) && (upper_beat.ticks - lower_beat.ticks <= Timecode::BBT_Time::ticks_per_beat / 4)) {
+ bbt_ruler_scale = bbt_show_ticks_super_detail;
+ }
+}
+
+gint
+Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/)
+{
+ if (_session == 0) {
+ return 0;
+ }
+
+ TempoMap::BBTPointList::const_iterator i;
+
+ char buf[64];
+ gint n = 0;
+ framepos_t pos;
+ Timecode::BBT_Time next_beat;
+ framepos_t next_beat_pos;
+ uint32_t beats = 0;
+
+ uint32_t tick = 0;
+ uint32_t skip;
+ uint32_t t;
+ framepos_t frame_skip;
+ double frame_skip_error;
+ double bbt_position_of_helper;
+ double accumulated_error;
+ bool i_am_accented = false;
+ bool helper_active = false;
- *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
+ ARDOUR::TempoMap::BBTPointList::const_iterator begin;
+ ARDOUR::TempoMap::BBTPointList::const_iterator end;
+
+ compute_current_bbt_points (lower, upper, begin, end);
+
+ if (distance (begin, end) == 0) {
+ return 0;
+ }
+
+ switch (bbt_ruler_scale) {
+
+ case bbt_show_beats:
+ beats = distance (begin, end);
+ 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 < nmarks && i != current_bbt_points->end(); ++i) {
+ for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
- 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).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).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++;
- }
-
+ if ((*i).is_bar()) {
+ (*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:
- /* Add the tick marks */
+ beats = distance (begin, end);
+ bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
- if (we_need_ticks && (*i).type == TempoMap::Beat) {
+ bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
+ *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks);
- /* Find the next beat */
+ (*marks)[0].label = g_strdup(" ");
+ (*marks)[0].position = lower;
+ (*marks)[0].style = GtkCustomRulerMarkMicro;
- next_beat.beats = (*i).beat;
- next_beat.bars = (*i).bar;
+ for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
- if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) {
- next_beat.beats += 1;
+ 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).is_bar()) {
+ (*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->divisions_per_bar() > (next_beat.beats + 1)) {
+ next_beat.beats += 1;
+ } else {
next_beat.bars += 1;
next_beat.beats = 1;
+ }
+
+ next_beat_pos = _session->tempo_map().frame_time(next_beat);
+
+ frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
+ frame_skip_error -= frame_skip;
+ skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision);
+
+ pos = (*i).frame + frame_skip;
+ accumulated_error = frame_skip_error;
+
+ tick = skip;
+
+ for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
+
+ if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
+ i_am_accented = true;
}
-
- next_beat_pos = session->tempo_map().frame_time(next_beat);
- 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);
+ snprintf (buf, sizeof(buf), " ");
+ (*marks)[n].label = g_strdup (buf);
- pos = (*i).frame + frame_skip;
- accumulated_error = frame_skip_error;
+ /* Error compensation for float to framepos_t*/
+ accumulated_error += frame_skip_error;
+ if (accumulated_error > 1) {
+ pos += 1;
+ accumulated_error -= 1.0f;
+ }
- tick = skip;
+ (*marks)[n].position = pos;
- for (t = 0; (tick < Meter::ticks_per_beat) && (n < nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
+ if ((bbt_beat_subdivision > 4) && i_am_accented) {
+ (*marks)[n].style = GtkCustomRulerMarkMinor;
+ } else {
+ (*marks)[n].style = GtkCustomRulerMarkMicro;
+ }
+ i_am_accented = false;
+ n++;
+ }
+ }
- 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);
- }
+ break;
- (*marks)[n].label = g_strdup (buf);
+ case bbt_show_ticks_detail:
- /* Error compensation for float to nframes_t*/
- accumulated_error += frame_skip_error;
- if (accumulated_error > 1) {
- pos += 1;
- accumulated_error -= 1.0f;
- }
+ beats = distance (begin, end);
+ bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
- (*marks)[n].position = pos;
+ bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
+ *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks);
- if ((bbt_beat_subdivision > 4) && i_am_accented) {
- (*marks)[n].style = GtkCustomRulerMarkMinor;
- } else {
- (*marks)[n].style = GtkCustomRulerMarkMicro;
- }
- i_am_accented = false;
- n++;
-
+ (*marks)[0].label = g_strdup(" ");
+ (*marks)[0].position = lower;
+ (*marks)[0].style = GtkCustomRulerMarkMicro;
+
+ for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
+
+ if ((*i).frame < lower && (bbt_bar_helper_on)) {
+ snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
+ (*marks)[0].label = g_strdup (buf);
+ helper_active = true;
+ } else {
+
+ if ((*i).is_bar()) {
+ (*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->divisions_per_bar() > (next_beat.beats + 1)) {
+ next_beat.beats += 1;
+ } else {
+ next_beat.bars += 1;
+ next_beat.beats = 1;
+ }
+
+ next_beat_pos = _session->tempo_map().frame_time(next_beat);
+
+ frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
+ frame_skip_error -= frame_skip;
+ skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision);
+
+ pos = (*i).frame + frame_skip;
+ accumulated_error = frame_skip_error;
+
+ tick = skip;
+
+ for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
+
+ if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
+ i_am_accented = true;
+ }
+
+ if (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);
+
+ /* Error compensation for float to framepos_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++;
}
}
- return n; //return the actual number of marks made, since we might have skipped some fro fractional time signatures
- } else {
+ break;
- /* we're in bar land */
+ case bbt_show_ticks_super_detail:
- if (desirable_marks < (bars / 256)) {
- nmarks = 1;
- *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
- snprintf (buf, sizeof(buf), "too many bars... (currently %" PRIu32 ")", bars );
+ beats = distance (begin, end);
+ 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 = begin; n < bbt_nmarks && i != end; ++i) {
+
+ if ((*i).frame < lower && (bbt_bar_helper_on)) {
+ snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
+ (*marks)[0].label = g_strdup (buf);
+ helper_active = true;
+ } else {
+
+ if ((*i).is_bar()) {
+ (*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->divisions_per_bar() > (next_beat.beats + 1)) {
+ next_beat.beats += 1;
+ } else {
+ next_beat.bars += 1;
+ next_beat.beats = 1;
+ }
+
+ next_beat_pos = _session->tempo_map().frame_time(next_beat);
+
+ frame_skip = (framepos_t) floor (frame_skip_error = (_session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
+ frame_skip_error -= frame_skip;
+ skip = (uint32_t) (Timecode::BBT_Time::ticks_per_beat / bbt_beat_subdivision);
+
+ pos = (*i).frame + frame_skip;
+ accumulated_error = frame_skip_error;
+
+ tick = skip;
+
+ for (t = 0; (tick < Timecode::BBT_Time::ticks_per_beat) && (n < bbt_nmarks) && (pos < next_beat_pos) ; pos += frame_skip, tick += skip, ++t) {
+
+ if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) {
+ i_am_accented = true;
+ }
+
+ if (pos > bbt_position_of_helper) {
+ snprintf (buf, sizeof(buf), "%" PRIu32, tick);
+ } else {
+ snprintf (buf, sizeof(buf), " ");
+ }
+
+ (*marks)[n].label = g_strdup (buf);
+
+ /* Error compensation for float to framepos_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++) {
- if ((*i).type == TempoMap::Bar) {
+ 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 = begin; i != end && n < bbt_nmarks; i++) {
+ if ((*i).is_bar()) {
if ((*i).bar % 64 == 1) {
if ((*i).bar % 256 == 1) {
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
}
}
}
- } 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 = begin; i != end && n < bbt_nmarks; i++) {
+ if ((*i).is_bar()) {
+ if ((*i).bar % 16 == 1) {
+ if ((*i).bar % 64 == 1) {
+ snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
+ (*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 = begin; i != end && n < bbt_nmarks; ++i) {
+ if ((*i).is_bar()) {
+ if ((*i).bar % 4 == 1) {
+ if ((*i).bar % 16 == 1) {
+ snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
+ (*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++;
+ }
}
- } 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;
+
+ case bbt_show_1:
+ // default:
+ bbt_nmarks = bbt_bars + 2;
+ *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks );
+ for (n = 0, i = begin; i != end && n < bbt_nmarks; i++) {
+ if ((*i).is_bar()) {
+ if ((*i).bar % 4 == 1) {
+ snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
+ (*marks)[n].style = GtkCustomRulerMarkMajor;
+ } 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++;
+ }
+ }
+
+ break;
+
}
+
+ return n; //return the actual number of marks made, since we might have skipped some from fractional time signatures
+
+}
+
+void
+Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper)
+{
+ _samples_ruler_interval = (upper - lower) / 5;
}
gint
-Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
+Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
{
- nframes_t mark_interval;
- nframes_t pos;
- nframes_t ilower = (nframes_t) floor (lower);
- nframes_t iupper = (nframes_t) floor (upper);
+ framepos_t pos;
+ framepos_t const ilower = (framepos_t) floor (lower);
gchar buf[16];
gint nmarks;
gint n;
- if (session == 0) {
+ if (_session == 0) {
return 0;
}
- mark_interval = (iupper - ilower) / 5;
- if (mark_interval > session->frame_rate()) {
- mark_interval -= mark_interval % session->frame_rate();
- } else {
- mark_interval = session->frame_rate() / (session->frame_rate() / mark_interval ) ;
- }
nmarks = 5;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
- for (n = 0, pos = ilower; n < nmarks; pos += mark_interval, ++n) {
- snprintf (buf, sizeof(buf), "%u", pos);
+ for (n = 0, pos = ilower; n < nmarks; pos += _samples_ruler_interval, ++n) {
+ snprintf (buf, sizeof(buf), "%" PRIi64, pos);
(*marks)[n].label = g_strdup (buf);
(*marks)[n].position = pos;
(*marks)[n].style = GtkCustomRulerMarkMajor;
}
-
+
return nmarks;
}
static void
-sample_to_clock_parts ( nframes_t sample,
- nframes_t sample_rate,
+sample_to_clock_parts ( framepos_t sample,
+ framepos_t sample_rate,
long *hrs_p,
long *mins_p,
long *secs_p,
long *millisecs_p)
{
- nframes_t left;
+ framepos_t left;
long hrs;
long mins;
long secs;
long millisecs;
-
+
left = sample;
hrs = left / (sample_rate * 60 * 60);
left -= hrs * sample_rate * 60 * 60;
return;
}
-gint
-Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint maxchars)
+void
+Editor::set_minsec_ruler_scale (framepos_t lower, framepos_t 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);
-
- if (session == 0) {
- return 0;
+ framepos_t fr;
+ framepos_t spacer;
+
+ if (_session == 0) {
+ return;
}
- fr = session->frame_rate();
+ fr = _session->frame_rate();
/* to prevent 'flashing' */
- if (lower > (spacer = (nframes_t)(128 * Editor::get_current_zoom ()))) {
- lower = lower - spacer;
+ if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) {
+ lower -= spacer;
} else {
lower = 0;
}
- upper = upper + spacer;
- range = iupper - ilower;
+ upper += spacer;
+ framecnt_t const range = 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 */
-
- mark_interval = 4 * 60 * 60 * fr; /* show 4 hrs */
+
+ /* not possible if framepos_t is a 32 bit quantity */
+
+ 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*/)
+{
+ framepos_t pos;
+ framepos_t spacer;
+ long hrs, mins, secs, millisecs;
+ gchar buf[16];
+ gint n;
+
+ if (_session == 0) {
+ return 0;
+ }
+
+ /* to prevent 'flashing' */
+ if (lower > (spacer = (framepos_t) (128 * Editor::get_current_zoom ()))) {
+ lower = lower - spacer;
+ } else {
+ lower = 0;
+ }
+
+ *marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * minsec_nmarks);
+ pos = ((((framepos_t) floor(lower)) + (minsec_mark_interval/2))/minsec_mark_interval) * minsec_mark_interval;
+ switch (minsec_ruler_scale) {
+ case minsec_show_seconds:
+ for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) {
+ sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs);
+ if (secs % minsec_mark_modulo == 0) {
if (secs == 0) {
(*marks)[n].style = GtkCustomRulerMarkMajor;
} else {
(*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 {
(*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 {
(*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;
(*marks)[n].label = g_strdup (buf);
(*marks)[n].position = pos;
}
+ break;
}
- return nmarks;
+ return minsec_nmarks;
}
projects / ardour.git / blobdiff