We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Select native midi devices: The patch also implements 'default' implementations of added API for non-windows (i.e. mac, macosx, haiku platforms) which can be expanded upon further.

nativemidiselection.patch (text/plain), 5.52 KB, created by Darren Janeczek on 2014-08-21 03:12:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Janeczek

Created: 2014-08-21 03:12:00 UTC

Size: 5.52 KB

patch

obsolete

>diff -r b9ed366f0154 SDL_mixer.h
>--- a/SDL_mixer.h	Tue Jul 08 00:42:06 2014 -0700
>+++ b/SDL_mixer.h	Wed Aug 20 23:08:49 2014 -0400
>@@ -605,6 +605,12 @@
> extern DECLSPEC int SDLCALL Mix_SetSynchroValue(int value);
> extern DECLSPEC int SDLCALL Mix_GetSynchroValue(void);
> 
>+/* Set/Get MIDI Device options */
>+extern DECLSPEC unsigned int SDLCALL Mix_GetNumMidiDevices();
>+extern DECLSPEC unsigned int SDLCALL Mix_GetActiveMidiDevice();
>+extern DECLSPEC void SDLCALL Mix_SetActiveMidiDevice(unsigned int device);
>+extern DECLSPEC const char* SDLCALL Mix_GetMidiDeviceName(unsigned int device);
>+
> /* Set/Get/Iterate SoundFonts paths to use by supported MIDI backends */
> extern DECLSPEC int SDLCALL Mix_SetSoundFonts(const char *paths);
> extern DECLSPEC const char* SDLCALL Mix_GetSoundFonts(void);
>diff -r b9ed366f0154 music.c
>--- a/music.c	Tue Jul 08 00:42:06 2014 -0700
>+++ b/music.c	Wed Aug 20 23:08:49 2014 -0400
>@@ -1545,6 +1545,41 @@
>     ms_per_step = 0;
> }
> 
>+unsigned int SDLCALL Mix_GetNumMidiDevices()
>+{
>+#ifdef USE_NATIVE_MIDI
>+  return native_midi_get_num_devices();
>+#else
>+  return 0; 
>+#endif
>+}
>+
>+unsigned int SDLCALL Mix_GetActiveMidiDevice()
>+{
>+#ifdef USE_NATIVE_MIDI
>+  return native_midi_get_device();
>+#else
>+  return 0xFFFFFFFF; 
>+#endif
>+}
>+
>+void SDLCALL Mix_SetActiveMidiDevice(unsigned int device)
>+{
>+#ifdef USE_NATIVE_MIDI
>+  return native_midi_set_device(device);
>+#else
>+#endif
>+}
>+
>+const char* SDLCALL Mix_GetMidiDeviceName(unsigned int device)
>+{
>+#ifdef USE_NATIVE_MIDI
>+  return native_midi_device_name(device);
>+#else
>+  return "Native MIDI not available";
>+#endif
>+}
>+
> int Mix_SetSoundFonts(const char *paths)
> {
> #ifdef MID_MUSIC
>diff -r b9ed366f0154 native_midi/native_midi.h
>--- a/native_midi/native_midi.h	Tue Jul 08 00:42:06 2014 -0700
>+++ b/native_midi/native_midi.h	Wed Aug 20 23:08:49 2014 -0400
>@@ -35,4 +35,10 @@
> void native_midi_setvolume(int volume);
> const char *native_midi_error(void);
> 
>+void native_midi_set_device(unsigned int device);
>+void native_midi_set_default_device();
>+unsigned int native_midi_get_num_devices();
>+unsigned int native_midi_get_device();
>+const char *native_midi_device_name(unsigned int device);
>+
> #endif /* _NATIVE_MIDI_H_ */
>diff -r b9ed366f0154 native_midi/native_midi_haiku.cpp
>--- a/native_midi/native_midi_haiku.cpp	Tue Jul 08 00:42:06 2014 -0700
>+++ b/native_midi/native_midi_haiku.cpp	Wed Aug 20 23:08:49 2014 -0400
>@@ -281,4 +281,29 @@
>   return lasterr;
> }
> 
>+/* !!! FIXME assuming System Default MIDI Device for this platform */
>+
>+void native_midi_set_device(UINT device)
>+{
>+}
>+
>+void native_midi_set_default_device()
>+{
>+}
>+
>+UINT native_midi_get_num_devices()
>+{
>+    return 1;
>+}
>+
>+UINT native_midi_get_device()
>+{
>+    return 0;
>+}
>+
>+const char *native_midi_device_name(UINT device)
>+{
>+    return "System Default MIDI Device";
>+}
>+
> #endif /* __HAIKU__ */
>diff -r b9ed366f0154 native_midi/native_midi_mac.c
>--- a/native_midi/native_midi_mac.c	Tue Jul 08 00:42:06 2014 -0700
>+++ b/native_midi/native_midi_mac.c	Wed Aug 20 23:08:49 2014 -0400
>@@ -637,4 +637,29 @@
>     return myHeader;
> }
> 
>+/* !!! FIXME assuming System Default MIDI Device for this platform */
>+
>+void native_midi_set_device(UINT device)
>+{
>+}
>+
>+void native_midi_set_default_device()
>+{
>+}
>+
>+UINT native_midi_get_num_devices()
>+{
>+    return 1;
>+}
>+
>+UINT native_midi_get_device()
>+{
>+    return 0;
>+}
>+
>+const char *native_midi_device_name(UINT device)
>+{
>+    return "System Default MIDI Device";
>+}
>+
> #endif /* MacOS native MIDI support */
>diff -r b9ed366f0154 native_midi/native_midi_macosx.c
>--- a/native_midi/native_midi_macosx.c	Tue Jul 08 00:42:06 2014 -0700
>+++ b/native_midi/native_midi_macosx.c	Wed Aug 20 23:08:49 2014 -0400
>@@ -334,5 +334,30 @@
>     return "";  /* !!! FIXME */
> }
> 
>+/* !!! FIXME assuming System Default MIDI Device for this platform */
>+
>+void native_midi_set_device(UINT device)
>+{
>+}
>+
>+void native_midi_set_default_device()
>+{
>+}
>+
>+UINT native_midi_get_num_devices()
>+{
>+    return 1;
>+}
>+
>+UINT native_midi_get_device()
>+{
>+    return 0;
>+}
>+
>+const char *native_midi_device_name(UINT device)
>+{
>+    return "System Default MIDI Device";
>+}
>+
> #endif /* Mac OS X native MIDI support */
> 
>diff -r b9ed366f0154 native_midi/native_midi_win32.c
>--- a/native_midi/native_midi_win32.c	Tue Jul 08 00:42:06 2014 -0700
>+++ b/native_midi/native_midi_win32.c	Wed Aug 20 23:08:49 2014 -0400
>@@ -45,6 +45,7 @@
>   int NewPos;
> };
> 
>+static const UINT DEFAULT_DEVICE=MIDI_MAPPER;
> static UINT MidiDevice=MIDI_MAPPER;
> static HMIDISTRM hMidiStream;
> static NativeMidiSong *currentsong;
>@@ -304,4 +305,54 @@
>   return "";
> }
> 
>+void native_midi_set_device(UINT device)
>+{
>+  if (device < native_midi_get_num_devices())
>+  {
>+    MidiDevice = device;
>+    if (currentsong->MusicPlaying)
>+    {
>+      native_midi_start(currentsong, currentsong->Loops);
>+    }
>+  }
>+}
>+
>+void native_midi_set_default_device()
>+{
>+  MidiDevice = DEFAULT_DEVICE;
>+  if (currentsong->MusicPlaying)
>+  {
>+    native_midi_start(currentsong, currentsong->Loops);
>+  }
>+}
>+
>+UINT native_midi_get_num_devices()
>+{
>+  return midiOutGetNumDevs();
>+}
>+
>+UINT native_midi_get_device()
>+{
>+  return MidiDevice;
>+}
>+
>+
>+static MIDIOUTCAPS midi_device_capabilities;
>+
>+const char *native_midi_device_name(UINT device)
>+{
>+  MIDIOUTCAPS *caps = &midi_device_capabilities;
>+  int result;
>+
>+  if (device == DEFAULT_DEVICE)
>+    return "System Default MIDI Device";
>+
>+  if (device > native_midi_get_num_devices())
>+    return "Invalid Device Identifier";
>+  
>+  result = midiOutGetDevCaps(device, caps, sizeof(MIDIOUTCAPS));
>+
>+  return caps->szPname;
>+}
>+
> #endif /* Windows native MIDI support */

Actions: View | Diff

Attachments on bug 2697: 1836

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.