diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
| commit | 30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch) | |
| tree | 620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/backends/dummy | |
| parent | cb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff) | |
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible
Diffstat (limited to 'libs/backends/dummy')
| -rw-r--r-- | libs/backends/dummy/dummy_audiobackend.cc | 4 | ||||
| -rw-r--r-- | libs/backends/dummy/dummy_audiobackend.h | 6 | ||||
| -rw-r--r-- | libs/backends/dummy/dummy_midi_seq.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc index 9400d03bbe..825add2c94 100644 --- a/libs/backends/dummy/dummy_audiobackend.cc +++ b/libs/backends/dummy/dummy_audiobackend.cc @@ -524,13 +524,13 @@ DummyAudioBackend::raw_buffer_size (DataType t) } /* Process time */ -framepos_t +samplepos_t DummyAudioBackend::sample_time () { return _processed_samples; } -framepos_t +samplepos_t DummyAudioBackend::sample_time_at_cycle_start () { return _processed_samples; diff --git a/libs/backends/dummy/dummy_audiobackend.h b/libs/backends/dummy/dummy_audiobackend.h index 739a649407..4bd4078ec5 100644 --- a/libs/backends/dummy/dummy_audiobackend.h +++ b/libs/backends/dummy/dummy_audiobackend.h @@ -316,8 +316,8 @@ class DummyAudioBackend : public AudioBackend { size_t raw_buffer_size (DataType t); /* Process time */ - framepos_t sample_time (); - framepos_t sample_time_at_cycle_start (); + samplepos_t sample_time (); + samplepos_t sample_time_at_cycle_start (); pframes_t samples_since_cycle_start (); int create_process_thread (boost::function<void()> func); @@ -435,7 +435,7 @@ class DummyAudioBackend : public AudioBackend { uint32_t _systemic_input_latency; uint32_t _systemic_output_latency; - framecnt_t _processed_samples; + samplecnt_t _processed_samples; pthread_t _main_thread; diff --git a/libs/backends/dummy/dummy_midi_seq.h b/libs/backends/dummy/dummy_midi_seq.h index e809a47371..8dbfb660cc 100644 --- a/libs/backends/dummy/dummy_midi_seq.h +++ b/libs/backends/dummy/dummy_midi_seq.h @@ -780,7 +780,7 @@ static const MIDISequence s7[] = { // channel1, nonsense }; static const MIDISequence s8[] = { // sysex - { 0.00, 10, {0xf0, 0x7f, 0x7f, 0x01, 0x01, /*hour + tc */ 0x20, /*min*/ 0x00, /*sec*/ 0x00, /*frame*/ 0x00, 0xf7} }, // 25fps, 00:00:00:00 + { 0.00, 10, {0xf0, 0x7f, 0x7f, 0x01, 0x01, /*hour + tc */ 0x20, /*min*/ 0x00, /*sec*/ 0x00, /*sample*/ 0x00, 0xf7} }, // 25fps, 00:00:00:00 // quarter frames spacing (in samples) at 25fps: SR / (25 * 4) // DummyMidiPort::setup_generator uses 120bpm ie (SR / 2) // hence the spacing is: SR / (25 * 4) / (SR / 2) = 0.2 |