Permalink
Browse files

- Began work on mp3 support.. it's buggy still.

  • Loading branch information...
q3shafe committed Dec 15, 2017
1 parent 6abb11a commit ec1b46ebd4fa23086b61b6a322b60d2cd2c338b2
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -108,9 +108,9 @@ void S_CodecInit()
#ifdef USE_CODEC_VORBIS
S_CodecRegister(&ogg_codec);
#endif
#if USE_CODEC_MP3
//#if USE_CODEC_MP3
S_CodecRegister(&mp3_codec);
#endif
//#endif
}
/*
@@ -96,12 +96,12 @@ int S_OGG_CodecReadStream(snd_stream_t *stream, int bytes, void *buffer);
#endif // USE_CODEC_VORBIS
// MP3 codec
#ifdef USE_CODEC_MP3
//#ifdef USE_CODEC_MP3
extern snd_codec_t mp3_codec;
void *S_MP3_CodecLoad(const char *filename, snd_info_t *info);
snd_stream_t *S_MP3_CodecOpenStream(const char *filename);
void S_MP3_CodecCloseStream(snd_stream_t *stream);
int S_MP3_CodecReadStream(snd_stream_t *stream, int bytes, void *buffer);
#endif // USE_CODEC_MP3
//#endif // USE_CODEC_MP3
#endif // !_SND_CODEC_H_
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
// MP3 support is enabled by this define
#if USE_CODEC_MP3
//#if USE_CODEC_MP3
// includes for the Q3 sound system
#include "client.h"
@@ -713,4 +713,4 @@ void *S_MP3_CodecLoad(const char *filename, snd_info_t *info)
return pcmbuffer;
}
#endif // USE_CODEC_MP3
//#endif // USE_CODEC_MP3
BIN +704 KB (100%) trep-engine/misc/msvc/ioq3.sdf
Binary file not shown.
BIN +1.5 KB (100%) trep-engine/misc/msvc/ioq3.suo
Binary file not shown.
@@ -214,8 +214,8 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>user32.lib;advapi32.lib;winmm.lib;wsock32.lib;ws2_32.lib;SDLmain.lib;SDL.lib;OpenGL32.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;libcurl.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)ioquake3.exe</OutputFile>
<AdditionalDependencies>libmad.lib;user32.lib;advapi32.lib;winmm.lib;wsock32.lib;ws2_32.lib;SDLmain.lib;SDL.lib;OpenGL32.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;libcurl.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)trepidation.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>false</GenerateDebugInformation>
<ProgramDatabaseFile>$(IntDir)quake3.pdb</ProgramDatabaseFile>
@@ -409,6 +409,7 @@
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\code\client\snd_codec_mp3.c" />
<ClCompile Include="..\..\code\qcommon\cm_load.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">Disabled</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -789,6 +790,7 @@
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\code\sys\sys_autoupdater.c" />
<ClCompile Include="..\..\code\sys\sys_main.c" />
<ClCompile Include="..\..\code\sys\sys_win32.c" />
<ClCompile Include="..\..\code\qcommon\unzip.c">
@@ -995,6 +997,8 @@
<ClCompile Include="..\..\code\zlib\zutil.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\code\client\mad.h" />
<ClInclude Include="..\..\code\client\snd_codec.h" />
<ClInclude Include="..\..\code\game\bg_public.h" />
<ClInclude Include="..\..\code\cgame\cg_public.h" />
<ClInclude Include="..\..\code\client\cl_curl.h" />
@@ -645,6 +645,12 @@
<ClCompile Include="..\..\code\zlib\zutil.c">
<Filter>zlib</Filter>
</ClCompile>
<ClCompile Include="..\..\code\sys\sys_autoupdater.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\code\client\snd_codec_mp3.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\code\game\bg_public.h">
@@ -848,6 +854,12 @@
<ClInclude Include="..\..\code\libspeex\config.h">
<Filter>speex</Filter>
</ClInclude>
<ClInclude Include="..\..\code\client\snd_codec.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\code\client\mad.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\code\sys\win_resource.rc">
Binary file not shown.
BIN +0 Bytes (100%) vms-source/code/quake3sdk.sdf
Binary file not shown.
BIN +0 Bytes (100%) vms-source/code/quake3sdk.suo
Binary file not shown.

0 comments on commit ec1b46e

Please sign in to comment.