Mercurial > hg > svcore

comparison data/fileio/CoreAudioFileReader.cpp @ 874:862fe7b20df7 tony_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from tonioni branch
author Chris Cannam
date Tue, 28 Jan 2014 15:01:54 +0000
parents 2d53205f70cd
children f3cda3280398 59e7fe1b1003
comparison
equal deleted inserted replaced
862:786ee8d1f30e 874:862fe7b20df7
87 (CFIndex)ba.length(), 87 (CFIndex)ba.length(),
88 false); 88 false);
89 89
90 //!!! how do we find out if the file open fails because of DRM protection? 90 //!!! how do we find out if the file open fails because of DRM protection?
91 91
92 #if (MACOSX_DEPLOYMENT_TARGET <= 1040 && MAC_OS_X_VERSION_MIN_REQUIRED <= 1040) 92 //#if (MACOSX_DEPLOYMENT_TARGET <= 1040 && MAC_OS_X_VERSION_MIN_REQUIRED <= 1040)
93 FSRef fsref; 93 // FSRef fsref;
94 if (!CFURLGetFSRef(url, &fsref)) { // returns Boolean, not error code 94 // if (!CFURLGetFSRef(url, &fsref)) { // returns Boolean, not error code
95 m_error = "CoreAudioReadStream: Error looking up FS ref (file not found?)"; 95 // m_error = "CoreAudioReadStream: Error looking up FS ref (file not found?)";
96 return; 96 // return;
97 } 97 // }
98 m_d->err = ExtAudioFileOpen(&fsref, &m_d->file); 98 // m_d->err = ExtAudioFileOpen(&fsref, &m_d->file);
99 #else 99 //#else
100 m_d->err = ExtAudioFileOpenURL(url, &m_d->file); 100 m_d->err = ExtAudioFileOpenURL(url, &m_d->file);
101 #endif 101 //#endif
102 102
103 CFRelease(url); 103 CFRelease(url);
104 104
105 if (m_d->err) { 105 if (m_d->err) {
106 m_error = "CoreAudioReadStream: Error opening file: code " + codestr(m_d->err); 106 m_error = "CoreAudioReadStream: Error opening file: code " + codestr(m_d->err);