[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp |
|
Date: |
Sat, 11 Aug 2007 05:25:05 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/11 05:25:04
Modified files:
. : ChangeLog
backend : sound_handler_sdl.cpp
Log message:
* backend/sound_handler_sdl.cpp: fix build for MAD media handler.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3995&r2=1.3996
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.80&r2=1.81
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3995
retrieving revision 1.3996
diff -u -b -r1.3995 -r1.3996
--- ChangeLog 11 Aug 2007 05:06:51 -0000 1.3995
+++ ChangeLog 11 Aug 2007 05:25:04 -0000 1.3996
@@ -1,5 +1,6 @@
2007-08-10 Sandro Santilli <address@hidden>
+ * backend/sound_handler_sdl.cpp: fix build for MAD media handler.
* server/shape.cpp: remove useless include of hash_wrapper.h
* gui/Makefile.am: fix build of sdl/cairo
* configure.ac: abort if a requested renderer/gui combination
Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- backend/sound_handler_sdl.cpp 10 Aug 2007 10:24:11 -0000 1.80
+++ backend/sound_handler_sdl.cpp 11 Aug 2007 05:25:04 -0000 1.81
@@ -18,7 +18,7 @@
// Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
// which has been donated to the Public Domain.
-// $Id: sound_handler_sdl.cpp,v 1.80 2007/08/10 10:24:11 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.81 2007/08/11 05:25:04 strk Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -907,7 +907,7 @@
mad_synth_frame (&sound->synth,
&sound->frame);
- outsize = sound->synth.pcm.length *
((soundStereo() == true) ? 4 : 2);
+ outsize = sound->synth.pcm.length *
((soundStereo == true) ? 4 : 2);
tmp_raw_buffer = new Uint8[outsize];
int sample;
@@ -918,7 +918,7 @@
// scaling while we're at it.
for(int f = 0; f <
sound->synth.pcm.length; f++)
{
- for (int e = 0; e <
((soundStereo() == true) ? 2 : 1); e++){ // channels (stereo/mono)
+ for (int e = 0; e <
((soundStereo == true) ? 2 : 1); e++){ // channels (stereo/mono)
mad_fixed_t mad_sample
= sound->synth.pcm.samples[e][f];
@@ -937,7 +937,7 @@
*dst++ = sample;
}
}
-#endif
+#endif // defined(USE_MAD)
// If we need to convert samplerate
or/and from mono to stereo...
if (outsize > 0 &&
(static_cast<int>(soundSampleRate) != handler->audioSpec.freq || !soundStereo))
{