diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2012-02-19 00:33:04 -0500 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2012-02-19 00:38:58 -0500 |
| commit | 9a25a6fe19bc798bb7d90ec63e3c54bd8c2892cd (patch) | |
| tree | 5df4f8da2de3340b685346c38981e877fa970589 /firmware/pcm_mixer.c | |
| parent | e5b1b0f998f9ac16dc4a5f6be73be535f22533e4 (diff) | |
| download | rockbox-9a25a6fe19bc798bb7d90ec63e3c54bd8c2892cd.tar.gz rockbox-9a25a6fe19bc798bb7d90ec63e3c54bd8c2892cd.zip | |
beep/mixer code: Code police a bit.
/firmware is in the #include path with makes #include "asm/beep.c" sufficient.
Add a comment to generic beep code and make another express intent better.
Change-Id: I587cd704478b894785927bdfe2e647e28614df62
Diffstat (limited to 'firmware/pcm_mixer.c')
| -rw-r--r-- | firmware/pcm_mixer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/firmware/pcm_mixer.c b/firmware/pcm_mixer.c index fcd9a1c4fd..4fd96bc97c 100644 --- a/firmware/pcm_mixer.c +++ b/firmware/pcm_mixer.c @@ -271,7 +271,9 @@ void mixer_channel_play_data(enum pcm_mixer_channel channel, { /* Initial buffer not passed - call the callback now */ pcm_play_lock(); - mixer_deactivate_channel(chan); /* Protect chan struct if active */ + mixer_deactivate_channel(chan); /* Protect chan struct if active; + may also be same callback which + must not be reentered */ pcm_play_unlock(); /* Allow playback while doing callback */ size = 0; |