add changes for JavaScript port

Author: feross

libtimidity/src/instrum.c

@@ -203,6 +203,19 @@ static void load_instrument(MidSong *song, const char *name,
   if (song->ifp == NULL)
     {
       DEBUG_MSG("Instrument `%s' can't be found.\n", name);
+
+      // Added for JavaScript port
+      if (song->load_request_count < 128) {
+        for (i=0; i < song->load_request_count; i++) {
+          if (strcmp(song->load_requests[i], name) == 0) {
+            return; // Already added this instrument, so return
+          }
+        }
+        // Add instrument to load request list
+        song->load_requests[song->load_request_count] = strdup(name);
+        song->load_request_count += 1;
+      }
+
       return;
     }
   fp = song->ifp;

libtimidity/src/timidity.c

@@ -639,6 +639,11 @@ void mid_song_free(MidSong *song)
     timi_free(song->meta_data[i]);
   }
 
+  // Added for JavaScript port
+  for (i = 0; i < song->load_request_count; i++) {
+    timi_free(song->load_requests[i]);
+  }
+
   timi_free(song);
 }
 
@@ -703,3 +708,26 @@ MidSong *mid_song_load_dls(MidIStream *stream, MidDLSPatches *dlspatches, MidSon
 {
   return NULL;
 }
+
+// Added for JavaScript port
+extern MidSongOptions *mid_alloc_options(sint32 rate, uint16 format, uint8 channels, uint16 buffer_size)
+{
+  MidSongOptions *o = (MidSongOptions *) timi_calloc(sizeof(MidSongOptions));
+  o->rate = rate;
+  o->format = format;
+  o->channels = channels;
+  o->buffer_size = buffer_size;
+  return o;
+}
+
+// Added for JavaScript port
+extern int mid_get_load_request_count(MidSong *song)
+{
+  return song->load_request_count;
+}
+
+// Added for JavaScript port
+extern char *mid_get_load_request(MidSong *song, int index)
+{
+  return song->load_requests[index];
+}

libtimidity/src/timidity.h

@@ -265,6 +265,26 @@ extern "C" {
  */
   TIMI_EXPORT extern void mid_song_free (MidSong *song);
 
+// Added for JavaScript port
+/* Create a MidSongOptions instance on the heap.
+ * The caller is responsible for freeing it using free() later.
+ */
+  TIMI_EXPORT extern MidSongOptions *mid_alloc_options (sint32 rate,
+                                                        uint16 format,
+                                                        uint8 channels,
+                                                        uint16 buffer_size);
+
+// Added for JavaScript port
+/* Return the amount of patch files that the song requires.
+ */
+  TIMI_EXPORT extern int mid_get_load_request_count (MidSong *song);
+
+// Added for JavaScript port
+/* Return the name of a patch file that the song requires.
+ */
+  TIMI_EXPORT extern char *mid_get_load_request (MidSong *song,
+                                                 int index);
+
 #ifdef __cplusplus
 }
 #endif

libtimidity/src/timidity_internal.h

@@ -257,6 +257,10 @@ struct _MidSong
   sint32 at;
   sint32 groomed_event_count;
   char *meta_data[MID_META_MAX];
+  // Added for JavaScript port
+  int load_request_count;
+  // Added for JavaScript port
+  char *load_requests[128];
 };
 
 #endif /* TIMIDITY_INTERNAL_H */