fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* snd_mp3.c: removed useless rudimentary info checks. 

* updated copyright years for several sound related sources.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@405 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2011-01-30 21:34:12 +00:00
parent a30a21400b
commit dd4c96d3c2
10 changed files with 16 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Quake/snd_codec.c
View File

@ -4,7 +4,7 @@
*
* Copyright (C) 1999-2005 Id Software, Inc.
* Copyright (C) 2005 Stuart Dalton <badcdev@gmail.com>
* Copyright (C) 2010 O.Sezer <sezero@users.sourceforge.net>
* Copyright (C) 2010-2011 O.Sezer <sezero@users.sourceforge.net>
*
* 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

2
Quake/snd_codec.h
View File

@ -4,7 +4,7 @@
*
* Copyright (C) 1999-2005 Id Software, Inc.
* Copyright (C) 2005 Stuart Dalton <badcdev@gmail.com>
* Copyright (C) 2010 O.Sezer <sezero@users.sourceforge.net>
* Copyright (C) 2010-2011 O.Sezer <sezero@users.sourceforge.net>
*
* 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

2
Quake/snd_codeci.h
View File

@ -4,7 +4,7 @@
*
* Copyright (C) 1999-2005 Id Software, Inc.
* Copyright (C) 2005 Stuart Dalton <badcdev@gmail.com>
* Copyright (C) 2010 O.Sezer <sezero@users.sourceforge.net>
* Copyright (C) 2010-2011 O.Sezer <sezero@users.sourceforge.net>
*
* 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

1
Quake/snd_dma.c
View File

@ -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 <sezero@users.sourceforge.net>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
Quake/snd_mem.c
View File

@ -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 <sezero@users.sourceforge.net>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

3
Quake/snd_mix.c
View File

@ -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 <sezero@users.sourceforge.net>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

37
Quake/snd_mp3.c
View File

@ -6,7 +6,9 @@
* written by Bertrand Petit <madlld@phoe.fmug.org> (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 <sezero@users.sourceforge.net>
*
* 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);

5
Quake/snd_sdl.c
View File

@ -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 <sezero@users.sourceforge.net>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

4
Quake/snd_vorbis.c
View File

@ -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 <sezero@users.sourceforge.net>
*
* 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

2
Quake/snd_wave.c
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 1999-2005 Id Software, Inc.
* Copyright (C) 2005 Stuart Dalton <badcdev@gmail.com>
* Copyright (C) 2010 O.Sezer <sezero@users.sourceforge.net>
* Copyright (C) 2010-2011 O.Sezer <sezero@users.sourceforge.net>
*
* 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