Skip to content
Permalink
Browse files

Silence clang++ warnings

  • Loading branch information...
bear101 committed Nov 3, 2019
1 parent 53f83dd commit c0c618eb84d87dda9814a20177b9dd450ea9d7a0
@@ -234,6 +234,9 @@ void MediaPlayback::MediaStreamStatusCallback(MediaStreamer* streamer,
m_finished = true;
break;
}
case MEDIASTREAM_NONE :
case MEDIASTREAM_PLAYING :
break;
}

if(m_statusfunc)
@@ -446,7 +446,7 @@ bool SoundLoopback::SetAGC(int samplerate, int samples, int channels,

// Fixed point SpeexDSP library doesn't support AGC and AEC so
// only report error if requested.
return init && (initagc && enable_agc || !enable_agc) &&
(initdenoise && denoise || !denoise) && (initaec && enable_aec || !enable_aec);
return init && ((initagc && enable_agc) || !enable_agc) &&
((initdenoise && denoise) || !denoise) && ((initaec && enable_aec) || !enable_aec);
}
#endif
@@ -3204,6 +3204,7 @@ TEAMTALKDLL_API TTBOOL TT_DBG_WriteAudioFileTone(IN MediaFileInfo* lpMediaFileIn
{
case AFF_WAVE_FORMAT :
break;
case AFF_NONE :
case AFF_CHANNELCODEC_FORMAT :
case AFF_MP3_16KBIT_FORMAT :
case AFF_MP3_32KBIT_FORMAT :
@@ -66,8 +66,8 @@ VoiceLog::VoiceLog(int userid, const ACE_TString& filename,

switch(aff)
{
#if defined(ENABLE_OGG)
case AFF_CHANNELCODEC_FORMAT :
#if defined(ENABLE_OGG)
{
bool vbr = true;
ACE_UNUSED_ARG(vbr);
@@ -88,7 +88,7 @@ VoiceLog::VoiceLog(int userid, const ACE_TString& filename,
m_active = false;
return;
}
#endif
#endif /* ENABLE_SPEEX */
}
break;
#if defined(ENABLE_OPUSTOOLS)
@@ -108,14 +108,14 @@ VoiceLog::VoiceLog(int userid, const ACE_TString& filename,
break;
#else
case CODEC_OPUS :
#endif
#endif /* ENABLE_OPUSTOOLS */
case CODEC_NO_CODEC :
case CODEC_WEBM_VP8 :
break;
}
}
#endif /* ENABLE_OGG */
break;
#endif

case AFF_MP3_16KBIT_FORMAT :
case AFF_MP3_32KBIT_FORMAT :
@@ -325,10 +325,9 @@ void VoiceLog::WritePacket(int packet_no)

switch(m_codec.codec)
{
#if defined(ENABLE_OGG)
case CODEC_SPEEX :
case CODEC_SPEEX_VBR :
#if defined(ENABLE_SPEEX)
#if defined(ENABLE_OGG) && defined(ENABLE_SPEEX)
TTASSERT(m_speexfile.get());
if (m_speexfile)
{
@@ -341,10 +340,10 @@ void VoiceLog::WritePacket(int packet_no)
pos += frame_sizes[i];
}
}
#endif /* ENABLE_SPEEX */
#endif /* ENABLE_OGG && ENABLE_SPEEX */
break;
case CODEC_OPUS :
#if defined(ENABLE_OPUSTOOLS)
#if defined(ENABLE_OGG) && defined(ENABLE_OPUSTOOLS)
TTASSERT(m_opusfile.get());
if (m_opusfile)
{
@@ -358,9 +357,8 @@ void VoiceLog::WritePacket(int packet_no)
}

}
#endif /* ENABLE_OPUSTOOLS */
#endif /* ENABLE_OGG && ENABLE_OPUSTOOLS */
break;
#endif /* ENABLE_OGG */
case CODEC_NO_CODEC :
case CODEC_WEBM_VP8 :
assert(0);

0 comments on commit c0c618e

Please sign in to comment.
You can’t perform that action at this time.