HTML5 initial commit. Untested.

* Autotools updated
* MSVC and Xcode are not updated

Author: devappd

Makefile.in

@@ -38,7 +38,7 @@ VERSION_OBJECTS = @VERSION_OBJECTS@
 PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
 PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@
 
-DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh load_aiff.c load_aiff.h load_voc.c load_voc.h mixer.c mixer.h music.c music.h music_cmd.c music_cmd.h music_flac.c music_flac.h music_fluidsynth.c music_fluidsynth.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_mpg123.c music_mpg123.h music_nativemidi.c music_nativemidi.h music_ogg.c music_ogg.h music_opus.c music_opus.h music_timidity.c music_timidity.h music_wav.c music_wav.h native_midi playmus.c playwave.c timidity version.rc
+DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh load_aiff.c load_aiff.h load_voc.c load_voc.h mixer.c mixer.h music.c music.h music_html5.c music_html5.h music_cmd.c music_cmd.h music_flac.c music_flac.h music_fluidsynth.c music_fluidsynth.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_mpg123.c music_mpg123.h music_nativemidi.c music_nativemidi.h music_ogg.c music_ogg.h music_opus.c music_opus.h music_timidity.c music_timidity.h music_wav.c music_wav.h native_midi playmus.c playwave.c timidity version.rc
 
 LT_AGE      = @LT_AGE@
 LT_CURRENT  = @LT_CURRENT@

SDL_mixer.h

@@ -127,6 +127,7 @@ typedef enum {
 /* These are types of music files (not libraries used to load them) */
 typedef enum {
     MUS_NONE,
+    MUS_HTML5,
     MUS_CMD,
     MUS_WAV,
     MUS_MOD,

configure

@@ -894,6 +894,7 @@ enable_dependency_tracking
 with_sdl_prefix
 with_sdl_exec_prefix
 enable_sdltest
+enable_music_html5
 enable_music_cmd
 enable_music_wave
 enable_music_mod
@@ -11687,6 +11688,17 @@ done
 
 CheckVisibilityHidden
 
+# Check whether --enable-music-html5 was given.
+if test "${enable_music_html5+set}" = set; then :
+  enableval=$enable_music_html5;
+else
+  enable_music_html5=no
+fi
+
+if test x$enable_music_html5 = xyes; then
+    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_HTML5"
+fi
+
 # Check whether --enable-music-cmd was given.
 if test "${enable_music_cmd+set}" = set; then :
   enableval=$enable_music_cmd;

configure.in

@@ -206,6 +206,13 @@ dnl Check command-line options
 
 CheckVisibilityHidden
 
+AC_ARG_ENABLE([music-html5],
+AC_HELP_STRING([--enable-music-html5], [enable streaming music on HTML5 <audio> [[default=no]]]),
+              [], [enable_music_html5=no])
+if test x$enable_music_html5 = xyes; then
+    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_HTML5"
+fi
+
 AC_ARG_ENABLE([music-cmd],
 AC_HELP_STRING([--enable-music-cmd], [support an external music player [[default=yes]]]),
               [], [enable_music_cmd=detect])

music.c

@@ -28,6 +28,7 @@
 #include "mixer.h"
 #include "music.h"
 
+#include "music_html5.h"
 #include "music_cmd.h"
 #include "music_wav.h"
 #include "music_mikmod.h"
@@ -80,6 +81,9 @@ static char* soundfont_paths = NULL;
 /* Interfaces for the various music interfaces, ordered by priority */
 static Mix_MusicInterface *s_music_interfaces[] =
 {
+#ifdef MUSIC_HTML5
+    &Mix_MusicInterface_HTML5,
+#endif
 #ifdef MUSIC_CMD
     &Mix_MusicInterface_CMD,
 #endif
@@ -380,6 +384,7 @@ void open_music(const SDL_AudioSpec *spec)
 #endif
 
     /* Load the music interfaces that don't have explicit initialization */
+    load_music_type(MUS_HTML5);
     load_music_type(MUS_CMD);
     load_music_type(MUS_WAV);
 

music.h

@@ -27,6 +27,7 @@
 
 typedef enum
 {
+    MIX_MUSIC_HTML5,
     MIX_MUSIC_CMD,
     MIX_MUSIC_WAVE,
     MIX_MUSIC_MODPLUG,
@@ -106,6 +107,7 @@ typedef struct
 extern int get_num_music_interfaces(void);
 extern Mix_MusicInterface *get_music_interface(int index);
 extern Mix_MusicType detect_music_type_from_magic(const Uint8 *magic);
+extern Mix_MusicType detect_music_type(SDL_RWops *src);
 extern SDL_bool load_music_type(Mix_MusicType type);
 extern SDL_bool open_music_type(Mix_MusicType type);
 extern SDL_bool has_music(Mix_MusicType type);