projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set up region BBT time when frame position changes, if the region is glued to BBT...
[ardour.git]
/
libs
/
ardour
/
audiofilesource.cc
diff --git
a/libs/ardour/audiofilesource.cc
b/libs/ardour/audiofilesource.cc
index 39701f24cc25550cff57942214ae4148c4f7a3c1..d3d3a4f4a77e85a02afc9f9d27ad2f5562450e1b 100644
(file)
--- a/
libs/ardour/audiofilesource.cc
+++ b/
libs/ardour/audiofilesource.cc
@@
-77,16
+77,16
@@
uint64_t AudioFileSource::header_position_offset = 0;
char AudioFileSource::bwf_serial_number[13] = "000000000000";
struct SizedSampleBuffer {
char AudioFileSource::bwf_serial_number[13] = "000000000000";
struct SizedSampleBuffer {
-
nframes
_t size;
- Sample* buf;
+
framecnt
_t size;
+
Sample* buf;
-
SizedSampleBuffer (nframes
_t sz) : size (sz) {
- buf = new Sample[size];
- }
+
SizedSampleBuffer (framecnt
_t sz) : size (sz) {
+
buf = new Sample[size];
+
}
- ~SizedSampleBuffer() {
- delete [] buf;
- }
+
~SizedSampleBuffer() {
+
delete [] buf;
+
}
};
Glib::StaticPrivate<SizedSampleBuffer> thread_interleave_buffer = GLIBMM_STATIC_PRIVATE_INIT;
};
Glib::StaticPrivate<SizedSampleBuffer> thread_interleave_buffer = GLIBMM_STATIC_PRIVATE_INIT;
@@
-129,7
+129,7
@@
AudioFileSource::AudioFileSource (Session& s, const XMLNode& node, bool must_exi
if (set_state (node, Stateful::loading_state_version)) {
throw failed_constructor ();
}
if (set_state (node, Stateful::loading_state_version)) {
throw failed_constructor ();
}
-
+
if (init (_path, must_exist)) {
throw failed_constructor ();
}
if (init (_path, must_exist)) {
throw failed_constructor ();
}
@@
-246,7
+246,7
@@
AudioFileSource::get_soundfile_info (string path, SoundFileInfo& _info, string&
if (SndFileSource::get_soundfile_info (path, _info, error_msg) != 0) {
return true;
}
if (SndFileSource::get_soundfile_info (path, _info, error_msg) != 0) {
return true;
}
-
+
#ifdef HAVE_COREAUDIO
if (CoreAudioSource::get_soundfile_info (path, _info, error_msg) == 0) {
return true;
#ifdef HAVE_COREAUDIO
if (CoreAudioSource::get_soundfile_info (path, _info, error_msg) == 0) {
return true;
@@
-302,7
+302,7
@@
AudioFileSource::move_dependents_to_trash()
}
void
}
void
-AudioFileSource::set_header_position_offset (
nframes
_t offset)
+AudioFileSource::set_header_position_offset (
framecnt
_t offset)
{
header_position_offset = offset;
HeaderPositionOffsetChanged ();
{
header_position_offset = offset;
HeaderPositionOffsetChanged ();
@@
-385,7
+385,7
@@
AudioFileSource::safe_audio_file_extension(const string& file)
}
Sample*
}
Sample*
-AudioFileSource::get_interleave_buffer (
nframes
_t size)
+AudioFileSource::get_interleave_buffer (
framecnt
_t size)
{
SizedSampleBuffer* ssb;
{
SizedSampleBuffer* ssb;