libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-06 10:58:01 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ALSA: Fix formatting.

Browse Source
This commit is contained in:
Johannes Schickel 2011-03-10 04:45:06 +01:00
parent 601a09e417
commit ff9653ddea
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
backends/midi/alsa.cpp
View File

@ -44,7 +44,7 @@
#if SND_LIB_MAJOR >= 1 || SND_LIB_MINOR >= 6 #if SND_LIB_MAJOR >= 1 || SND_LIB_MINOR >= 6
#define snd_seq_flush_output(x) snd_seq_drain_output(x) #define snd_seq_flush_output(x) snd_seq_drain_output(x)
#define snd_seq_set_client_group(x,name) /*nop */ #define snd_seq_set_client_group(x,name) /*nop */
#define my_snd_seq_open(seqp) snd_seq_open(seqp, "hw", SND_SEQ_OPEN_DUPLEX, 0) #define my_snd_seq_open(seqp) snd_seq_open(seqp, "hw", SND_SEQ_OPEN_DUPLEX, 0)
#else #else
/* SND_SEQ_OPEN_OUT causes oops on early version of ALSA */ /* SND_SEQ_OPEN_OUT causes oops on early version of ALSA */
@ -53,9 +53,8 @@
#define perm_ok(pinfo,bits) ((snd_seq_port_info_get_capability(pinfo) & (bits)) == (bits)) #define perm_ok(pinfo,bits) ((snd_seq_port_info_get_capability(pinfo) & (bits)) == (bits))
static int check_permission(snd_seq_port_info_t *pinfo) static int check_permission(snd_seq_port_info_t *pinfo) {
{ if (perm_ok(pinfo, SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE)) {
if (perm_ok(pinfo, SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE)) {
if (!(snd_seq_port_info_get_capability(pinfo) & SND_SEQ_PORT_CAP_NO_EXPORT)) if (!(snd_seq_port_info_get_capability(pinfo) & SND_SEQ_PORT_CAP_NO_EXPORT))
return 1; return 1;
} }
@ -68,7 +67,7 @@ static int check_permission(snd_seq_port_info_t *pinfo)
#define ADDR_DELIM ".:" #define ADDR_DELIM ".:"
class MidiDriver_ALSA:public MidiDriver_MPU401 { class MidiDriver_ALSA : public MidiDriver_MPU401 {
public: public:
MidiDriver_ALSA(int client, int port); MidiDriver_ALSA(int client, int port);
int open(); int open();
@ -88,8 +87,7 @@ private:
}; };
MidiDriver_ALSA::MidiDriver_ALSA(int client, int port) MidiDriver_ALSA::MidiDriver_ALSA(int client, int port)
: _isOpen(false), seq_handle(0), seq_client(client), seq_port(port), my_client(0), my_port(0), _channel0Volume(127) : _isOpen(false), seq_handle(0), seq_client(client), seq_port(port), my_client(0), my_port(0), _channel0Volume(127) {
{
memset(&ev, 0, sizeof(ev)); memset(&ev, 0, sizeof(ev));
} }
@ -116,7 +114,7 @@ int MidiDriver_ALSA::open() {
// with those capabilities. // with those capabilities.
my_port = snd_seq_create_simple_port(seq_handle, "SCUMMVM port 0", 0, my_port = snd_seq_create_simple_port(seq_handle, "SCUMMVM port 0", 0,
SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION); SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION);
if (my_port < 0) { if (my_port < 0) {
snd_seq_close(seq_handle); snd_seq_close(seq_handle);
@ -238,14 +236,13 @@ void MidiDriver_ALSA::send(uint32 b) {
// somewhere. // somewhere.
send(0x07B0 | (_channel0Volume << 16)); send(0x07B0 | (_channel0Volume << 16));
break; break;
case 0xE0:{ case 0xE0: {
// long theBend = ((((long)midiCmd[1] + (long)(midiCmd[2] << 7))) - 0x2000) / 4; // long theBend = ((((long)midiCmd[1] + (long)(midiCmd[2] << 7))) - 0x2000) / 4;
// snd_seq_ev_set_pitchbend(&ev, chanID, theBend); // snd_seq_ev_set_pitchbend(&ev, chanID, theBend);
long theBend = ((long)midiCmd[1] + (long)(midiCmd[2] << 7)) - 0x2000; long theBend = ((long)midiCmd[1] + (long)(midiCmd[2] << 7)) - 0x2000;
snd_seq_ev_set_pitchbend(&ev, chanID, theBend); snd_seq_ev_set_pitchbend(&ev, chanID, theBend);
send_event(1); send_event(1);
} } break;
break;
default: default:
warning("Unknown MIDI Command: %08x", (int)b); warning("Unknown MIDI Command: %08x", (int)b);