Skip to content

Commit

Permalink
fixed: AE suspending was broken resulting in it resuming/suspending o…
Browse files Browse the repository at this point in the history 
…ver and over again (fixes ticket #13508)
  • Loading branch information
arnova committed Nov 17, 2012
1 parent fbf1f62 commit e0a9d07
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
View file
Expand Up @@ -1041,7 +1041,7 @@ void CSoftAE::Run()
delete m_sink;
m_sink = NULL;
}
if (!m_playingStreams.empty() || !m_playing_sounds.empty() || m_sounds.empty())
if (!m_playingStreams.empty() || !m_playing_sounds.empty() || !m_sounds.empty())
m_softSuspend = false;
m_wake.WaitMSec(SOFTAE_IDLE_WAIT_MSEC);
}
Expand Down

4 comments on commit e0a9d07

@Memphiz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx

@theuni
Copy link
Contributor

@theuni theuni commented on e0a9d07 Nov 20, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not correct, this will cause early break-outs as well.

As far as I can tell, m_sounds is just a list of sounds cached for playback, that has nothing to do with the sleep status.

As an example, the startup sound may be loaded for a window, but if we're not currently playing it, it shouldn't block sleeping.

Removing the m_sounds check altogether fixes my looping alsa, I believe that's the correct thing to do.

I have a few other Alsa initialization fixes as well, PR is coming up.

@gnif
Copy link

@gnif gnif commented on e0a9d07 Jan 11, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@theuni - You are correct, m_sounds is indeed just a list of the available sounds, this should not be part of the condition.

@DDDamian
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gnif - think you checked a bit of an old one :) try #2061

Please sign in to comment.