haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
aec3652b011664a609d7c3d78c2df706f5d1778f
haikuports/media-libs/sdl_mixer/patches/sdl_mixer-1.2.11.patch
Oliver Tappe aec3652b01 Cleanup: fix names of recipe and patch files. 
* this fixes the wrong recipe names introduced by myself in #d525fee
* adjust patch names to match corresponding recipes
* additionally: create 'additional-files' folders as hint to some
  ports that do not have a proper recipe yet
2013-08-25 23:51:08 +02:00

335 lines
9.1 KiB
Diff
Raw Blame History

diff -urN SDL_mixer-1.2.11/Makefile.in SDL_mixer-1.2.11-haiku/Makefile.in
--- SDL_mixer-1.2.11/Makefile.in 2009-10-12 23:06:53.024903680 +0000
+++ SDL_mixer-1.2.11-haiku/Makefile.in 2010-12-30 15:34:53.693895168 +0000
@@ -20,6 +20,7 @@
EXE = @EXE@
SHELL = @SHELL@
CC = @CC@
+CXX = g++
CFLAGS = @BUILD_CFLAGS@
EXTRA_CFLAGS = @EXTRA_CFLAGS@
LDFLAGS = @BUILD_LDFLAGS@
diff -urN SDL_mixer-1.2.11/configure.in SDL_mixer-1.2.11-haiku/configure.in
--- SDL_mixer-1.2.11/configure.in 2009-11-12 06:41:28.034865152 +0000
+++ SDL_mixer-1.2.11-haiku/configure.in 2010-12-30 16:26:40.889716736 +0000
@@ -301,10 +301,18 @@
use_music_native_midi=yes
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit -Wl,-framework,CoreServices"
;;
+ *-*-haiku*)
+ use_music_native_midi=yes_cpp
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmidi"
+ ;;
esac
if test x$use_music_native_midi = xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
SOURCES="$SOURCES $srcdir/native_midi/*.c"
+ elif test x$use_music_native_midi = xyes_cpp; then
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
+ SOURCES="$SOURCES $srcdir/native_midi/*.c"
+ SOURCES_CXX="$SOURCES_CXX $srcdir/native_midi/*.cpp"
fi
fi
AC_ARG_ENABLE([music-native-midi-gpl],
@@ -536,6 +545,15 @@
$(objects)/\2.lo: \1/\2.c\\
\$(LIBTOOL) --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+OBJECTS_CXX=`echo $SOURCES_CXX`
+DEPENDS_CXX=`echo $SOURCES_CXX`
+OBJECTS_CXX=`echo "$OBJECTS_CXX" | sed 's,[[^ ]]*/\([[^ ]]*\)\.cpp,$(objects)/\1.lo,g'`
+DEPENDS_CXX=`echo "$DEPENDS_CXX" | sed 's,\([[^ ]]*\)/\([[^ ]]*\)\.cpp,\\
+$(objects)/\2.lo: \1/\2.cpp\\
+ \$(LIBTOOL) --mode=compile \$(CXX) \$(CFLAGS) \$(EXTRA_CFLAGS) '"$DEPENDENCY_TRACKING_OPTIONS"' -c \$< -o \$@,g'`
+OBJECTS="$OBJECTS $OBJECTS_CXX"
+DEPENDS="$DEPENDS $DEPENDS_CXX"
+
VERSION_OBJECTS=`echo $VERSION_SOURCES`
VERSION_DEPENDS=`echo $VERSION_SOURCES`
VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
diff -urN SDL_mixer-1.2.11/native_midi/native_midi_haiku.cpp SDL_mixer-1.2.11-haiku/native_midi/native_midi_haiku.cpp
--- SDL_mixer-1.2.11/native_midi/native_midi_haiku.cpp 1970-01-01 00:00:00.000000000 +0000
+++ SDL_mixer-1.2.11-haiku/native_midi/native_midi_haiku.cpp 2010-12-29 23:05:51.000000000 +0000
@@ -0,0 +1,281 @@
+/*
+ native_midi_haiku: Native Midi support on HaikuOS for the SDL_mixer library
+ Copyright (C) 2010 Egor Suvorov
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ Egor Suvorov
+ egor_suvorov@mail.ru
+*/
+#include "SDL_config.h"
+
+#ifdef __HAIKU__
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <MidiStore.h>
+#include <MidiDefs.h>
+#include <MidiSynthFile.h>
+#include <algorithm>
+#include <assert.h>
+extern "C" {
+#include "native_midi.h"
+#include "native_midi_common.h"
+}
+
+bool compareMIDIEvent(const MIDIEvent &a, const MIDIEvent &b)
+{
+ return a.time < b.time;
+}
+
+class MidiEventsStore : public BMidi
+{
+ public:
+ MidiEventsStore()
+ {
+ fPlaying = false;
+ }
+ virtual status_t Import(SDL_RWops *rw)
+ {
+ fEvs = CreateMIDIEventList(rw, &fDivision);
+ if (!fEvs) {
+ return B_BAD_MIDI_DATA;
+ }
+ fTotal = 0;
+ for (MIDIEvent *x = fEvs; x; x = x->next) fTotal++;
+ fPos = fTotal;
+
+ sort_events();
+ return B_OK;
+ }
+ virtual void Run()
+ {
+ fPlaying = true;
+ fPos = 0;
+ MIDIEvent *ev = fEvs;
+
+ uint32 startTime = B_NOW;
+ while (KeepRunning() && ev)
+ {
+ SprayEvent(ev, ev->time + startTime);
+ ev = ev->next;
+ fPos++;
+ }
+ fPos = fTotal;
+ fPlaying = false;
+ }
+ virtual ~MidiEventsStore()
+ {
+ if (!fEvs) return;
+ FreeMIDIEventList(fEvs);
+ fEvs = 0;
+ }
+
+ int CurrentEvent()
+ {
+ return fPos;
+ }
+ int CountEvents()
+ {
+ return fTotal;
+ }
+
+ bool IsPlaying()
+ {
+ return fPlaying;
+ }
+
+ protected:
+ MIDIEvent *fEvs;
+ Uint16 fDivision;
+
+ int fPos, fTotal;
+ bool fPlaying;
+
+ void SprayEvent(MIDIEvent *ev, uint32 time)
+ {
+ switch (ev->status & 0xF0)
+ {
+ case B_NOTE_OFF:
+ SprayNoteOff((ev->status & 0x0F) + 1, ev->data[0], ev->data[1], time);
+ break;
+ case B_NOTE_ON:
+ SprayNoteOn((ev->status & 0x0F) + 1, ev->data[0], ev->data[1], time);
+ break;
+ case B_KEY_PRESSURE:
+ SprayKeyPressure((ev->status & 0x0F) + 1, ev->data[0], ev->data[1], time);
+ break;
+ case B_CONTROL_CHANGE:
+ SprayControlChange((ev->status & 0x0F) + 1, ev->data[0], ev->data[1], time);
+ break;
+ case B_PROGRAM_CHANGE:
+ SprayProgramChange((ev->status & 0x0F) + 1, ev->data[0], time);
+ break;
+ case B_CHANNEL_PRESSURE:
+ SprayChannelPressure((ev->status & 0x0F) + 1, ev->data[0], time);
+ break;
+ case B_PITCH_BEND:
+ SprayPitchBend((ev->status & 0x0F) + 1, ev->data[0], ev->data[1], time);
+ break;
+ case 0xF:
+ switch (ev->status)
+ {
+ case B_SYS_EX_START:
+ SpraySystemExclusive(ev->extraData, ev->extraLen, time);
+ break;
+ case B_MIDI_TIME_CODE:
+ case B_SONG_POSITION:
+ case B_SONG_SELECT:
+ case B_CABLE_MESSAGE:
+ case B_TUNE_REQUEST:
+ case B_SYS_EX_END:
+ SpraySystemCommon(ev->status, ev->data[0], ev->data[1], time);
+ break;
+ case B_TIMING_CLOCK:
+ case B_START:
+ case B_STOP:
+ case B_CONTINUE:
+ case B_ACTIVE_SENSING:
+ SpraySystemRealTime(ev->status, time);
+ break;
+ case B_SYSTEM_RESET:
+ if (ev->data[0] == 0x51 && ev->data[1] == 0x03)
+ {
+ assert(ev->extraLen == 3);
+ int val = (ev->extraData[0] << 16) | (ev->extraData[1] << 8) | ev->extraData[2];
+ int tempo = 60000000 / val;
+ SprayTempoChange(tempo, time);
+ }
+ else
+ {
+ SpraySystemRealTime(ev->status, time);
+ }
+ }
+ break;
+ }
+ }
+
+ void sort_events()
+ {
+ MIDIEvent *items = new MIDIEvent[fTotal];
+ MIDIEvent *x = fEvs;
+ for (int i = 0; i < fTotal; i++)
+ {
+ memcpy(items + i, x, sizeof(MIDIEvent));
+ x = x->next;
+ }
+ std::sort(items, items + fTotal, compareMIDIEvent);
+
+ x = fEvs;
+ for (int i = 0; i < fTotal; i++)
+ {
+ MIDIEvent *ne = x->next;
+ memcpy(x, items + i, sizeof(MIDIEvent));
+ x->next = ne;
+ x = ne;
+ }
+
+ for (x = fEvs; x && x->next; x = x->next)
+ assert(x->time <= x->next->time);
+
+ delete[] items;
+ }
+};
+
+BMidiSynth synth;
+struct _NativeMidiSong {
+ MidiEventsStore *store;
+} *currentSong = NULL;
+
+char lasterr[1024];
+
+int native_midi_detect()
+{
+ status_t res = synth.EnableInput(true, false);
+ return res == B_OK;
+}
+
+void native_midi_setvolume(int volume)
+{
+ if (volume < 0) volume = 0;
+ if (volume > 128) volume = 128;
+ synth.SetVolume(volume / 128.0);
+}
+
+NativeMidiSong *native_midi_loadsong_RW(SDL_RWops *rw)
+{
+ NativeMidiSong *song = new NativeMidiSong;
+ song->store = new MidiEventsStore;
+ status_t res = song->store->Import(rw);
+
+ if (res != B_OK)
+ {
+ snprintf(lasterr, sizeof lasterr, "Cannot Import() midi file: status_t=%d", res);
+ delete song->store;
+ delete song;
+ return NULL;
+ }
+ return song;
+}
+
+NativeMidiSong *native_midi_loadsong(const char *midifile)
+{
+ SDL_RWops *rw = SDL_RWFromFile(midifile, "rb");
+ if (!rw) return NULL;
+ NativeMidiSong *song = native_midi_loadsong_RW(rw);
+ SDL_RWclose(rw);
+ return song;
+}
+
+void native_midi_freesong(NativeMidiSong *song)
+{
+ if (song == NULL) return;
+ song->store->Stop();
+ song->store->Disconnect(&synth);
+ if (currentSong == song)
+ {
+ currentSong = NULL;
+ }
+ delete song->store;
+ delete song; song = 0;
+}
+void native_midi_start(NativeMidiSong *song)
+{
+ native_midi_stop();
+ song->store->Connect(&synth);
+ song->store->Start();
+ 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__ */
Reference in New Issue View Git Blame Copy Permalink