projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rationalize (a bit) engine start/stop/restart so that it is possible to start up...
[ardour.git]
/
libs
/
ardour
/
sndfileimportable.cc
diff --git
a/libs/ardour/sndfileimportable.cc
b/libs/ardour/sndfileimportable.cc
index 758e8955c2b82e3187fc4ff029061d911ee6d188..c9f6c4014f272f75e54b99610c2a70f7d3eebf63 100644
(file)
--- a/
libs/ardour/sndfileimportable.cc
+++ b/
libs/ardour/sndfileimportable.cc
@@
-43,10
+43,10
@@
SndFileImportableSource::~SndFileImportableSource ()
{
}
{
}
-
nframes
_t
-SndFileImportableSource::read (Sample* buffer,
nframes
_t nframes)
+
framecnt
_t
+SndFileImportableSource::read (Sample* buffer,
framecnt
_t nframes)
{
{
-
nframes
_t per_channel = nframes / sf_info.channels;
+
framecnt
_t per_channel = nframes / sf_info.channels;
per_channel = sf_readf_float (in.get(), buffer, per_channel);
return per_channel * sf_info.channels;
}
per_channel = sf_readf_float (in.get(), buffer, per_channel);
return per_channel * sf_info.channels;
}
@@
-57,34
+57,35
@@
SndFileImportableSource::channels () const
return sf_info.channels;
}
return sf_info.channels;
}
-
nframes
_t
+
framecnt
_t
SndFileImportableSource::length () const
{
SndFileImportableSource::length () const
{
- return sf_info.frames;
+ return
(framecnt_t)
sf_info.frames;
}
}
-
nframes
_t
-SndFileImportableSource::samplerate() const
+
framecnt
_t
+SndFileImportableSource::samplerate
() const
{
return sf_info.samplerate;
}
void
{
return sf_info.samplerate;
}
void
-SndFileImportableSource::seek (
nframe
s_t /*pos*/)
+SndFileImportableSource::seek (
framepo
s_t /*pos*/)
{
sf_seek (in.get(), 0, SEEK_SET);
}
{
sf_seek (in.get(), 0, SEEK_SET);
}
-
nframes64
_t
+
framepos
_t
SndFileImportableSource::natural_position () const
{
SndFileImportableSource::natural_position () const
{
- return timecode;
+ return
(framepos_t)
timecode;
}
bool
SndFileImportableSource::clamped_at_unity () const
{
}
bool
SndFileImportableSource::clamped_at_unity () const
{
+ int const type = sf_info.format & SF_FORMAT_TYPEMASK;
int const sub = sf_info.format & SF_FORMAT_SUBMASK;
/* XXX: this may not be the full list of formats that are unclamped */
int const sub = sf_info.format & SF_FORMAT_SUBMASK;
/* XXX: this may not be the full list of formats that are unclamped */
- return (sub != SF_FORMAT_FLOAT && sub != SF_FORMAT_DOUBLE);
+ return (sub != SF_FORMAT_FLOAT && sub != SF_FORMAT_DOUBLE
&& type != SF_FORMAT_OGG
);
}
}