Changeset 2cd18e3 in buchla-emu

Timestamp:

02/25/2018 03:01:24 PM (6 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

25c3737

Parents:

9ddbf3e

Message:

Initialize RtMidi device's data member.

Location:

emu

Files:

• all.h (modified) (2 diffs)
• main.c (modified) (2 diffs)
• mid.c (modified) (5 diffs)

emu/all.h

@@ -31 +31 @@
 #include <SDL2/SDL_ttf.h>
 
-// work around RtMidi's C++-isms
+// XXX - work around RtMidi's C++-isms; remove when fixed in RtMidi
 
 #pragma GCC diagnostic push
@@ -76 +76 @@
 extern const char *font;
 
-extern int32_t mid_port;
+extern uint32_t mid_port;
 
 extern SDL_atomic_t run;

emu/main.c

@@ -43 +43 @@
 const char *font = "ttf/vera-sans-mono.ttf";
 
-int32_t mid_port = -1;
+uint32_t mid_port = 0;
 
 SDL_atomic_t run;
@@ -160 +160 @@
                         }
 
-                        mid_port = (int32_t)tmp;
+                        mid_port = (uint32_t)tmp;
                         continue;
                 }

emu/mid.c

@@ -103 +103 @@
         (void)data;
 
+        // XXX - remove length calculation once RtMidi passes the length
+
         int32_t len;
 
@@ -165 +167 @@
         ver("mid init");
 
-        if (mid_port < 0) {
-                ver("no MIDI requested");
-                return;
-        }
-
         mid_in = rtmidi_in_create_default();
+        mid_in->data = NULL; // XXX - remove initialization once it's added to RtMidi
 
         if (!mid_in->ok) {
@@ -176 +174 @@
         }
 
-        int32_t n_ports = (int32_t)rtmidi_get_port_count(mid_in);
+        uint32_t n_ports = rtmidi_get_port_count(mid_in);
 
         if (n_ports == 0) {
@@ -186 +184 @@
 
         if (mid_port >= n_ports) {
-                fail("invalid MIDI port %d selected (%d available)", mid_port, n_ports);
-        }
-
-        const char *name = rtmidi_get_port_name(mid_in, (uint32_t)mid_port);
-        rtmidi_open_port(mid_in, (uint32_t)mid_port, name);
+                fail("invalid MIDI port %u selected (%u available)", mid_port, n_ports);
+        }
+
+        const char *name = rtmidi_get_port_name(mid_in, mid_port);
+        rtmidi_open_port(mid_in, mid_port, name);
 
         if (!mid_in->ok) {
-                fail("error while opening MIDI port %d (%s): %s", mid_port, name, mid_in->msg);
-        }
-
-        inf("using MIDI port %d (%s)", mid_port, name);
+                fail("error while opening MIDI port %u (%s): %s", mid_port, name, mid_in->msg);
+        }
+
+        inf("using MIDI port %u (%s)", mid_port, name);
 
         rtmidi_in_set_callback(mid_in, callback, mid_in->data);
@@ -294 +292 @@
 {
         mid_in = rtmidi_in_create_default();
+        mid_in->data = NULL; // XXX - remove initialization once it's added to RtMidi
 
         if (!mid_in->ok) {