Permalink
Browse files

Merge pull request #3981 from FernetMenta/aefixes

ActiveAE: remove group transitions from CONFIGURED to CONFIGURED_PLAY, f...
  • Loading branch information...
FernetMenta committed Jan 8, 2014
2 parents c658b3c + b11561e commit 7549d92d10718312a770db8dcba0d37459d8263a
@@ -435,14 +435,12 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg)
case CActiveAEControlProtocol::RESUMESTREAM:
stream = *(CActiveAEStream**)msg->data;
stream->m_paused = false;
- m_state = AE_TOP_CONFIGURED_PLAY;
m_extTimeout = 0;
return;
case CActiveAEControlProtocol::FLUSHSTREAM:
stream = *(CActiveAEStream**)msg->data;
SFlushStream(stream);
msg->Reply(CActiveAEControlProtocol::ACC);
- m_state = AE_TOP_CONFIGURED_PLAY;
m_extTimeout = 0;
return;
case CActiveAEControlProtocol::STREAMAMP:
@@ -655,6 +653,20 @@ void CActiveAE::StateMachine(int signal, Protocol *port, Message *msg)
{
switch (signal)
{
+ case CActiveAEControlProtocol::RESUMESTREAM:
+ CActiveAEStream *stream;
+ stream = *(CActiveAEStream**)msg->data;
+ stream->m_paused = false;
+ m_state = AE_TOP_CONFIGURED_PLAY;
+ m_extTimeout = 0;
+ return;
+ case CActiveAEControlProtocol::FLUSHSTREAM:
+ stream = *(CActiveAEStream**)msg->data;
+ SFlushStream(stream);
+ msg->Reply(CActiveAEControlProtocol::ACC);
+ m_state = AE_TOP_CONFIGURED_PLAY;
+ m_extTimeout = 0;
+ return;
case CActiveAEControlProtocol::TIMEOUT:
ResampleSounds();
ClearDiscardedBuffers();
@@ -353,7 +353,6 @@ void CActiveAEStream::Drain(bool wait)
MsgStreamSample msgData;
msgData.stream = this;
msgData.buffer = *((CSampleBuffer**)msg->data);
- RemapBuffer();
msg->Reply(CActiveAEDataProtocol::STREAMSAMPLE, &msgData, sizeof(MsgStreamSample));
DecFreeBuffers();
continue;

0 comments on commit 7549d92

Please sign in to comment.