Guillaume Cottenceau - Wed Feb 13 15:43:20 PST 2002
authorSam Lantinga <slouken@libsdl.org>
Wed, 13 Feb 2002 23:43:45 +0000
changeset 1612a4946fc5a62
parent 160 c62666b42573
child 162 8b812ab58ab5
Guillaume Cottenceau - Wed Feb 13 15:43:20 PST 2002
* Implemented Ogg Vorbis stream rewinding
CHANGES
configure.in
music.c
     1.1 --- a/CHANGES	Wed Feb 13 19:07:39 2002 +0000
     1.2 +++ b/CHANGES	Wed Feb 13 23:43:45 2002 +0000
     1.3 @@ -1,5 +1,7 @@
     1.4  
     1.5  1.2.3:
     1.6 +Guillaume Cottenceau - Wed Feb 13 15:43:20 PST 2002
     1.7 + * Implemented Ogg Vorbis stream rewinding
     1.8  Peter Kutak - Wed Feb 13 10:26:57 PST 2002
     1.9   * Added native midi support on Linux, using GPL code
    1.10  	--enable-music-native-midi-gpl
     2.1 --- a/configure.in	Wed Feb 13 19:07:39 2002 +0000
     2.2 +++ b/configure.in	Wed Feb 13 23:43:45 2002 +0000
     2.3 @@ -135,14 +135,6 @@
     2.4                  use_music_native_midi=yes
     2.5                  LIBS="$LIBS -framework QuickTime"
     2.6                  ;;
     2.7 -            *-*-linux* | *-*-freebsd*)
     2.8 -                if test x$enable_music_native_midi_gpl != xyes; then
     2.9 -                    AC_ERROR([the native midi code is GPL code, use --enable-music-native-midi-gpl])
    2.10 -                fi
    2.11 -                ;;
    2.12 -            *)
    2.13 -                AC_ERROR([native MIDI not supported on this platform])
    2.14 -                ;;
    2.15          esac
    2.16          if test x$use_music_native_midi = xyes; then
    2.17              CFLAGS="$CFLAGS -DUSE_NATIVE_MIDI -I\$(top_srcdir)/native_midi"
    2.18 @@ -158,9 +150,6 @@
    2.19              *-*-linux* | *-*-freebsd*)
    2.20                  use_music_native_midi_gpl=yes
    2.21                  ;;
    2.22 -            *)
    2.23 -                AC_ERROR([native MIDI not supported on this platform])
    2.24 -                ;;
    2.25          esac
    2.26          if test x$use_music_native_midi_gpl = xyes; then
    2.27              CFLAGS="$CFLAGS -DUSE_NATIVE_MIDI -I\$(top_srcdir)/native_midi"
     3.1 --- a/music.c	Wed Feb 13 19:07:39 2002 +0000
     3.2 +++ b/music.c	Wed Feb 13 23:43:45 2002 +0000
     3.3 @@ -919,6 +919,11 @@
     3.4  			SMPEG_rewind(music_playing->data.mp3);
     3.5  			break;
     3.6  #endif
     3.7 +#ifdef OGG_MUSIC
     3.8 +		case MUS_OGG:
     3.9 +			OGG_jump_to_time(music_playing->data.ogg, 0);
    3.10 +			break;
    3.11 +#endif
    3.12  #ifdef MID_MUSIC
    3.13  		case MUS_MID:
    3.14  #ifdef USE_NATIVE_MIDI