1
0
Fork 0

(svn r518) Merge extmidi.c r441 to trunk:

- Whitespace cleanup
- Use execlp() with relative path instead of execl() with absolute path
release/0.4.5
tron 2004-11-06 23:24:59 +00:00
parent 476dfd9f12
commit 6909bba290
1 changed files with 53 additions and 52 deletions

105
extmidi.c
View File

@ -12,83 +12,83 @@
#include <errno.h> #include <errno.h>
#ifndef EXTERNAL_PLAYER #ifndef EXTERNAL_PLAYER
#define EXTERNAL_PLAYER "/usr/bin/timidity" #define EXTERNAL_PLAYER "timidity"
#endif #endif
static pid_t _pid; static pid_t _pid;
static void extmidi_kill(void) { static void extmidi_kill(void)
if(_pid > 0) { {
kill(_pid, SIGKILL); if (_pid > 0) {
while(waitpid(_pid, NULL, WNOHANG) != _pid); kill(_pid, SIGKILL);
} while (waitpid(_pid, NULL, WNOHANG) != _pid);
_pid = 0; }
_pid = 0;
} }
static char *extmidi_start(char **parm) { static char *extmidi_start(char **parm)
_pid = 0; {
_pid = 0;
return NULL; return NULL;
} }
static void extmidi_stop(void) { static void extmidi_stop(void)
extmidi_kill(); {
extmidi_kill();
} }
static void extmidi_play_song(const char *filename) { static void extmidi_play_song(const char *filename)
extmidi_kill(); {
extmidi_kill();
_pid = fork(); _pid = fork();
if(_pid < 0) { if (_pid < 0) {
fprintf(stderr, "extmidi: couldn't fork: %s\n", strerror(errno)); fprintf(stderr, "extmidi: couldn't fork: %s\n", strerror(errno));
_pid = 0; _pid = 0;
return; return;
} }
if(_pid == 0) { if (_pid == 0) {
#if defined(MIDI_ARG) #if defined(MIDI_ARG)
execl(EXTERNAL_PLAYER, "extmidi", MIDI_ARG, filename, NULL); execlp(EXTERNAL_PLAYER, "extmidi", MIDI_ARG, filename, NULL);
#else #else
execl(EXTERNAL_PLAYER, "extmidi", filename, NULL); execlp(EXTERNAL_PLAYER, "extmidi", filename, NULL);
#endif #endif
fprintf(stderr, "extmidi: couldn't execl: %s\n", strerror(errno));
exit(0);
}
fprintf(stderr, "extmidi: couldn't execl: %s\n", strerror(errno)); usleep(500);
exit(0); if (_pid == waitpid(_pid, NULL, WNOHANG)) {
} fprintf(stderr, "extmidi: play song failed\n");
_pid = 0;
usleep(5000);
}
usleep(500);
if(_pid == waitpid(_pid, NULL, WNOHANG)) {
fprintf(stderr, "extmidi: play song failed\n");
_pid = 0;
usleep(5000);
}
} }
static void extmidi_stop_song(void) { static void extmidi_stop_song(void)
extmidi_kill(); {
extmidi_kill();
} }
static bool extmidi_is_playing(void) { static bool extmidi_is_playing(void)
if(_pid == 0) {
return 0; if (_pid == 0)
return 0;
if(waitpid(_pid, NULL, WNOHANG) == _pid) { if (waitpid(_pid, NULL, WNOHANG) == _pid) {
_pid = 0; _pid = 0;
return 0; return 0;
} }
return 1; return 1;
} }
static void extmidi_set_volume(byte vol) { static void extmidi_set_volume(byte vol)
fprintf(stderr, "extmidi: set volume not implemented\n"); {
fprintf(stderr, "extmidi: set volume not implemented\n");
} }
const HalMusicDriver _extmidi_music_driver = { const HalMusicDriver _extmidi_music_driver = {
@ -99,5 +99,6 @@ const HalMusicDriver _extmidi_music_driver = {
extmidi_is_playing, extmidi_is_playing,
extmidi_set_volume, extmidi_set_volume,
}; };
#endif /* __MORPHOS__ */ #endif /* __MORPHOS__ */
#endif /* __BEOS__ */ #endif /* __BEOS__ */