Commit 60d9438c authored by Sam Hocevar's avatar Sam Hocevar

  * Fixed a nonsense in configure.in preventing to build sdl.so.
  * Removed a few stupid debug instructions in aout_s16.c that should
    have never been commited. Sorry about that.
parent 1c5ddd94
......@@ -4,8 +4,10 @@
HEAD
* Removed debug instructions in the audio output.
* Coding style fixes here and there.
* Miscellaneous QNX compile fixes.
* Changed --enable-debug into --enable-trace.
* Beginning of the mingw32 port by Gildas Bazin <gbazin@netcourrier.com>.
* Changed broadcast handling.
* Added a vlc-howto in sgml format in the doc directory.
......@@ -17,6 +19,9 @@ HEAD
* AC3 decoder enhancements.
* Fixed an alignment issue in the bitstream callback.
* Got rid of asprintf.
* Better angle handling (on the fly selection).
* Bugfixes in CSS.
* Various changes and bugfixes in the Gnome interface.
* XVideo fullscreen mode by David Kennedy <dkennedy@tinytoad.com>.
* X11 fullscreen mode by David Kennedy <dkennedy@tinytoad.com>.
* Fixed build process when no plugins or no builtins were chosen.
......
......@@ -3487,7 +3487,7 @@ if test "${with_sdl+set}" = set; then
PLUGINS="${PLUGINS} sdl";
if test "x$withval" != "xyes";
then
LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -l"$withval
LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -lSDL"
INCLUDE="${INCLUDE} -I"$withval"/include"
else
for ac_hdr in SDL/SDL.h
......
......@@ -343,7 +343,7 @@ AC_ARG_WITH(sdl,
PLUGINS="${PLUGINS} sdl";
if test "x$withval" != "xyes";
then
LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -l"$withval
LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -L"$withval"/lib -lSDL"
INCLUDE="${INCLUDE} -I"$withval"/include"
else
AC_CHECK_HEADERS(SDL/SDL.h, , [echo "Cannot find SDL headers !"; exit])
......
......@@ -80,28 +80,45 @@ void aout_S16StereoThread( aout_thread_t * p_aout )
for ( l_buffer = 0; l_buffer < l_buffer_limit; l_buffer++ )
{
((s16 *)p_aout->buffer)[l_buffer] = (s16)( ( p_aout->s32_buffer[l_buffer] / AOUT_MAX_FIFOS ) * p_aout->vol / 256 ) ;
((s16 *)p_aout->buffer)[l_buffer] =
(s16)( ( p_aout->s32_buffer[l_buffer] / AOUT_MAX_FIFOS )
* p_aout->vol / 256 ) ;
p_aout->s32_buffer[l_buffer] = 0;
}
l_bytes = p_aout->pf_getbufinfo( p_aout, l_buffer_limit );
//fprintf(stderr,"l_bytes 1: %li\n",l_bytes);
//fprintf(stderr," playing...\n");
p_aout->date = mdate() + ((((mtime_t)(l_bytes / 4)) * 1000000) / ((mtime_t)p_aout->l_rate)); /* sizeof(s16) << (p_aout->b_stereo) == 4 */
p_aout->pf_play( p_aout, (byte_t *)p_aout->buffer, l_buffer_limit * sizeof(s16) );
//fprintf(stderr,"l_bytes #: %li\n",p_aout->pf_getbufinfo( p_aout, l_buffer_limit ));
#if 0
fprintf(stderr,"l_bytes 1: %li\n",l_bytes);
fprintf(stderr," playing...\n");
#endif
/* sizeof(s16) << (p_aout->b_stereo) == 4 */
p_aout->date = mdate() + ((((mtime_t)(l_bytes / 4)) * 1000000)
/ ((mtime_t)p_aout->l_rate));
p_aout->pf_play( p_aout, (byte_t *)p_aout->buffer,
l_buffer_limit * sizeof(s16) );
#if 0
fprintf( stderr,"l_bytes #: %li\n",
p_aout->pf_getbufinfo( p_aout, l_buffer_limit ) );
#endif
if ( l_bytes > (l_buffer_limit * sizeof(s16)) )
{
//fprintf(stderr," sleeping...\n");
msleep( p_aout->l_msleep );
#if 0
fprintf(stderr," sleeping...\n");
msleep( p_aout->l_msleep / 2);
l_bytes = p_aout->pf_getbufinfo( p_aout, l_buffer_limit );
//fprintf(stderr,"l_bytes *: %li\n",l_bytes);
l_bytes = p_aout->pf_getbufinfo( p_aout, l_buffer_limit );
fprintf(stderr,"l_bytes *: %li\n",l_bytes);
msleep( p_aout->l_msleep / 2);
}
else
//fprintf(stderr," not sleeping.\n");
l_bytes = p_aout->pf_getbufinfo( p_aout, l_buffer_limit );
//fprintf(stderr,"l_bytes 2: %li\n\n",l_bytes);
else
{
fprintf(stderr," not sleeping.\n");
l_bytes = p_aout->pf_getbufinfo( p_aout, l_buffer_limit );
fprintf(stderr,"l_bytes 2: %li\n\n",l_bytes);
#endif
}
}
vlc_mutex_lock( &p_aout->fifos_lock );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment