remove smpeg support completely and backport libmpg123 support instead.

libsdl-org · Oct 11, 2018 · 2db9153 · 2db9153
1 parent 84a4492
commit 2db9153
Show file tree

Hide file tree

Showing 53 changed files with 5,577 additions and 4,124 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,10 +1,14 @@
 1.2.13:
+Ozkan Sezer - Wed, 10 Oct 2018 14:56:10
+ * Removed smpeg support for mp3 music, now that it's replaced by libmpg123
 Ozkan Sezer - Sun, 07 Oct 2018 14:00:02
- * Backports of fixes from SDL_mixer-2.0.x
+ * Backports of several fixes from SDL_mixer-2.0.x
 Ozkan Sezer - Sun, 07 Oct 2018 08:50:02
  * Fixed mp3 mad decoder to skip tags, which otherwise would lead to crashes
+Franc[e]sco - Thu, 20 Jul 2017 20:03:19
+ * Added support for MP3 playback using mpg123
 Sam Lantinga - Sat Aug 23 10:57:26 2014
-* Fixed floating point exception in Mix_Volume()
+ * Fixed floating point exception in Mix_Volume()
 Paul P Komkoff Jr - Sun Jul 22 16:12:28 PDT 2012
  * Fixed malloc/free mismatch in the MikMod driver
 

diff --git a/README b/README
@@ -6,7 +6,7 @@ http://www.libsdl.org/projects/SDL_mixer/
 
 Due to popular demand, here is a simple multi-channel audio mixer.
 It supports 8 channels of 16 bit stereo audio, plus a single channel
-of music, mixed by the popular MikMod MOD, Timidity MIDI and SMPEG MP3
+of music, mixed by the popular MikMod MOD, Timidity MIDI, and mpg123 MP3
 libraries.
 
 See the header file SDL_mixer.h and the examples playwave.c and playmus.c
@@ -16,7 +16,7 @@ The mixer can currently load Microsoft WAVE files and Creative Labs VOC
 files as audio samples, and can load MIDI files via Timidity and the
 following music formats via MikMod:  .MOD .S3M .IT .XM. It can load
 Ogg Vorbis streams as music if built with Ogg Vorbis or Tremor libraries,
-and finally it can load MP3 music using the SMPEG or libmad libraries.
+and finally it can load MP3 music using the libmpeg123 or libmad libraries.
 
 Tremor decoding is disabled by default; you can enable it by passing
 	--enable-music-ogg-tremor

diff --git a/SDL_mixer.spec.in b/SDL_mixer.spec.in
@@ -16,7 +16,7 @@ Prefix: %{_prefix}
 Due to popular demand, here is a simple multi-channel audio mixer.
 It supports 4 channels of 16 bit stereo audio, plus a single channel
 of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis,
-Tremor, SMPEG MP3, and libmad MP3 libraries.
+Tremor, libmpg123 and libmad MP3 libraries.
 
 %package devel
 Summary: Libraries, includes and more to develop SDL applications.
@@ -27,7 +27,7 @@ Requires: %{name}
 Due to popular demand, here is a simple multi-channel audio mixer.
 It supports 4 channels of 16 bit stereo audio, plus a single channel
 of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis,
-Tremor, SMPEG MP3, and libmad MP3 libraries.
+Tremor, libmpg123 and libmad MP3 libraries.
 
 %prep
 %setup 

diff --git a/VisualC/SDL_mixer.sln b/VisualC/SDL_mixer.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL_mixer", "SDL_mixer.vcproj", "{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C} = {B162B6F1-E876-4D5F-A1F6-E3A6DC2F4A2C}

diff --git a/VisualC/SDL_mixer.vcproj b/VisualC/SDL_mixer.vcproj
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="8.00"
 	Name="SDL_mixer"
 	ProjectGUID="{F7E944B3-0815-40CD-B3E4-90B2A15B0E33}"
 	RootNamespace="SDL_mixer"
-	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -53,7 +52,7 @@
 				AdditionalOptions="/D OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\timidity;..\native_midi;external\include"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MPG123_DYNAMIC=\&quot;libmpg123-0.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
 				MinimalRebuild="true"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\Debug/SDL_mixer.pch"
@@ -140,7 +139,7 @@
 				AdditionalOptions="/D OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\timidity;..\native_midi;external\include"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MPG123_DYNAMIC=\&quot;libmpg123-0.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
 				MinimalRebuild="true"
 				RuntimeLibrary="2"
 				PrecompiledHeaderFile=".\Debug/SDL_mixer.pch"
@@ -228,7 +227,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\timidity;..\native_midi;external\include"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MPG123_DYNAMIC=\&quot;libmpg123-0.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -314,7 +313,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\timidity;..\native_midi;external\include"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MP3_DYNAMIC=\&quot;smpeg.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MOD_MUSIC;MOD_DYNAMIC=\&quot;libmikmod-2.dll\&quot;;OGG_MUSIC;OGG_DYNAMIC=\&quot;libvorbisfile-3.dll\&quot;;FLAC_MUSIC;FLAC_DYNAMIC=\&quot;libFLAC-8.dll\&quot;;MP3_MUSIC;MPG123_DYNAMIC=\&quot;libmpg123-0.dll\&quot;;MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -900,6 +899,14 @@
 			RelativePath="..\music_mod.h"
 			>
 		</File>
+		<File
+			RelativePath="..\music_mpg.c"
+			>
+		</File>
+		<File
+			RelativePath="..\music_mpg.h"
+			>
+		</File>
 		<File
 			RelativePath="..\music_ogg.c"
 			>

diff --git a/VisualC/external/include/MPEGfilter.h b/VisualC/external/include/MPEGfilter.h