mirror of
https://github.com/ZDoom/Raze.git
synced 2025-05-31 01:11:15 +00:00
- make things compile again.
Let's hope it still works...
This commit is contained in:
Christoph Oelckers
parent
082fcfeef0
commit
8730ce552b
17 changed files with 41 additions and 378 deletions
|
|
@ -189,7 +189,7 @@ int SDLDrv_PCM_Init(int *mixrate, int *numchannels, void * initdata)
|
|||
auto drivername = Xstrdup(SDL_GetCurrentAudioDriver());
|
||||
|
||||
for (int i=0;drivername[i] != 0;++i)
|
||||
drivername[i] = toupperlookup[drivername[i]];
|
||||
drivername[i] = toupper(drivername[i]);
|
||||
|
||||
auto devname = Xstrdup(SDL_GetAudioDeviceName(0, 0));
|
||||
auto pdevname = Bstrchr(devname, '(');
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
/*
|
||||
Copyright (C) 2009 Jonathon Fowler <jf@jonof.id.au>
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
*/
|
||||
|
||||
#include "midifuncs.h"
|
||||
|
||||
int WinMMDrv_GetError(void);
|
||||
const char *WinMMDrv_ErrorString( int ErrorNumber );
|
||||
|
||||
int WinMMDrv_MIDI_Init(midifuncs *);
|
||||
void WinMMDrv_MIDI_Shutdown(void);
|
||||
int WinMMDrv_MIDI_StartPlayback(void (*service)(void));
|
||||
void WinMMDrv_MIDI_HaltPlayback(void);
|
||||
void WinMMDrv_MIDI_SetTempo(int tempo, int division);
|
||||
void WinMMDrv_MIDI_Lock(void);
|
||||
void WinMMDrv_MIDI_Unlock(void);
|
||||
|
||||
|
|
@ -34,7 +34,6 @@
|
|||
|
||||
#ifdef _WIN32
|
||||
# include "driver_directsound.h"
|
||||
# include "driver_winmm.h"
|
||||
#endif
|
||||
|
||||
int ASS_PCMSoundDriver = ASS_AutoDetect;
|
||||
|
|
@ -140,6 +139,7 @@ static struct {
|
|||
nullptr,
|
||||
},
|
||||
|
||||
#if 0
|
||||
// Windows MultiMedia system
|
||||
{
|
||||
"WinMM",
|
||||
|
|
@ -160,6 +160,7 @@ static struct {
|
|||
UNSUPPORTED_COMPLETELY
|
||||
#endif
|
||||
},
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,318 +0,0 @@
|
|||
//-------------------------------------------------------------------------
|
||||
/*
|
||||
Copyright (C) 2010 EDuke32 developers and contributors
|
||||
|
||||
This file is part of EDuke32.
|
||||
|
||||
EDuke32 is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License version 2
|
||||
as published by the Free Software Foundation.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
#include "compat.h"
|
||||
#include "multivoc.h"
|
||||
#include "music.h"
|
||||
#include "vfs.h"
|
||||
#include "winbits.h"
|
||||
|
||||
// fork/exec based external music player
|
||||
#ifndef _WIN32
|
||||
#include <signal.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
#define INVALID_HANDLE_VALUE -1
|
||||
typedef pid_t proc_t;
|
||||
#else
|
||||
typedef HANDLE proc_t;
|
||||
#endif
|
||||
|
||||
static char ** g_musicPlayerArgv;
|
||||
static int g_musicPlayerEnabled;
|
||||
static proc_t g_musicPlayerHandle = INVALID_HANDLE_VALUE;
|
||||
static int g_musicPlayerReady;
|
||||
static int8_t g_musicPlayerRestart;
|
||||
static char * g_musicPlayerCommandLine;
|
||||
|
||||
static char g_musicFileName[BMAX_PATH];
|
||||
static int g_musicFileNameArgvPos;
|
||||
|
||||
char const *errorMessage;
|
||||
|
||||
int MUSIC_Init(int SoundCard)
|
||||
{
|
||||
// Use an external music player
|
||||
g_musicPlayerCommandLine = getenv("EDUKE32_MUSIC_CMD");
|
||||
|
||||
UNREFERENCED_PARAMETER(SoundCard);
|
||||
|
||||
if (g_musicPlayerReady)
|
||||
{
|
||||
errorMessage = "MUSIC_Init: external player already initialized!";
|
||||
return MUSIC_Error;
|
||||
} // if
|
||||
|
||||
g_musicPlayerEnabled = (g_musicPlayerCommandLine && g_musicPlayerCommandLine[0]);
|
||||
|
||||
if (!g_musicPlayerEnabled)
|
||||
{
|
||||
errorMessage = "MUSIC_Init: no external player configured!";
|
||||
return MUSIC_Error;
|
||||
}
|
||||
|
||||
MV_Printf("Using external music player: \"%s\"\n", g_musicPlayerCommandLine);
|
||||
|
||||
#ifndef _WIN32
|
||||
int ws=1, numargs=0, pagesize=Bgetpagesize();
|
||||
char *c, *cmd;
|
||||
size_t sz;
|
||||
|
||||
if (pagesize == -1)
|
||||
{
|
||||
errorMessage = "MUSIC_Init: unable to determine system page size";
|
||||
return MUSIC_Error;
|
||||
}
|
||||
for (c=g_musicPlayerCommandLine; *c; c++)
|
||||
{
|
||||
if (isspace(*c))
|
||||
ws = 1;
|
||||
else if (ws)
|
||||
{
|
||||
ws = 0;
|
||||
numargs++;
|
||||
}
|
||||
}
|
||||
|
||||
if (numargs == 0)
|
||||
{
|
||||
errorMessage = "MUSIC_Init: not enough arguments for external player";
|
||||
return MUSIC_Error;
|
||||
}
|
||||
|
||||
sz = (numargs+2)*sizeof(char *) + (c-g_musicPlayerCommandLine+1);
|
||||
sz = ((sz+pagesize-1)/pagesize)*pagesize;
|
||||
g_musicPlayerArgv = (char **)Xaligned_alloc(pagesize, sz);
|
||||
cmd = (char *)g_musicPlayerArgv + (numargs+2)*sizeof(intptr_t);
|
||||
Bmemcpy(cmd, g_musicPlayerCommandLine, c-g_musicPlayerCommandLine+1);
|
||||
|
||||
ws = 1;
|
||||
numargs = 0;
|
||||
for (c=cmd; *c; c++)
|
||||
{
|
||||
if (isspace(*c))
|
||||
{
|
||||
ws = 1;
|
||||
*c = 0;
|
||||
}
|
||||
else if (ws)
|
||||
{
|
||||
ws = 0;
|
||||
g_musicPlayerArgv[numargs++] = c;
|
||||
}
|
||||
}
|
||||
g_musicFileNameArgvPos = numargs;
|
||||
g_musicPlayerArgv[numargs] = g_musicFileName;
|
||||
g_musicPlayerArgv[numargs+1] = nullptr;
|
||||
|
||||
#if 0
|
||||
if (mprotect(g_musicPlayerArgv, sz, PROT_READ)==-1) // make argv and command string read-only
|
||||
{
|
||||
initprintf("MUSIC_Init: mprotect(): %s\n");
|
||||
errorMessage = "MUSIC_Init: mprotect() failure";
|
||||
return MUSIC_Error;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
g_musicPlayerReady = 1;
|
||||
return MUSIC_Ok;
|
||||
}
|
||||
|
||||
|
||||
int MUSIC_Shutdown(void)
|
||||
{
|
||||
MUSIC_StopSong();
|
||||
g_musicPlayerReady = 0;
|
||||
|
||||
return MUSIC_Ok;
|
||||
} // MUSIC_Shutdown
|
||||
|
||||
int MUSIC_StopSong(void)
|
||||
{
|
||||
if (!g_musicPlayerEnabled)
|
||||
return MUSIC_Ok;
|
||||
|
||||
if (g_musicPlayerHandle != INVALID_HANDLE_VALUE)
|
||||
{
|
||||
g_musicPlayerRestart = 0; // make SIGCHLD handler a no-op
|
||||
|
||||
#ifndef _WIN32
|
||||
struct timespec ts;
|
||||
|
||||
ts.tv_sec = 0;
|
||||
ts.tv_nsec = 5000000; // sleep 5ms at most
|
||||
|
||||
kill(g_musicPlayerHandle, SIGTERM);
|
||||
nanosleep(&ts, nullptr);
|
||||
|
||||
if (int ret = waitpid(g_musicPlayerHandle, nullptr, WNOHANG|WUNTRACED) != g_musicPlayerHandle)
|
||||
{
|
||||
if (ret==-1)
|
||||
initprintf("%s: waitpid: %s\n", __func__, strerror(errno));
|
||||
else
|
||||
{
|
||||
// we tried to be nice, but no...
|
||||
kill(g_musicPlayerHandle, SIGKILL);
|
||||
|
||||
initprintf("%s: SIGTERM timed out--trying SIGKILL\n", __func__);
|
||||
|
||||
if (waitpid(g_musicPlayerHandle, nullptr, WUNTRACED)==-1)
|
||||
initprintf("%s: waitpid: %s\n", __func__, strerror(errno));
|
||||
}
|
||||
}
|
||||
#else
|
||||
TerminateProcess(g_musicPlayerHandle, 0);
|
||||
#endif
|
||||
g_musicPlayerHandle = INVALID_HANDLE_VALUE;
|
||||
}
|
||||
|
||||
return MUSIC_Ok;
|
||||
} // MUSIC_StopSong
|
||||
|
||||
static int MUSIC_PlayExternal()
|
||||
{
|
||||
#ifdef _WIN32
|
||||
STARTUPINFO si;
|
||||
PROCESS_INFORMATION pi;
|
||||
|
||||
ZeroMemory(&si,sizeof(si));
|
||||
ZeroMemory(&pi,sizeof(pi));
|
||||
si.cb = sizeof(si);
|
||||
|
||||
if (!CreateProcess(nullptr,g_musicPlayerCommandLine,nullptr,nullptr,0,0,nullptr,nullptr,&si,&pi))
|
||||
{
|
||||
MV_Printf("%s: CreateProcess: %s\n", __func__, windowsGetErrorMessage(GetLastError()));
|
||||
return MUSIC_Error;
|
||||
}
|
||||
else
|
||||
g_musicPlayerHandle = pi.hProcess;
|
||||
#else
|
||||
proc_t pid = vfork();
|
||||
|
||||
if (pid==-1) // error
|
||||
{
|
||||
initprintf("%s: vfork: %s\n", __func__, strerror(errno));
|
||||
return MUSIC_Error;
|
||||
}
|
||||
else if (pid==0) // child
|
||||
{
|
||||
// exec without PATH lookup
|
||||
if (execv(g_musicPlayerArgv[0], g_musicPlayerArgv) < 0)
|
||||
{
|
||||
initprintf("%s: execv: %s\n", __func__, strerror(errno));
|
||||
_exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
else // parent
|
||||
{
|
||||
g_musicPlayerHandle = pid;
|
||||
}
|
||||
#endif
|
||||
return MUSIC_Ok;
|
||||
}
|
||||
|
||||
#ifndef _WIN32
|
||||
static void sigchld_handler(int signo)
|
||||
{
|
||||
if (g_musicPlayerHandle <= 0 || !g_musicPlayerRestart || signo != SIGCHLD)
|
||||
return;
|
||||
|
||||
int status;
|
||||
|
||||
if (waitpid(g_musicPlayerHandle, &status, WUNTRACED)==-1)
|
||||
initprintf("%s: waitpid: %s\n", __func__, strerror(errno));
|
||||
|
||||
if (WIFEXITED(status) && WEXITSTATUS(status)==0)
|
||||
{
|
||||
// loop ...
|
||||
MUSIC_PlayExternal();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
int MUSIC_PlaySong(char *song, int songsize, int loopflag, const char *fn /*= nullptr*/)
|
||||
{
|
||||
if (!g_musicPlayerEnabled)
|
||||
{
|
||||
errorMessage = "MUSIC_Init: no external player configured!";
|
||||
return MUSIC_Error;
|
||||
}
|
||||
|
||||
#ifndef _WIN32
|
||||
static int sigchld_handler_set;
|
||||
|
||||
if (!sigchld_handler_set)
|
||||
{
|
||||
struct sigaction sa;
|
||||
sa.sa_handler=sigchld_handler;
|
||||
sa.sa_flags=0;
|
||||
sigemptyset(&sa.sa_mask);
|
||||
|
||||
if (sigaction(SIGCHLD, &sa, nullptr)==-1)
|
||||
initprintf("%s: sigaction: %s\n", __func__, strerror(errno));
|
||||
|
||||
sigchld_handler_set = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
auto ext = Xstrdup(fn);
|
||||
auto const c = Bsnprintf(g_musicFileName, sizeof(g_musicFileName), "%s/external%s", Bgethomedir(), strtok(ext,"."));
|
||||
g_musicFileName[c] = '\0';
|
||||
Xfree(ext);
|
||||
|
||||
if (auto fp = buildvfs_fopen_write(g_musicFileName))
|
||||
{
|
||||
buildvfs_fwrite(song, 1, songsize, fp);
|
||||
buildvfs_fclose(fp);
|
||||
|
||||
g_musicPlayerRestart = loopflag;
|
||||
g_musicPlayerArgv[g_musicFileNameArgvPos] = g_musicFileName;
|
||||
|
||||
if (int retval = MUSIC_PlayExternal() != MUSIC_Ok)
|
||||
return retval;
|
||||
}
|
||||
else
|
||||
{
|
||||
MV_Printf("%s: fopen: %s\n", __func__, strerror(errno));
|
||||
return MUSIC_Error;
|
||||
}
|
||||
|
||||
return MUSIC_Ok;
|
||||
}
|
||||
|
||||
|
||||
void MUSIC_Update(void)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
if (g_musicPlayerHandle == INVALID_HANDLE_VALUE || !g_musicPlayerRestart)
|
||||
return;
|
||||
|
||||
DWORD exitCode = -1;
|
||||
|
||||
GetExitCodeProcess(g_musicPlayerHandle, &exitCode);
|
||||
|
||||
if (exitCode != STILL_ACTIVE)
|
||||
MUSIC_PlayExternal();
|
||||
#endif
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue