X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fcoreaudiosource.cc;h=3c81b18fd4fb2ee129a8d230d4fb180f75e234b6;hb=f3e5450492109bb4fab898ae824e30ede28bf7b5;hp=049b5aabbecdc6ef34d72c8e17ffcf2e7a68aae6;hpb=7c95da93ab608662a15e77c74bc5b4565438c104;p=ardour.git

diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc
index 049b5aabbe..3c81b18fd4 100644
--- a/libs/ardour/coreaudiosource.cc
+++ b/libs/ardour/coreaudiosource.cc
@@ -43,7 +43,7 @@ CoreAudioSource::CoreAudioSource (Session& s, const string& idstr, Flag flags)
 }
 
 void 
-CoreAudioSource::init (const string& idstr)
+CoreAudioSource::init (string idstr)
 {
 	string::size_type pos;
 
@@ -84,13 +84,6 @@ CoreAudioSource::init (const string& idstr)
 		error << string_compose ("CoreAudioSource: %1 (%2)", cax.mOperation, name()) << endmsg;
 		throw failed_constructor ();
 	}
-	
-	if (_build_peakfiles) {
-		if (initialize_peakfile (false, _path)) {
-			error << string_compose("CoreAudioSource: initialize peakfile failed (%1)", name()) << endmsg;
-			throw failed_constructor ();
-		}
-	}
 }
 
 CoreAudioSource::~CoreAudioSource ()
@@ -105,8 +98,8 @@ CoreAudioSource::~CoreAudioSource ()
 	cerr << "deletion done" << endl;
 }
 
-jack_nframes_t
-CoreAudioSource::read_unlocked (Sample *dst, jack_nframes_t start, jack_nframes_t cnt) const
+nframes_t
+CoreAudioSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const
 {
 	try {
 		af.Seek (start);
@@ -188,7 +181,57 @@ CoreAudioSource::sample_rate() const
 }
 
 int
-CoreAudioSource::update_header (jack_nframes_t when, struct tm&, time_t)
+CoreAudioSource::update_header (nframes_t when, struct tm&, time_t)
 {
 	return 0;
 }
+
+int
+CoreAudioSource::get_soundfile_info (string path, SoundFileInfo& _info, string& error_msg)
+{
+	FSRef ref; 
+	ExtAudioFileRef af = 0;
+	size_t size;
+	CFStringRef name;
+	int ret = -1;
+
+	if (FSPathMakeRef ((UInt8*)path.c_str(), &ref, 0) != noErr) {
+		goto out;
+	}
+	
+	if (ExtAudioFileOpen(&ref, &af) != noErr) {
+		goto out;
+	}
+	
+	AudioStreamBasicDescription absd;
+	memset(&absd, 0, sizeof(absd));
+	size = sizeof(AudioStreamBasicDescription);
+	if (ExtAudioFileGetProperty (af, kExtAudioFileProperty_FileDataFormat, &size, &absd) != noErr) {
+		goto out;
+	}
+	
+	_info.samplerate = absd.mSampleRate;
+	_info.channels   = absd.mChannelsPerFrame;
+
+	size = sizeof(_info.length);
+	if (ExtAudioFileGetProperty(af, kExtAudioFileProperty_FileLengthFrames, &size, &_info.length) != noErr) {
+		goto out;
+	}
+	
+	size = sizeof(CFStringRef);
+	if (AudioFormatGetProperty(kAudioFormatProperty_FormatName, sizeof(absd), &absd, &size, &name) != noErr) {
+		goto out;
+	}
+
+	_info.format_name = CFStringRefToStdString(name);
+
+	// XXX it would be nice to find a way to get this information if it exists
+
+	_info.timecode = 0;
+	ret = 0;
+	
+  out:
+	ExtAudioFileDispose (af);
+	return ret;
+	
+}