X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiofilesource.cc;h=5a59ff339bc023c81a5e220d95df75d992190d43;hb=5ada17eba0195d90f0685776251b384efdf5168e;hp=690942fb1a4f6e3924516b34f53344f20b9a7201;hpb=e4c4193640317ef4c3f61c2fdf4a3729d2b2f524;p=ardour.git

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 690942fb1a..5a59ff339b 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -69,16 +69,16 @@ using namespace PBD;
 using namespace Glib;
 
 PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
-framecnt_t         AudioFileSource::header_position_offset = 0;
+samplecnt_t         AudioFileSource::header_position_offset = 0;
 
 /* XXX maybe this too */
 char AudioFileSource::bwf_serial_number[13] = "000000000000";
 
 struct SizedSampleBuffer {
-	framecnt_t size;
+	samplecnt_t size;
 	Sample* buf;
 
-	SizedSampleBuffer (framecnt_t sz) : size (sz) {
+	SizedSampleBuffer (samplecnt_t sz) : size (sz) {
 		buf = new Sample[size];
 	}
 
@@ -207,7 +207,6 @@ AudioFileSource::get_soundfile_info (const string& path, SoundFileInfo& _info, s
 XMLNode&
 AudioFileSource::get_state ()
 {
-	LocaleGuard lg;
 	XMLNode& root (AudioSource::get_state());
 	root.set_property (X_("channel"), _channel);
 	root.set_property (X_("origin"), _origin);
@@ -250,7 +249,7 @@ AudioFileSource::move_dependents_to_trash()
 }
 
 void
-AudioFileSource::set_header_position_offset (framecnt_t offset)
+AudioFileSource::set_header_position_offset (samplecnt_t offset)
 {
 	header_position_offset = offset;
 	HeaderPositionOffsetChanged ();
@@ -350,7 +349,7 @@ AudioFileSource::safe_audio_file_extension(const string& file)
 }
 
 Sample*
-AudioFileSource::get_interleave_buffer (framecnt_t size)
+AudioFileSource::get_interleave_buffer (samplecnt_t size)
 {
 	SizedSampleBuffer* ssb;