zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

sdlmusic: Slight cosmetic cleanup

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6891 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-05-19 14:14:25 +00:00
parent b5caf1cd1e
commit 6cb29c820c
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/audiolib/src/driver_sdl.cpp
View file

@ -22,7 +22,7 @@
* libSDL output driver for MultiVoc * libSDL output driver for MultiVoc
*/ */
#define _NEED_SDLMIXER #define NEED_SDL_MIXER
#include "compat.h" #include "compat.h"
#include "sdl_inc.h" #include "sdl_inc.h"
#include "driver_sdl.h" #include "driver_sdl.h"

2
source/build/include/sdl_inc.h
View file

@ -51,7 +51,7 @@ Minimum required SDL versions:
#error SDL version found is too old #error SDL version found is too old
#endif #endif
#if defined _NEED_SDLMIXER #if defined NEED_SDL_MIXER
# if defined SDL_USEFOLDER # if defined SDL_USEFOLDER
# if SDL_TARGET == 2 # if SDL_TARGET == 2

7
source/duke3d/src/sdlmusic.cpp
View file

@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// This object is shared by all Build games with MIDI playback! // This object is shared by all Build games with MIDI playback!
#define _NEED_SDLMIXER 1 #define NEED_SDL_MIXER
#include "compat.h" #include "compat.h"
@ -102,8 +102,8 @@ const char *MUSIC_ErrorString(int32_t ErrorNumber)
int32_t MUSIC_Init(int32_t SoundCard, int32_t Address) int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
{ {
#ifdef __ANDROID__ #ifdef __ANDROID__
music_initialized = 1; music_initialized = 1;
return MUSIC_Ok; return MUSIC_Ok;
#endif #endif
// Use an external MIDI player if the user has specified to do so // Use an external MIDI player if the user has specified to do so
char *command = getenv("EDUKE32_MUSIC_CMD"); char *command = getenv("EDUKE32_MUSIC_CMD");
@ -410,7 +410,6 @@ static void sigchld_handler(int signo)
// void MUSIC_PlayMusic(char *_filename) // void MUSIC_PlayMusic(char *_filename)
int32_t MUSIC_PlaySong(char *song, int32_t songsize, int32_t loopflag) int32_t MUSIC_PlaySong(char *song, int32_t songsize, int32_t loopflag)
{ {
// initprintf("MUSIC_PlaySong");
if (external_midi) if (external_midi)
{ {
FILE *fp; FILE *fp;