Moved this project from the LGPL to zlib license.

Deleted the Timidity and libmpg123 decoders, since we were including those libraries' LGPL sources here. We'll find or build replacements for those formats later. This commit has some minor changes and other deletions to remove contributions from people I could not contact for permission to relicense their code. Any code remaining as of this commit, and any commits after this point will be zlib licensed. The stable-1.0 branch is not being relicensed, but I intend to not touch it any further. My sincere thanks to everyone that gave permission for their contributions to be relicensed!
icculus · Jul 14, 2018 · 0dc141a · 0dc141a
1 parent adb84ae
commit 0dc141a
Show file tree

Hide file tree

Showing 133 changed files with 111 additions and 98,782 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/SDL_sound.c b/SDL_sound.c
@@ -1,31 +1,16 @@
-/*
- * SDL_sound -- An abstract sound format decoding API.
- * Copyright (C) 2001  Ryan C. Gordon.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+/**
+ * SDL_sound; An abstract sound format decoding API.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * Please see the file LICENSE.txt in the source's root directory.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  This file written by Ryan C. Gordon.
  */
 
 /**
  * This file implements the core API, which is relatively simple.
  *   The real meat of SDL_sound is in the decoders directory.
  *
  * Documentation is in SDL_sound.h ... It's verbose, honest.  :)
- *
- * Please see the file LICENSE.txt in the source's root directory.
- *
- *  This file written by Ryan C. Gordon. (icculus@icculus.org)
  */
 
 #if HAVE_CONFIG_H
@@ -48,7 +33,6 @@
 /* The various decoder drivers... */
 
 /* All these externs may be missing; we check SOUND_SUPPORTS_xxx before use. */
-extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MPG123;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MIKMOD;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MODPLUG;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_WAV;
@@ -58,7 +42,6 @@ extern const Sound_DecoderFunctions __Sound_DecoderFunctions_OGG;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_VOC;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_RAW;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_SHN;
-extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MIDI;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_FLAC;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_QuickTime;
 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_SPEEX;
@@ -72,10 +55,6 @@ typedef struct
 
 static decoder_element decoders[] =
 {
-#if (defined SOUND_SUPPORTS_MPG123)
-    { 0, &__Sound_DecoderFunctions_MPG123 },
-#endif
-
 #if (defined SOUND_SUPPORTS_MODPLUG)
     { 0, &__Sound_DecoderFunctions_MODPLUG },
 #endif
@@ -116,10 +95,6 @@ static decoder_element decoders[] =
     { 0, &__Sound_DecoderFunctions_FLAC },
 #endif
 
-#if (defined SOUND_SUPPORTS_MIDI)
-    { 0, &__Sound_DecoderFunctions_MIDI },
-#endif
-
 #if (defined SOUND_SUPPORTS_QUICKTIME)
     { 0, &__Sound_DecoderFunctions_QuickTime },
 #endif
@@ -181,7 +156,7 @@ int Sound_Init(void)
     error_msgs = NULL;
 
     available_decoders = (const Sound_DecoderInfo **)
-                            malloc((total) * sizeof (Sound_DecoderInfo *));
+                            SDL_calloc(total, sizeof (Sound_DecoderInfo *));
     BAIL_IF_MACRO(available_decoders == NULL, ERR_OUT_OF_MEMORY, 0);
 
     SDL_InitSubSystem(SDL_INIT_AUDIO);
@@ -199,8 +174,6 @@ int Sound_Init(void)
         } /* if */
     } /* for */
 
-    available_decoders[pos] = NULL;
-
     initialized = 1;
     return(1);
 } /* Sound_Init */

diff --git a/SDL_sound.h b/SDL_sound.h
@@ -1,22 +1,9 @@
 /** \file SDL_sound.h */
 
 /*
- * SDL_sound -- An abstract sound format decoding API.
- * Copyright (C) 2001  Ryan C. Gordon.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * SDL_sound; An abstract sound format decoding API.
+ *
+ * Please see the file LICENSE.txt in the source's root directory.
  */
 
 /**

diff --git a/SDL_sound_internal.h b/SDL_sound_internal.h
@@ -1,29 +1,14 @@
-/*
- * SDL_sound -- An abstract sound format decoding API.
- * Copyright (C) 2001  Ryan C. Gordon.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+/**
+ * SDL_sound; An abstract sound format decoding API.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * Please see the file LICENSE.txt in the source's root directory.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  This file written by Ryan C. Gordon.
  */
 
 /*
  * Internal function/structure declaration. Do NOT include in your
  *  application.
- *
- * Please see the file LICENSE.txt in the source's root directory.
- *
- *  This file written by Ryan C. Gordon. (icculus@icculus.org)
  */
 
 #ifndef _INCLUDE_SDL_SOUND_INTERNAL_H_