Updated sdl-mixer to reflect recent license change. Removed patch as it's been applied upstream.

This commit is contained in:
Scott McCreary
2012-01-04 23:20:37 +00:00
parent 9b2534f5b6
commit 2ebefcec56
2 changed files with 2 additions and 33 deletions

View File

@@ -1,27 +0,0 @@
diff -urN sdl-mixer-1.2-hg/native_midi/native_midi_haiku.cpp sdl-mixer-1.2-hg-haiku/native_midi/native_midi_haiku.cpp
--- sdl-mixer-1.2-hg/native_midi/native_midi_haiku.cpp 2011-04-06 14:55:40.152305664 +0000
+++ sdl-mixer-1.2-hg-haiku/native_midi/native_midi_haiku.cpp 2011-04-06 14:08:15.000000000 +0000
@@ -259,3 +259,23 @@
currentSong = song;
}
void native_midi_stop()
+{
+ if (currentSong == NULL) return;
+ currentSong->store->Stop();
+ currentSong->store->Disconnect(&synth);
+ while (currentSong->store->IsPlaying())
+ usleep(1000);
+ currentSong = NULL;
+}
+int native_midi_active()
+{
+ if (currentSong == NULL) return 0;
+ return currentSong->store->CurrentEvent() < currentSong->store->CountEvents();
+}
+
+const char* native_midi_error(void)
+{
+ return lasterr;
+}
+
+#endif /* __HAIKU__ */