Changeset 305 for GPL/branches/uniaud-2.0/lib32/soundmidi.c

Timestamp:

Mar 24, 2008, 2:43:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to ALSA 1.0.16 level

File:

• GPL/branches/uniaud-2.0/lib32/soundmidi.c (modified) (5 diffs)

GPL/branches/uniaud-2.0/lib32/soundmidi.c

@@ -23 +23 @@
  */
 
-#include <sound/driver.h>
+#include <sound/core.h>
 #include <sound/control.h>
 #include <sound/info.h>
@@ -31 +31 @@
 #include <sound/asequencer.h>
 #include <sound/seqmid.h>
+#include <sound/seq_kernel.h>
 #include <linux/file.h>
 #include <linux/soundcard.h>
@@ -48 +49 @@
     midihandle                      *pHandle;
     int                              ret, i;
-    struct snd_seq_port_subscribe  subs;
+    struct snd_seq_port_subscribe       subs;
     struct snd_seq_client_info     clientinfo;
     struct snd_seq_port_info       portinfo;
@@ -179 +180 @@
         pHandle->state |= MIDISTATE_SUBSCRIBED;
         
+#if 0
         //Load FM instruments (only done once)
         OSS32_FMMidiLoadInstruments((ULONG)pHandle);
+#endif
 
     }//if FM
@@ -204 +207 @@
     if(pHandle->state & MIDISTATE_SUBSCRIBED) {
         struct snd_seq_port_subscribe  subs;
-
         memset(&subs, 0, sizeof(subs));
         subs.dest.client   = pHandle->destclient;