From 2b00a94094b95d299e89248e5190e9ea338a2245 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 13 Feb 2002 23:43:45 +0000 Subject: [PATCH] Guillaume Cottenceau - Wed Feb 13 15:43:20 PST 2002 * Implemented Ogg Vorbis stream rewinding --- CHANGES | 2 ++ configure.in | 11 ----------- music.c | 5 +++++ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index affddf6c..5fb11e46 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ 1.2.3: +Guillaume Cottenceau - Wed Feb 13 15:43:20 PST 2002 + * Implemented Ogg Vorbis stream rewinding Peter Kutak - Wed Feb 13 10:26:57 PST 2002 * Added native midi support on Linux, using GPL code --enable-music-native-midi-gpl diff --git a/configure.in b/configure.in index 06caaa57..782826d6 100644 --- a/configure.in +++ b/configure.in @@ -135,14 +135,6 @@ if test x$enable_music_midi = xyes; then use_music_native_midi=yes LIBS="$LIBS -framework QuickTime" ;; - *-*-linux* | *-*-freebsd*) - if test x$enable_music_native_midi_gpl != xyes; then - AC_ERROR([the native midi code is GPL code, use --enable-music-native-midi-gpl]) - fi - ;; - *) - AC_ERROR([native MIDI not supported on this platform]) - ;; esac if test x$use_music_native_midi = xyes; then CFLAGS="$CFLAGS -DUSE_NATIVE_MIDI -I\$(top_srcdir)/native_midi" @@ -158,9 +150,6 @@ if test x$enable_music_midi = xyes; then *-*-linux* | *-*-freebsd*) use_music_native_midi_gpl=yes ;; - *) - AC_ERROR([native MIDI not supported on this platform]) - ;; esac if test x$use_music_native_midi_gpl = xyes; then CFLAGS="$CFLAGS -DUSE_NATIVE_MIDI -I\$(top_srcdir)/native_midi" diff --git a/music.c b/music.c index 2081b5e4..4f9eb5a3 100644 --- a/music.c +++ b/music.c @@ -919,6 +919,11 @@ void Mix_RewindMusic(void) SMPEG_rewind(music_playing->data.mp3); break; #endif +#ifdef OGG_MUSIC + case MUS_OGG: + OGG_jump_to_time(music_playing->data.ogg, 0); + break; +#endif #ifdef MID_MUSIC case MUS_MID: #ifdef USE_NATIVE_MIDI