← Back to branch summary

~ubuntu-branches/ubuntu/trusty/portmidi/trusty

« back to all changes in this revision

Viewing changes to debian/patches/02_pmlinuxalsa.diff

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2010-02-14 17:30:52 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100214173052-uraknpxk6m8ogzf8
Tags: 1:200-0ubuntu1
* New upstream release
* debian/patches/: Refresh/rediff

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_pmlinuxalsa.diff
1
 
--- portmidi~/pm_linux/pmlinuxalsa.c    2009-09-16 05:41:04.000000000 +0200
2
 
+++ portmidi/pm_linux/pmlinuxalsa.c     2009-09-16 05:45:29.000000000 +0200
3
 
@@ -243,8 +243,8 @@
 
1
Index: portmidi-200/pm_linux/pmlinuxalsa.c
 
2
===================================================================
 
3
--- portmidi-200.orig/pm_linux/pmlinuxalsa.c    2009-11-20 00:41:09.000000000 -0500
 
4
+++ portmidi-200/pm_linux/pmlinuxalsa.c 2010-02-14 17:39:06.000000000 -0500
 
5
@@ -242,8 +242,8 @@
4
6
     alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor;
5
7
     if (!desc) return pmBadPtr;
6
8
 
11
13
         // if there's an error, try to delete the port anyway, but don't
12
14
         // change the pm_hosterror value so we retain the first error
13
15
         snd_seq_delete_port(seq, desc->this_port);
14
 
@@ -333,8 +333,8 @@
 
16
@@ -332,8 +332,8 @@
15
17
 {
16
18
     alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor;
17
19
     if (!desc) return pmBadPtr;
22
24
         snd_seq_delete_port(seq, desc->this_port); /* try to close port */
23
25
     } else {
24
26
         pm_hosterror = snd_seq_delete_port(seq, desc->this_port);
25
 
@@ -421,7 +421,7 @@
26
 
     }
27
 
     if (desc->error < 0) return pmHostError;
28
 
 
29
 
-    VERBOSE printf("snd_seq_drain_output: 0x%x\n", seq);
30
 
+    VERBOSE printf("snd_seq_drain_output: 0x%x\n", (unsigned int)seq);
31
 
     desc->error = snd_seq_drain_output(seq);
32
 
     if (desc->error < 0) return pmHostError;
33
 
 
34
 
@@ -607,7 +607,7 @@
 
27
@@ -606,7 +606,7 @@
35
28
     case SND_SEQ_EVENT_SYSEX: {
36
29
         const BYTE *ptr = (const BYTE *) ev->data.ext.ptr;
37
30
         /* assume there is one sysex byte to process */