Skip to content

Commit

Permalink
Rename CoreAudioSharedInternalUnit::m_ioUnit to m_audioUnit
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=274200
rdar://128111716

Reviewed by Eric Carlson.

CoreAudioSharedInternalUnit::m_ioUnit is conflicting with CoreAudioSharedUnit:m_ioUnit which makes the code less easy to read/search.
Renaming CoreAudioSharedInternalUnit::m_ioUnit to CoreAudioSharedInternalUnit::m_audioUnit instead.

* Source/WebCore/platform/mediastream/mac/CoreAudioSharedUnit.cpp:
(WebCore::CoreAudioSharedInternalUnit::CoreAudioSharedInternalUnit):
(WebCore::CoreAudioSharedInternalUnit::~CoreAudioSharedInternalUnit):
(WebCore::CoreAudioSharedInternalUnit::initialize):
(WebCore::CoreAudioSharedInternalUnit::uninitialize):
(WebCore::CoreAudioSharedInternalUnit::start):
(WebCore::CoreAudioSharedInternalUnit::stop):
(WebCore::CoreAudioSharedInternalUnit::set):
(WebCore::CoreAudioSharedInternalUnit::get):
(WebCore::CoreAudioSharedInternalUnit::render):

Canonical link: https://commits.webkit.org/278852@main
  • Loading branch information
youennf committed May 16, 2024
1 parent 63db443 commit db27786
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions Source/WebCore/platform/mediastream/mac/CoreAudioSharedUnit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class CoreAudioSharedInternalUnit final : public CoreAudioSharedUnit::InternalU
OSStatus defaultInputDevice(uint32_t*) final;
OSStatus defaultOutputDevice(uint32_t*) final;

CoreAudioSharedUnit::StoredAudioUnit m_ioUnit;
CoreAudioSharedUnit::StoredAudioUnit m_audioUnit;
bool m_shouldUseVPIO { false };
};

Expand Down Expand Up @@ -152,8 +152,8 @@ Expected<UniqueRef<CoreAudioSharedUnit::InternalUnit>, OSStatus> CoreAudioShared
return result;
}

CoreAudioSharedInternalUnit::CoreAudioSharedInternalUnit(CoreAudioSharedUnit::StoredAudioUnit&& ioUnit, bool shouldUseVPIO)
: m_ioUnit(WTFMove(ioUnit))
CoreAudioSharedInternalUnit::CoreAudioSharedInternalUnit(CoreAudioSharedUnit::StoredAudioUnit&& audioUnit, bool shouldUseVPIO)
: m_audioUnit(WTFMove(audioUnit))
, m_shouldUseVPIO(shouldUseVPIO)
{
}
Expand All @@ -162,43 +162,43 @@ CoreAudioSharedInternalUnit::~CoreAudioSharedInternalUnit()
{
#if PLATFORM(MAC)
if (m_shouldUseVPIO)
CoreAudioSharedUnit::unit().setStoredVPIOUnit(std::exchange(m_ioUnit, { }));
CoreAudioSharedUnit::unit().setStoredVPIOUnit(std::exchange(m_audioUnit, { }));
#endif
}

OSStatus CoreAudioSharedInternalUnit::initialize()
{
return PAL::AudioUnitInitialize(m_ioUnit.get());
return PAL::AudioUnitInitialize(m_audioUnit.get());
}

OSStatus CoreAudioSharedInternalUnit::uninitialize()
{
return PAL::AudioUnitUninitialize(m_ioUnit.get());
return PAL::AudioUnitUninitialize(m_audioUnit.get());
}

OSStatus CoreAudioSharedInternalUnit::start()
{
return PAL::AudioOutputUnitStart(m_ioUnit.get());
return PAL::AudioOutputUnitStart(m_audioUnit.get());
}

OSStatus CoreAudioSharedInternalUnit::stop()
{
return PAL::AudioOutputUnitStop(m_ioUnit.get());
return PAL::AudioOutputUnitStop(m_audioUnit.get());
}

OSStatus CoreAudioSharedInternalUnit::set(AudioUnitPropertyID propertyID, AudioUnitScope scope, AudioUnitElement element, const void* value, UInt32 size)
{
return PAL::AudioUnitSetProperty(m_ioUnit.get(), propertyID, scope, element, value, size);
return PAL::AudioUnitSetProperty(m_audioUnit.get(), propertyID, scope, element, value, size);
}

OSStatus CoreAudioSharedInternalUnit::get(AudioUnitPropertyID propertyID, AudioUnitScope scope, AudioUnitElement element, void* value, UInt32* size)
{
return PAL::AudioUnitGetProperty(m_ioUnit.get(), propertyID, scope, element, value, size);
return PAL::AudioUnitGetProperty(m_audioUnit.get(), propertyID, scope, element, value, size);
}

OSStatus CoreAudioSharedInternalUnit::render(AudioUnitRenderActionFlags* ioActionFlags, const AudioTimeStamp* inTimeStamp, UInt32 inOutputBusNumber, UInt32 inNumberFrames, AudioBufferList* list)
{
return PAL::AudioUnitRender(m_ioUnit.get(), ioActionFlags, inTimeStamp, inOutputBusNumber, inNumberFrames, list);
return PAL::AudioUnitRender(m_audioUnit.get(), ioActionFlags, inTimeStamp, inOutputBusNumber, inNumberFrames, list);
}

OSStatus CoreAudioSharedInternalUnit::defaultInputDevice(uint32_t* deviceID)
Expand Down

0 comments on commit db27786

Please sign in to comment.