Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Converted all text encoding from ISO-8859-1 to UTF-8.
  • Loading branch information
icculus committed Apr 17, 2008
1 parent 23195e8 commit 860f55e
Show file tree
Hide file tree
Showing 12 changed files with 57 additions and 56 deletions.
59 changes: 30 additions & 29 deletions CHANGELOG
Expand Up @@ -2,7 +2,8 @@
* CHANGELOG.
*/

04172008 - Look for Speex includes in new directory.
04172008 - Look for Speex includes in new directory. Converted all text
encoding from ISO-8859-1 to UTF-8.
04112008 - Check if Speex header has bogus data (CVE-2008-1686).
08062007 - Updated my email address.
07152007 - Minor correction in Timidity resampling code (Thanks, Sam!).
Expand Down Expand Up @@ -54,15 +55,15 @@
08222002 - Borland project files in CVS, thanks to Dominique Louis. There are
project files for C++ Builder 6 (Windows), C++ Builder for Linux
(aka Kylix 3) and Borland's C++ Command line compiler.
08172002 - Timidity memory leak cleanup by Torbj�rn.
08172002 - Timidity memory leak cleanup by Torbjörn.
07292002 - Valgrind cleanups; memory leak patches, etc.
07212002 - done_flag was not being reset between files in playsound, so the
first file would playback, and then any following tracks in a given
run would "finish" immediately. Fixed.
07132002 - More altcvt fixes from Frank Ranostaj.
07122002 - Changed inline keyword to compile universally.
07102002 - Fixed a bug in command line handling in playsound.c. Fixes from
Torbj�rn and myself to get flac.c friendly between versions of
Torbjörn and myself to get flac.c friendly between versions of
libFLAC. Mutex'd a potential race condition in decoders/modplug.c.
FIXME cleanups here and there.
07092002 - Fixed typo in documentation (SDL_sound.h).
Expand All @@ -85,19 +86,19 @@
checks if setbuf() is available.
06292002 - More altcvt fixes from Frank Ranostaj...mostly working now?
06252002 - More altcvt fixes from Frank Ranostaj.
06132002 - Patch from Torbj�rn to fix stereo AIFF files.
06132002 - Patch from Torbjörn to fix stereo AIFF files.
06212002 - More altcvt fixes from Frank Ranostaj.
06132002 - Patch from Torbj�rn to make the WAV decoder more tolerant.
06132002 - Patch from Torbjörn to make the WAV decoder more tolerant.
06122002 - Committed some altcvt enhancements from Frank Ranostaj.
06112002 - Fixed some debug messages in smpeg.c and mpglib.c.
06072002 - Manpages! Finally installed Doxygen and scratched together a
Doxyfile. After some revision to physfs.h, we've got a rather
nice API reference.
06062002 - Added URLs for official and unofficial versions of ModPlug in
decoders/modplug.c. Cleaned up some FIXMEs.
05222002 - Torbj�rn sent in some more fixes for altcvt: mono to stereo
05222002 - Torbjörn sent in some more fixes for altcvt: mono to stereo
conversion works, now.
05222002 - Torbj�rn sent in some initial cleanups and fixes for altcvt, and
05222002 - Torbjörn sent in some initial cleanups and fixes for altcvt, and
fixed a bug in playsound when not all three of --rate, --channels
and --format are specified.
05202002 - Some .cvsignores from Max and me. Added a seek implementations for
Expand All @@ -114,7 +115,7 @@
experimental decoder that uses Apple's QuickTime libraries
(see decoders/quicktime.c). I've included the Mac project files
in CVS, now. Removed all use of alloca() from playsound.
04242002 - Added --seek option and bugfixes to playsound.c. Torbj�rn comes
04242002 - Added --seek option and bugfixes to playsound.c. Torbjörn comes
through with seek support for the FLAC, MIDI, and ModPlug
decoders (and some stub code for MikMod), and a bugfix for sample
flag manipulation in the base library (and his own --seek code for
Expand Down Expand Up @@ -163,12 +164,12 @@
02212002 - Changed SMPEG's URL to point to the icculus.org site. Added an
mpglib decoder (internal to SDL_sound; relies on no external libs)
and changes mp3.c to smpeg.c (and other associated things).
02112002 - Committed a patch from Torbj�rn to fix incorrect memory accesses
02112002 - Committed a patch from Torbjörn to fix incorrect memory accesses
in the Timidity code. Changed the magic number in the AU decoder
to be bigendian (seems appropriate). Updated README for
completeness, and TODO for accuracy. Darrell sent in updated
MacOS X Project Builder files (on the website).
02072002 - Committed a patch Torbj�rn sent in awhile ago for preventing
02072002 - Committed a patch Torbjörn sent in awhile ago for preventing
confusion with Timidity++-specific stuff in the timidity.cfg file.
Tyler Montbriand sent in an updated Visual C package.
Updated SDL_sound.h's comments a little. Upped version to 0.1.5.
Expand All @@ -179,7 +180,7 @@
files for MacOS 9. Sweet!
01232002 - Max fixed decoders/Makefile.am to work with seperate build
directories, and corrected some dates in this file.
01192002 - Torbj�rn sent in patches implementing the rewind method for the
01192002 - Torbjörn sent in patches implementing the rewind method for the
rest of the decoders except shn.c, for which I added a kludged
implementation. Added more info to the README. Hunted down the
reason why SMPEG can't decode before calling SDL_OpenAudio(), and
Expand All @@ -197,15 +198,15 @@
point. I implemented the WAV, VOC, AU, AIFF, and RAW ones, for now.
(...and skeleton.c, for what that's worth.) A few tweaks in the
core API implementation to fix unlikely but possible leaks.
01112002 - Mattias Engdeg�rd sent in an .AU decoder. Nice! He also tweaked
01112002 - Mattias Engdegård sent in an .AU decoder. Nice! He also tweaked
playsound to try and wait until SDL has completed playing a given
sound before closing the audio device. Changed a macro in
decoders/shn.c to be more uniform with the other decoders.
SDL_sound error messages are now maintained on a per-thread basis,
and do not interfere with SDL_[GS]etError() anymore.
01112002 - Committed the rest of Torbj�rn's MOD patches, to clean up file
01112002 - Committed the rest of Torbjörn's MOD patches, to clean up file
extension handling.
01092002 - Torbj�rn comes through with a ModPlug-based decoder, which should
01092002 - Torbjörn comes through with a ModPlug-based decoder, which should
work nicely for decoding multiple .MODs at once. Now we need to
figure out what to do with two decoders that can decode the same
file. For now, if you explicitly want either MikMod or ModPlug, you
Expand All @@ -217,7 +218,7 @@
Added some notes to the top of COPYING about other libraries, etc.
A real MIDI decoder (using a hacked version of the hacked version
of Timidity from SDL_mixer) is now in place and working well,
thanks to Torbj�rn.
thanks to Torbjörn.
01012002 - Happy New Year. Added some debug output to wav.c for future
codecs (GSM comes to mind). Fixed the SMPEG decoder's URL to point
to Loki's webpage.
Expand All @@ -243,7 +244,7 @@
end Max's torment. :) ) Tweaks to wav.c, and work on aiff.c to
make it easier to support multiple audio formats (for compression
handling later down the road).
11302001 - Torbj�rn and I make Sound_DecodeAll() more robust: checks for
11302001 - Torbjörn and I make Sound_DecodeAll() more robust: checks for
previous decoding failures and sets an appropriate error, handles
decoders that change their buffers on the fly (such as the FLAC
decoder), and deals with out-of-memory conditions more gracefully.
Expand All @@ -253,11 +254,11 @@
theoretical bugs in Sound_FreeSample(). playsound no longer
buffers stdout and stderr. Updated Sound_DecodeAll()'s comments in
SDL_sound.h ...
11192001 - FLAC decoder cleanups from Torbj�rn.
11092001 - Torbj�rn fixes playsound's audio callback after I broke it, again.
11192001 - FLAC decoder cleanups from Torbjörn.
11092001 - Torbjörn fixes playsound's audio callback after I broke it, again.
A bug in configure.in was preventing SMPEG from being used unless
--enable-debug was set; fixed. Changed this file to list latest
changes first. Torbj�rn submitted a FLAC decoder that utilizes
changes first. Torbjörn submitted a FLAC decoder that utilizes
libFLAC (http://flac.sf.net/). Cool.
11012001 - API COMPATIBILITY BREAKAGE: Decoders can now list multiple file
extensions each. Playsound has been updated to handle this.
Expand All @@ -266,14 +267,14 @@
10232001 - Rewrote playsound.c's audio_callback() to no longer need the
overflow buffer hack, which streamlines it a little and trims the
memory requirements for playsound by about 16 kilobytes.
10172001 - Torbj�rn catches a problem with the overflow buffer in playsound's
10172001 - Torbjörn catches a problem with the overflow buffer in playsound's
audio callback.
10152001 - Torbj�rn sends in a default sample format for the MIDI decoder,
10152001 - Torbjörn sends in a default sample format for the MIDI decoder,
and the starts of the audio conversion funcitonality (ripped
from SDL). Officially released 0.1.3. Added LICENSE and
CHANGELOG to the distribution. (Again, from Torbj�rn) added in
CHANGELOG to the distribution. (Again, from Torbjörn) added in
the start of a tweaked audio converter.
10122001 - Torbj�rn Andersson submitted command line enhancements to
10122001 - Torbjörn Andersson submitted command line enhancements to
playsound, and I cleaned up the --help output.
10092001 - Patches to shn.c for Visual C compatibility. Visual C project files
available from the website. Changed Corona688 to Tyler Montbriand
Expand All @@ -292,24 +293,24 @@
10032001 - After hours of tracking down a bogus pointer, the SHN decoder works!
I can die happy. :) Max placated me with an --enable-debug option
so I could stop my whining. Other autoconf goodies (such as
reenabling -Werror for debug builds, etc). Torbj�rn brings in a
reenabling -Werror for debug builds, etc). Torbjörn brings in a
MIDI decoder, which reads from a Timidity process through a pipe.
Changed playsound to open the audio device to match the properties
of each sound file, which results in less conversion (and therefore,
more chance of correct playback).
10022001 - Changed a comment in mod.c to not refer to "the mikmod
directory" anymore. Committed Torbj�rn's patch for MP3 detection.
directory" anymore. Committed Torbjörn's patch for MP3 detection.
(better late than never). __Sound_strcasecmp() now handles NULL
strings gracefully, fixing the crash with "playsound bootstrap".
More work on the SHN decoder.
10012001 - Fixed a memory leak that Torbj�rn found in the MOD decoder.
10012001 - Fixed a memory leak that Torbjörn found in the MOD decoder.
09252001 - More autoconf work. Gave Max Horn write access to the CVS
repository, so I don't drive him nuts tweaking this thing. :)
Fixed a const complaint and some other stuff needed for compilation
under Visual C++ 6.0 (no, it isn't ported yet). Put the SHN source
in CVS, even though it isn't ready (and doesn't even compile). Do
NOT enable it in your build!
09242001 - Thank goodness, Torbj�rn came through with the MP3 fix. Apparently
09242001 - Thank goodness, Torbjörn came through with the MP3 fix. Apparently
SMPEG mixes each chunk of decoded data with whatever is already
in the buffer you give it. I hate that. I'm going to patch SMPEG
to let the programmer enable and disable that behaviour in a given
Expand All @@ -320,7 +321,7 @@
robust in general: fixed potential overflow in audio_callback,
made it chatter less, made it take multiple files and some other
command lines. Initial autoconf support, thanks to Max Horn.
09222001 - Torbj�rn Andersson strikes again, with a collection of patches.
09222001 - Torbjörn Andersson strikes again, with a collection of patches.
First, some cosmetic tweaks for decoders/aiff.c. Next, a MOD player
based on MikMod. This inspired me to add two more methods to
Sound_DecoderFunctions: init() and quit(). Third, a fix to
Expand All @@ -331,7 +332,7 @@
as unavailable at runtime, and SDL_sound now handles this.
Added [LIB|INC]PATH_[OGG|MOD]. Bigendian fixes; now works on
PowerPC Linux. MikMod tweaks. Changed version to 0.1.2.
09202001 - Torbj�rn Andersson submitted several patches: fixed a comment in
09202001 - Torbjörn Andersson submitted several patches: fixed a comment in
the .WAV decoder (whoops...screwed up my own search-and-replace.
Hah.), made an attempt at putting multiple sound streams behind
one RWops (gotta think on that one first), and, most importantly,
Expand Down
4 changes: 2 additions & 2 deletions CREDITS
Expand Up @@ -25,7 +25,7 @@ MikMod driver,
MIDI driver,
ModPlug driver,
FLAC driver:
Torbj�rn Andersson
Torbjörn Andersson

autoconf,
MacOS X support:
Expand All @@ -37,7 +37,7 @@ other fixes:
Tyler Montbriand

AU driver,
Mattias Engdeg�rd
Mattias Engdegård

MacOS Classic support,
quicktime decoder,
Expand Down
2 changes: 1 addition & 1 deletion alt_audio_convert.c
Expand Up @@ -2,7 +2,7 @@
* Extended Audio Converter for SDL (Simple DirectMedia Layer)
* Copyright (C) 2002 Frank Ranostaj
* Institute of Applied Physik
* Johann Wolfgang Goethe-Universität
* Johann Wolfgang Goethe-Universität
* Frankfurt am Main, Germany
*
* This library is free software; you can redistribute it and/or
Expand Down
2 changes: 1 addition & 1 deletion alt_audio_convert.h
Expand Up @@ -2,7 +2,7 @@
* Extended Audio Converter for SDL (Simple DirectMedia Layer)
* Copyright (C) 2002 Frank Ranostaj
* Institute of Applied Physik
* Johann Wolfgang Goethe-Universität
* Johann Wolfgang Goethe-Universität
* Frankfurt am Main, Germany
*
* This library is free software; you can redistribute it and/or
Expand Down
4 changes: 2 additions & 2 deletions decoders/aiff.c
Expand Up @@ -38,7 +38,7 @@
*
* Please see the file COPYING in the source's root directory.
*
* This file was written by Torbjörn Andersson. (d91tan@Update.UU.SE)
* This file was written by Torbjörn Andersson. (d91tan@Update.UU.SE)
*/

#if HAVE_CONFIG_H
Expand Down Expand Up @@ -73,7 +73,7 @@ const Sound_DecoderFunctions __Sound_DecoderFunctions_AIFF =
{
extensions_aiff,
"Audio Interchange File Format",
"Torbjörn Andersson <d91tan@Update.UU.SE>",
"Torbjörn Andersson <d91tan@Update.UU.SE>",
"http://www.icculus.org/SDL_sound/"
},

Expand Down
22 changes: 11 additions & 11 deletions decoders/au.c
Expand Up @@ -19,12 +19,12 @@

/*
* Sun/NeXT .au decoder for SDL_sound.
* Formats supported: 8 and 16 bit linear PCM, 8 bit µ-law.
* Files without valid header are assumed to be 8 bit µ-law, 8kHz, mono.
* Formats supported: 8 and 16 bit linear PCM, 8 bit µ-law.
* Files without valid header are assumed to be 8 bit µ-law, 8kHz, mono.
*
* Please see the file COPYING in the source's root directory.
*
* This file written by Mattias Engdegård. (f91-men@nada.kth.se)
* This file written by Mattias Engdegård. (f91-men@nada.kth.se)
*/

#if HAVE_CONFIG_H
Expand Down Expand Up @@ -61,7 +61,7 @@ const Sound_DecoderFunctions __Sound_DecoderFunctions_AU =
{
extensions_au,
"Sun/NeXT audio file format",
"Mattias Engdegård <f91-men@nada.kth.se>",
"Mattias Engdegård <f91-men@nada.kth.se>",
"http://www.icculus.org/SDL_sound/"
},

Expand Down Expand Up @@ -99,7 +99,7 @@ struct au_file_hdr

enum
{
AU_ENC_ULAW_8 = 1, /* 8-bit ISDN µ-law */
AU_ENC_ULAW_8 = 1, /* 8-bit ISDN µ-law */
AU_ENC_LINEAR_8 = 2, /* 8-bit linear PCM */
AU_ENC_LINEAR_16 = 3, /* 16-bit linear PCM */

Expand Down Expand Up @@ -185,9 +185,9 @@ static int AU_open(Sound_Sample *sample, const char *ext)
switch(dec->encoding)
{
case AU_ENC_ULAW_8:
/* Convert 8-bit µ-law to 16-bit linear on the fly. This is
/* Convert 8-bit µ-law to 16-bit linear on the fly. This is
slightly wasteful if the audio driver must convert them
back, but µ-law only devices are rare (mostly _old_ Suns) */
back, but µ-law only devices are rare (mostly _old_ Suns) */
sample->actual.format = AUDIO_S16SYS;
break;

Expand Down Expand Up @@ -224,11 +224,11 @@ static int AU_open(Sound_Sample *sample, const char *ext)
{
/*
* A number of files in the wild have the .au extension but no valid
* header; these are traditionally assumed to be 8kHz µ-law. Handle
* header; these are traditionally assumed to be 8kHz µ-law. Handle
* them here only if the extension is recognized.
*/

SNDDBG(("AU: Invalid header, assuming raw 8kHz µ-law.\n"));
SNDDBG(("AU: Invalid header, assuming raw 8kHz µ-law.\n"));
/* if seeking fails, we lose 24 samples. big deal */
SDL_RWseek(rw, -HDR_SIZE, SEEK_CUR);
dec->encoding = AU_ENC_ULAW_8;
Expand Down Expand Up @@ -260,7 +260,7 @@ static void AU_close(Sound_Sample *sample)
} /* AU_close */


/* table to convert from µ-law encoding to signed 16-bit samples,
/* table to convert from µ-law encoding to signed 16-bit samples,
generated by a throwaway perl script */
static Sint16 ulaw_to_linear[256] = {
-32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,
Expand Down Expand Up @@ -310,7 +310,7 @@ static Uint32 AU_read(Sound_Sample *sample)
buf = internal->buffer;
if (dec->encoding == AU_ENC_ULAW_8)
{
/* We read µ-law samples into the second half of the buffer, so
/* We read µ-law samples into the second half of the buffer, so
we can expand them to 16-bit samples afterwards */
maxlen >>= 1;
buf += maxlen;
Expand Down
4 changes: 2 additions & 2 deletions decoders/flac.c
Expand Up @@ -26,7 +26,7 @@
*
* Please see the file COPYING in the source's root directory.
*
* This file written by Torbjörn Andersson. (d91tan@Update.UU.SE)
* This file written by Torbjörn Andersson. (d91tan@Update.UU.SE)
*/

#if HAVE_CONFIG_H
Expand Down Expand Up @@ -146,7 +146,7 @@ const Sound_DecoderFunctions __Sound_DecoderFunctions_FLAC =
{
extensions_flac,
"Free Lossless Audio Codec",
"Torbjörn Andersson <d91tan@Update.UU.SE>",
"Torbjörn Andersson <d91tan@Update.UU.SE>",
"http://flac.sourceforge.net/"
},

Expand Down
4 changes: 2 additions & 2 deletions decoders/midi.c
Expand Up @@ -25,7 +25,7 @@
*
* Please see the file COPYING in the source's root directory.
*
* This file written by Torbjörn Andersson. (d91tan@Update.UU.SE)
* This file written by Torbjörn Andersson. (d91tan@Update.UU.SE)
*/

#if HAVE_CONFIG_H
Expand Down Expand Up @@ -60,7 +60,7 @@ const Sound_DecoderFunctions __Sound_DecoderFunctions_MIDI =
{
extensions_midi,
"MIDI decoder, using a subset of TiMidity",
"Torbjörn Andersson <d91tan@Update.UU.SE>",
"Torbjörn Andersson <d91tan@Update.UU.SE>",
"http://www.icculus.org/SDL_sound/"
},

Expand Down
4 changes: 2 additions & 2 deletions decoders/mikmod.c
Expand Up @@ -23,7 +23,7 @@
*
* Please see the file COPYING in the source's root directory.
*
* This file written by Torbjörn Andersson (d91tan@Update.UU.SE)
* This file written by Torbjörn Andersson (d91tan@Update.UU.SE)
*/

#if HAVE_CONFIG_H
Expand Down Expand Up @@ -80,7 +80,7 @@ const Sound_DecoderFunctions __Sound_DecoderFunctions_MIKMOD =
{
extensions_mikmod,
"Play modules through MikMod",
"Torbjörn Andersson <d91tan@Update.UU.SE>",
"Torbjörn Andersson <d91tan@Update.UU.SE>",
"http://mikmod.raphnet.net/"
},

Expand Down

0 comments on commit 860f55e

Please sign in to comment.