[OMPT-svn-commit] SF.net SVN: modplug:[4125] trunk/OpenMPT

[<man...@us...>]

Revision: 4125
          http://sourceforge.net/p/modplug/code/4125
Author:   manxorist
Date:     2014-06-18 08:19:08 +0000 (Wed, 18 Jun 2014)
Log Message:
-----------
[Mod] openmpt123: Always build with SDL if available in order to work by default on systems with no PortAudio. If both are available, PortAudio is still the default.
[Fix] openmpt123: Properly initialize SDL as per API specification.

Modified Paths:
--------------
    trunk/OpenMPT/Makefile
    trunk/OpenMPT/libopenmpt/dox/changelog.md
    trunk/OpenMPT/openmpt123/openmpt123_sdl.hpp

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2014-06-18 07:16:30 UTC (rev 4124)
+++ trunk/OpenMPT/Makefile	2014-06-18 08:19:08 UTC (rev 4125)
@@ -58,7 +58,7 @@
 # Build flags for openmpt123 (provide on each `make` invocation)
 #
 #  (defaults are 0):
-#  USE_SDL=1        Use SDL (in addition to or in place of PortAudio)
+#  NO_SDL=1         Avoid using SDL, even if found
 #  NO_PORTAUDIO=1   Avoid using PortAudio, even if found
 #  NO_FLAC=1        Avoid using FLAC, even if found
 #  NO_WAVPACK=1     Avoid using WavPack, even if found
@@ -271,12 +271,15 @@
 else
 endif
 
-ifeq ($(USE_SDL),1)
+ifeq ($(NO_SDL),1)
+else
 #LDLIBS   += -lsdl
 ifeq ($(shell pkg-config --exists sdl && echo yes),yes)
 CPPFLAGS_SDL := $(shell pkg-config --cflags-only-I sdl ) -DMPT_WITH_SDL
 LDFLAGS_SDL  := $(shell pkg-config --libs-only-L   sdl ) $(shell pkg-config --libs-only-other sdl )
 LDLIBS_SDL   := $(shell pkg-config --libs-only-l   sdl )
+else
+NO_SDL:=1
 endif
 endif
 

Modified: trunk/OpenMPT/libopenmpt/dox/changelog.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/changelog.md	2014-06-18 07:16:30 UTC (rev 4124)
+++ trunk/OpenMPT/libopenmpt/dox/changelog.md	2014-06-18 08:19:08 UTC (rev 4125)
@@ -5,6 +5,11 @@
 For fully detailed change log, please see the source repository directly. This
 is just a high-level summary.
 
+### libopenmpt svn
+
+ *  openmpt123: SDL is now also used by default if availble, in addition to
+    PortAudio.
+
 ### 2014-06-15 - libopenmpt 0.2-beta5
 
  *  Add unmo3 support for non-Windows builds.

Modified: trunk/OpenMPT/openmpt123/openmpt123_sdl.hpp
===================================================================
--- trunk/OpenMPT/openmpt123/openmpt123_sdl.hpp	2014-06-18 07:16:30 UTC (rev 4124)
+++ trunk/OpenMPT/openmpt123/openmpt123_sdl.hpp	2014-06-18 08:19:08 UTC (rev 4125)
@@ -41,7 +41,7 @@
 		, channels(flags.channels)
 	{
 		double bufferSeconds = flags.buffer * 0.001;
-		check_sdl_error( SDL_InitSubSystem( SDL_INIT_NOPARACHUTE | SDL_INIT_TIMER | SDL_INIT_AUDIO ) );
+		check_sdl_error( SDL_Init( SDL_INIT_NOPARACHUTE | SDL_INIT_TIMER | SDL_INIT_AUDIO ) );
 		SDL_AudioSpec audiospec;
 		std::memset( &audiospec, 0, sizeof( SDL_AudioSpec ) );
 		audiospec.freq = flags.samplerate;
@@ -59,7 +59,7 @@
 	~sdl_stream_raii() {
 		SDL_PauseAudio( 1 );
 		SDL_CloseAudio();
-		SDL_QuitSubSystem( SDL_INIT_NOPARACHUTE | SDL_INIT_TIMER | SDL_INIT_AUDIO );
+		SDL_Quit();
 	}
 private:
 	static void sdl_callback_wrapper( void * userdata, Uint8 * stream, int len ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.