break;
default:
- cerr << "Editor received unexpected timecode type" << endl;
+ error << "Editor received unexpected timecode type" << endmsg;
}
+
return false;
}
void
_current_frame_rate = (nframes_t) round (_base_frame_rate * (1.0 + (config.get_video_pullup()/100.0)));
_frames_per_timecode_frame = (double) _current_frame_rate / (double) timecode_frames_per_second();
if (timecode_drop_frames()) {
- _frames_per_hour = (long)(107892 * _frames_per_timecode_frame);
+ _frames_per_hour = (int32_t)(107892 * _frames_per_timecode_frame);
} else {
- _frames_per_hour = (long)(3600 * rint(timecode_frames_per_second()) * _frames_per_timecode_frame);
+ _frames_per_hour = (int32_t)(3600 * rint(timecode_frames_per_second()) * _frames_per_timecode_frame);
}
_timecode_frames_per_hour = (nframes_t)rint(timecode_frames_per_second() * 3600.0);
}
void
-Session::timecode_to_sample( Timecode::Time& timecode, nframes_t& sample, bool use_offset, bool use_subframes ) const
+Session::timecode_to_sample( Timecode::Time& timecode, framepos_t& sample, bool use_offset, bool use_subframes ) const
{
if (timecode.drop) {
nframes_t base_samples = (nframes_t) (((timecode.hours * 107892) + ((timecode.minutes / 10) * 17982)) * _frames_per_timecode_frame);
// Samples inside time exceeding the nearest 10 minutes (always offset, see above)
- long exceeding_df_minutes = timecode.minutes % 10;
- long exceeding_df_seconds = (exceeding_df_minutes * 60) + timecode.seconds;
- long exceeding_df_frames = (30 * exceeding_df_seconds) + timecode.frames - (2 * exceeding_df_minutes);
+ int32_t exceeding_df_minutes = timecode.minutes % 10;
+ int32_t exceeding_df_seconds = (exceeding_df_minutes * 60) + timecode.seconds;
+ int32_t exceeding_df_frames = (30 * exceeding_df_seconds) + timecode.frames - (2 * exceeding_df_minutes);
nframes_t exceeding_samples = (nframes_t) rint(exceeding_df_frames * _frames_per_timecode_frame);
sample = base_samples + exceeding_samples;
} else {
}
if (use_subframes) {
- sample += (long) (((double)timecode.subframes * _frames_per_timecode_frame) / config.get_subframes_per_frame());
+ sample += (int32_t) (((double)timecode.subframes * _frames_per_timecode_frame) / config.get_subframes_per_frame());
}
if (use_offset) {
void
-Session::sample_to_timecode( nframes_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes ) const
+Session::sample_to_timecode (framepos_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes ) const
{
- nframes_t offset_sample;
+ framepos_t offset_sample;
if (!use_offset) {
offset_sample = sample;
double timecode_frames_left_exact;
double timecode_frames_fraction;
- unsigned long timecode_frames_left;
+ uint32_t timecode_frames_left;
// Extract whole hours. Do this to prevent rounding errors with
// high sample numbers in the calculations that follow.
// Calculate exact number of (exceeding) timecode frames and fractional frames
timecode_frames_left_exact = (double) offset_sample / _frames_per_timecode_frame;
timecode_frames_fraction = timecode_frames_left_exact - floor( timecode_frames_left_exact );
- timecode.subframes = (long) rint(timecode_frames_fraction * config.get_subframes_per_frame());
+ timecode.subframes = (int32_t) rint(timecode_frames_fraction * config.get_subframes_per_frame());
// XXX Not sure if this is necessary anymore...
if (timecode.subframes == config.get_subframes_per_frame()) {
}
// Extract hour-exceeding frames for minute, second and frame calculations
- timecode_frames_left = ((long) floor( timecode_frames_left_exact ));
+ timecode_frames_left = (uint32_t) floor (timecode_frames_left_exact);
if (timecode_drop_frames()) {
- // See long explanation in timecode_to_sample()...
+ // See int32_t explanation in timecode_to_sample()...
// Number of 10 minute chunks
timecode.minutes = (timecode_frames_left / 17982) * 10; // exactly 17982 frames in 10 minutes
// frames exceeding the nearest 10 minute barrier
- long exceeding_df_frames = timecode_frames_left % 17982;
+ int32_t exceeding_df_frames = timecode_frames_left % 17982;
// Find minutes exceeding the nearest 10 minute barrier
if (exceeding_df_frames >= 1800) { // nothing to do if we are inside the first minute (0-1799)
exceeding_df_frames -= 1800; // take away first minute (different number of frames than the others)
- long extra_minutes_minus_1 = exceeding_df_frames / 1798; // how many minutes after the first one
+ int32_t extra_minutes_minus_1 = exceeding_df_frames / 1798; // how many minutes after the first one
exceeding_df_frames -= extra_minutes_minus_1 * 1798; // take away the (extra) minutes just found
timecode.minutes += extra_minutes_minus_1 + 1; // update with exceeding minutes
}
}
} else {
// Non drop is easy
- timecode.minutes = timecode_frames_left / ((long) rint (timecode_frames_per_second ()) * 60);
- timecode_frames_left = timecode_frames_left % ((long) rint (timecode_frames_per_second ()) * 60);
- timecode.seconds = timecode_frames_left / (long) rint(timecode_frames_per_second ());
- timecode.frames = timecode_frames_left % (long) rint(timecode_frames_per_second ());
+ timecode.minutes = timecode_frames_left / ((int32_t) rint (timecode_frames_per_second ()) * 60);
+ timecode_frames_left = timecode_frames_left % ((int32_t) rint (timecode_frames_per_second ()) * 60);
+ timecode.seconds = timecode_frames_left / (int32_t) rint(timecode_frames_per_second ());
+ timecode.frames = timecode_frames_left % (int32_t) rint(timecode_frames_per_second ());
}
if (!use_subframes) {
}
void
-Session::timecode_duration_string (char* buf, nframes_t when) const
+Session::timecode_duration_string (char* buf, framepos_t when) const
{
Timecode::Time timecode;
switch (state) {
case JackTransportStopped:
- if (slave && _transport_frame != pos->frame && post_transport_work == 0) {
+ if (slave && _transport_frame != pos->frame && post_transport_work() == 0) {
request_locate (pos->frame, false);
// cerr << "SYNC: stopped, locate to " << pos->frame << " from " << _transport_frame << endl;
return false;
}
case JackTransportStarting:
- // cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " << post_transport_work << " pos matches ? " << (_transport_frame == pos->frame) << endl;
+ // cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " << post_transport_work() << " pos matches ? " << (_transport_frame == pos->frame) << endl;
if (slave) {
- return _transport_frame == pos->frame && post_transport_work == 0;
+ return _transport_frame == pos->frame && post_transport_work() == 0;
} else {
return true;
}
{
BBT_Time bbt;
- /* frame info */
-
- pos->frame = _transport_frame;
- pos->valid = JackPositionTimecode;
+ if (pos->frame != _transport_frame) {
+ cerr << "ARDOUR says " << _transport_frame << " JACK says " << pos->frame << endl;
+ }
/* BBT info */
if (_tempo_map) {
- TempoMap::Metric metric (_tempo_map->metric_at (_transport_frame));
+ TempoMetric metric (_tempo_map->metric_at (_transport_frame));
_tempo_map->bbt_time_with_metric (_transport_frame, bbt, metric);
pos->bar = bbt.bars;
#if 0
/* Timecode info */
- t.timecode_offset = _timecode_offset;
+ pos->timecode_offset = _timecode_offset;
t.timecode_frame_rate = timecode_frames_per_second();
+ pos->valid = jack_position_bits_t (pos->valid | JackPositionTimecode;
if (_transport_speed) {
}
}
-
#endif
}