Converted all mod files to ogg, moved the ogg files into the media

repository, and switched the track data to use the ogg files.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@1448 178a84e3-b1eb-0310-8ba1-8eac791a3b58

configure.ac

@@ -146,9 +146,7 @@ dnl The check for OpenAL headers depends on the OS, since
 dnl Apple has the headers in OpenAL/al.h instead of AL/al.h 
 AC_SEARCH_LIBS(alGenBuffers, [openal alut], have_al_lib=yes)   
 
-dnl as well as mikmod, since mikmod is only used (but then
-dnl it's necessary) when openal is used. We also check for
-dnl ogg vorbis support now.
+dnl We also check for ogg vorbis support now.
 dnl we have 4 sound libraries to check, first we check for OpenAL   
 if test x$have_al_lib = xyes; then
   case "${host}" in
@@ -195,13 +193,6 @@ case "${host}" in
       fi
    fi
 
-   dnl search for mikmod libraries, needed to play mod files with OpenAL
-   AC_SEARCH_LIBS(MikMod_RegisterDriver, mikmod, have_mikmod_lib=yes)
-   
-   if test x$have_mikmod_lib = xyes; then
-      AC_CHECK_HEADER(mikmod.h, have_mikmod_hdr=yes)
-   fi
- 
    dnl search for the libraries needed to use ogg vorbis
    AC_SEARCH_LIBS(ov_open, vorbisfile, have_vorbisfile_lib=yes)
 
@@ -225,27 +216,20 @@ case "${host}" in
        SUMMARY="$SUMMARY You DO NOT have freealut."
    fi
    
-   if test x$have_mikmod_hdr != xyes; then
-       SUMMARY="$SUMMARY You DO NOT have mikmod."
-   fi
-   
    if test x$have_al_hdr = xyes -a x$alut_version_ok = xyes; then
-       if test x$have_mikmod_hdr = xyes; then
-           openal_LIBS="$LIBS"
-           AC_DEFINE([HAVE_OPENAL], 1, [Defined when OpenAL is available])
-           AC_DEFINE([HAVE_MIKMOD], 1, [Defined when mikmod is available])
-           SUMMARY="$SUMMARY\nUsing OpenAL for sound."
-           
-           if test x$have_vorbisfile_hdr = xyes -a x$have_ogg_hdr = xyes; then
-               AC_DEFINE([HAVE_OGGVORBIS], 1, [Defined when Ogg Vorbis is available])
-               SUMMARY="$SUMMARY\nWe have Ogg Vorbis support."
-               # ov_read for ogg music needs endianness flag. This macro defines
-	       # WORDS_BIGENDIAN if it's a big endian machine. See music_ogg.cpp
-	       AC_C_BIGENDIAN
-           fi
+       openal_LIBS="$LIBS"
+       AC_DEFINE([HAVE_OPENAL], 1, [Defined when OpenAL is available])
+       SUMMARY="$SUMMARY\nUsing OpenAL for sound."
+
+       if test x$have_vorbisfile_hdr = xyes -a x$have_ogg_hdr = xyes; then
+           AC_DEFINE([HAVE_OGGVORBIS], 1, [Defined when Ogg Vorbis is available])
+           SUMMARY="$SUMMARY\nWe have Ogg Vorbis support."
+           # ov_read for ogg music needs endianness flag. This macro defines
+           # WORDS_BIGENDIAN if it's a big endian machine. See music_ogg.cpp
+	   AC_C_BIGENDIAN
        fi
    else
-       SUMMARY="$SUMMARY\nInstall OpenAL, freealut and mikmod for better sound!"
+       SUMMARY="$SUMMARY\nInstall OpenAL and freealut for better sound!"
    fi
 
    LIBS=$save_LIBS
@@ -374,7 +358,6 @@ fi
 AC_SUBST(bullet_LIBS)
 AC_SUBST(opengl_LIBS)
 AC_SUBST(openal_LIBS)
-AC_SUBST(mikmod_LIBS)
 AC_SUBST(sdl_LIBS)
 
 AC_MSG_CHECKING([for gcc -fno-regmove option ])
@@ -425,7 +408,6 @@ AC_CONFIG_FILES([         \
  fonts/Makefile           \
  images/Makefile          \
  models/Makefile          \
- mods/Makefile            \
  src/Makefile             \
  wavs/Makefile            \
  wavs/radio/Makefile      \

data/beach.track

@@ -1,11 +1,11 @@
 ;; -*- mode: lisp -*-
 
 (tuxkart-track
- (name "On the Beach")
+ (name        "On the Beach")
  (description "Created by Ingo Ruhnke")
- (music "mods/Boom_boom_boom.mod")
- (screenshot "sshot-beach.rgb")
- (topview "topview-beach.rgb")
+ (music       "oggs/Boom_boom_boom.ogg")
+ (screenshot  "sshot-beach.rgb")
+ (topview     "topview-beach.rgb")
 )
 
 ;; EOF ;;

data/bsodcastle.track

@@ -1,11 +1,11 @@
 ;; -*- mode: lisp -*-
 
 (tuxkart-track
- (name "BSODs Battlements")
+ (name        "BSODs Battlements")
  (description "Created by Oliver & Steve Baker")
- (music "oggs/Lava\ Lagoon_2.ogg")
- (screenshot "sshot-bsodcastle.rgb")
- (topview "topview-bsodcastle.rgb")
+ (music       "oggs/Lava\ Lagoon_2.ogg")
+ (screenshot  "sshot-bsodcastle.rgb")
+ (topview     "topview-bsodcastle.rgb")
 )
 
 ;; EOF ;;

data/geekopeak.track

@@ -1,11 +1,11 @@
 ;; -*- mode: lisp -*-
 
 (tuxkart-track
- (name "Geeko Peak")
+ (name        "Geeko Peak")
  (description "Created by Oliver & Steve Baker")
- (music "mods/tk2.mod")
- (screenshot "sshot-geekopeak.rgb")
- (topview "topview-geekopeak.rgb")
+ (music       "oggs/tk2.ogg")
+ (screenshot  "sshot-geekopeak.rgb")
+ (topview     "topview-geekopeak.rgb")
 )
 
 ;; EOF ;;

data/gownsbow.track

@@ -1,12 +1,12 @@
 ;; -*- mode: lisp -*-
 
 (tuxkart-track
- (name "Gowns Bow")
+ (name        "Gowns Bow")
  (description "Created by Oliver & Steve Baker")
- (gravity 78.0)
- (music "mods/tk5a.mod")
- (screenshot "sshot-gownsbow.rgb")
- (topview "topview-gownsbow.rgb")
+ (gravity     78.0)
+ (music       "oggs/tk5a.ogg")
+ (screenshot  "sshot-gownsbow.rgb")
+ (topview     "topview-gownsbow.rgb")
 )
 
 ;; EOF ;;

data/islandtrack.track

@@ -1,11 +1,11 @@
 ;; -*- mode: lisp -*-
 
 (tuxkart-track
- (name "The Island")
+ (name        "The Island")
  (description "Created by Johannes Sjolund")
- (music "mods/Boom_boom_boom.mod")
- (screenshot "sshot-islandtrack.rgb")
- (topview "topview-islandtrack.rgb")
+ (music       "oggs/Boom_boom_boom.ogg")
+ (screenshot  "sshot-islandtrack.rgb")
+ (topview     "topview-islandtrack.rgb")
  (start-heading  0.0  3.7  9.5 11.5 15.1 17.0  20.2  22.0  26.0  36.0 )
  (start-x       -1.2  1.6 -0.9  2.3  0.0  3.4   1.2   4.2   2.6   6.2 )
  (start-y       -0.5 -1.5 -3.8 -5.0 -7.0 -8.0 -10.4 -10.9 -13.4 -14.1 )

data/lighthouse.track

@@ -1,11 +1,11 @@
 ;; -*- mode: lisp -*-
 
 (tuxkart-track
- (name "Around the Lighthouse")
+ (name        "Around the Lighthouse")
  (description "Created by Ingo Ruhnke")
- (music "mods/tk2.mod")
- (screenshot "sshot-lighthouse.rgb")
- (topview "topview-lighthouse.rgb")
+ (music       "oggs/tk2.ogg")
+ (screenshot  "sshot-lighthouse.rgb")
+ (topview     "topview-lighthouse.rgb")
 )
 
 ;; EOF ;;

data/littlevolcano.track

@@ -15,9 +15,9 @@
  (sun-diffuse  0.8 0.6 0.6 0.0)
  (sun-specular 1.0 0.8 0.8 0.0)
 
- (music "mods/tk5a.mod")
+ (music      "oggs/tk5a.ogg")
  (screenshot "sshot-littlevolcano.rgb")
- (topview "topview-littlevolcano.rgb")
+ (topview    "topview-littlevolcano.rgb")
 )
 
 ;; EOF ;;

data/olivermath.track

@@ -1,11 +1,11 @@
 ;; -*- mode: lisp -*-
 
 (tuxkart-track
- (name "Oliver's Math Class")
+ (name        "Oliver's Math Class")
  (description "Created by Oliver & Steve Baker")
- (music "mods/Boom_boom_boom.mod")
- (screenshot "sshot-olivermath.rgb")
- (topview "topview-olivermath.rgb")
+ (music       "oggs/Boom_boom_boom.ogg")
+ (screenshot  "sshot-olivermath.rgb")
+ (topview     "topview-olivermath.rgb")
 )
 
 ;; EOF ;;

data/race.track

@@ -1,11 +1,11 @@
 ;; -*- mode: lisp -*-
 
 (tuxkart-track
- (name "Race Track")
+ (name        "Race Track")
  (description "Created by Ingo Ruhnke")
- (music "mods/tk5a.mod" "mods/tk2.mod")
- (screenshot "sshot-race.rgb")
- (topview "topview-race.rgb")
+ (music       "oggs/tk5a.ogg" "oggs/tk2.ogg")
+ (screenshot  "sshot-race.rgb")
+ (topview     "topview-race.rgb")
 )
 
 ;; EOF ;;

data/sandtrack.track

@@ -1,11 +1,11 @@
 ;; -*- mode: lisp -*-
 
 (tuxkart-track
- (name "Shifting Sands")
+ (name        "Shifting Sands")
  (description "Created by Oliver & Steve Baker")
- (music "mods/tk7.mod")
- (screenshot "sshot-sandtrack.rgb")
- (topview "topview-sandtrack.rgb")
+ (music       "oggs/tk7.ogg")
+ (screenshot  "sshot-sandtrack.rgb")
+ (topview     "topview-sandtrack.rgb")
 )
 
 ;; EOF ;;

data/subseatrack.track

@@ -15,9 +15,9 @@
  (sun-specular 0.8 0.8 1.0 0.0)
   ;; The default x start coordinates are a bit too far to the right
  (start-x  2.0 -1.0 2.0 -1.0 2.0 -1.0 2.0 -1.0 2.0 -1.0 )
- (music "mods/tuxr.mod")
+ (music      "oggs/tuxr.ogg")
  (screenshot "sshot-subseatrack.rgb")
- (topview "topview-subseatrack.rgb")
+ (topview    "topview-subseatrack.rgb")
 )
 
 ;; EOF ;;

data/tuxtrack.track

@@ -3,9 +3,9 @@
 (tuxkart-track
  (name        "Tux Tollway")
  (description "Created by Oliver & Steve Baker")
- (music       "mods/tk2.mod")
- (screenshot "sshot-tuxtrack.rgb")
- (topview "topview-tuxtrack.rgb")
+ (music       "oggs/tk2.ogg")
+ (screenshot  "sshot-tuxtrack.rgb")
+ (topview     "topview-tuxtrack.rgb")
  (start-heading -25.0 -25.0 -25.0 -25.0 -25.0 -25.0 -25.0 -25.0 -25.0  -25.0 )
  (start-x         0.1  -3.3  -1.5  -4.8  -3.0  -6.3  -4.5  -7.8  -6.0   -9.3 )
  (start-y        -2.0  -1.8  -4.6  -4.4  -7.2  -7.0  -9.8  -9.6  -12.4 -12.2 )

data/volcano.track

@@ -1,11 +1,11 @@
 ;; -*- mode: lisp -*-
 
 (tuxkart-track
- (name "Volcano")
+ (name        "Volcano")
  (description "Created by Ingo Ruhnke")
- (music "mods/Boom_boom_boom.mod")
- (screenshot "sshot-volcano.rgb")
- (topview "topview-volcano.rgb")
+ (music       "oggs/Boom_boom_boom.ogg")
+ (screenshot  "sshot-volcano.rgb")
+ (topview     "topview-volcano.rgb")
 )
 
 ;; EOF ;;

mods/Makefile.am

@@ -1,7 +0,0 @@
-# mods/
-
-pkgdatadir = $(datadir)/games/@PACKAGE@/mods
-
-pkgdata_DATA = $(wildcard *.mod)
-
-EXTRA_DIST = $(pkgdata_DATA)