Francois Gouget : wineoss.drv: Add support for $MIDIDEV to match $AUDIODEV and $MIXERDEV.
Module: wine Branch: master Commit: 02b1ef89203df6120622ba49936cdb135cabd143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b1ef89203df6120622ba4993... Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 27 18:29:02 2007 +0200 wineoss.drv: Add support for $MIDIDEV to match $AUDIODEV and $MIXERDEV. --- dlls/wineoss.drv/midi.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index dfacffb..2f790f1 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -42,6 +42,7 @@ #include "config.h" #include "wine/port.h" +#include <stdlib.h> #include <string.h> #include <stdarg.h> #include <stdio.h> @@ -78,8 +79,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); #ifdef HAVE_OSS_MIDI -#define MIDI_SEQ "/dev/sequencer" - typedef struct { int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ DWORD bufsize; @@ -455,13 +454,16 @@ static int midi_warn = 1; static int midiOpenSeq(void) { if (numOpenMidiSeq == 0) { - midiSeqFD = open(MIDI_SEQ, O_RDWR, 0); + const char* device; + device=getenv("MIDIDEV"); + if (!device) device="/dev/sequencer"; + midiSeqFD = open(device, O_RDWR, 0); if (midiSeqFD == -1) { if (midi_warn) { WARN("Can't open MIDI device '%s' ! (%s). If your " "program needs this (probably not): %s\n", - MIDI_SEQ, strerror(errno), + device, strerror(errno), errno == ENOENT ? "create it ! (\"man MAKEDEV\" ?)" : errno == ENODEV ?
participants (1)
-
Alexandre Julliard