diff --git a/Quake/snd_codec.c b/Quake/snd_codec.c index 5c93dc1b..c6802827 100644 --- a/Quake/snd_codec.c +++ b/Quake/snd_codec.c @@ -4,7 +4,7 @@ * * Copyright (C) 1999-2005 Id Software, Inc. * Copyright (C) 2005 Stuart Dalton - * Copyright (C) 2010 O.Sezer + * Copyright (C) 2010-2011 O.Sezer * * 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 diff --git a/Quake/snd_codec.h b/Quake/snd_codec.h index 360fd7bb..f4c11180 100644 --- a/Quake/snd_codec.h +++ b/Quake/snd_codec.h @@ -4,7 +4,7 @@ * * Copyright (C) 1999-2005 Id Software, Inc. * Copyright (C) 2005 Stuart Dalton - * Copyright (C) 2010 O.Sezer + * Copyright (C) 2010-2011 O.Sezer * * 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 diff --git a/Quake/snd_codeci.h b/Quake/snd_codeci.h index 8d59dd6a..0d13d378 100644 --- a/Quake/snd_codeci.h +++ b/Quake/snd_codeci.h @@ -4,7 +4,7 @@ * * Copyright (C) 1999-2005 Id Software, Inc. * Copyright (C) 2005 Stuart Dalton - * Copyright (C) 2010 O.Sezer + * Copyright (C) 2010-2011 O.Sezer * * 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 diff --git a/Quake/snd_dma.c b/Quake/snd_dma.c index 81400dec..0927b336 100644 --- a/Quake/snd_dma.c +++ b/Quake/snd_dma.c @@ -2,6 +2,7 @@ Copyright (C) 1996-2001 Id Software, Inc. Copyright (C) 2002-2009 John Fitzgibbons and others Copyright (C) 2007-2008 Kristian Duske +Copyright (C) 2010-2011 O. Sezer This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/Quake/snd_mem.c b/Quake/snd_mem.c index 7e11887e..eea18b64 100644 --- a/Quake/snd_mem.c +++ b/Quake/snd_mem.c @@ -1,6 +1,6 @@ /* Copyright (C) 1996-2001 Id Software, Inc. -Copyright (C) 2002-2009 John Fitzgibbons and others +Copyright (C) 2010-2011 O. Sezer This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/Quake/snd_mix.c b/Quake/snd_mix.c index dc2e8dfe..4e28039a 100644 --- a/Quake/snd_mix.c +++ b/Quake/snd_mix.c @@ -1,7 +1,6 @@ /* Copyright (C) 1996-2001 Id Software, Inc. -Copyright (C) 2002-2009 John Fitzgibbons and others -Copyright (C) 2007-2008 Kristian Duske +Copyright (C) 2010-2011 O. Sezer This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/Quake/snd_mp3.c b/Quake/snd_mp3.c index 3d197416..736297b9 100644 --- a/Quake/snd_mp3.c +++ b/Quake/snd_mp3.c @@ -6,7 +6,9 @@ * written by Bertrand Petit (BSD license, see at * http://www.bsd-dk.dk/~elrond/audio/madlld/). The tag identification * functions were adapted from the GPL-licensed libid3tag library, see at - * http://www.underbit.com/products/mad/. + * http://www.underbit.com/products/mad/. Adapted to Quake and Hexen II + * game engines by O.Sezer : + * Copyright (C) 2010-2011 O.Sezer * * 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 @@ -495,25 +497,6 @@ static void S_MP3_CodecShutdown (void) { } -static int MP3_check_file (snd_stream_t *stream) -{ - unsigned char magic[16]; - - if (FS_fread(magic, 1, 16, &stream->fh) != 16) - return -1; - if ((magic[0] == 0xFF && (magic[1] & 0xF0) == 0xF0) || - tag_is_id3v2(magic, 16)) - return 0; - if (FS_fseek(&stream->fh, -128, SEEK_END) < 0) - return -1; - if (FS_fread(magic, 1, 16, &stream->fh) != 16) - return -1; - if (tag_is_id3v1(magic, 16)) - return 0; - - return -1; -} - static snd_stream_t *S_MP3_CodecOpenStream (const char *filename) { snd_stream_t *stream; @@ -524,20 +507,6 @@ static snd_stream_t *S_MP3_CodecOpenStream (const char *filename) stream->priv = Z_Malloc(sizeof(mp3_priv_t)); - /* check some rudimentary info before feeding it to libmad. */ - if (MP3_check_file(stream) < 0) - { - /* - Con_Printf("%s format couldn't be identified.\n", filename); - Z_Free(stream->priv); - S_CodecUtilClose(&stream); - return NULL; - */ - Con_DPrintf("%s has no identifier tags.\n", filename); - } - - FS_rewind(&stream->fh); - if (mp3_startread(stream) < 0) { Con_Printf("%s is not a valid MP3 file.\n", filename); diff --git a/Quake/snd_sdl.c b/Quake/snd_sdl.c index 2498ee41..f43b021b 100644 --- a/Quake/snd_sdl.c +++ b/Quake/snd_sdl.c @@ -1,10 +1,11 @@ /* - snd_sdl2.c + snd_sdl.c SDL audio driver for Hexen II: Hammer of Thyrion, based on the implementations found in the quakeforge and quake3-icculus.org projects. - $Id: snd_sdl2.c,v 1.8 2010/01/23 12:01:23 sezero Exp $ + Copyright (C) 1999-2005 Id Software, Inc. + Copyright (C) 2005-2011 O.Sezer This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/Quake/snd_vorbis.c b/Quake/snd_vorbis.c index dc07dc52..94b7fcb8 100644 --- a/Quake/snd_vorbis.c +++ b/Quake/snd_vorbis.c @@ -1,7 +1,9 @@ /* - * Ogg/Vorbis streaming music support, adapted from several open source + * Ogg/Vorbis streaming music support, loosely based on several open source * Quake engine based projects with many modifications. * + * Copyright (C) 2010-2011 O.Sezer + * * 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 diff --git a/Quake/snd_wave.c b/Quake/snd_wave.c index c3a0a19e..37052cd5 100644 --- a/Quake/snd_wave.c +++ b/Quake/snd_wave.c @@ -3,7 +3,7 @@ * * Copyright (C) 1999-2005 Id Software, Inc. * Copyright (C) 2005 Stuart Dalton - * Copyright (C) 2010 O.Sezer + * Copyright (C) 2010-2011 O.Sezer * * 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