X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiofilesource.cc;h=0e498c3d59a418d88bae2dab270474e43bd34009;hb=8f59346592b8232e910ce0bbdc247cf8cecde4dd;hp=1500b139acdff2edf26c3b34e5428b2fa040d1e2;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 1500b139ac..0e498c3d59 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -70,7 +70,7 @@ using namespace Glib;
 
 ustring AudioFileSource::peak_dir = "";
 
-boost::signals2::signal<void()> AudioFileSource::HeaderPositionOffsetChanged;
+PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
 uint64_t           AudioFileSource::header_position_offset = 0;
 
 /* XXX maybe this too */
@@ -235,16 +235,20 @@ AudioFileSource::old_peak_path (ustring audio_path)
 bool
 AudioFileSource::get_soundfile_info (ustring path, SoundFileInfo& _info, string& error_msg)
 {
+        /* try sndfile first because it gets timecode info from .wav (BWF) if it exists,
+           which at present, ExtAudioFile from Apple seems unable to do.
+        */
+
+	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;
 	}
 #endif // HAVE_COREAUDIO
 
-	if (SndFileSource::get_soundfile_info (path, _info, error_msg) != 0) {
-		return true;
-	}
-
 	return false;
 }