[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2239-ge8514ef

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  e8514ef80100b6ea920c40c3855f6dc599d15ee6 (commit)
      from  eef4c8f3008ae2efd63f2ba89cd59825417449c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=e8514ef80100b6ea920c40c3855f6dc599d15ee6


commit e8514ef80100b6ea920c40c3855f6dc599d15ee6
Author: Sandro Santilli <address@hidden>
Date:   Thu Dec 17 15:41:28 2015 +0100

    Add comment in mixAudio
    
    References code in SDL mixer

diff --git a/libsound/sound_handler.cpp b/libsound/sound_handler.cpp
index 538060b..7644af5 100644
--- a/libsound/sound_handler.cpp
+++ b/libsound/sound_handler.cpp
@@ -76,12 +76,13 @@ ensurePadding(SimpleBuffer& data, media::MediaHandler* m)
 /* The volume ranges from 0 - 128 */
 #define MIX_MAXVOLUME 128
 #define ADJUST_VOLUME(s, v)    (s = (s*v)/MIX_MAXVOLUME)
-#define ADJUST_VOLUME_U8(s, v) (s = (((s-128)*v)/MIX_MAXVOLUME)+128)
 
 void 
 mixAudio(std::uint8_t *dst, const std::uint8_t *src, std::uint32_t len, int 
volume)
 {
-       if ( volume == 0 ) return;
+  if ( volume == 0 ) return;
+
+  // Assume AUDIO_S16MSB
 
   std::int16_t src1, src2;
   int dst_sample;

-----------------------------------------------------------------------

Summary of changes:
 libsound/sound_handler.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash