From 959f71dd729f8db0716eb7703cec746bb0892346 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 14 Dec 2001 12:56:55 +0000 Subject: [PATCH] Updated the copyright information --- SDL_mixer.h | 6 +----- effect_position.c | 4 ++-- effect_stereoreverse.c | 4 ++-- effects_internal.c | 5 +++-- effects_internal.h | 24 ++++++++++++++++++++++++ load_aiff.c | 4 +++- load_aiff.h | 2 +- load_voc.c | 2 +- load_voc.h | 2 +- mixer.c | 10 ++++------ music.c | 42 +++++++++++++++++++++--------------------- music_cmd.c | 10 +++++----- music_cmd.h | 10 +++++----- music_ogg.c | 10 +++++----- music_ogg.h | 10 +++++----- playmus.c | 26 +++++++++++++------------- playwave.c | 26 +++++++++++++------------- wavestream.c | 10 +++++----- wavestream.h | 10 +++++----- 19 files changed, 119 insertions(+), 98 deletions(-) diff --git a/SDL_mixer.h b/SDL_mixer.h index afdb93e6..ab093b78 100644 --- a/SDL_mixer.h +++ b/SDL_mixer.h @@ -1,5 +1,4 @@ /* - SDL - Simple DirectMedia Layer SDL_mixer: An audio mixer library based on the SDL library Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga @@ -21,10 +20,7 @@ slouken@libsdl.org */ -#ifdef SAVE_RCSID -static char rcsid = - "@(#) $Id$"; -#endif +/* $id:$ */ #ifndef _MIXER_H_ #define _MIXER_H_ diff --git a/effect_position.c b/effect_position.c index 1f8ead27..6b6527ed 100644 --- a/effect_position.c +++ b/effect_position.c @@ -1,6 +1,6 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/effect_stereoreverse.c b/effect_stereoreverse.c index 2fa6216b..bc19dc2d 100644 --- a/effect_stereoreverse.c +++ b/effect_stereoreverse.c @@ -1,6 +1,6 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/effects_internal.c b/effects_internal.c index 8d5f97af..cfaf76bc 100644 --- a/effects_internal.c +++ b/effects_internal.c @@ -1,6 +1,6 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -21,6 +21,7 @@ These are some helper functions for the internal mixer special effects. */ +/* $id:$ */ /* ------ These are used internally only. Don't touch. ------ */ diff --git a/effects_internal.h b/effects_internal.h index 41c15d3e..cd48cb51 100644 --- a/effects_internal.h +++ b/effects_internal.h @@ -1,3 +1,27 @@ +/* + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + Sam Lantinga + slouken@libsdl.org +*/ + +/* $id:$ */ + #ifndef _INCLUDE_EFFECTS_INTERNAL_H_ #define _INCLUDE_EFFECTS_INTERNAL_H_ diff --git a/load_aiff.c b/load_aiff.c index 700c6d90..27349e59 100644 --- a/load_aiff.c +++ b/load_aiff.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2001 Sam Lantinga + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -24,6 +24,8 @@ This file by Torbjörn Andersson (torbjorn.andersson@eurotime.se) */ +/* $id:$ */ + #include #include "SDL_mixer.h" diff --git a/load_aiff.h b/load_aiff.h index 4404d619..91d4f885 100644 --- a/load_aiff.h +++ b/load_aiff.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2001 Sam Lantinga + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/load_voc.c b/load_voc.c index 01cdd221..5fa84fe0 100644 --- a/load_voc.c +++ b/load_voc.c @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2001 Sam Lantinga + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/load_voc.h b/load_voc.h index 028a0ead..d97f5ffb 100644 --- a/load_voc.h +++ b/load_voc.h @@ -1,6 +1,6 @@ /* SDL_mixer: An audio mixer library based on the SDL library - Copyright (C) 1997-2001 Sam Lantinga + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/mixer.c b/mixer.c index 93c276f5..210b7f36 100644 --- a/mixer.c +++ b/mixer.c @@ -1,6 +1,6 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -17,12 +17,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga - 5635-34 Springhouse Dr. - Pleasanton, CA 94588 (USA) - slouken@devolution.com + slouken@libsdl.org */ -/* $Id$ */ +/* $id:$ */ #include #include diff --git a/music.c b/music.c index 73001f65..e10af6ce 100644 --- a/music.c +++ b/music.c @@ -1,27 +1,27 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - Sam Lantinga - 5635-34 Springhouse Dr. - Pleasanton, CA 94588 (USA) - slouken@devolution.com + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + Sam Lantinga + slouken@libsdl.org */ +/* $id:$ */ + #include #include #include diff --git a/music_cmd.c b/music_cmd.c index ebc02963..4260323d 100644 --- a/music_cmd.c +++ b/music_cmd.c @@ -1,6 +1,6 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga - 5635-34 Springhouse Dr. - Pleasanton, CA 94588 (USA) - slouken@devolution.com + slouken@libsdl.org */ +/* $id:$ */ + /* This file supports an external command for playing music */ #ifdef unix /* This is a UNIX-specific hack */ diff --git a/music_cmd.h b/music_cmd.h index 4b1ea9dd..92c8f001 100644 --- a/music_cmd.h +++ b/music_cmd.h @@ -1,6 +1,6 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga - 5635-34 Springhouse Dr. - Pleasanton, CA 94588 (USA) - slouken@devolution.com + slouken@libsdl.org */ +/* $id:$ */ + /* This file supports an external command for playing music */ #ifdef unix /* This is a UNIX-specific hack */ diff --git a/music_ogg.c b/music_ogg.c index f7e90718..74256de9 100644 --- a/music_ogg.c +++ b/music_ogg.c @@ -1,6 +1,6 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga - 5635-34 Springhouse Dr. - Pleasanton, CA 94588 (USA) - slouken@devolution.com + slouken@libsdl.org */ +/* $id:$ */ + #ifdef OGG_MUSIC /* This file supports Ogg Vorbis music streams */ diff --git a/music_ogg.h b/music_ogg.h index 295610e0..ff9f718e 100644 --- a/music_ogg.h +++ b/music_ogg.h @@ -1,6 +1,6 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga - 5635-34 Springhouse Dr. - Pleasanton, CA 94588 (USA) - slouken@devolution.com + slouken@libsdl.org */ +/* $id:$ */ + #ifdef OGG_MUSIC /* This file supports Ogg Vorbis music streams */ diff --git a/playmus.c b/playmus.c index 5ae787c2..bb0f3540 100644 --- a/playmus.c +++ b/playmus.c @@ -1,27 +1,27 @@ /* PLAYMUS: A test application for the SDL mixer library. - Copyright (C) 1997-1999 Sam Lantinga + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + 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 General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga - 5635-34 Springhouse Dr. - Pleasanton, CA 94588 (USA) - slouken@devolution.com + slouken@libsdl.org */ +/* $id:$ */ + #include #include #include diff --git a/playwave.c b/playwave.c index 0c6decc7..23d2a545 100644 --- a/playwave.c +++ b/playwave.c @@ -1,27 +1,27 @@ /* PLAYWAVE: A test application for the SDL mixer library. - Copyright (C) 1997-1999 Sam Lantinga + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + 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 General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga - 5635-34 Springhouse Dr. - Pleasanton, CA 94588 (USA) - slouken@devolution.com + slouken@libsdl.org */ +/* $id:$ */ + #include #include #include diff --git a/wavestream.c b/wavestream.c index d0faef42..ed7abf41 100644 --- a/wavestream.c +++ b/wavestream.c @@ -1,6 +1,6 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga - 5635-34 Springhouse Dr. - Pleasanton, CA 94588 (USA) - slouken@devolution.com + slouken@libsdl.org */ +/* $id:$ */ + /* This file supports streaming WAV files, without volume adjustment */ #include diff --git a/wavestream.h b/wavestream.h index a827feb1..28fb19c3 100644 --- a/wavestream.h +++ b/wavestream.h @@ -1,6 +1,6 @@ /* - MIXERLIB: An audio mixer library based on the SDL library - Copyright (C) 1997-1999 Sam Lantinga + SDL_mixer: An audio mixer library based on the SDL library + Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga - 5635-34 Springhouse Dr. - Pleasanton, CA 94588 (USA) - slouken@devolution.com + slouken@libsdl.org */ +/* $id:$ */ + /* This file supports streaming WAV files, without volume adjustment */ #include