Changeset - r1608:33d8a75e9241
[Not reviewed]
master
0 3 0
tron - 20 years ago 2005-03-30 19:52:26
tron@openttd.org
(svn r2112) -Fix: ExtMidi no longer halts the game while starting a song
-Fix: Redirect stdin/stdout/stderr of the ExtMidi process to /dev/null, to prevent it from writing to the terminal
While here give the ExtMidi functions canonical names
3 files changed with 76 insertions and 68 deletions:
0 comments (0 inline, 0 general)
extmidi.c
Show inline comments
 
@@ -5,6 +5,8 @@
 
#include "ttd.h"
 
#include "hal.h"
 
#include "sound.h"
 
#include "string.h"
 
#include <fcntl.h>
 
#include <sys/types.h>
 
#include <sys/wait.h>
 
#include <unistd.h>
 
@@ -12,89 +14,97 @@
 
#include <sys/stat.h>
 
#include <errno.h>
 

	
 
static pid_t _pid;
 
static struct {
 
	char song[MAX_PATH];
 
	int pid;
 
} _midi;
 

	
 
static void extmidi_kill(void)
 
static void DoPlay(void);
 
static void DoStop(void);
 

	
 
static const char* ExtMidiStart(const char* const * parm)
 
{
 
	if (_pid > 0) {
 
		kill(_pid, SIGKILL);
 
		while (waitpid(_pid, NULL, WNOHANG) != _pid);
 
	}
 
	_pid = 0;
 
}
 

	
 
static const char *extmidi_start(const char * const *parm)
 
{
 
	_pid = 0;
 
	_midi.song[0] = '\0';
 
	_midi.pid = -1;
 
	return NULL;
 
}
 

	
 
static void extmidi_stop(void)
 
static void ExtMidiStop(void)
 
{
 
	extmidi_kill();
 
	_midi.song[0] = '\0';
 
	DoStop();
 
}
 

	
 
static void ExtMidiPlaySong(const char* filename)
 
{
 
	ttd_strlcpy(_midi.song, filename, lengthof(_midi.song));
 
	DoStop();
 
}
 

	
 
static void extmidi_play_song(const char *filename)
 
static void ExtMidiStopSong(void)
 
{
 
	extmidi_kill();
 

	
 
	_pid = fork();
 
	if (_pid < 0) {
 
		fprintf(stderr, "extmidi: couldn't fork: %s\n", strerror(errno));
 
		_pid = 0;
 
		return;
 
	}
 

	
 
	if (_pid == 0) {
 
		#if defined(MIDI_ARG)
 
			execlp(msf.extmidi, "extmidi", MIDI_ARG, filename, NULL);
 
		#else
 
			execlp(msf.extmidi, "extmidi", filename, NULL);
 
		#endif
 
		fprintf(stderr, "extmidi: couldn't execl: %s\n", strerror(errno));
 
		exit(0);
 
	}
 

	
 
	usleep(500);
 

	
 
	if (_pid == waitpid(_pid, NULL, WNOHANG)) {
 
		fprintf(stderr, "extmidi: play song failed\n");
 
		_pid = 0;
 

	
 
		usleep(5000);
 
	}
 
	_midi.song[0] = '\0';
 
	DoStop();
 
}
 

	
 
static void extmidi_stop_song(void)
 
static bool ExtMidiIsPlaying(void)
 
{
 
	extmidi_kill();
 
	if (_midi.pid != -1 && waitpid(_midi.pid, NULL, WNOHANG) == _midi.pid)
 
		_midi.pid = -1;
 
	if (_midi.pid == -1 && _midi.song[0] != '\0') DoPlay();
 
	return _midi.pid != -1;
 
}
 

	
 
static bool extmidi_is_playing(void)
 
{
 
	if (_pid == 0)
 
		return 0;
 

	
 
	if (waitpid(_pid, NULL, WNOHANG) == _pid) {
 
		_pid = 0;
 
		return 0;
 
	}
 

	
 
	return 1;
 
}
 

	
 
static void extmidi_set_volume(byte vol)
 
static void ExtMidiSetVolume(byte vol)
 
{
 
	fprintf(stderr, "extmidi: set volume not implemented\n");
 
}
 

	
 
static void DoPlay(void)
 
{
 
	_midi.pid = fork();
 
	switch (_midi.pid) {
 
		case 0: {
 
			int d;
 

	
 
			close(0);
 
			close(1);
 
			close(2);
 
			d = open("/dev/null", O_RDONLY);
 
			if (d != -1) {
 
				if (dup2(d, 1) != -1 && dup2(d, 2) != -1) {
 
					#if defined(MIDI_ARG)
 
						execlp(msf.extmidi, "extmidi", MIDI_ARG, _midi.song, NULL);
 
					#else
 
						execlp(msf.extmidi, "extmidi", _midi.song, NULL);
 
					#endif
 
				}
 
			}
 
			exit(1);
 
		}
 

	
 
		case -1:
 
			fprintf(stderr, "extmidi: couldn't fork: %s\n", strerror(errno));
 
			/* FALLTHROUGH */
 

	
 
		default:
 
			_midi.song[0] = '\0';
 
			break;
 
	}
 
}
 

	
 
static void DoStop(void)
 
{
 
	if (_midi.pid != -1) kill(_midi.pid, SIGTERM);
 
}
 

	
 
const HalMusicDriver _extmidi_music_driver = {
 
	extmidi_start,
 
	extmidi_stop,
 
	extmidi_play_song,
 
	extmidi_stop_song,
 
	extmidi_is_playing,
 
	extmidi_set_volume,
 
	ExtMidiStart,
 
	ExtMidiStop,
 
	ExtMidiPlaySong,
 
	ExtMidiStopSong,
 
	ExtMidiIsPlaying,
 
	ExtMidiSetVolume,
 
};
 

	
 
#endif /* __MORPHOS__ */
music_gui.c
Show inline comments
 
@@ -181,7 +181,7 @@ void MusicLoop(void)
 
	if (_song_is_active == false)
 
		return;
 

	
 
	if (!_music_driver->is_song_playing()) {
 
	if (!_music_driver->is_song_playing() && _game_mode != GM_MENU) {
 
		StopMusic();
 
		SkipToNextSong();
 
		PlayPlaylistSong();
ttd.c
Show inline comments
 
@@ -641,7 +641,6 @@ int ttd_main(int argc, char* argv[])
 
	LoadDriver(SOUND_DRIVER, _ini_sounddriver);
 
	LoadDriver(MUSIC_DRIVER, _ini_musicdriver);
 
	LoadDriver(VIDEO_DRIVER, _ini_videodriver); // load video last, to prevent an empty window while sound and music loads
 
	MusicLoop();
 
	_savegame_sort_order = 1; // default sorting of savegames is by date, newest first
 

	
 
#ifdef ENABLE_NETWORK
 
@@ -1165,8 +1164,7 @@ void GameLoop(void)
 

	
 
	InputLoop();
 

	
 
	if (_game_mode != GM_MENU)
 
		MusicLoop();
 
	MusicLoop();
 
}
 

	
 
void BeforeSaveGame(void)
0 comments (0 inline, 0 general)