*/
+#define __STDC_FORMAT_MACROS 1
#include <cstdio> // for sprintf, grrr
#include <cmath>
+#include <inttypes.h>
#include <string>
#include <gtk/gtkaction.h>
+#include "ardour/session.h"
#include "ardour/tempo.h"
#include "ardour/profile.h"
#include <gtkmm2ext/gtk_ui.h>
#include "i18n.h"
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Gtk;
frames_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
minsec_ruler->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::SCROLL_MASK);
- timecode_ruler->signal_button_release_event().connect (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));
+ timecode_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
+ bbt_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
+ frames_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
+ minsec_ruler->signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_release));
- timecode_ruler->signal_button_press_event().connect (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));
+ timecode_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
+ bbt_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
+ frames_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
+ minsec_ruler->signal_button_press_event().connect (sigc::mem_fun(*this, &Editor::ruler_button_press));
- timecode_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));
+ timecode_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
+ bbt_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
+ frames_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
+ minsec_ruler->signal_motion_notify_event().connect (sigc::mem_fun(*this, &Editor::ruler_mouse_motion));
- timecode_ruler->signal_scroll_event().connect (mem_fun(*this, &Editor::ruler_scroll));
- bbt_ruler->signal_scroll_event().connect (mem_fun(*this, &Editor::ruler_scroll));
- frames_ruler->signal_scroll_event().connect (mem_fun(*this, &Editor::ruler_scroll));
- minsec_ruler->signal_scroll_event().connect (mem_fun(*this, &Editor::ruler_scroll));
+ timecode_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
+ bbt_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
+ frames_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
+ minsec_ruler->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::ruler_scroll));
visible_timebars = 0; /*this will be changed below */
canvas_timebars_vsize = 0;
bool
Editor::ruler_scroll (GdkEventScroll* event)
{
- nframes64_t xdelta;
+ framepos_t xdelta;
int direction = event->direction;
bool handled = false;
case GDK_SCROLL_RIGHT:
xdelta = (current_page_frames() / 2);
- if (max_frames - xdelta > leftmost_frame) {
+ if (max_framepos - xdelta > leftmost_frame) {
reset_x_origin (leftmost_frame + xdelta);
} else {
- reset_x_origin (max_frames - current_page_frames());
+ reset_x_origin (max_framepos - current_page_frames());
}
handled = true;
break;
gint
Editor::ruler_button_press (GdkEventButton* ev)
{
- if (session == 0) {
+ if (_session == 0) {
return FALSE;
}
if (ev->button == 1) {
// Since we will locate the playhead on button release, cancel any running
// auditions.
- if (session->is_auditioning()) {
- session->cancel_audition ();
+ if (_session->is_auditioning()) {
+ _session->cancel_audition ();
}
/* playhead cursor */
- assert (_drag == 0);
- _drag = new CursorDrag (this, &playhead_cursor->canvas_item, false);
- _drag->start_grab (reinterpret_cast<GdkEvent *> (ev));
+ _drags->set (new CursorDrag (this, &playhead_cursor->canvas_item, false), reinterpret_cast<GdkEvent *> (ev));
_dragging_playhead = true;
}
gint
Editor::ruler_button_release (GdkEventButton* ev)
{
- if (session == 0) {
+ if (_session == 0) {
return FALSE;
}
gint x,y;
Gdk::ModifierType state;
- if (_drag) {
- _drag->end_grab (reinterpret_cast<GdkEvent*> (ev));
- delete _drag;
- _drag = 0;
+ if (_drags->active ()) {
+ _drags->end_grab (reinterpret_cast<GdkEvent*> (ev));
_dragging_playhead = false;
}
stop_canvas_autoscroll();
- nframes64_t where = leftmost_frame + pixel_to_frame (x);
+ framepos_t where = leftmost_frame + pixel_to_frame (x);
snap_to (where);
popup_ruler_menu (where);
}
gint
Editor::ruler_mouse_motion (GdkEventMotion* ev)
{
- if (session == 0) {
+ if (_session == 0) {
return FALSE;
}
- if (_drag) {
- _drag->motion_handler (reinterpret_cast<GdkEvent*> (ev), false);
+ if (_drags->active ()) {
+ _drags->motion_handler (reinterpret_cast<GdkEvent*> (ev), false);
}
return TRUE;
void
-Editor::popup_ruler_menu (nframes64_t where, ItemType t)
+Editor::popup_ruler_menu (framepos_t where, ItemType t)
{
using namespace Menu_Helpers;
switch (t) {
case MarkerBarItem:
- ruler_items.push_back (MenuElem (_("New location marker"), bind ( mem_fun(*this, &Editor::mouse_add_new_marker), where, false, false)));
- ruler_items.push_back (MenuElem (_("Clear all locations"), mem_fun(*this, &Editor::clear_markers)));
- ruler_items.push_back (MenuElem (_("Unhide locations"), mem_fun(*this, &Editor::unhide_markers)));
+ ruler_items.push_back (MenuElem (_("New location marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, false, false)));
+ ruler_items.push_back (MenuElem (_("Clear all locations"), sigc::mem_fun(*this, &Editor::clear_markers)));
+ ruler_items.push_back (MenuElem (_("Unhide locations"), sigc::mem_fun(*this, &Editor::unhide_markers)));
ruler_items.push_back (SeparatorElem ());
break;
case RangeMarkerBarItem:
//ruler_items.push_back (MenuElem (_("New Range")));
- ruler_items.push_back (MenuElem (_("Clear all ranges"), mem_fun(*this, &Editor::clear_ranges)));
- ruler_items.push_back (MenuElem (_("Unhide ranges"), mem_fun(*this, &Editor::unhide_ranges)));
+ ruler_items.push_back (MenuElem (_("Clear all ranges"), sigc::mem_fun(*this, &Editor::clear_ranges)));
+ ruler_items.push_back (MenuElem (_("Unhide ranges"), sigc::mem_fun(*this, &Editor::unhide_ranges)));
ruler_items.push_back (SeparatorElem ());
break;
case CdMarkerBarItem:
// TODO
- ruler_items.push_back (MenuElem (_("New CD track marker"), bind ( mem_fun(*this, &Editor::mouse_add_new_marker), where, true, false)));
+ ruler_items.push_back (MenuElem (_("New CD track marker"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_marker), where, true, false)));
break;
case TempoBarItem:
- ruler_items.push_back (MenuElem (_("New Tempo"), bind ( mem_fun(*this, &Editor::mouse_add_new_tempo_event), where)));
+ ruler_items.push_back (MenuElem (_("New Tempo"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_tempo_event), where)));
ruler_items.push_back (MenuElem (_("Clear tempo")));
ruler_items.push_back (SeparatorElem ());
break;
case MeterBarItem:
- ruler_items.push_back (MenuElem (_("New Meter"), bind ( mem_fun(*this, &Editor::mouse_add_new_meter_event), where)));
+ ruler_items.push_back (MenuElem (_("New Meter"), sigc::bind ( sigc::mem_fun(*this, &Editor::mouse_add_new_meter_event), where)));
ruler_items.push_back (MenuElem (_("Clear meter")));
ruler_items.push_back (SeparatorElem ());
break;
node->add_property (X_("transportmarker"), ruler_loop_punch_action->get_active() ? "yes": "no");
node->add_property (X_("cdmarker"), ruler_cd_marker_action->get_active() ? "yes": "no");
- session->add_extra_xml (*node);
- session->set_dirty ();
+ _session->add_extra_xml (*node);
+ _session->set_dirty ();
}
void
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;
}
} else {
- // this session doesn't yet know about the cdmarker ruler
+ // this _session doesn't yet know about the cdmarker ruler
// as a benefit to the user who doesn't know the feature exists, show the ruler if
// any cd marks exist
ruler_cd_marker_action->set_active (false);
- const Locations::LocationList & locs = session->locations()->list();
+ const Locations::LocationList & locs = _session->locations()->list();
for (Locations::LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) {
if ((*i)->is_cd_marker()) {
ruler_cd_marker_action->set_active (true);
void
Editor::update_just_timecode ()
{
- ENSURE_GUI_THREAD(mem_fun(*this, &Editor::update_just_timecode));
+ ENSURE_GUI_THREAD (*this, &Editor::update_just_timecode)
- if (session == 0) {
+ if (_session == 0) {
return;
}
- nframes64_t rightmost_frame = leftmost_frame + current_page_frames();
+ framepos_t rightmost_frame = leftmost_frame + current_page_frames();
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());
+ leftmost_frame, _session->current_end_frame());
}
}
void
Editor::compute_fixed_ruler_scale ()
{
- if (session == 0) {
+ if (_session == 0) {
return;
}
void
Editor::update_fixed_rulers ()
{
- nframes64_t rightmost_frame;
+ framepos_t rightmost_frame;
- if (session == 0) {
+ if (_session == 0) {
return;
}
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());
+ leftmost_frame, _session->current_end_frame());
}
if (ruler_samples_action->get_active()) {
gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_frames_ruler), leftmost_frame, rightmost_frame,
- leftmost_frame, session->current_end_frame());
+ leftmost_frame, _session->current_end_frame());
}
if (ruler_minsec_action->get_active()) {
gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_minsec_ruler), leftmost_frame, rightmost_frame,
- leftmost_frame, session->current_end_frame());
+ leftmost_frame, _session->current_end_frame());
}
}
void
Editor::update_tempo_based_rulers ()
{
- if (session == 0) {
+ if (_session == 0) {
return;
}
if (ruler_bbt_action->get_active()) {
gtk_custom_ruler_set_range (GTK_CUSTOM_RULER(_bbt_ruler), leftmost_frame, leftmost_frame+current_page_frames(),
- leftmost_frame, session->current_end_frame());
+ leftmost_frame, _session->current_end_frame());
}
}
void
Editor::set_timecode_ruler_scale (gdouble lower, gdouble upper)
{
- nframes64_t range;
- nframes64_t spacer;
- nframes64_t fr;
+ framepos_t range;
+ framepos_t spacer;
+ framepos_t fr;
- if (session == 0) {
+ if (_session == 0) {
return;
}
- fr = session->frame_rate();
+ fr = _session->frame_rate();
- if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) {
+ if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) {
lower = lower - spacer;
} else {
lower = 0;
}
upper = upper + spacer;
- range = (nframes64_t) floor (upper - lower);
+ range = (framepos_t) floor (upper - lower);
- if (range < (2 * session->frames_per_timecode_frame())) { /* 0 - 2 frames */
+ 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());
+ timecode_nmarks = 2 + (2 * _session->config.get_subframes_per_frame());
} else if (range <= (fr / 4)) { /* 2 frames - 0.250 second */
timecode_ruler_scale = timecode_show_frames;
timecode_mark_modulo = 1;
- timecode_nmarks = 2 + (range / (nframes64_t)session->frames_per_timecode_frame());
+ timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame());
} else if (range <= (fr / 2)) { /* 0.25-0.5 second */
timecode_ruler_scale = timecode_show_frames;
timecode_mark_modulo = 2;
- timecode_nmarks = 2 + (range / (nframes64_t)session->frames_per_timecode_frame());
+ timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame());
} else if (range <= fr) { /* 0.5-1 second */
timecode_ruler_scale = timecode_show_frames;
timecode_mark_modulo = 5;
- timecode_nmarks = 2 + (range / (nframes64_t)session->frames_per_timecode_frame());
+ timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame());
} else if (range <= 2 * fr) { /* 1-2 seconds */
timecode_ruler_scale = timecode_show_frames;
timecode_mark_modulo = 10;
- timecode_nmarks = 2 + (range / (nframes64_t)session->frames_per_timecode_frame());
+ timecode_nmarks = 2 + (range / (framepos_t)_session->frames_per_timecode_frame());
} else if (range <= 8 * fr) { /* 2-8 seconds */
timecode_ruler_scale = timecode_show_seconds;
timecode_mark_modulo = 1;
timecode_nmarks = 2 + 24;
} else {
- /* not possible if nframes64_t is a 32 bit quantity */
+ /* not possible if framepos_t is a 32 bit quantity */
timecode_ruler_scale = timecode_show_hours;
timecode_mark_modulo = 4;
gint
Editor::metric_get_timecode (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
{
- nframes_t pos;
- nframes64_t spacer;
+ framepos_t pos;
+ framecnt_t spacer;
Timecode::Time timecode;
gchar buf[16];
gint n;
- if (session == 0) {
+ if (_session == 0) {
return 0;
}
- if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) {
+ if (lower > (spacer = (framecnt_t)(128 * Editor::get_current_zoom ()))) {
lower = lower - spacer;
} else {
lower = 0;
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 */ );
+ _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 */ );
+ _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;
(*marks)[n].position = pos;
// Increment subframes by one
- Timecode::increment_subframes( timecode, session->config.get_subframes_per_frame() );
+ Timecode::increment_subframes( timecode, _session->config.get_subframes_per_frame() );
}
break;
case timecode_show_seconds:
// Find timecode time of this sample (pos)
- session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ );
+ _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ );
// Go to next whole second down
Timecode::seconds_floor( timecode );
for (n = 0; n < timecode_nmarks; n++) {
- session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ );
+ _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].label = g_strdup (buf);
- Timecode::increment_seconds( timecode, session->config.get_subframes_per_frame() );
+ Timecode::increment_seconds( timecode, _session->config.get_subframes_per_frame() );
}
break;
case timecode_show_minutes:
// Find timecode time of this sample (pos)
- session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ );
+ _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ );
// Go to next whole minute down
Timecode::minutes_floor( timecode );
for (n = 0; n < timecode_nmarks; n++) {
- session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ );
+ _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;
}
(*marks)[n].label = g_strdup (buf);
(*marks)[n].position = pos;
- Timecode::increment_minutes( timecode, session->config.get_subframes_per_frame() );
+ Timecode::increment_minutes( timecode, _session->config.get_subframes_per_frame() );
}
break;
case timecode_show_hours:
// Find timecode time of this sample (pos)
- session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ );
+ _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ );
// Go to next whole hour down
Timecode::hours_floor( timecode );
for (n = 0; n < timecode_nmarks; n++) {
- session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ );
+ _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", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames);
(*marks)[n].label = g_strdup (buf);
(*marks)[n].position = pos;
- Timecode::increment_hours( timecode, session->config.get_subframes_per_frame() );
+ Timecode::increment_hours( timecode, _session->config.get_subframes_per_frame() );
}
break;
case timecode_show_frames:
// Find timecode time of this sample (pos)
- session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ );
+ _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ );
// Go to next whole frame down
Timecode::frames_floor( timecode );
for (n = 0; n < timecode_nmarks; n++) {
- session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ );
+ _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;
}
(*marks)[n].label = g_strdup (buf);
- Timecode::increment( timecode, session->config.get_subframes_per_frame() );
+ Timecode::increment( timecode, _session->config.get_subframes_per_frame() );
}
break;
void
-Editor::compute_bbt_ruler_scale (nframes64_t lower, nframes64_t upper)
+Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper)
{
- if (session == 0) {
+ if (_session == 0) {
return;
}
TempoMap::BBTPointList::iterator i;
BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler
- session->bbt_time((jack_nframes_t) lower, lower_beat);
- session->bbt_time((jack_nframes_t) upper, upper_beat);
+ _session->bbt_time((jack_nframes_t) lower, lower_beat);
+ _session->bbt_time((jack_nframes_t) upper, upper_beat);
uint32_t beats = 0;
bbt_accent_modulo = 1;
bbt_ruler_scale = bbt_over;
- switch (snap_type) {
- case SnapToAThirdBeat:
+ switch (_snap_type) {
+ case SnapToBeatDiv2:
+ bbt_beat_subdivision = 2;
+ break;
+ case SnapToBeatDiv3:
bbt_beat_subdivision = 3;
break;
- case SnapToAQuarterBeat:
+ case SnapToBeatDiv4:
bbt_beat_subdivision = 4;
break;
- case SnapToAEighthBeat:
+ case SnapToBeatDiv5:
+ bbt_beat_subdivision = 5;
+ bbt_accent_modulo = 2; // XXX YIKES
+ break;
+ case SnapToBeatDiv6:
+ bbt_beat_subdivision = 6;
+ bbt_accent_modulo = 2; // XXX YIKES
+ break;
+ case SnapToBeatDiv7:
+ bbt_beat_subdivision = 7;
+ bbt_accent_modulo = 2; // XXX YIKES
+ break;
+ case SnapToBeatDiv8:
bbt_beat_subdivision = 8;
bbt_accent_modulo = 2;
break;
- case SnapToASixteenthBeat:
+ case SnapToBeatDiv10:
+ bbt_beat_subdivision = 10;
+ bbt_accent_modulo = 2; // XXX YIKES
+ break;
+ case SnapToBeatDiv12:
+ bbt_beat_subdivision = 12;
+ bbt_accent_modulo = 3;
+ break;
+ case SnapToBeatDiv14:
+ bbt_beat_subdivision = 14;
+ bbt_accent_modulo = 3; // XXX YIKES!
+ break;
+ case SnapToBeatDiv16:
bbt_beat_subdivision = 16;
bbt_accent_modulo = 4;
break;
- case SnapToAThirtysecondBeat:
+ case SnapToBeatDiv20:
+ bbt_beat_subdivision = 20;
+ bbt_accent_modulo = 5;
+ break;
+ case SnapToBeatDiv24:
+ bbt_beat_subdivision = 24;
+ bbt_accent_modulo = 6;
+ break;
+ case SnapToBeatDiv28:
+ bbt_beat_subdivision = 28;
+ bbt_accent_modulo = 7;
+ break;
+ case SnapToBeatDiv32:
bbt_beat_subdivision = 32;
bbt_accent_modulo = 8;
break;
gint
Editor::metric_get_bbt (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
{
- if (session == 0) {
+ if (_session == 0) {
return 0;
}
char buf[64];
gint n = 0;
- nframes64_t pos;
+ framepos_t pos;
BBT_Time next_beat;
- nframes64_t next_beat_pos;
+ framepos_t next_beat_pos;
uint32_t beats = 0;
uint32_t tick = 0;
uint32_t skip;
uint32_t t;
- nframes64_t frame_skip;
+ framepos_t frame_skip;
double frame_skip_error;
double bbt_position_of_helper;
double accumulated_error;
next_beat.beats = 1;
}
- next_beat_pos = session->tempo_map().frame_time(next_beat);
+ next_beat_pos = _session->tempo_map().frame_time(next_beat);
- frame_skip = (nframes64_t) floor (frame_skip_error = (session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
+ frame_skip = (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) (Meter::ticks_per_beat / bbt_beat_subdivision);
snprintf (buf, sizeof(buf), " ");
(*marks)[n].label = g_strdup (buf);
- /* Error compensation for float to nframes64_t*/
+ /* Error compensation for float to framepos_t*/
accumulated_error += frame_skip_error;
if (accumulated_error > 1) {
pos += 1;
next_beat.beats = 1;
}
- next_beat_pos = session->tempo_map().frame_time(next_beat);
+ next_beat_pos = _session->tempo_map().frame_time(next_beat);
- frame_skip = (nframes64_t) floor (frame_skip_error = (session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
+ frame_skip = (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) (Meter::ticks_per_beat / bbt_beat_subdivision);
(*marks)[n].label = g_strdup (buf);
- /* Error compensation for float to nframes64_t*/
+ /* Error compensation for float to framepos_t*/
accumulated_error += frame_skip_error;
if (accumulated_error > 1) {
pos += 1;
next_beat.beats = 1;
}
- next_beat_pos = session->tempo_map().frame_time(next_beat);
+ next_beat_pos = _session->tempo_map().frame_time(next_beat);
- frame_skip = (nframes64_t) floor (frame_skip_error = (session->frame_rate() * 60) / (bbt_beat_subdivision * (*i).tempo->beats_per_minute()));
+ frame_skip = (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) (Meter::ticks_per_beat / bbt_beat_subdivision);
(*marks)[n].label = g_strdup (buf);
- /* Error compensation for float to nframes64_t*/
+ /* Error compensation for float to framepos_t*/
accumulated_error += frame_skip_error;
if (accumulated_error > 1) {
pos += 1;
gint
Editor::metric_get_frames (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/)
{
- nframes64_t mark_interval;
- nframes64_t pos;
- nframes64_t ilower = (nframes64_t) floor (lower);
- nframes64_t iupper = (nframes64_t) floor (upper);
+ framepos_t mark_interval;
+ framepos_t pos;
+ framepos_t ilower = (framepos_t) floor (lower);
+ framepos_t iupper = (framepos_t) floor (upper);
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();
+ if (mark_interval > _session->frame_rate()) {
+ mark_interval -= mark_interval % _session->frame_rate();
} else {
- mark_interval = session->frame_rate() / (session->frame_rate() / mark_interval ) ;
+ mark_interval = _session->frame_rate() / (_session->frame_rate() / mark_interval ) ;
}
nmarks = 5;
*marks = (GtkCustomRulerMark *) g_malloc (sizeof(GtkCustomRulerMark) * nmarks);
}
static void
-sample_to_clock_parts ( nframes64_t sample,
- nframes64_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)
{
- nframes64_t left;
+ framepos_t left;
long hrs;
long mins;
long secs;
void
Editor::set_minsec_ruler_scale (gdouble lower, gdouble upper)
{
- nframes64_t range;
- nframes64_t fr;
- nframes64_t spacer;
+ framepos_t range;
+ framepos_t fr;
+ framepos_t spacer;
- if (session == 0) {
+ if (_session == 0) {
return;
}
- fr = session->frame_rate();
+ fr = _session->frame_rate();
/* to prevent 'flashing' */
- if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) {
+ if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) {
lower -= spacer;
} else {
lower = 0;
}
upper += spacer;
- range = (nframes64_t) (upper - lower);
+ range = (framepos_t) (upper - lower);
if (range < (fr / 50)) {
minsec_mark_interval = fr / 1000; /* show 1/1000 seconds */
minsec_mark_modulo = 2;
} else {
- /* not possible if nframes64_t is a 32 bit quantity */
+ /* not possible if framepos_t is a 32 bit quantity */
minsec_mark_interval = 4 * 60 * 60 * fr; /* show 4 hrs */
}
gint
Editor::metric_get_minsec (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/)
{
- nframes64_t pos;
- nframes64_t spacer;
+ framepos_t pos;
+ framepos_t spacer;
long hrs, mins, secs, millisecs;
gchar buf[16];
gint n;
- if (session == 0) {
+ if (_session == 0) {
return 0;
}
/* to prevent 'flashing' */
- if (lower > (spacer = (nframes64_t)(128 * Editor::get_current_zoom ()))) {
+ 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 = ((((nframes64_t) floor(lower)) + (minsec_mark_interval/2))/minsec_mark_interval) * minsec_mark_interval;
+ 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);
+ 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;
break;
case minsec_show_minutes:
for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) {
- sample_to_clock_parts (pos, session->frame_rate(), &hrs, &mins, &secs, &millisecs);
+ sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs);
if (mins % minsec_mark_modulo == 0) {
if (mins == 0) {
(*marks)[n].style = GtkCustomRulerMarkMajor;
break;
case minsec_show_hours:
for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) {
- sample_to_clock_parts (pos, session->frame_rate(), &hrs, &mins, &secs, &millisecs);
+ sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs);
if (hrs % minsec_mark_modulo == 0) {
(*marks)[n].style = GtkCustomRulerMarkMajor;
snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs);
break;
case minsec_show_frames:
for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) {
- sample_to_clock_parts (pos, session->frame_rate(), &hrs, &mins, &secs, &millisecs);
+ sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs);
if (millisecs % minsec_mark_modulo == 0) {
if (secs == 0) {
(*marks)[n].style = GtkCustomRulerMarkMajor;
projects / ardour.git / blobdiff