projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix MIDI port offsets.
[ardour.git]
/
libs
/
ardour
/
coreaudiosource.cc
diff --git
a/libs/ardour/coreaudiosource.cc
b/libs/ardour/coreaudiosource.cc
index 90ab07b86d5df7ac1f5104b7cfea6b44ef9f8131..48040952db05520198a126250f18826ea4daf26d 100644
(file)
--- a/
libs/ardour/coreaudiosource.cc
+++ b/
libs/ardour/coreaudiosource.cc
@@
-115,9
+115,9
@@
CoreAudioSource::close ()
}
int
}
int
-CoreAudioSource::safe_read (Sample* dst,
framepos_t start, fram
ecnt_t cnt, AudioBufferList& abl) const
+CoreAudioSource::safe_read (Sample* dst,
samplepos_t start, sampl
ecnt_t cnt, AudioBufferList& abl) const
{
{
-
fram
ecnt_t nread = 0;
+
sampl
ecnt_t nread = 0;
while (nread < cnt) {
while (nread < cnt) {
@@
-160,10
+160,10
@@
CoreAudioSource::safe_read (Sample* dst, framepos_t start, framecnt_t cnt, Audio
}
}
-
fram
ecnt_t
-CoreAudioSource::read_unlocked (Sample *dst,
framepos_t start, fram
ecnt_t cnt) const
+
sampl
ecnt_t
+CoreAudioSource::read_unlocked (Sample *dst,
samplepos_t start, sampl
ecnt_t cnt) const
{
{
-
fram
ecnt_t file_cnt;
+
sampl
ecnt_t file_cnt;
AudioBufferList abl;
abl.mNumberBuffers = 1;
AudioBufferList abl;
abl.mNumberBuffers = 1;
@@
-189,7
+189,7
@@
CoreAudioSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) c
}
if (file_cnt != cnt) {
}
if (file_cnt != cnt) {
-
fram
eoffset_t delta = cnt - file_cnt;
+
sampl
eoffset_t delta = cnt - file_cnt;
memset (dst+file_cnt, 0, sizeof (Sample) * delta);
}
memset (dst+file_cnt, 0, sizeof (Sample) * delta);
}
@@
-213,7
+213,7
@@
CoreAudioSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) c
/* stride through the interleaved data */
/* stride through the interleaved data */
- for (
fram
ecnt_t n = 0; n < file_cnt; ++n) {
+ for (
sampl
ecnt_t n = 0; n < file_cnt; ++n) {
dst[n] = *ptr;
ptr += n_channels;
}
dst[n] = *ptr;
ptr += n_channels;
}
@@
-237,7
+237,7
@@
CoreAudioSource::sample_rate() const
}
int
}
int
-CoreAudioSource::update_header (
fram
epos_t, struct tm&, time_t)
+CoreAudioSource::update_header (
sampl
epos_t, struct tm&, time_t)
{
return 0;
}
{
return 0;
}