zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-18 01:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed Linux compilation errors. (I'm not too sure what I was supposed to do with PrepTimidity() though.)

Browse source 
SVN r2882 (trunk)
This commit is contained in:
Braden Obrzut 2010-10-02 16:49:44 +00:00
parent d3ca1fddcc
commit f26e65e550
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sound/music_midi_timidity.cpp
View file

@ -429,7 +429,7 @@ bool TimidityPPMIDIDevice::LaunchTimidity ()
} }
return false; return false;
#else #else
if (WavePipe[0] != -1 && WavePipe[1] == -1 && m_Stream != NULL) if (WavePipe[0] != -1 && WavePipe[1] == -1 && Stream != NULL)
{ {
// Timidity was previously launched, so the write end of the pipe // Timidity was previously launched, so the write end of the pipe
// is closed, and the read end is still open. Close the pipe // is closed, and the read end is still open. Close the pipe
@ -437,9 +437,9 @@ bool TimidityPPMIDIDevice::LaunchTimidity ()
close (WavePipe[0]); close (WavePipe[0]);
WavePipe[0] = -1; WavePipe[0] = -1;
delete m_Stream; delete Stream;
m_Stream = NULL; Stream = NULL;
PrepTimidity (); Open (NULL, NULL);
} }
int forkres; int forkres;
@ -597,7 +597,7 @@ bool TimidityPPMIDIDevice::IsOpen() const
{ {
if (waitpid (ChildProcess, NULL, WNOHANG) == ChildProcess) if (waitpid (ChildProcess, NULL, WNOHANG) == ChildProcess)
{ {
ChildProcess = -1; const_cast<TimidityPPMIDIDevice *>(this)->ChildProcess = -1;
#endif #endif
return false; return false;
} }