- Added FMOD_OPENONLY to the callback version of CreateStream() to prevent it
from doing prebuffering of the song. This was causing the Linux version to hang while waiting for input from the pipe, since Timidity hadn't been started yet. I tried using a select call in the FillStream() method, but it always seems to return the pipe as having nothing available. Unfortunately, the game still falls all over itself if Timidity isn't available. Instead of execvp failing nicely, X errors kill the game. I don't know why it's doing that. My advice for Linux music: Skip Timidity++ and get a DLS patch set (/WINDOWS/system32/drivers/gm.dls is probably the most common by far) and set the snd_midipatchset cvar to point to it. It's faster and also sounds a whole lot better than the crappy freepats Ubuntu wants to install with Timidity++. - GCC fixes. SVN r858 (trunk)
This commit is contained in:
parent
6420d82a58
commit
39940fe20a
12 changed files with 93 additions and 33 deletions
|
|
@ -370,7 +370,8 @@ FSwitchDef *ParseSwitchDef (FScanner &sc, bool ignoreBad)
|
|||
thisframe.Time = ((max - min + 1) << 16) | min;
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
thisframe.Time = 0; // Shush, GCC.
|
||||
sc.ScriptError ("Must specify a duration for switch frame");
|
||||
}
|
||||
frames.Push(thisframe);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue