Commit 02b1ef89 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

wineoss.drv: Add support for $MIDIDEV to match $AUDIODEV and $MIXERDEV.

parent 344e8acb
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "config.h" #include "config.h"
#include "wine/port.h" #include "wine/port.h"
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
...@@ -78,8 +79,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); ...@@ -78,8 +79,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi);
#ifdef HAVE_OSS_MIDI #ifdef HAVE_OSS_MIDI
#define MIDI_SEQ "/dev/sequencer"
typedef struct { typedef struct {
int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */
DWORD bufsize; DWORD bufsize;
...@@ -455,13 +454,16 @@ static int midi_warn = 1; ...@@ -455,13 +454,16 @@ static int midi_warn = 1;
static int midiOpenSeq(void) static int midiOpenSeq(void)
{ {
if (numOpenMidiSeq == 0) { 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 (midiSeqFD == -1) {
if (midi_warn) if (midi_warn)
{ {
WARN("Can't open MIDI device '%s' ! (%s). If your " WARN("Can't open MIDI device '%s' ! (%s). If your "
"program needs this (probably not): %s\n", "program needs this (probably not): %s\n",
MIDI_SEQ, strerror(errno), device, strerror(errno),
errno == ENOENT ? errno == ENOENT ?
"create it ! (\"man MAKEDEV\" ?)" : "create it ! (\"man MAKEDEV\" ?)" :
errno == ENODEV ? errno == ENODEV ?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment