Changeset 86630 in webkit

Timestamp:

May 16, 2011 4:13:14 PM (13 years ago)

Author:

crogers@google.com

Message:

2011-05-16 Chris Rogers <​crogers@google.com>

Unreviewed build fix.

Fix web audio enabled mac port compile errors
​https://bugs.webkit.org/show_bug.cgi?id=60930

• platform/audio/mac/AudioBusMac.mm: (WebCore::AudioBus::loadPlatformResource):
• platform/audio/mac/AudioFileReaderMac.cpp: (WebCore::AudioFileReader::createBus):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/mac/AudioBusMac.mm (modified) (1 diff)
• platform/audio/mac/AudioFileReaderMac.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-16  Chris Rogers  <crogers@google.com>
+
+        Unreviewed build fix.
+
+        Fix web audio enabled mac port compile errors
+        https://bugs.webkit.org/show_bug.cgi?id=60930
+
+        * platform/audio/mac/AudioBusMac.mm:
+        (WebCore::AudioBus::loadPlatformResource):
+        * platform/audio/mac/AudioFileReaderMac.cpp:
+        (WebCore::AudioFileReader::createBus):
+
 2011-05-16  Eric Seidel  <eric@webkit.org>
 

trunk/Source/WebCore/platform/audio/mac/AudioBusMac.mm

@@ -59 +59 @@
     ASSERT_NOT_REACHED();
     [pool release];
-    return 0;
+    return adoptPtr(static_cast<AudioBus*>(0));
 }
 

trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp

@@ -139 +139 @@
 {
     if (!m_extAudioFileRef)
-        return 0;
+        return adoptPtr(static_cast<AudioBus*>(0));
 
     // Get file's data format
@@ -145 +145 @@
     OSStatus result = ExtAudioFileGetProperty(m_extAudioFileRef, kExtAudioFileProperty_FileDataFormat, &size, &m_fileDataFormat);
     if (result != noErr)
-        return 0;
+        return adoptPtr(static_cast<AudioBus*>(0));
 
     // Number of channels
@@ -155 +155 @@
     result = ExtAudioFileGetProperty(m_extAudioFileRef, kExtAudioFileProperty_FileLengthFrames, &size, &numberOfFrames64);
     if (result != noErr)
-        return 0;
+        return adoptPtr(static_cast<AudioBus*>(0));
 
     // Sample-rate
@@ -178 +178 @@
     result = ExtAudioFileSetProperty(m_extAudioFileRef, kExtAudioFileProperty_ClientDataFormat, sizeof(AudioStreamBasicDescription), &m_clientDataFormat);
     if (result != noErr)
-        return 0;
+        return adoptPtr(static_cast<AudioBus*>(0));
 
     // Change numberOfFrames64 to destination sample-rate
@@ -227 +227 @@
     result = ExtAudioFileRead(m_extAudioFileRef, &framesToRead, bufferList);
     if (result != noErr)
-        return 0;
+        return adoptPtr(static_cast<AudioBus*>(0));
 
     if (mixToMono && numberOfChannels == 2) {