zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 06:32:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use posix_memalign in fork/exec midi player when not using nedmalloc. This fixes compilation in this case for me.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1725 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2010-11-09 21:10:26 +00:00
parent 2751ea0c5d
commit f3e992b0c8
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
polymer/eduke32/source/sdlmusic.c
View file

@ -36,7 +36,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "sdl_inc.h" #include "sdl_inc.h"
#include "music.h" #include "music.h"
#if !defined _WIN32 // fork/exec based external midi player #if !defined _WIN32
# define FORK_EXEC_MIDI 1
#endif
#if defined FORK_EXEC_MIDI // fork/exec based external midi player
#include <stdlib.h> #include <stdlib.h>
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
@ -138,7 +142,7 @@ int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
{ {
initprintf("Setting music command to \"%s\".\n", command); initprintf("Setting music command to \"%s\".\n", command);
#if defined _WIN32 #if !defined FORK_EXEC_MIDI
if (Mix_SetMusicCMD(command)==-1) if (Mix_SetMusicCMD(command)==-1)
{ {
perror("Mix_SetMusicCMD"); perror("Mix_SetMusicCMD");
@ -168,11 +172,14 @@ int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
sz = (numargs+2)*sizeof(char *) + (c-command+1); sz = (numargs+2)*sizeof(char *) + (c-command+1);
sz = ((sz+pagesize-1)/pagesize)*pagesize; sz = ((sz+pagesize-1)/pagesize)*pagesize;
# ifdef NEDMALLOC
external_midi_argv = Bmemalign(pagesize, sz); external_midi_argv = Bmemalign(pagesize, sz);
if (!external_midi_argv) if (!external_midi_argv)
goto fallback; goto fallback;
# else
if (posix_memalign((void **)&external_midi_argv, pagesize, sz))
goto fallback;
# endif
cmd = (char *)external_midi_argv + (numargs+2)*sizeof(char *); cmd = (char *)external_midi_argv + (numargs+2)*sizeof(char *);
Bmemcpy(cmd, command, c-command+1); Bmemcpy(cmd, command, c-command+1);
@ -250,7 +257,7 @@ fallback:
int32_t MUSIC_Shutdown(void) int32_t MUSIC_Shutdown(void)
{ {
// TODO - make sure this is being called from the menu -- SA // TODO - make sure this is being called from the menu -- SA
#if defined _WIN32 #if !defined FORK_EXEC_MIDI
if (external_midi) if (external_midi)
Mix_SetMusicCMD(NULL); Mix_SetMusicCMD(NULL);
#endif #endif
@ -323,7 +330,7 @@ void MUSIC_Pause(void)
int32_t MUSIC_StopSong(void) int32_t MUSIC_StopSong(void)
{ {
#if !defined _WIN32 #if defined FORK_EXEC_MIDI
if (external_midi) if (external_midi)
{ {
if (external_midi_pid > 0) if (external_midi_pid > 0)
@ -376,7 +383,7 @@ int32_t MUSIC_StopSong(void)
return(MUSIC_Ok); return(MUSIC_Ok);
} // MUSIC_StopSong } // MUSIC_StopSong
#if !defined _WIN32 #if defined FORK_EXEC_MIDI
static void playmusic() static void playmusic()
{ {
pid_t pid = vfork(); pid_t pid = vfork();
@ -428,7 +435,7 @@ int32_t MUSIC_PlaySong(char *song, int32_t loopflag)
{ {
FILE *fp; FILE *fp;
#if !defined _WIN32 #if defined FORK_EXEC_MIDI
static int32_t sigchld_handler_set = 0; static int32_t sigchld_handler_set = 0;
if (!sigchld_handler_set) if (!sigchld_handler_set)
@ -449,7 +456,7 @@ int32_t MUSIC_PlaySong(char *song, int32_t loopflag)
fwrite(song, 1, g_musicSize, fp); fwrite(song, 1, g_musicSize, fp);
Bfclose(fp); Bfclose(fp);
#if !defined _WIN32 #if defined FORK_EXEC_MIDI
external_midi_restart = loopflag; external_midi_restart = loopflag;
playmusic(); playmusic();
#else #else