diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-06-27 08:22:52 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-07-22 21:53:17 +0200 |
commit | d9c0dc773391641be59190d7103334f4ef81115f (patch) | |
tree | 0a3f2bf8c2688a838aa32c3c3954d0ae93a12445 /audio/out | |
parent | 7d7381f9cf51ac510f6456112de243a59dcbfb9d (diff) | |
download | mpv-d9c0dc773391641be59190d7103334f4ef81115f.tar.bz2 mpv-d9c0dc773391641be59190d7103334f4ef81115f.tar.xz |
ao_coreaudio: remove packetSize private variable
Diffstat (limited to 'audio/out')
-rw-r--r-- | audio/out/ao_coreaudio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 7fbd66da0b..7b45e68ecf 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -73,7 +73,6 @@ struct priv /* AudioUnit */ AudioUnit theOutputUnit; - int packetSize; bool paused; struct mp_ring *buffer; @@ -92,8 +91,9 @@ static OSStatus render_cb_lpcm(void *ctx, AudioUnitRenderActionFlags *aflags, { struct ao *ao = ctx; struct priv *p = ao->priv; - int requested = frames * p->packetSize; + AudioBuffer buf = buffer_list->mBuffers[0]; + int requested = buf.mDataByteSize; buf.mDataByteSize = mp_ring_read(p->buffer, buf.mData, requested); @@ -318,7 +318,7 @@ static int init(struct ao *ao, char *params) asbd.mFormatFlags |= kAudioFormatFlagIsBigEndian; asbd.mFramesPerPacket = 1; - p->packetSize = asbd.mBytesPerPacket = asbd.mBytesPerFrame = + asbd.mBytesPerPacket = asbd.mBytesPerFrame = asbd.mFramesPerPacket * asbd.mChannelsPerFrame * (asbd.mBitsPerChannel / 8); |