convert codebase to use Temporal for various time types

[ardour.git] / libs / ardour / disk_writer.cc

diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc
index b741a864dca4339eb1891be88b2f541e6eb84da8..b5dade0dc11f6c376aa900bfb51c35bda74cb7ca 100644 (file)
--- a/libs/ardour/disk_writer.cc
+++ b/libs/ardour/disk_writer.cc
@@ -48,14 +48,14 @@ DiskWriter::DiskWriter (Session& s, string const & str, DiskIOProcessor::Flag f)
        , _record_enabled (0)
        , _record_safe (0)
        , capture_start_sample (0)
-        , capture_captured (0)
-        , was_recording (false)
-        , adjust_capture_position (0)
-        , _capture_offset (0)
-        , first_recordable_sample (max_samplepos)
-        , last_recordable_sample (max_samplepos)
-        , last_possibly_recording (0)
-        , _alignment_style (ExistingMaterial)
+       , capture_captured (0)
+       , was_recording (false)
+       , adjust_capture_position (0)
+       , _capture_offset (0)
+       , first_recordable_sample (max_samplepos)
+       , last_recordable_sample (max_samplepos)
+       , last_possibly_recording (0)
+       , _alignment_style (ExistingMaterial)
        , _num_captured_loops (0)
        , _accumulated_capture_offset (0)
        , _gui_feed_buffer(AudioEngine::instance()->raw_buffer_size (DataType::MIDI))
@@ -1265,14 +1265,14 @@ DiskWriter::transport_stopped_wallclock (struct tm& when, time_t twhen, bool abo
                /* set length in beats to entire capture length */
 
                BeatsSamplesConverter converter (_session.tempo_map(), capture_info.front()->start);
-               const Evoral::Beats total_capture_beats = converter.from (total_capture);
+               const Temporal::Beats total_capture_beats = converter.from (total_capture);
                _midi_write_source->set_length_beats (total_capture_beats);
 
                /* flush to disk: this step differs from the audio path,
                   where all the data is already on disk.
                */
 
-               _midi_write_source->mark_midi_streaming_write_completed (source_lock, Evoral::Sequence<Evoral::Beats>::ResolveStuckNotes, total_capture_beats);
+               _midi_write_source->mark_midi_streaming_write_completed (source_lock, Evoral::Sequence<Temporal::Beats>::ResolveStuckNotes, total_capture_beats);
        }
 
        _last_capture_sources.insert (_last_capture_sources.end(), audio_srcs.begin(), audio_srcs.end());