zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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;
#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
// is closed, and the read end is still open. Close the pipe
@ -437,9 +437,9 @@ bool TimidityPPMIDIDevice::LaunchTimidity ()
close (WavePipe[0]);
WavePipe[0] = -1;
delete m_Stream;
m_Stream = NULL;
PrepTimidity ();
delete Stream;
Stream = NULL;
Open (NULL, NULL);
}
int forkres;
@ -597,7 +597,7 @@ bool TimidityPPMIDIDevice::IsOpen() const
{
if (waitpid (ChildProcess, NULL, WNOHANG) == ChildProcess)
{
ChildProcess = -1;
const_cast<TimidityPPMIDIDevice *>(this)->ChildProcess = -1;
#endif
return false;
}