aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrent Nelson <trent.a.b.nelson@gmail.com>2014-04-15 11:52:57 -0600
committerTrent Nelson <trent.a.b.nelson@gmail.com>2014-04-15 12:16:35 -0600
commitafc7ecfb6c9905c71ee07fcbc5a3ad425f6716ab (patch)
tree0f4b02d106bba0bac74923c7fe077f96ac7dec1f
parent524861472a27e378a99502f839efc7e97892a1c5 (diff)
Merge pull request #4563 from FernetMenta/aefixes
ActiveAE: check suspend state before creating a stream
-rw-r--r--xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
index d8b89a151f..3b7dbe1ad3 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -2643,6 +2643,9 @@ bool CActiveAE::ResampleSound(CActiveAESound *sound)
IAEStream *CActiveAE::MakeStream(enum AEDataFormat dataFormat, unsigned int sampleRate, unsigned int encodedSampleRate, CAEChannelInfo channelLayout, unsigned int options)
{
+ if (IsSuspended())
+ return NULL;
+
//TODO: pass number of samples in audio packet
AEAudioFormat format;