Work at SourceForge, help us to make it a better place! We have an immediate need for a Support Technician in our San Francisco or Denver office.

Close

Diff of /CMakeLists.txt [730007] .. [717dc6] Maximize Restore

  Switch to side-by-side view

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,14 +31,15 @@
 #############################################################################
 ### build options:                                                        ###
 
-# OPTION(DEBUG       "build debug code [default=off]" OFF)
-# OPTION(WITH_ALSA   "enable playback/recording via ALSA [default=on]" ON)
-# OPTION(WITH_DOC    "build online documentation [default=on]" ON)
-# OPTION(WITH_FLAC   "enable support for FLAC files [default=on]" ON)
-# OPTION(WITH_MP3    "enable support for mp3 files [default=off]" OFF)
-# OPTION(WITH_OGG    "enable support for ogg files [default=on]" ON)
-# OPTION(WITH_OSS    "enable playback/recording via OSS [default=on]" ON)
-# OPTION(WITH_PHONON "enable playback via Phonon [default=off]" OFF)
+# OPTION(DEBUG           "build debug code [default=off]" OFF)
+# OPTION(WITH_ALSA       "enable playback/recording via ALSA [default=on]" ON)
+# OPTION(WITH_DOC        "build online documentation [default=on]" ON)
+# OPTION(WITH_FLAC       "enable support for FLAC files [default=on]" ON)
+# OPTION(WITH_MP3        "enable support for mp3 files [default=off]" OFF)
+# OPTION(WITH_OGG        "enable support for ogg files [default=on]" ON)
+# OPTION(WITH_OSS        "enable playback/recording via OSS [default=on]" ON)
+# OPTION(WITH_PHONON     "enable playback via Phonon [default=off]" OFF)
+# OPTION(WITH_SAMPLERATE "enable support for libsamplerate [default=on]" ON)
 
 #############################################################################
 ### toplevel build targets:                                               ###
@@ -240,9 +241,10 @@
 CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF)
 
 #############################################################################
-### libaudiofile support                                                  ###
+### libaudiofile and libsamplerate support                                ###
 
 INCLUDE(KwaveLibaudiofileSupport)
+INCLUDE(KwaveLibsamplerateSupport)
 
 #############################################################################
 ### optionally: OSS, ALSA and Phonon support for playback/recording       ###
@@ -324,6 +326,7 @@
 IF (WITH_OGG)
     SET(KWAVE_DESKTOP_MIME_TYPES "${KWAVE_DESKTOP_MIME_TYPES}audio/x-ogg;")
     SET(KWAVE_DESKTOP_MIME_TYPES "${KWAVE_DESKTOP_MIME_TYPES}application/ogg;")
+    SET(KWAVE_DESKTOP_MIME_TYPES "${KWAVE_DESKTOP_MIME_TYPES}audio/x-vorbis+ogg;")
 ENDIF (WITH_OGG)
 
 CONFIGURE_FILE(