From 99f15679a6998a3780f687ebb7c2aa6cc9d3ecbb Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Fri, 1 Jul 2022 12:42:21 -0700 Subject: [PATCH] [Audio Output] Remove unnecessary variables These variables weren't being used anyway, so remove them. Signed-off-by: Christopher Snowhill --- Audio/Output/OutputAVFoundation.h | 3 --- Audio/Output/OutputAVFoundation.m | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/Audio/Output/OutputAVFoundation.h b/Audio/Output/OutputAVFoundation.h index e997a7251..bc9920f1e 100644 --- a/Audio/Output/OutputAVFoundation.h +++ b/Audio/Output/OutputAVFoundation.h @@ -76,7 +76,6 @@ using std::atomic_long; AudioStreamBasicDescription visFormat; // Mono format for vis - uint32_t deviceChannelConfig; uint32_t streamChannelConfig; uint32_t newChannelConfig; @@ -85,8 +84,6 @@ using std::atomic_long; CMAudioFormatDescriptionRef audioFormatDescription; - AudioChannelLayoutTag streamTag; - id currentPtsObserver; NSLock *currentPtsLock; CMTime currentPts, lastPts; diff --git a/Audio/Output/OutputAVFoundation.m b/Audio/Output/OutputAVFoundation.m index 412b696c9..240cb0982 100644 --- a/Audio/Output/OutputAVFoundation.m +++ b/Audio/Output/OutputAVFoundation.m @@ -604,35 +604,27 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons switch(streamChannelConfig) { case AudioConfigMono: tag = kAudioChannelLayoutTag_Mono; - deviceChannelConfig = AudioConfigMono; break; case AudioConfigStereo: tag = kAudioChannelLayoutTag_Stereo; - deviceChannelConfig = AudioConfigStereo; break; case AudioConfig3Point0: tag = kAudioChannelLayoutTag_WAVE_3_0; - deviceChannelConfig = AudioConfig3Point0; break; case AudioConfig4Point0: tag = kAudioChannelLayoutTag_WAVE_4_0_A; - deviceChannelConfig = AudioConfig4Point0; break; case AudioConfig5Point0: tag = kAudioChannelLayoutTag_WAVE_5_0_A; - deviceChannelConfig = AudioConfig5Point0; break; case AudioConfig5Point1: tag = kAudioChannelLayoutTag_WAVE_5_1_A; - deviceChannelConfig = AudioConfig5Point1; break; case AudioConfig6Point1: tag = kAudioChannelLayoutTag_WAVE_6_1; - deviceChannelConfig = AudioConfig6Point1; break; case AudioConfig7Point1: tag = kAudioChannelLayoutTag_WAVE_7_1; - deviceChannelConfig = AudioConfig7Point1; break; default: @@ -640,8 +632,6 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons break; } - streamTag = tag; - if(tag) { layout.mChannelLayoutTag = tag; } else {