#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 "gtkmm2ext/gtk_ui.h"
#include "editor.h"
#include "editing.h"
GtkCustomMetric Editor::ruler_metrics[4] = {
{1, Editor::_metric_get_timecode },
{1, Editor::_metric_get_bbt },
- {1, Editor::_metric_get_frames },
+ {1, Editor::_metric_get_samples },
{1, Editor::_metric_get_minsec }
};
bbt_ruler->set_no_show_all();
bbt_nmarks = 0;
- _frames_ruler = gtk_custom_hruler_new ();
- frames_ruler = Glib::wrap (_frames_ruler);
- frames_ruler->set_name ("FramesRuler");
- frames_ruler->set_size_request (-1, (int)timebar_height);
- gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER(_frames_ruler), &ruler_metrics[ruler_metric_frames]);
- frames_ruler->hide ();
- frames_ruler->set_no_show_all();
+ _samples_ruler = gtk_custom_hruler_new ();
+ samples_ruler = Glib::wrap (_samples_ruler);
+ samples_ruler->set_name ("SamplesRuler");
+ samples_ruler->set_size_request (-1, (int) timebar_height);
+ gtk_custom_ruler_set_metric (GTK_CUSTOM_RULER (_samples_ruler), &ruler_metrics[ruler_metric_samples]);
+ samples_ruler->hide ();
+ samples_ruler->set_no_show_all ();
_bbt_ruler = gtk_custom_hruler_new ();
bbt_ruler = Glib::wrap (_bbt_ruler);
using namespace Box_Helpers;
BoxList & ruler_lab_children = ruler_label_vbox.children();
BoxList & ruler_children = time_canvas_vbox.children();
- BoxList & lab_children = time_button_vbox.children();
+ BoxList & lab_children = time_bars_vbox.children();
BoxList::iterator canvaspos = ruler_children.begin();
lab_children.push_back (Element(transport_mark_label, PACK_SHRINK, PACK_START));
lab_children.push_back (Element(cd_mark_label, PACK_SHRINK, PACK_START));
lab_children.push_back (Element(mark_label, PACK_SHRINK, PACK_START));
+ lab_children.push_back (Element(videotl_label, PACK_SHRINK, PACK_START));
ruler_lab_children.push_back (Element(minsec_label, PACK_SHRINK, PACK_START));
ruler_children.insert (canvaspos, Element(*minsec_ruler, PACK_SHRINK, PACK_START));
ruler_lab_children.push_back (Element(timecode_label, PACK_SHRINK, PACK_START));
ruler_children.insert (canvaspos, Element(*timecode_ruler, PACK_SHRINK, PACK_START));
- ruler_lab_children.push_back (Element(frame_label, PACK_SHRINK, PACK_START));
- ruler_children.insert (canvaspos, Element(*frames_ruler, PACK_SHRINK, PACK_START));
+ ruler_lab_children.push_back (Element(samples_label, PACK_SHRINK, PACK_START));
+ ruler_children.insert (canvaspos, Element (*samples_ruler, PACK_SHRINK, PACK_START));
ruler_lab_children.push_back (Element(bbt_label, PACK_SHRINK, PACK_START));
ruler_children.insert (canvaspos, Element(*bbt_ruler, PACK_SHRINK, PACK_START));
timecode_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
bbt_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
- frames_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
+ samples_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
minsec_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
timecode_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
bbt_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
- frames_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
+ samples_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
minsec_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
timecode_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
bbt_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
- frames_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
+ samples_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
minsec_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
timecode_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
bbt_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
- frames_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
+ samples_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
minsec_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
timecode_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
bbt_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
- frames_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
+ samples_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
minsec_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
visible_timebars = 0; /*this will be changed below */
- canvas_timebars_vsize = 0;
}
bool
switch (direction) {
case GDK_SCROLL_UP:
- temporal_zoom_step (true);
+ temporal_zoom_step (false);
handled = true;
break;
case GDK_SCROLL_DOWN:
- temporal_zoom_step (false);
+ temporal_zoom_step (true);
handled = true;
break;
}
-gint
+bool
Editor::ruler_button_press (GdkEventButton* ev)
{
if (_session == 0) {
- return FALSE;
+ return false;
}
- // jlc: grab ev->window ?
- //Gtk::Main::grab_add (*minsec_ruler);
Widget * grab_widget = 0;
if (timecode_ruler->is_realized() && ev->window == timecode_ruler->get_window()->gobj()) {
grab_widget = timecode_ruler;
} else if (bbt_ruler->is_realized() && ev->window == bbt_ruler->get_window()->gobj()) {
grab_widget = bbt_ruler;
- } else if (frames_ruler->is_realized() && ev->window == frames_ruler->get_window()->gobj()) {
- grab_widget = frames_ruler;
+ } else if (samples_ruler->is_realized() && ev->window == samples_ruler->get_window()->gobj()) {
+ grab_widget = samples_ruler;
} else if (minsec_ruler->is_realized() && ev->window == minsec_ruler->get_window()->gobj()) {
grab_widget = minsec_ruler;
}
}
/* playhead cursor */
- _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), reinterpret_cast<GdkEvent *> (ev));
+ _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;
+ return false;
}
gint x,y;
ruler_grabbed_widget = 0;
}
- return TRUE;
+ return true;
}
-gint
+bool
Editor::ruler_label_button_release (GdkEventButton* ev)
{
if (ev->button == 3) {
- Gtk::Menu* m= dynamic_cast<Gtk::Menu*> (ActionManager::get_widget (X_("/RulerMenuPopup")));
+ 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) {
- return FALSE;
+ return false;
}
if (_drags->active ()) {
_drags->motion_handler (reinterpret_cast<GdkEvent*> (ev), false);
}
- return TRUE;
+ return true;
}
ruler_items.push_back (SeparatorElem ());
break;
case RangeMarkerBarItem:
- //ruler_items.push_back (MenuElem (_("New Range")));
+ ruler_items.push_back (MenuElem (_("New range"), sigc::bind (sigc::mem_fun (*this, &Editor::mouse_add_new_range), where)));
ruler_items.push_back (MenuElem (_("Clear all ranges"), sigc::mem_fun(*this, &Editor::clear_ranges)));
ruler_items.push_back (MenuElem (_("Unhide ranges"), sigc::mem_fun(*this, &Editor::unhide_ranges)));
ruler_items.push_back (SeparatorElem ());
case TempoBarItem:
ruler_items.push_back (MenuElem (_("New Tempo"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_tempo_event), where)));
- ruler_items.push_back (MenuElem (_("Clear tempo")));
ruler_items.push_back (SeparatorElem ());
break;
case MeterBarItem:
ruler_items.push_back (MenuElem (_("New Meter"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_meter_event), where)));
- ruler_items.push_back (MenuElem (_("Clear meter")));
+ ruler_items.push_back (SeparatorElem ());
+ break;
+
+ case VideoBarItem:
+ ruler_items.push_back (MenuElem (_("Timeline height")));
+ static_cast<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;
if (action) {
ruler_items.push_back (MenuElem (*action->create_menu_item()));
}
+ action = ActionManager::get_action ("Rulers", "toggle-video-ruler");
+ if (action) {
+ ruler_items.push_back (MenuElem (*action->create_menu_item()));
+ }
editor_ruler_menu->popup (1, gtk_get_current_event_time());
node->add_property (X_("timecode"), ruler_timecode_action->get_active() ? "yes": "no");
node->add_property (X_("bbt"), ruler_bbt_action->get_active() ? "yes": "no");
- node->add_property (X_("frames"), ruler_samples_action->get_active() ? "yes": "no");
+ node->add_property (X_("samples"), ruler_samples_action->get_active() ? "yes": "no");
node->add_property (X_("minsec"), ruler_minsec_action->get_active() ? "yes": "no");
node->add_property (X_("tempo"), ruler_tempo_action->get_active() ? "yes": "no");
node->add_property (X_("meter"), ruler_meter_action->get_active() ? "yes": "no");
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 ();
ruler_bbt_action->set_active (false);
}
}
- if ((prop = node->property ("frames")) != 0) {
+ if ((prop = node->property ("samples")) != 0) {
if (string_is_affirmative (prop->value())) {
ruler_samples_action->set_active (true);
} else {
}
}
+ 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;
if (ruler_samples_action->get_active()) {
visible_rulers++;
- frame_label.show ();
- frames_ruler->show ();
+ samples_label.show ();
+ samples_ruler->show ();
} else {
- frame_label.hide ();
- frames_ruler->hide ();
+ samples_label.hide ();
+ samples_ruler->hide ();
}
if (ruler_bbt_action->get_active()) {
transport_mark_label.hide();
cd_mark_label.hide();
mark_label.hide();
+ videotl_label.hide();
#endif
if (ruler_meter_action->get_active()) {
- old_unit_pos = meter_group->property_y();
+ 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->property_y();
+ old_unit_pos = meter_bar_group->position().y;
if (tbgpos != old_unit_pos) {
- meter_bar_group->move ( 0.0, tbgpos - old_unit_pos);
+ meter_bar_group->move (ArdourCanvas::Duple (0.0, tbgpos - old_unit_pos));
}
meter_bar_group->show();
meter_group->show();
}
if (ruler_tempo_action->get_active()) {
- old_unit_pos = tempo_group->property_y();
+ 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->property_y();
+ old_unit_pos = tempo_bar_group->position().y;
if (tbgpos != old_unit_pos) {
- tempo_bar_group->move ( 0.0, tbgpos - old_unit_pos);
+ tempo_bar_group->move (ArdourCanvas::Duple (0.0, tbgpos - old_unit_pos));
}
tempo_bar_group->show();
tempo_group->show();
}
if (!Profile->get_sae() && ruler_range_action->get_active()) {
- old_unit_pos = range_marker_group->property_y();
+ old_unit_pos = range_marker_group->position().y;
if (tbpos != old_unit_pos) {
- range_marker_group->move (0.0, tbpos - old_unit_pos);
+ range_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
- old_unit_pos = range_marker_bar_group->property_y();
+ old_unit_pos = range_marker_bar_group->position().y;
if (tbgpos != old_unit_pos) {
- range_marker_bar_group->move (0.0, 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();
}
if (ruler_loop_punch_action->get_active()) {
- old_unit_pos = transport_marker_group->property_y();
+ old_unit_pos = transport_marker_group->position().y;
if (tbpos != old_unit_pos) {
- transport_marker_group->move ( 0.0, tbpos - old_unit_pos);
+ transport_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
- old_unit_pos = transport_marker_bar_group->property_y();
+ old_unit_pos = transport_marker_bar_group->position().y;
if (tbgpos != old_unit_pos) {
- transport_marker_bar_group->move ( 0.0, 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();
}
if (ruler_cd_marker_action->get_active()) {
- old_unit_pos = cd_marker_group->property_y();
+ old_unit_pos = cd_marker_group->position().y;
if (tbpos != old_unit_pos) {
- cd_marker_group->move (0.0, tbpos - old_unit_pos);
+ cd_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
- old_unit_pos = cd_marker_bar_group->property_y();
+ old_unit_pos = cd_marker_bar_group->position().y;
if (tbgpos != old_unit_pos) {
- cd_marker_bar_group->move (0.0, 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();
}
if (ruler_marker_action->get_active()) {
- old_unit_pos = marker_group->property_y();
+ old_unit_pos = marker_group->position().y;
if (tbpos != old_unit_pos) {
- marker_group->move ( 0.0, tbpos - old_unit_pos);
+ marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
- old_unit_pos = marker_bar_group->property_y();
+ old_unit_pos = marker_bar_group->position().y;
if (tbgpos != old_unit_pos) {
- marker_bar_group->move ( 0.0, 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.hide();
}
- gdouble old_canvas_timebars_vsize = canvas_timebars_vsize;
- canvas_timebars_vsize = (timebar_height * visible_timebars) - 1;
- gdouble vertical_pos_delta = canvas_timebars_vsize - old_canvas_timebars_vsize;
- vertical_adjustment.set_upper(vertical_adjustment.get_upper() + vertical_pos_delta);
- full_canvas_height += vertical_pos_delta;
-
- if (vertical_adjustment.get_value() != 0 && (vertical_adjustment.get_value() + _canvas_height >= full_canvas_height)) {
- /*if we're at the bottom of the canvas, don't move the _trackview_group*/
- vertical_adjustment.set_value (full_canvas_height - _canvas_height + 1);
+ 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 {
- _trackview_group->property_y () = - get_trackview_group_vertical_offset ();
- _background_group->property_y () = - get_trackview_group_vertical_offset ();
- _trackview_group->move (0, 0);
- _background_group->move (0, 0);
- last_trackview_group_vertical_offset = get_trackview_group_vertical_offset ();
- }
-
- gdouble bottom_track_pos = vertical_adjustment.get_value() + _canvas_height - canvas_timebars_vsize;
- std::pair<TimeAxisView*, int> const p = trackview_by_y_position (bottom_track_pos);
- if (p.first) {
- p.first->clip_to_viewport ();
+ videotl_bar_group->hide();
+ videotl_group->hide();
+ videotl_label.hide();
+ update_video_timeline(true);
}
ruler_label_vbox.set_size_request (-1, (int)(timebar_height * visible_rulers));
}
if (ruler_timecode_action->get_active()) {
- set_timecode_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames() );
+ set_timecode_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
}
if (ruler_minsec_action->get_active()) {
- set_minsec_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames() );
+ set_minsec_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
}
if (ruler_samples_action->get_active()) {
- set_frames_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
+ set_samples_ruler_scale (leftmost_frame, leftmost_frame + current_page_frames());
}
}
return;
}
- ruler_metrics[ruler_metric_timecode].units_per_pixel = frames_per_unit;
- ruler_metrics[ruler_metric_frames].units_per_pixel = frames_per_unit;
- ruler_metrics[ruler_metric_minsec].units_per_pixel = frames_per_unit;
+ 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();
}
if (ruler_samples_action->get_active()) {
- gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_frames_ruler), leftmost_frame, rightmost_frame,
+ gtk_custom_ruler_set_range (GTK_CUSTOM_RULER (_samples_ruler), leftmost_frame, rightmost_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) {
return;
}
- ruler_metrics[ruler_metric_bbt].units_per_pixel = frames_per_unit;
+ compute_bbt_ruler_scale (leftmost_frame, leftmost_frame+current_page_frames(),
+ begin, end);
+
+ ruler_metrics[ruler_metric_bbt].units_per_pixel = frames_per_pixel;
if (ruler_bbt_action->get_active()) {
gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_bbt_ruler), leftmost_frame, leftmost_frame+current_page_frames(),
}
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
}
void
-Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper)
+Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper)
{
- framepos_t range;
framepos_t spacer;
framepos_t fr;
fr = _session->frame_rate();
- if (lower > (spacer = (framepos_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 = (framepos_t) floor (upper - lower);
+ framecnt_t const range = upper - lower;
if (range < (2 * _session->frames_per_timecode_frame())) { /* 0 - 2 frames */
timecode_ruler_scale = timecode_show_bits;
}
(*marks)[n].label = g_strdup (buf);
(*marks)[n].position = pos;
+
Timecode::increment_minutes( timecode, _session->config.get_subframes_per_frame() );
}
void
-Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper)
+Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper,
+ ARDOUR::TempoMap::BBTPointList::const_iterator begin,
+ ARDOUR::TempoMap::BBTPointList::const_iterator end)
{
if (_session == 0) {
return;
}
- TempoMap::BBTPointList::iterator i;
+
+ TempoMap::BBTPointList::const_iterator i;
Timecode::BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler
_session->bbt_time (lower, lower_beat);
bbt_beat_subdivision = 32;
bbt_accent_modulo = 8;
break;
+ case SnapToBeatDiv64:
+ bbt_beat_subdivision = 64;
+ bbt_accent_modulo = 8;
+ break;
+ case SnapToBeatDiv128:
+ bbt_beat_subdivision = 128;
+ bbt_accent_modulo = 8;
+ break;
default:
bbt_beat_subdivision = 4;
break;
}
- if (current_bbt_points == 0 || current_bbt_points->empty()) {
+ if (distance (begin, end) == 0) {
return;
}
- i = current_bbt_points->end();
+ i = end;
i--;
- if ((*i).beat >= (*current_bbt_points->begin()).beat) {
- bbt_bars = (*i).bar - (*current_bbt_points->begin()).bar;
+ if ((*i).beat >= (*begin).beat) {
+ bbt_bars = (*i).bar - (*begin).bar;
} else {
- bbt_bars = (*i).bar - (*current_bbt_points->begin()).bar - 1;
+ bbt_bars = (*i).bar - (*begin).bar - 1;
}
- beats = current_bbt_points->size() - bbt_bars;
+ beats = distance (begin, end) - bbt_bars;
- /*Only show the bar helper if there aren't many bars on the screen */
+ /* Only show the bar helper if there aren't many bars on the screen */
if ((bbt_bars < 2) || (beats < 5)) {
bbt_bar_helper_on = true;
}
if (bbt_bars > 8192) {
- bbt_ruler_scale = bbt_over;
+ bbt_ruler_scale = bbt_over;
} else if (bbt_bars > 1024) {
- bbt_ruler_scale = bbt_show_64;
+ bbt_ruler_scale = bbt_show_64;
} else if (bbt_bars > 256) {
- bbt_ruler_scale = bbt_show_16;
+ bbt_ruler_scale = bbt_show_16;
} else if (bbt_bars > 64) {
- bbt_ruler_scale = bbt_show_4;
+ bbt_ruler_scale = bbt_show_4;
} else if (bbt_bars > 10) {
- bbt_ruler_scale = bbt_show_1;
+ bbt_ruler_scale = bbt_show_1;
} else if (bbt_bars > 2) {
- bbt_ruler_scale = bbt_show_beats;
+ bbt_ruler_scale = bbt_show_beats;
} else if (bbt_bars > 0) {
- bbt_ruler_scale = bbt_show_ticks;
+ bbt_ruler_scale = bbt_show_ticks;
} else {
- bbt_ruler_scale = bbt_show_ticks_detail;
+ bbt_ruler_scale = bbt_show_ticks_detail;
}
if ((bbt_ruler_scale == bbt_show_ticks_detail) && (lower_beat.beats == upper_beat.beats) && (upper_beat.ticks - lower_beat.ticks <= Timecode::BBT_Time::ticks_per_beat / 4)) {
}
gint
-Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
+Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/)
{
if (_session == 0) {
return 0;
}
- TempoMap::BBTPointList::iterator i;
+ TempoMap::BBTPointList::const_iterator i;
char buf[64];
gint n = 0;
bool i_am_accented = false;
bool helper_active = false;
- if (current_bbt_points == 0 || current_bbt_points->empty()) {
+ ARDOUR::TempoMap::BBTPointList::const_iterator begin;
+ ARDOUR::TempoMap::BBTPointList::const_iterator end;
+
+ compute_current_bbt_points (lower, upper, begin, end);
+
+ if (distance (begin, end) == 0) {
return 0;
}
switch (bbt_ruler_scale) {
case bbt_show_beats:
- beats = current_bbt_points->size();
+ beats = distance (begin, end);
bbt_nmarks = beats + 2;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks);
(*marks)[0].label = g_strdup(" ");
(*marks)[0].position = lower;
(*marks)[0].style = GtkCustomRulerMarkMicro;
+
+ for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
- for (n = 1, i = current_bbt_points->begin(); n < bbt_nmarks && i != current_bbt_points->end(); ++i) {
- if ((*i).type != TempoMap::Beat) {
- continue;
- }
if ((*i).frame < lower && (bbt_bar_helper_on)) {
snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
(*marks)[0].label = g_strdup (buf);
helper_active = true;
} else {
- if ((*i).beat == 1) {
+ if ((*i).is_bar()) {
(*marks)[n].style = GtkCustomRulerMarkMajor;
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
} else if (((*i).beat % 2 == 1)) {
case bbt_show_ticks:
- beats = current_bbt_points->size();
+ beats = distance (begin, end);
bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
(*marks)[0].position = lower;
(*marks)[0].style = GtkCustomRulerMarkMicro;
- for (n = 1, i = current_bbt_points->begin(); n < bbt_nmarks && i != current_bbt_points->end(); ++i) {
- if ((*i).type != TempoMap::Beat) {
- continue;
- }
+ for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
+
if ((*i).frame < lower && (bbt_bar_helper_on)) {
snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
(*marks)[0].label = g_strdup (buf);
helper_active = true;
} else {
- if ((*i).beat == 1) {
+ if ((*i).is_bar()) {
(*marks)[n].style = GtkCustomRulerMarkMajor;
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
} else {
next_beat.bars = (*i).bar;
next_beat.ticks = 0;
- if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) {
+ if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) {
next_beat.beats += 1;
} else {
next_beat.bars += 1;
case bbt_show_ticks_detail:
- beats = current_bbt_points->size();
+ beats = distance (begin, end);
bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
(*marks)[0].position = lower;
(*marks)[0].style = GtkCustomRulerMarkMicro;
- for (n = 1, i = current_bbt_points->begin(); n < bbt_nmarks && i != current_bbt_points->end(); ++i) {
- if ((*i).type != TempoMap::Beat) {
- continue;
- }
+ for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
+
if ((*i).frame < lower && (bbt_bar_helper_on)) {
snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
(*marks)[0].label = g_strdup (buf);
helper_active = true;
} else {
- if ((*i).beat == 1) {
+ if ((*i).is_bar()) {
(*marks)[n].style = GtkCustomRulerMarkMajor;
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
} else {
next_beat.beats = (*i).beat;
next_beat.bars = (*i).bar;
- if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) {
+ if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) {
next_beat.beats += 1;
} else {
next_beat.bars += 1;
case bbt_show_ticks_super_detail:
- beats = current_bbt_points->size();
+ beats = distance (begin, end);
bbt_nmarks = (beats + 2) * bbt_beat_subdivision;
bbt_position_of_helper = lower + (30 * Editor::get_current_zoom ());
(*marks)[0].position = lower;
(*marks)[0].style = GtkCustomRulerMarkMicro;
- for (n = 1, i = current_bbt_points->begin(); n < bbt_nmarks && i != current_bbt_points->end(); ++i) {
- if ((*i).type != TempoMap::Beat) {
- continue;
- }
+ for (n = 1, i = begin; n < bbt_nmarks && i != end; ++i) {
+
if ((*i).frame < lower && (bbt_bar_helper_on)) {
snprintf (buf, sizeof(buf), "<%" PRIu32 "|%" PRIu32, (*i).bar, (*i).beat);
(*marks)[0].label = g_strdup (buf);
helper_active = true;
} else {
- if ((*i).beat == 1) {
+ if ((*i).is_bar()) {
(*marks)[n].style = GtkCustomRulerMarkMajor;
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
} else {
next_beat.beats = (*i).beat;
next_beat.bars = (*i).bar;
- if ((*i).meter->beats_per_bar() > (next_beat.beats + 1)) {
+ if ((*i).meter->divisions_per_bar() > (next_beat.beats + 1)) {
next_beat.beats += 1;
} else {
next_beat.bars += 1;
case bbt_show_64:
bbt_nmarks = (gint) (bbt_bars / 64) + 1;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks);
- for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < bbt_nmarks; i++) {
- if ((*i).type == TempoMap::Bar) {
+ for (n = 0, i = begin; i != end && n < bbt_nmarks; i++) {
+ if ((*i).is_bar()) {
if ((*i).bar % 64 == 1) {
if ((*i).bar % 256 == 1) {
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
case bbt_show_16:
bbt_nmarks = (bbt_bars / 16) + 1;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks);
- for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < bbt_nmarks; i++) {
- if ((*i).type == TempoMap::Bar) {
+ for (n = 0, i = begin; i != end && n < bbt_nmarks; i++) {
+ if ((*i).is_bar()) {
if ((*i).bar % 16 == 1) {
if ((*i).bar % 64 == 1) {
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
case bbt_show_4:
bbt_nmarks = (bbt_bars / 4) + 1;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks);
- for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < bbt_nmarks; ++i) {
- if ((*i).type == TempoMap::Bar) {
+ for (n = 0, i = begin; i != end && n < bbt_nmarks; ++i) {
+ if ((*i).is_bar()) {
if ((*i).bar % 4 == 1) {
if ((*i).bar % 16 == 1) {
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
// default:
bbt_nmarks = bbt_bars + 2;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * bbt_nmarks );
- for (n = 0, i = current_bbt_points->begin(); i != current_bbt_points->end() && n < bbt_nmarks; i++) {
- if ((*i).type == TempoMap::Bar) {
+ for (n = 0, i = begin; i != end && n < bbt_nmarks; i++) {
+ if ((*i).is_bar()) {
if ((*i).bar % 4 == 1) {
snprintf (buf, sizeof(buf), "%" PRIu32, (*i).bar);
(*marks)[n].style = GtkCustomRulerMarkMajor;
}
void
-Editor::set_frames_ruler_scale (framepos_t lower, framepos_t upper)
+Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper)
{
- _frames_ruler_interval = (upper - lower) / 5;
+ _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*/)
{
framepos_t pos;
framepos_t const ilower = (framepos_t) floor (lower);
nmarks = 5;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
- for (n = 0, pos = ilower; n < nmarks; pos += _frames_ruler_interval, ++n) {
+ for (n = 0, pos = ilower; n < nmarks; pos += _samples_ruler_interval, ++n) {
snprintf (buf, sizeof(buf), "%" PRIi64, pos);
(*marks)[n].label = g_strdup (buf);
(*marks)[n].position = pos;
}
void
-Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper)
+Editor::set_minsec_ruler_scale (framepos_t lower, framepos_t upper)
{
- framepos_t range;
framepos_t fr;
framepos_t spacer;
lower = 0;
}
upper += spacer;
- range = (framepos_t) (upper - lower);
+ framecnt_t const range = upper - lower;
if (range < (fr / 50)) {
minsec_mark_interval = fr / 1000; /* show 1/1000 seconds */
}
/* to prevent 'flashing' */
- if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) {
+ if (lower > (spacer = (framepos_t) (128 * Editor::get_current_zoom ()))) {
lower = lower - spacer;
} else {
lower = 0;
projects / ardour.git / blobdiff