mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1052383 - Minor style fixes. r=rillian
This commit is contained in:
parent
6a3e20c777
commit
09cdc50043
@ -61,10 +61,10 @@ AppleATDecoder::~AppleATDecoder()
|
||||
}
|
||||
|
||||
static void
|
||||
_MetadataCallback(void *aDecoder,
|
||||
_MetadataCallback(void* aDecoder,
|
||||
AudioFileStreamID aStream,
|
||||
AudioFileStreamPropertyID aProperty,
|
||||
UInt32 *aFlags)
|
||||
UInt32* aFlags)
|
||||
{
|
||||
LOG("AppleATDecoder metadata callback");
|
||||
AppleATDecoder* decoder = static_cast<AppleATDecoder*>(aDecoder);
|
||||
@ -72,10 +72,11 @@ _MetadataCallback(void *aDecoder,
|
||||
}
|
||||
|
||||
static void
|
||||
_SampleCallback(void *aDecoder,
|
||||
UInt32 aNumBytes, UInt32 aNumPackets,
|
||||
const void *aData,
|
||||
AudioStreamPacketDescription *aPackets)
|
||||
_SampleCallback(void* aDecoder,
|
||||
UInt32 aNumBytes,
|
||||
UInt32 aNumPackets,
|
||||
const void* aData,
|
||||
AudioStreamPacketDescription* aPackets)
|
||||
{
|
||||
LOG("AppleATDecoder sample callback %u bytes %u packets",
|
||||
aNumBytes, aNumPackets);
|
||||
@ -180,8 +181,8 @@ struct PassthroughUserData {
|
||||
AppleATDecoder* mDecoder;
|
||||
UInt32 mNumPackets;
|
||||
UInt32 mDataSize;
|
||||
const void *mData;
|
||||
AudioStreamPacketDescription *mPacketDesc;
|
||||
const void* mData;
|
||||
AudioStreamPacketDescription* mPacketDesc;
|
||||
bool mDone;
|
||||
};
|
||||
|
||||
@ -191,12 +192,12 @@ const uint32_t kNeedMoreData = 'MOAR';
|
||||
|
||||
static OSStatus
|
||||
_PassthroughInputDataCallback(AudioConverterRef aAudioConverter,
|
||||
UInt32 *aNumDataPackets /* in/out */,
|
||||
AudioBufferList *aData /* in/out */,
|
||||
AudioStreamPacketDescription **aPacketDesc,
|
||||
void *aUserData)
|
||||
UInt32* aNumDataPackets /* in/out */,
|
||||
AudioBufferList* aData /* in/out */,
|
||||
AudioStreamPacketDescription** aPacketDesc,
|
||||
void* aUserData)
|
||||
{
|
||||
PassthroughUserData *userData = (PassthroughUserData *)aUserData;
|
||||
PassthroughUserData* userData = (PassthroughUserData*)aUserData;
|
||||
if (userData->mDone) {
|
||||
// We make sure this callback is run _once_, with all the data we received
|
||||
// from |AudioFileStreamParseBytes|. When we return an error, the decoder
|
||||
@ -217,7 +218,7 @@ _PassthroughInputDataCallback(AudioConverterRef aAudioConverter,
|
||||
|
||||
aData->mBuffers[0].mNumberChannels = userData->mDecoder->mConfig.channel_count;
|
||||
aData->mBuffers[0].mDataByteSize = userData->mDataSize;
|
||||
aData->mBuffers[0].mData = const_cast<void *>(userData->mData);
|
||||
aData->mBuffers[0].mData = const_cast<void*>(userData->mData);
|
||||
|
||||
return noErr;
|
||||
}
|
||||
@ -290,9 +291,9 @@ AppleATDecoder::SampleCallback(uint32_t aNumBytes,
|
||||
LOG("pushed audio at time %lfs; duration %lfs\n",
|
||||
(double)time / USECS_PER_S, (double)duration / USECS_PER_S);
|
||||
|
||||
AudioData *audio = new AudioData(mSamplePosition,
|
||||
AudioData* audio = new AudioData(mSamplePosition,
|
||||
time, duration, numFrames,
|
||||
reinterpret_cast<AudioDataValue *>(decoded.forget()),
|
||||
reinterpret_cast<AudioDataValue*>(decoded.forget()),
|
||||
channels, rate);
|
||||
mCallback->Output(audio);
|
||||
mHaveOutput = true;
|
||||
|
@ -26,12 +26,12 @@ namespace mozilla {
|
||||
nsresult
|
||||
AppleUtils::GetProperty(AudioFileStreamID aAudioFileStream,
|
||||
AudioFileStreamPropertyID aPropertyID,
|
||||
void *aData)
|
||||
void* aData)
|
||||
{
|
||||
UInt32 size;
|
||||
Boolean writeable;
|
||||
OSStatus rv = AudioFileStreamGetPropertyInfo(aAudioFileStream, aPropertyID,
|
||||
&size, &writeable);
|
||||
&size, &writeable);
|
||||
|
||||
if (rv) {
|
||||
WARN("Couldn't get property " PROPERTY_ID_FORMAT "\n",
|
||||
|
@ -16,7 +16,7 @@ struct AppleUtils {
|
||||
// Helper to retrieve properties from AudioFileStream objects.
|
||||
static nsresult GetProperty(AudioFileStreamID aAudioFileStream,
|
||||
AudioFileStreamPropertyID aPropertyID,
|
||||
void *aData);
|
||||
void* aData);
|
||||
|
||||
// Helper to set a string, string pair on a CFMutableDictionaryRef.
|
||||
static void SetCFDict(CFMutableDictionaryRef dict,
|
||||
|
Loading…
Reference in New Issue
Block a user