diff --git a/deps/sndfile/include/sndfile.h b/deps/sndfile/include/sndfile.h index 07649da1..f5d9c105 100644 --- a/deps/sndfile/include/sndfile.h +++ b/deps/sndfile/include/sndfile.h @@ -71,6 +71,7 @@ enum SF_FORMAT_OGG = 0x200000, /* Xiph OGG container */ SF_FORMAT_MPC2K = 0x210000, /* Akai MPC 2000 sampler */ SF_FORMAT_RF64 = 0x220000, /* RF64 WAV file */ + SF_FORMAT_MPEG = 0x230000, /* MPEG-1/2 audio stream */ /* Subtypes from here on. */ @@ -116,6 +117,10 @@ enum SF_FORMAT_ALAC_24 = 0x0072, /* Apple Lossless Audio Codec (24 bit). */ SF_FORMAT_ALAC_32 = 0x0073, /* Apple Lossless Audio Codec (32 bit). */ + SF_FORMAT_MPEG_LAYER_I = 0x0080, /* MPEG-1 Audio Layer I */ + SF_FORMAT_MPEG_LAYER_II = 0x0081, /* MPEG-1 Audio Layer II */ + SF_FORMAT_MPEG_LAYER_III = 0x0082, /* MPEG-2 Audio Layer III */ + /* Endian-ness options. */ SF_ENDIAN_FILE = 0x00000000, /* Default file endian-ness. */ @@ -173,6 +178,7 @@ enum SFC_SET_RAW_START_OFFSET = 0x1090, + /* Commands reserved for dithering, which is not implemented. */ SFC_SET_DITHER_ON_WRITE = 0x10A0, SFC_SET_DITHER_ON_READ = 0x10A1, @@ -217,6 +223,9 @@ enum SFC_SET_OGG_PAGE_LATENCY_MS = 0x1302, SFC_SET_OGG_PAGE_LATENCY = 0x1303, + SFC_GET_BITRATE_MODE = 0x1304, + SFC_SET_BITRATE_MODE = 0x1305, + /* Cart Chunk support */ SFC_SET_CART_INFO = 0x1400, SFC_GET_CART_INFO = 0x1401, @@ -333,10 +342,18 @@ enum SF_CHANNEL_MAP_MAX } ; +/* Bitrate mode values (for use with SFC_GET/SET_BITRATE_MODE) +*/ +enum +{ SF_BITRATE_MODE_CONSTANT = 0, + SF_BITRATE_MODE_AVERAGE, + SF_BITRATE_MODE_VARIABLE +} ; + /* A SNDFILE* pointer can be passed around much like stdio.h's FILE* pointer. */ -typedef struct SNDFILE_tag SNDFILE ; +typedef struct sf_private_tag SNDFILE ; /* The following typedef is system specific and is defined when libsndfile is ** compiled. sf_count_t will be a 64 bit value when the underlying OS allows @@ -386,8 +403,7 @@ typedef struct /* ** Enums and typedefs for adding dither on read and write. -** See the html documentation for sf_command(), SFC_SET_DITHER_ON_WRITE -** and SFC_SET_DITHER_ON_READ. +** Reserved for future implementation. */ enum @@ -755,16 +771,10 @@ void sf_write_sync (SNDFILE *sndfile) ; /* The function sf_wchar_open() is Windows Only! ** Open a file passing in a Windows Unicode filename. Otherwise, this is ** the same as sf_open(). -** -** In order for this to work, you need to do the following: -** -** #include -** #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1 -** #including */ -#if (defined (ENABLE_SNDFILE_WINDOWS_PROTOTYPES) && ENABLE_SNDFILE_WINDOWS_PROTOTYPES) -SNDFILE* sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ; +#ifdef _WIN32 +SNDFILE* sf_wchar_open (const wchar_t *wpath, int mode, SF_INFO *sfinfo) ; #endif diff --git a/deps/sndfile/lib/cmake/SndFile/SndFileConfig.cmake b/deps/sndfile/lib/cmake/SndFile/SndFileConfig.cmake index 514e8f08..1a82ccfc 100644 --- a/deps/sndfile/lib/cmake/SndFile/SndFileConfig.cmake +++ b/deps/sndfile/lib/cmake/SndFile/SndFileConfig.cmake @@ -1,9 +1,10 @@ -set(SndFile_VERSION 1.0.31) +set(SndFile_VERSION 1.1.0) set(SndFile_VERSION_MAJOR 1) -set(SndFile_VERSION_MINOR 0) -set(SndFile_VERSION_PATCH 31) +set(SndFile_VERSION_MINOR 1) +set(SndFile_VERSION_PATCH 0) set (SndFile_WITH_EXTERNAL_LIBS 1) +set (SndFile_WITH_MPEG 0) ####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() ####### @@ -40,6 +41,11 @@ if (SndFile_WITH_EXTERNAL_LIBS AND NOT NO) find_dependency (Opus) endif () +if (SndFile_WITH_MPEG AND NOT NO) + find_dependency (Lame) + find_dependency (MPG123) +endif () + include (${CMAKE_CURRENT_LIST_DIR}/SndFileTargets.cmake) set_and_check (SndFile_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include") diff --git a/deps/sndfile/lib/cmake/SndFile/SndFileConfigVersion.cmake b/deps/sndfile/lib/cmake/SndFile/SndFileConfigVersion.cmake index 77cdaef8..b981cf60 100644 --- a/deps/sndfile/lib/cmake/SndFile/SndFileConfigVersion.cmake +++ b/deps/sndfile/lib/cmake/SndFile/SndFileConfigVersion.cmake @@ -9,26 +9,45 @@ # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "1.0.31") +set(PACKAGE_VERSION "1.1.0") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("1.0.31" MATCHES "^([0-9]+)\\.") + if("1.1.0" MATCHES "^([0-9]+)\\.") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") + if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) + string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") + endif() else() - set(CVF_VERSION_MAJOR "1.0.31") + set(CVF_VERSION_MAJOR "1.1.0") endif() - if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR) - set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION_RANGE) + # both endpoints of the range must have the expected major version + math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1") + if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR + OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT))) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR + AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX))) + set(PACKAGE_VERSION_COMPATIBLE TRUE) + else() + set(PACKAGE_VERSION_COMPATIBLE FALSE) + endif() else() - set(PACKAGE_VERSION_COMPATIBLE FALSE) - endif() + if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR) + set(PACKAGE_VERSION_COMPATIBLE TRUE) + else() + set(PACKAGE_VERSION_COMPATIBLE FALSE) + endif() - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) set(PACKAGE_VERSION_EXACT TRUE) + endif() endif() endif() diff --git a/deps/sndfile/lib/cmake/SndFile/SndFileTargets.cmake b/deps/sndfile/lib/cmake/SndFile/SndFileTargets.cmake index 2fb84448..930fe1ee 100644 --- a/deps/sndfile/lib/cmake/SndFile/SndFileTargets.cmake +++ b/deps/sndfile/lib/cmake/SndFile/SndFileTargets.cmake @@ -4,7 +4,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) message(FATAL_ERROR "CMake >= 2.6.0 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.6...3.17) +cmake_policy(VERSION 2.6...3.19) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- @@ -55,7 +55,7 @@ add_library(SndFile::sndfile STATIC IMPORTED) set_target_properties(SndFile::sndfile PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" - INTERFACE_LINK_LIBRARIES "\$:m>>;\$:Vorbis::vorbisenc>>;\$:FLAC::FLAC>>;\$,\$,\$>:Speex::Speex>>;\$:Opus::opus>>" + INTERFACE_LINK_LIBRARIES "\$:m>>;\$:Vorbis::vorbisenc>>;\$:FLAC::FLAC>>;\$,\$,\$>:Speex::Speex>>;\$:Opus::opus>>;\$:MPG123::libmpg123>>;\$:Lame::Lame>>" ) if(CMAKE_VERSION VERSION_LESS 2.8.12) diff --git a/deps/sndfile/lib/libsndfile.a b/deps/sndfile/lib/libsndfile.a index a769b356..bfa4a810 100644 Binary files a/deps/sndfile/lib/libsndfile.a and b/deps/sndfile/lib/libsndfile.a differ diff --git a/deps/sndfile/lib/pkgconfig/sndfile.pc b/deps/sndfile/lib/pkgconfig/sndfile.pc index ea7dff43..d147a70d 100644 --- a/deps/sndfile/lib/pkgconfig/sndfile.pc +++ b/deps/sndfile/lib/pkgconfig/sndfile.pc @@ -1,12 +1,13 @@ prefix= exec_prefix=${prefix} -libdir=${prefix}/lib +libdir=${exec_prefix}/lib includedir=${prefix}/include Name: sndfile Description: A library for reading and writing audio files Requires: -Requires.private: flac ogg vorbis vorbisenc opus -Version: 1.0.31 +Requires.private: flac ogg vorbis vorbisenc opus +Version: 1.1.0 Libs: -L${libdir} -lsndfile +Libs.private: Cflags: -I${includedir}