Changeset 86633 in webkit
- Timestamp:
- May 16, 2011 4:36:22 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r86632 r86633 1 2011-05-16 Chris Rogers <crogers@google.com> 2 3 Unreviewed build fix. 4 5 Just return "nullptr" to fix compile errors 6 https://bugs.webkit.org/show_bug.cgi?id=60932 7 8 * platform/audio/mac/AudioBusMac.mm: 9 (WebCore::AudioBus::loadPlatformResource): 10 * platform/audio/mac/AudioFileReaderMac.cpp: 11 (WebCore::AudioFileReader::createBus): 12 1 13 2011-05-16 Emil A Eklund <eae@chromium.org> 2 14 -
trunk/Source/WebCore/platform/audio/mac/AudioBusMac.mm
r86630 r86633 59 59 ASSERT_NOT_REACHED(); 60 60 [pool release]; 61 return adoptPtr(static_cast<AudioBus*>(0));61 return nullptr; 62 62 } 63 63 -
trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp
r86630 r86633 139 139 { 140 140 if (!m_extAudioFileRef) 141 return adoptPtr(static_cast<AudioBus*>(0));141 return nullptr; 142 142 143 143 // Get file's data format … … 145 145 OSStatus result = ExtAudioFileGetProperty(m_extAudioFileRef, kExtAudioFileProperty_FileDataFormat, &size, &m_fileDataFormat); 146 146 if (result != noErr) 147 return adoptPtr(static_cast<AudioBus*>(0));147 return nullptr; 148 148 149 149 // Number of channels … … 155 155 result = ExtAudioFileGetProperty(m_extAudioFileRef, kExtAudioFileProperty_FileLengthFrames, &size, &numberOfFrames64); 156 156 if (result != noErr) 157 return adoptPtr(static_cast<AudioBus*>(0));157 return nullptr; 158 158 159 159 // Sample-rate … … 178 178 result = ExtAudioFileSetProperty(m_extAudioFileRef, kExtAudioFileProperty_ClientDataFormat, sizeof(AudioStreamBasicDescription), &m_clientDataFormat); 179 179 if (result != noErr) 180 return adoptPtr(static_cast<AudioBus*>(0));180 return nullptr; 181 181 182 182 // Change numberOfFrames64 to destination sample-rate … … 227 227 result = ExtAudioFileRead(m_extAudioFileRef, &framesToRead, bufferList); 228 228 if (result != noErr) 229 return adoptPtr(static_cast<AudioBus*>(0));229 return nullptr; 230 230 231 231 if (mixToMono && numberOfChannels == 2) {
Note: See TracChangeset
for help on using the changeset viewer.