mirror of
https://github.com/GTAmodding/re3.git
synced 2021-02-19 17:49:54 +01:00
oal wav/mp3 stream update
This commit is contained in:
Fire-Head
parent
73c809f616
commit
12a3499ca3
9764
libsndfile/ChangeLog
Normal file
9764
libsndfile/ChangeLog
Normal file
File diff suppressed because it is too large
Load Diff
199
libsndfile/NEWS
Normal file
199
libsndfile/NEWS
Normal file
@ -0,0 +1,199 @@
|
|||||||
|
Version 1.0.28 (2017-04-02)
|
||||||
|
* Fix buffer overruns in FLAC and ID3 handling code.
|
||||||
|
* Move to variable length header storage.
|
||||||
|
* Fix detection of Large File Support for 32 bit systems.
|
||||||
|
* Remove large stack allocations in ALAC handling code.
|
||||||
|
* Remove all use of Variable Length Arrays.
|
||||||
|
* Minor bug fixes and improvements.
|
||||||
|
|
||||||
|
Version 1.0.27 (2016-06-19)
|
||||||
|
* Fix an SF_INFO seekable flag regression introduced in 1.0.26.
|
||||||
|
* Fix potential infinite loops on malformed input files.
|
||||||
|
* Add string metadata read/write for CAF and RF64.
|
||||||
|
* Add handling of CUE chunks.
|
||||||
|
* Fix endian-ness issues in PAF files.
|
||||||
|
* Minor bug fixes and improvements.
|
||||||
|
|
||||||
|
Version 1.0.26 (2015-11-22)
|
||||||
|
* Fix for CVE-2014-9496, SD2 buffer read overflow.
|
||||||
|
* Fix for CVE-2014-9756, file_io.c divide by zero.
|
||||||
|
* Fix for CVE-2015-7805, AIFF heap write overflow.
|
||||||
|
* Add support for ALAC encoder in a CAF container.
|
||||||
|
* Add support for Cart chunks in WAV files.
|
||||||
|
* Minor bug fixes and improvements.
|
||||||
|
|
||||||
|
Version 1.0.25 (2011-07-13)
|
||||||
|
* Fix for Secunia Advisory SA45125, heap overflow in PAF file handler.
|
||||||
|
* Accept broken WAV files with blockalign == 0.
|
||||||
|
* Minor bug fixes and improvements.
|
||||||
|
|
||||||
|
Version 1.0.24 (2011-03-23)
|
||||||
|
* WAV files now have an 18 byte u-law and A-law fmt chunk.
|
||||||
|
* Document virtual I/O functionality.
|
||||||
|
* Two new methods rawHandle() and takeOwnership() in sndfile.hh.
|
||||||
|
* AIFF fix for non-zero offset value in SSND chunk.
|
||||||
|
* Minor bug fixes and improvements.
|
||||||
|
|
||||||
|
Version 1.0.23 (2010-10-10)
|
||||||
|
* Add version metadata to Windows DLL.
|
||||||
|
* Add a missing 'inline' to sndfile.hh.
|
||||||
|
* Update docs.
|
||||||
|
* Minor bug fixes and improvements.
|
||||||
|
|
||||||
|
Version 1.0.22 (2010-10-04)
|
||||||
|
* Couple of fixes for SDS file writer.
|
||||||
|
* Fixes arising from static analysis.
|
||||||
|
* Handle FLAC files with ID3 meta data at start of file.
|
||||||
|
* Handle FLAC files which report zero length.
|
||||||
|
* Other minor bug fixes and improvements.
|
||||||
|
|
||||||
|
Version 1.0.21 (2009-12-13)
|
||||||
|
* Add a couple of new binary programs to programs/ dir.
|
||||||
|
* Remove sndfile-jackplay (now in sndfile-tools package).
|
||||||
|
* Add windows only function sf_wchar_open().
|
||||||
|
* Bunch of minor bug fixes.
|
||||||
|
|
||||||
|
Version 1.0.20 (2009-05-14)
|
||||||
|
* Fix potential heap overflow in VOC file parser (Tobias Klein, http://www.trapkit.de/).
|
||||||
|
|
||||||
|
Version 1.0.19 (2009-03-02)
|
||||||
|
* Fix for CVE-2009-0186 (Alin Rad Pop, Secunia Research).
|
||||||
|
* Huge number of minor bug fixes as a result of static analysis.
|
||||||
|
|
||||||
|
Version 1.0.18 (2009-02-07)
|
||||||
|
* Add Ogg/Vorbis support (thanks to John ffitch).
|
||||||
|
* Remove captive FLAC library.
|
||||||
|
* Many new features and bug fixes.
|
||||||
|
* Generate Win32 and Win64 pre-compiled binaries.
|
||||||
|
|
||||||
|
Version 1.0.17 (2006-08-31)
|
||||||
|
* Add sndfile.hh C++ wrapper.
|
||||||
|
* Update Win32 MinGW build instructions.
|
||||||
|
* Minor bug fixes and cleanups.
|
||||||
|
|
||||||
|
Version 1.0.16 (2006-04-30)
|
||||||
|
* Add support for Broadcast (BEXT) chunks in WAV files.
|
||||||
|
* Implement new commands SFC_GET_SIGNAL_MAX and SFC_GET_MAX_ALL_CHANNELS.
|
||||||
|
* Add support for RIFX (big endian WAV variant).
|
||||||
|
* Fix configure script bugs.
|
||||||
|
* Fix bug in INST and MARK chunk writing for AIFF files.
|
||||||
|
|
||||||
|
Version 1.0.15 (2006-03-16)
|
||||||
|
* Fix some ia64 issues.
|
||||||
|
* Fix precompiled DLL.
|
||||||
|
* Minor bug fixes.
|
||||||
|
|
||||||
|
Version 1.0.14 (2006-02-19)
|
||||||
|
* Really fix MinGW compile problems.
|
||||||
|
* Minor bug fixes.
|
||||||
|
|
||||||
|
Version 1.0.13 (2006-01-21)
|
||||||
|
* Fix for MinGW compiler problems.
|
||||||
|
* Allow readin/write of instrument chunks from WAV and AIFF files.
|
||||||
|
* Compile problem fix for Solaris compiler.
|
||||||
|
* Minor cleanups and bug fixes.
|
||||||
|
|
||||||
|
Version 1.0.12 (2005-09-30)
|
||||||
|
* Add support for FLAC and Apple's Core Audio Format (CAF).
|
||||||
|
* Add virtual I/O interface (still needs docs).
|
||||||
|
* Cygwin and other Win32 fixes.
|
||||||
|
* Minor bug fixes and cleanups.
|
||||||
|
|
||||||
|
Version 1.0.11 (2004-11-15)
|
||||||
|
* Add support for SD2 files.
|
||||||
|
* Add read support for loop info in WAV and AIFF files.
|
||||||
|
* Add more tests.
|
||||||
|
* Improve type safety.
|
||||||
|
* Minor optimisations and bug fixes.
|
||||||
|
|
||||||
|
Version 1.0.10 (2004-06-15)
|
||||||
|
* Fix AIFF read/write mode bugs.
|
||||||
|
* Add support for compiling Win32 DLLS using MinGW.
|
||||||
|
* Fix problems resulting in failed compiles with gcc-2.95.
|
||||||
|
* Improve test suite.
|
||||||
|
* Minor bug fixes.
|
||||||
|
|
||||||
|
Version 1.0.9 (2004-03-30)
|
||||||
|
* Add handling of AVR (Audio Visual Research) files.
|
||||||
|
* Improve handling of WAVEFORMATEXTENSIBLE WAV files.
|
||||||
|
* Fix for using pipes on Win32.
|
||||||
|
|
||||||
|
Version 1.0.8 (2004-03-14)
|
||||||
|
* Correct peak chunk handing for files with > 16 tracks.
|
||||||
|
* Fix for WAV files with huge number of CUE chunks.
|
||||||
|
|
||||||
|
Version 1.0.7 (2004-02-25)
|
||||||
|
* Fix clip mode detection on ia64, MIPS and other CPUs.
|
||||||
|
* Fix two MacOSX build problems.
|
||||||
|
|
||||||
|
Version 1.0.6 (2004-02-08)
|
||||||
|
* Added support for native Win32 file access API (Ross Bencina).
|
||||||
|
* New mode to add clippling then a converting from float/double to integer
|
||||||
|
would otherwise wrap around.
|
||||||
|
* Fixed a bug in reading/writing files > 2Gig on Linux, Solaris and others.
|
||||||
|
* Many minor bug fixes.
|
||||||
|
* Other random fixes for Win32.
|
||||||
|
|
||||||
|
Version 1.0.5 (2003-05-03)
|
||||||
|
* Added support for HTK files.
|
||||||
|
* Added new function sf_open_fd() to allow for secure opening of temporary
|
||||||
|
files as well as reading/writing sound files embedded within larger
|
||||||
|
container files.
|
||||||
|
* Added string support for AIFF files.
|
||||||
|
* Minor bug fixes and code cleanups.
|
||||||
|
|
||||||
|
Version 1.0.4 (2003-02-02)
|
||||||
|
* Added suport of PVF and XI files.
|
||||||
|
* Added functionality for setting and retreiving strings from sound files.
|
||||||
|
* Minor code cleanups and bug fixes.
|
||||||
|
|
||||||
|
Version 1.0.3 (2002-12-09)
|
||||||
|
* Minor bug fixes.
|
||||||
|
|
||||||
|
Version 1.0.2 (2002-11-24)
|
||||||
|
* Added support for VOX ADPCM.
|
||||||
|
* Improved error reporting.
|
||||||
|
* Added version scripting on Linux and Solaris.
|
||||||
|
* Minor bug fixes.
|
||||||
|
|
||||||
|
Version 1.0.1 (2002-09-14)
|
||||||
|
* Added MAT and MAT5 file formats.
|
||||||
|
* Minor bug fixes.
|
||||||
|
|
||||||
|
Version 1.0.0 (2002-08-16)
|
||||||
|
* Final release for 1.0.0.
|
||||||
|
|
||||||
|
Version 1.0.0rc6 (2002-08-14)
|
||||||
|
* Release candidate 6 for the 1.0.0 series.
|
||||||
|
* MacOS9 fixes.
|
||||||
|
|
||||||
|
Version 1.0.0rc5 (2002-08-10)
|
||||||
|
* Release candidate 5 for the 1.0.0 series.
|
||||||
|
* Changed the definition of sf_count_t which was causing problems when
|
||||||
|
libsndfile was compiled with other libraries (ie WxWindows).
|
||||||
|
* Minor bug fixes.
|
||||||
|
* Documentation cleanup.
|
||||||
|
|
||||||
|
Version 1.0.0rc4 (2002-08-03)
|
||||||
|
* Release candidate 4 for the 1.0.0 series.
|
||||||
|
* Minor bug fixes.
|
||||||
|
* Fix broken Win32 "make check".
|
||||||
|
|
||||||
|
Version 1.0.0rc3 (2002-08-02)
|
||||||
|
* Release candidate 3 for the 1.0.0 series.
|
||||||
|
* Fix bug where libsndfile was reading beyond the end of the data chunk.
|
||||||
|
* Added on-the-fly header updates on write.
|
||||||
|
* Fix a couple of documentation issues.
|
||||||
|
|
||||||
|
Version 1.0.0rc2 (2002-06-24)
|
||||||
|
* Release candidate 2 for the 1.0.0 series.
|
||||||
|
* Fix compile problem for Win32.
|
||||||
|
|
||||||
|
Version 1.0.0rc1 (2002-06-24)
|
||||||
|
* Release candidate 1 for the 1.0.0 series.
|
||||||
|
|
||||||
|
Version 0.0.28 (2002-04-27)
|
||||||
|
* Last offical release of 0.0.X series of the library.
|
||||||
|
|
||||||
|
Version 0.0.8 (1999-02-16)
|
||||||
|
* First offical release.
|
||||||
BIN
libsndfile/dist/libsndfile-1.dll
vendored
Normal file
BIN
libsndfile/dist/libsndfile-1.dll
vendored
Normal file
Binary file not shown.
857
libsndfile/include/sndfile.h
Normal file
857
libsndfile/include/sndfile.h
Normal file
@ -0,0 +1,857 @@
|
|||||||
|
/*
|
||||||
|
** Copyright (C) 1999-2016 Erik de Castro Lopo <erikd@mega-nerd.com>
|
||||||
|
**
|
||||||
|
** This program is free software; you can redistribute it and/or modify
|
||||||
|
** it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
** the Free Software Foundation; either version 2.1 of the License, or
|
||||||
|
** (at your option) any later version.
|
||||||
|
**
|
||||||
|
** This program is distributed in the hope that it will be useful,
|
||||||
|
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
** GNU Lesser General Public License for more details.
|
||||||
|
**
|
||||||
|
** You should have received a copy of the GNU Lesser General Public License
|
||||||
|
** along with this program; if not, write to the Free Software
|
||||||
|
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
** sndfile.h -- system-wide definitions
|
||||||
|
**
|
||||||
|
** API documentation is in the doc/ directory of the source code tarball
|
||||||
|
** and at http://www.mega-nerd.com/libsndfile/api.html.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef SNDFILE_H
|
||||||
|
#define SNDFILE_H
|
||||||
|
|
||||||
|
/* This is the version 1.0.X header file. */
|
||||||
|
#define SNDFILE_1
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
|
/* The following file types can be read and written.
|
||||||
|
** A file type would consist of a major type (ie SF_FORMAT_WAV) bitwise
|
||||||
|
** ORed with a minor type (ie SF_FORMAT_PCM). SF_FORMAT_TYPEMASK and
|
||||||
|
** SF_FORMAT_SUBMASK can be used to separate the major and minor file
|
||||||
|
** types.
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum
|
||||||
|
{ /* Major formats. */
|
||||||
|
SF_FORMAT_WAV = 0x010000, /* Microsoft WAV format (little endian default). */
|
||||||
|
SF_FORMAT_AIFF = 0x020000, /* Apple/SGI AIFF format (big endian). */
|
||||||
|
SF_FORMAT_AU = 0x030000, /* Sun/NeXT AU format (big endian). */
|
||||||
|
SF_FORMAT_RAW = 0x040000, /* RAW PCM data. */
|
||||||
|
SF_FORMAT_PAF = 0x050000, /* Ensoniq PARIS file format. */
|
||||||
|
SF_FORMAT_SVX = 0x060000, /* Amiga IFF / SVX8 / SV16 format. */
|
||||||
|
SF_FORMAT_NIST = 0x070000, /* Sphere NIST format. */
|
||||||
|
SF_FORMAT_VOC = 0x080000, /* VOC files. */
|
||||||
|
SF_FORMAT_IRCAM = 0x0A0000, /* Berkeley/IRCAM/CARL */
|
||||||
|
SF_FORMAT_W64 = 0x0B0000, /* Sonic Foundry's 64 bit RIFF/WAV */
|
||||||
|
SF_FORMAT_MAT4 = 0x0C0000, /* Matlab (tm) V4.2 / GNU Octave 2.0 */
|
||||||
|
SF_FORMAT_MAT5 = 0x0D0000, /* Matlab (tm) V5.0 / GNU Octave 2.1 */
|
||||||
|
SF_FORMAT_PVF = 0x0E0000, /* Portable Voice Format */
|
||||||
|
SF_FORMAT_XI = 0x0F0000, /* Fasttracker 2 Extended Instrument */
|
||||||
|
SF_FORMAT_HTK = 0x100000, /* HMM Tool Kit format */
|
||||||
|
SF_FORMAT_SDS = 0x110000, /* Midi Sample Dump Standard */
|
||||||
|
SF_FORMAT_AVR = 0x120000, /* Audio Visual Research */
|
||||||
|
SF_FORMAT_WAVEX = 0x130000, /* MS WAVE with WAVEFORMATEX */
|
||||||
|
SF_FORMAT_SD2 = 0x160000, /* Sound Designer 2 */
|
||||||
|
SF_FORMAT_FLAC = 0x170000, /* FLAC lossless file format */
|
||||||
|
SF_FORMAT_CAF = 0x180000, /* Core Audio File format */
|
||||||
|
SF_FORMAT_WVE = 0x190000, /* Psion WVE format */
|
||||||
|
SF_FORMAT_OGG = 0x200000, /* Xiph OGG container */
|
||||||
|
SF_FORMAT_MPC2K = 0x210000, /* Akai MPC 2000 sampler */
|
||||||
|
SF_FORMAT_RF64 = 0x220000, /* RF64 WAV file */
|
||||||
|
|
||||||
|
/* Subtypes from here on. */
|
||||||
|
|
||||||
|
SF_FORMAT_PCM_S8 = 0x0001, /* Signed 8 bit data */
|
||||||
|
SF_FORMAT_PCM_16 = 0x0002, /* Signed 16 bit data */
|
||||||
|
SF_FORMAT_PCM_24 = 0x0003, /* Signed 24 bit data */
|
||||||
|
SF_FORMAT_PCM_32 = 0x0004, /* Signed 32 bit data */
|
||||||
|
|
||||||
|
SF_FORMAT_PCM_U8 = 0x0005, /* Unsigned 8 bit data (WAV and RAW only) */
|
||||||
|
|
||||||
|
SF_FORMAT_FLOAT = 0x0006, /* 32 bit float data */
|
||||||
|
SF_FORMAT_DOUBLE = 0x0007, /* 64 bit float data */
|
||||||
|
|
||||||
|
SF_FORMAT_ULAW = 0x0010, /* U-Law encoded. */
|
||||||
|
SF_FORMAT_ALAW = 0x0011, /* A-Law encoded. */
|
||||||
|
SF_FORMAT_IMA_ADPCM = 0x0012, /* IMA ADPCM. */
|
||||||
|
SF_FORMAT_MS_ADPCM = 0x0013, /* Microsoft ADPCM. */
|
||||||
|
|
||||||
|
SF_FORMAT_GSM610 = 0x0020, /* GSM 6.10 encoding. */
|
||||||
|
SF_FORMAT_VOX_ADPCM = 0x0021, /* OKI / Dialogix ADPCM */
|
||||||
|
|
||||||
|
SF_FORMAT_G721_32 = 0x0030, /* 32kbs G721 ADPCM encoding. */
|
||||||
|
SF_FORMAT_G723_24 = 0x0031, /* 24kbs G723 ADPCM encoding. */
|
||||||
|
SF_FORMAT_G723_40 = 0x0032, /* 40kbs G723 ADPCM encoding. */
|
||||||
|
|
||||||
|
SF_FORMAT_DWVW_12 = 0x0040, /* 12 bit Delta Width Variable Word encoding. */
|
||||||
|
SF_FORMAT_DWVW_16 = 0x0041, /* 16 bit Delta Width Variable Word encoding. */
|
||||||
|
SF_FORMAT_DWVW_24 = 0x0042, /* 24 bit Delta Width Variable Word encoding. */
|
||||||
|
SF_FORMAT_DWVW_N = 0x0043, /* N bit Delta Width Variable Word encoding. */
|
||||||
|
|
||||||
|
SF_FORMAT_DPCM_8 = 0x0050, /* 8 bit differential PCM (XI only) */
|
||||||
|
SF_FORMAT_DPCM_16 = 0x0051, /* 16 bit differential PCM (XI only) */
|
||||||
|
|
||||||
|
SF_FORMAT_VORBIS = 0x0060, /* Xiph Vorbis encoding. */
|
||||||
|
|
||||||
|
SF_FORMAT_ALAC_16 = 0x0070, /* Apple Lossless Audio Codec (16 bit). */
|
||||||
|
SF_FORMAT_ALAC_20 = 0x0071, /* Apple Lossless Audio Codec (20 bit). */
|
||||||
|
SF_FORMAT_ALAC_24 = 0x0072, /* Apple Lossless Audio Codec (24 bit). */
|
||||||
|
SF_FORMAT_ALAC_32 = 0x0073, /* Apple Lossless Audio Codec (32 bit). */
|
||||||
|
|
||||||
|
/* Endian-ness options. */
|
||||||
|
|
||||||
|
SF_ENDIAN_FILE = 0x00000000, /* Default file endian-ness. */
|
||||||
|
SF_ENDIAN_LITTLE = 0x10000000, /* Force little endian-ness. */
|
||||||
|
SF_ENDIAN_BIG = 0x20000000, /* Force big endian-ness. */
|
||||||
|
SF_ENDIAN_CPU = 0x30000000, /* Force CPU endian-ness. */
|
||||||
|
|
||||||
|
SF_FORMAT_SUBMASK = 0x0000FFFF,
|
||||||
|
SF_FORMAT_TYPEMASK = 0x0FFF0000,
|
||||||
|
SF_FORMAT_ENDMASK = 0x30000000
|
||||||
|
} ;
|
||||||
|
|
||||||
|
/*
|
||||||
|
** The following are the valid command numbers for the sf_command()
|
||||||
|
** interface. The use of these commands is documented in the file
|
||||||
|
** command.html in the doc directory of the source code distribution.
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum
|
||||||
|
{ SFC_GET_LIB_VERSION = 0x1000,
|
||||||
|
SFC_GET_LOG_INFO = 0x1001,
|
||||||
|
SFC_GET_CURRENT_SF_INFO = 0x1002,
|
||||||
|
|
||||||
|
|
||||||
|
SFC_GET_NORM_DOUBLE = 0x1010,
|
||||||
|
SFC_GET_NORM_FLOAT = 0x1011,
|
||||||
|
SFC_SET_NORM_DOUBLE = 0x1012,
|
||||||
|
SFC_SET_NORM_FLOAT = 0x1013,
|
||||||
|
SFC_SET_SCALE_FLOAT_INT_READ = 0x1014,
|
||||||
|
SFC_SET_SCALE_INT_FLOAT_WRITE = 0x1015,
|
||||||
|
|
||||||
|
SFC_GET_SIMPLE_FORMAT_COUNT = 0x1020,
|
||||||
|
SFC_GET_SIMPLE_FORMAT = 0x1021,
|
||||||
|
|
||||||
|
SFC_GET_FORMAT_INFO = 0x1028,
|
||||||
|
|
||||||
|
SFC_GET_FORMAT_MAJOR_COUNT = 0x1030,
|
||||||
|
SFC_GET_FORMAT_MAJOR = 0x1031,
|
||||||
|
SFC_GET_FORMAT_SUBTYPE_COUNT = 0x1032,
|
||||||
|
SFC_GET_FORMAT_SUBTYPE = 0x1033,
|
||||||
|
|
||||||
|
SFC_CALC_SIGNAL_MAX = 0x1040,
|
||||||
|
SFC_CALC_NORM_SIGNAL_MAX = 0x1041,
|
||||||
|
SFC_CALC_MAX_ALL_CHANNELS = 0x1042,
|
||||||
|
SFC_CALC_NORM_MAX_ALL_CHANNELS = 0x1043,
|
||||||
|
SFC_GET_SIGNAL_MAX = 0x1044,
|
||||||
|
SFC_GET_MAX_ALL_CHANNELS = 0x1045,
|
||||||
|
|
||||||
|
SFC_SET_ADD_PEAK_CHUNK = 0x1050,
|
||||||
|
SFC_SET_ADD_HEADER_PAD_CHUNK = 0x1051,
|
||||||
|
|
||||||
|
SFC_UPDATE_HEADER_NOW = 0x1060,
|
||||||
|
SFC_SET_UPDATE_HEADER_AUTO = 0x1061,
|
||||||
|
|
||||||
|
SFC_FILE_TRUNCATE = 0x1080,
|
||||||
|
|
||||||
|
SFC_SET_RAW_START_OFFSET = 0x1090,
|
||||||
|
|
||||||
|
SFC_SET_DITHER_ON_WRITE = 0x10A0,
|
||||||
|
SFC_SET_DITHER_ON_READ = 0x10A1,
|
||||||
|
|
||||||
|
SFC_GET_DITHER_INFO_COUNT = 0x10A2,
|
||||||
|
SFC_GET_DITHER_INFO = 0x10A3,
|
||||||
|
|
||||||
|
SFC_GET_EMBED_FILE_INFO = 0x10B0,
|
||||||
|
|
||||||
|
SFC_SET_CLIPPING = 0x10C0,
|
||||||
|
SFC_GET_CLIPPING = 0x10C1,
|
||||||
|
|
||||||
|
SFC_GET_CUE_COUNT = 0x10CD,
|
||||||
|
SFC_GET_CUE = 0x10CE,
|
||||||
|
SFC_SET_CUE = 0x10CF,
|
||||||
|
|
||||||
|
SFC_GET_INSTRUMENT = 0x10D0,
|
||||||
|
SFC_SET_INSTRUMENT = 0x10D1,
|
||||||
|
|
||||||
|
SFC_GET_LOOP_INFO = 0x10E0,
|
||||||
|
|
||||||
|
SFC_GET_BROADCAST_INFO = 0x10F0,
|
||||||
|
SFC_SET_BROADCAST_INFO = 0x10F1,
|
||||||
|
|
||||||
|
SFC_GET_CHANNEL_MAP_INFO = 0x1100,
|
||||||
|
SFC_SET_CHANNEL_MAP_INFO = 0x1101,
|
||||||
|
|
||||||
|
SFC_RAW_DATA_NEEDS_ENDSWAP = 0x1110,
|
||||||
|
|
||||||
|
/* Support for Wavex Ambisonics Format */
|
||||||
|
SFC_WAVEX_SET_AMBISONIC = 0x1200,
|
||||||
|
SFC_WAVEX_GET_AMBISONIC = 0x1201,
|
||||||
|
|
||||||
|
/*
|
||||||
|
** RF64 files can be set so that on-close, writable files that have less
|
||||||
|
** than 4GB of data in them are converted to RIFF/WAV, as per EBU
|
||||||
|
** recommendations.
|
||||||
|
*/
|
||||||
|
SFC_RF64_AUTO_DOWNGRADE = 0x1210,
|
||||||
|
|
||||||
|
SFC_SET_VBR_ENCODING_QUALITY = 0x1300,
|
||||||
|
SFC_SET_COMPRESSION_LEVEL = 0x1301,
|
||||||
|
|
||||||
|
/* Cart Chunk support */
|
||||||
|
SFC_SET_CART_INFO = 0x1400,
|
||||||
|
SFC_GET_CART_INFO = 0x1401,
|
||||||
|
|
||||||
|
/* Following commands for testing only. */
|
||||||
|
SFC_TEST_IEEE_FLOAT_REPLACE = 0x6001,
|
||||||
|
|
||||||
|
/*
|
||||||
|
** SFC_SET_ADD_* values are deprecated and will disappear at some
|
||||||
|
** time in the future. They are guaranteed to be here up to and
|
||||||
|
** including version 1.0.8 to avoid breakage of existing software.
|
||||||
|
** They currently do nothing and will continue to do nothing.
|
||||||
|
*/
|
||||||
|
SFC_SET_ADD_DITHER_ON_WRITE = 0x1070,
|
||||||
|
SFC_SET_ADD_DITHER_ON_READ = 0x1071
|
||||||
|
} ;
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
** String types that can be set and read from files. Not all file types
|
||||||
|
** support this and even the file types which support one, may not support
|
||||||
|
** all string types.
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum
|
||||||
|
{ SF_STR_TITLE = 0x01,
|
||||||
|
SF_STR_COPYRIGHT = 0x02,
|
||||||
|
SF_STR_SOFTWARE = 0x03,
|
||||||
|
SF_STR_ARTIST = 0x04,
|
||||||
|
SF_STR_COMMENT = 0x05,
|
||||||
|
SF_STR_DATE = 0x06,
|
||||||
|
SF_STR_ALBUM = 0x07,
|
||||||
|
SF_STR_LICENSE = 0x08,
|
||||||
|
SF_STR_TRACKNUMBER = 0x09,
|
||||||
|
SF_STR_GENRE = 0x10
|
||||||
|
} ;
|
||||||
|
|
||||||
|
/*
|
||||||
|
** Use the following as the start and end index when doing metadata
|
||||||
|
** transcoding.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define SF_STR_FIRST SF_STR_TITLE
|
||||||
|
#define SF_STR_LAST SF_STR_GENRE
|
||||||
|
|
||||||
|
enum
|
||||||
|
{ /* True and false */
|
||||||
|
SF_FALSE = 0,
|
||||||
|
SF_TRUE = 1,
|
||||||
|
|
||||||
|
/* Modes for opening files. */
|
||||||
|
SFM_READ = 0x10,
|
||||||
|
SFM_WRITE = 0x20,
|
||||||
|
SFM_RDWR = 0x30,
|
||||||
|
|
||||||
|
SF_AMBISONIC_NONE = 0x40,
|
||||||
|
SF_AMBISONIC_B_FORMAT = 0x41
|
||||||
|
} ;
|
||||||
|
|
||||||
|
/* Public error values. These are guaranteed to remain unchanged for the duration
|
||||||
|
** of the library major version number.
|
||||||
|
** There are also a large number of private error numbers which are internal to
|
||||||
|
** the library which can change at any time.
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum
|
||||||
|
{ SF_ERR_NO_ERROR = 0,
|
||||||
|
SF_ERR_UNRECOGNISED_FORMAT = 1,
|
||||||
|
SF_ERR_SYSTEM = 2,
|
||||||
|
SF_ERR_MALFORMED_FILE = 3,
|
||||||
|
SF_ERR_UNSUPPORTED_ENCODING = 4
|
||||||
|
} ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Channel map values (used with SFC_SET/GET_CHANNEL_MAP).
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum
|
||||||
|
{ SF_CHANNEL_MAP_INVALID = 0,
|
||||||
|
SF_CHANNEL_MAP_MONO = 1,
|
||||||
|
SF_CHANNEL_MAP_LEFT, /* Apple calls this 'Left' */
|
||||||
|
SF_CHANNEL_MAP_RIGHT, /* Apple calls this 'Right' */
|
||||||
|
SF_CHANNEL_MAP_CENTER, /* Apple calls this 'Center' */
|
||||||
|
SF_CHANNEL_MAP_FRONT_LEFT,
|
||||||
|
SF_CHANNEL_MAP_FRONT_RIGHT,
|
||||||
|
SF_CHANNEL_MAP_FRONT_CENTER,
|
||||||
|
SF_CHANNEL_MAP_REAR_CENTER, /* Apple calls this 'Center Surround', Msft calls this 'Back Center' */
|
||||||
|
SF_CHANNEL_MAP_REAR_LEFT, /* Apple calls this 'Left Surround', Msft calls this 'Back Left' */
|
||||||
|
SF_CHANNEL_MAP_REAR_RIGHT, /* Apple calls this 'Right Surround', Msft calls this 'Back Right' */
|
||||||
|
SF_CHANNEL_MAP_LFE, /* Apple calls this 'LFEScreen', Msft calls this 'Low Frequency' */
|
||||||
|
SF_CHANNEL_MAP_FRONT_LEFT_OF_CENTER, /* Apple calls this 'Left Center' */
|
||||||
|
SF_CHANNEL_MAP_FRONT_RIGHT_OF_CENTER, /* Apple calls this 'Right Center */
|
||||||
|
SF_CHANNEL_MAP_SIDE_LEFT, /* Apple calls this 'Left Surround Direct' */
|
||||||
|
SF_CHANNEL_MAP_SIDE_RIGHT, /* Apple calls this 'Right Surround Direct' */
|
||||||
|
SF_CHANNEL_MAP_TOP_CENTER, /* Apple calls this 'Top Center Surround' */
|
||||||
|
SF_CHANNEL_MAP_TOP_FRONT_LEFT, /* Apple calls this 'Vertical Height Left' */
|
||||||
|
SF_CHANNEL_MAP_TOP_FRONT_RIGHT, /* Apple calls this 'Vertical Height Right' */
|
||||||
|
SF_CHANNEL_MAP_TOP_FRONT_CENTER, /* Apple calls this 'Vertical Height Center' */
|
||||||
|
SF_CHANNEL_MAP_TOP_REAR_LEFT, /* Apple and MS call this 'Top Back Left' */
|
||||||
|
SF_CHANNEL_MAP_TOP_REAR_RIGHT, /* Apple and MS call this 'Top Back Right' */
|
||||||
|
SF_CHANNEL_MAP_TOP_REAR_CENTER, /* Apple and MS call this 'Top Back Center' */
|
||||||
|
|
||||||
|
SF_CHANNEL_MAP_AMBISONIC_B_W,
|
||||||
|
SF_CHANNEL_MAP_AMBISONIC_B_X,
|
||||||
|
SF_CHANNEL_MAP_AMBISONIC_B_Y,
|
||||||
|
SF_CHANNEL_MAP_AMBISONIC_B_Z,
|
||||||
|
|
||||||
|
SF_CHANNEL_MAP_MAX
|
||||||
|
} ;
|
||||||
|
|
||||||
|
|
||||||
|
/* A SNDFILE* pointer can be passed around much like stdio.h's FILE* pointer. */
|
||||||
|
|
||||||
|
typedef struct SNDFILE_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
|
||||||
|
** 64 bit file offsets.
|
||||||
|
** On windows, we need to allow the same header file to be compiler by both GCC
|
||||||
|
** and the Microsoft compiler.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if (defined (_MSCVER) || defined (_MSC_VER) && (_MSC_VER < 1310))
|
||||||
|
typedef __int64 sf_count_t ;
|
||||||
|
#define SF_COUNT_MAX 0x7fffffffffffffffi64
|
||||||
|
#else
|
||||||
|
typedef __int64 sf_count_t ;
|
||||||
|
#define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/* A pointer to a SF_INFO structure is passed to sf_open () and filled in.
|
||||||
|
** On write, the SF_INFO structure is filled in by the user and passed into
|
||||||
|
** sf_open ().
|
||||||
|
*/
|
||||||
|
|
||||||
|
struct SF_INFO
|
||||||
|
{ sf_count_t frames ; /* Used to be called samples. Changed to avoid confusion. */
|
||||||
|
int samplerate ;
|
||||||
|
int channels ;
|
||||||
|
int format ;
|
||||||
|
int sections ;
|
||||||
|
int seekable ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
typedef struct SF_INFO SF_INFO ;
|
||||||
|
|
||||||
|
/* The SF_FORMAT_INFO struct is used to retrieve information about the sound
|
||||||
|
** file formats libsndfile supports using the sf_command () interface.
|
||||||
|
**
|
||||||
|
** Using this interface will allow applications to support new file formats
|
||||||
|
** and encoding types when libsndfile is upgraded, without requiring
|
||||||
|
** re-compilation of the application.
|
||||||
|
**
|
||||||
|
** Please consult the libsndfile documentation (particularly the information
|
||||||
|
** on the sf_command () interface) for examples of its use.
|
||||||
|
*/
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{ int format ;
|
||||||
|
const char *name ;
|
||||||
|
const char *extension ;
|
||||||
|
} SF_FORMAT_INFO ;
|
||||||
|
|
||||||
|
/*
|
||||||
|
** 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum
|
||||||
|
{ SFD_DEFAULT_LEVEL = 0,
|
||||||
|
SFD_CUSTOM_LEVEL = 0x40000000,
|
||||||
|
|
||||||
|
SFD_NO_DITHER = 500,
|
||||||
|
SFD_WHITE = 501,
|
||||||
|
SFD_TRIANGULAR_PDF = 502
|
||||||
|
} ;
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{ int type ;
|
||||||
|
double level ;
|
||||||
|
const char *name ;
|
||||||
|
} SF_DITHER_INFO ;
|
||||||
|
|
||||||
|
/* Struct used to retrieve information about a file embedded within a
|
||||||
|
** larger file. See SFC_GET_EMBED_FILE_INFO.
|
||||||
|
*/
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{ sf_count_t offset ;
|
||||||
|
sf_count_t length ;
|
||||||
|
} SF_EMBED_FILE_INFO ;
|
||||||
|
|
||||||
|
/*
|
||||||
|
** Struct used to retrieve cue marker information from a file
|
||||||
|
*/
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{ int32_t indx ;
|
||||||
|
uint32_t position ;
|
||||||
|
int32_t fcc_chunk ;
|
||||||
|
int32_t chunk_start ;
|
||||||
|
int32_t block_start ;
|
||||||
|
uint32_t sample_offset ;
|
||||||
|
char name [256] ;
|
||||||
|
} SF_CUE_POINT ;
|
||||||
|
|
||||||
|
#define SF_CUES_VAR(count) \
|
||||||
|
struct \
|
||||||
|
{ uint32_t cue_count ; \
|
||||||
|
SF_CUE_POINT cue_points [count] ; \
|
||||||
|
}
|
||||||
|
|
||||||
|
typedef SF_CUES_VAR (100) SF_CUES ;
|
||||||
|
|
||||||
|
/*
|
||||||
|
** Structs used to retrieve music sample information from a file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum
|
||||||
|
{ /*
|
||||||
|
** The loop mode field in SF_INSTRUMENT will be one of the following.
|
||||||
|
*/
|
||||||
|
SF_LOOP_NONE = 800,
|
||||||
|
SF_LOOP_FORWARD,
|
||||||
|
SF_LOOP_BACKWARD,
|
||||||
|
SF_LOOP_ALTERNATING
|
||||||
|
} ;
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{ int gain ;
|
||||||
|
char basenote, detune ;
|
||||||
|
char velocity_lo, velocity_hi ;
|
||||||
|
char key_lo, key_hi ;
|
||||||
|
int loop_count ;
|
||||||
|
|
||||||
|
struct
|
||||||
|
{ int mode ;
|
||||||
|
uint32_t start ;
|
||||||
|
uint32_t end ;
|
||||||
|
uint32_t count ;
|
||||||
|
} loops [16] ; /* make variable in a sensible way */
|
||||||
|
} SF_INSTRUMENT ;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* Struct used to retrieve loop information from a file.*/
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
short time_sig_num ; /* any positive integer > 0 */
|
||||||
|
short time_sig_den ; /* any positive power of 2 > 0 */
|
||||||
|
int loop_mode ; /* see SF_LOOP enum */
|
||||||
|
|
||||||
|
int num_beats ; /* this is NOT the amount of quarter notes !!!*/
|
||||||
|
/* a full bar of 4/4 is 4 beats */
|
||||||
|
/* a full bar of 7/8 is 7 beats */
|
||||||
|
|
||||||
|
float bpm ; /* suggestion, as it can be calculated using other fields:*/
|
||||||
|
/* file's length, file's sampleRate and our time_sig_den*/
|
||||||
|
/* -> bpms are always the amount of _quarter notes_ per minute */
|
||||||
|
|
||||||
|
int root_key ; /* MIDI note, or -1 for None */
|
||||||
|
int future [6] ;
|
||||||
|
} SF_LOOP_INFO ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Struct used to retrieve broadcast (EBU) information from a file.
|
||||||
|
** Strongly (!) based on EBU "bext" chunk format used in Broadcast WAVE.
|
||||||
|
*/
|
||||||
|
#define SF_BROADCAST_INFO_VAR(coding_hist_size) \
|
||||||
|
struct \
|
||||||
|
{ char description [256] ; \
|
||||||
|
char originator [32] ; \
|
||||||
|
char originator_reference [32] ; \
|
||||||
|
char origination_date [10] ; \
|
||||||
|
char origination_time [8] ; \
|
||||||
|
uint32_t time_reference_low ; \
|
||||||
|
uint32_t time_reference_high ; \
|
||||||
|
short version ; \
|
||||||
|
char umid [64] ; \
|
||||||
|
char reserved [190] ; \
|
||||||
|
uint32_t coding_history_size ; \
|
||||||
|
char coding_history [coding_hist_size] ; \
|
||||||
|
}
|
||||||
|
|
||||||
|
/* SF_BROADCAST_INFO is the above struct with coding_history field of 256 bytes. */
|
||||||
|
typedef SF_BROADCAST_INFO_VAR (256) SF_BROADCAST_INFO ;
|
||||||
|
|
||||||
|
struct SF_CART_TIMER
|
||||||
|
{ char usage [4] ;
|
||||||
|
int32_t value ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
typedef struct SF_CART_TIMER SF_CART_TIMER ;
|
||||||
|
|
||||||
|
#define SF_CART_INFO_VAR(p_tag_text_size) \
|
||||||
|
struct \
|
||||||
|
{ char version [4] ; \
|
||||||
|
char title [64] ; \
|
||||||
|
char artist [64] ; \
|
||||||
|
char cut_id [64] ; \
|
||||||
|
char client_id [64] ; \
|
||||||
|
char category [64] ; \
|
||||||
|
char classification [64] ; \
|
||||||
|
char out_cue [64] ; \
|
||||||
|
char start_date [10] ; \
|
||||||
|
char start_time [8] ; \
|
||||||
|
char end_date [10] ; \
|
||||||
|
char end_time [8] ; \
|
||||||
|
char producer_app_id [64] ; \
|
||||||
|
char producer_app_version [64] ; \
|
||||||
|
char user_def [64] ; \
|
||||||
|
int32_t level_reference ; \
|
||||||
|
SF_CART_TIMER post_timers [8] ; \
|
||||||
|
char reserved [276] ; \
|
||||||
|
char url [1024] ; \
|
||||||
|
uint32_t tag_text_size ; \
|
||||||
|
char tag_text [p_tag_text_size] ; \
|
||||||
|
}
|
||||||
|
|
||||||
|
typedef SF_CART_INFO_VAR (256) SF_CART_INFO ;
|
||||||
|
|
||||||
|
/* Virtual I/O functionality. */
|
||||||
|
|
||||||
|
typedef sf_count_t (*sf_vio_get_filelen) (void *user_data) ;
|
||||||
|
typedef sf_count_t (*sf_vio_seek) (sf_count_t offset, int whence, void *user_data) ;
|
||||||
|
typedef sf_count_t (*sf_vio_read) (void *ptr, sf_count_t count, void *user_data) ;
|
||||||
|
typedef sf_count_t (*sf_vio_write) (const void *ptr, sf_count_t count, void *user_data) ;
|
||||||
|
typedef sf_count_t (*sf_vio_tell) (void *user_data) ;
|
||||||
|
|
||||||
|
struct SF_VIRTUAL_IO
|
||||||
|
{ sf_vio_get_filelen get_filelen ;
|
||||||
|
sf_vio_seek seek ;
|
||||||
|
sf_vio_read read ;
|
||||||
|
sf_vio_write write ;
|
||||||
|
sf_vio_tell tell ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
typedef struct SF_VIRTUAL_IO SF_VIRTUAL_IO ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Open the specified file for read, write or both. On error, this will
|
||||||
|
** return a NULL pointer. To find the error number, pass a NULL SNDFILE
|
||||||
|
** to sf_strerror ().
|
||||||
|
** All calls to sf_open() should be matched with a call to sf_close().
|
||||||
|
*/
|
||||||
|
|
||||||
|
SNDFILE* sf_open (const char *path, int mode, SF_INFO *sfinfo) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Use the existing file descriptor to create a SNDFILE object. If close_desc
|
||||||
|
** is TRUE, the file descriptor will be closed when sf_close() is called. If
|
||||||
|
** it is FALSE, the descriptor will not be closed.
|
||||||
|
** When passed a descriptor like this, the library will assume that the start
|
||||||
|
** of file header is at the current file offset. This allows sound files within
|
||||||
|
** larger container files to be read and/or written.
|
||||||
|
** On error, this will return a NULL pointer. To find the error number, pass a
|
||||||
|
** NULL SNDFILE to sf_strerror ().
|
||||||
|
** All calls to sf_open_fd() should be matched with a call to sf_close().
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
SNDFILE* sf_open_fd (int fd, int mode, SF_INFO *sfinfo, int close_desc) ;
|
||||||
|
|
||||||
|
SNDFILE* sf_open_virtual (SF_VIRTUAL_IO *sfvirtual, int mode, SF_INFO *sfinfo, void *user_data) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* sf_error () returns a error number which can be translated to a text
|
||||||
|
** string using sf_error_number().
|
||||||
|
*/
|
||||||
|
|
||||||
|
int sf_error (SNDFILE *sndfile) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* sf_strerror () returns to the caller a pointer to the current error message for
|
||||||
|
** the given SNDFILE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const char* sf_strerror (SNDFILE *sndfile) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* sf_error_number () allows the retrieval of the error string for each internal
|
||||||
|
** error number.
|
||||||
|
**
|
||||||
|
*/
|
||||||
|
|
||||||
|
const char* sf_error_number (int errnum) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* The following two error functions are deprecated but they will remain in the
|
||||||
|
** library for the foreseeable future. The function sf_strerror() should be used
|
||||||
|
** in their place.
|
||||||
|
*/
|
||||||
|
|
||||||
|
int sf_perror (SNDFILE *sndfile) ;
|
||||||
|
int sf_error_str (SNDFILE *sndfile, char* str, size_t len) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */
|
||||||
|
|
||||||
|
int sf_command (SNDFILE *sndfile, int command, void *data, int datasize) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Return TRUE if fields of the SF_INFO struct are a valid combination of values. */
|
||||||
|
|
||||||
|
int sf_format_check (const SF_INFO *info) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Seek within the waveform data chunk of the SNDFILE. sf_seek () uses
|
||||||
|
** the same values for whence (SEEK_SET, SEEK_CUR and SEEK_END) as
|
||||||
|
** stdio.h function fseek ().
|
||||||
|
** An offset of zero with whence set to SEEK_SET will position the
|
||||||
|
** read / write pointer to the first data sample.
|
||||||
|
** On success sf_seek returns the current position in (multi-channel)
|
||||||
|
** samples from the start of the file.
|
||||||
|
** Please see the libsndfile documentation for moving the read pointer
|
||||||
|
** separately from the write pointer on files open in mode SFM_RDWR.
|
||||||
|
** On error all of these functions return -1.
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum
|
||||||
|
{ SF_SEEK_SET = SEEK_SET,
|
||||||
|
SF_SEEK_CUR = SEEK_CUR,
|
||||||
|
SF_SEEK_END = SEEK_END
|
||||||
|
} ;
|
||||||
|
|
||||||
|
sf_count_t sf_seek (SNDFILE *sndfile, sf_count_t frames, int whence) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Functions for retrieving and setting string data within sound files.
|
||||||
|
** Not all file types support this features; AIFF and WAV do. For both
|
||||||
|
** functions, the str_type parameter must be one of the SF_STR_* values
|
||||||
|
** defined above.
|
||||||
|
** On error, sf_set_string() returns non-zero while sf_get_string()
|
||||||
|
** returns NULL.
|
||||||
|
*/
|
||||||
|
|
||||||
|
int sf_set_string (SNDFILE *sndfile, int str_type, const char* str) ;
|
||||||
|
|
||||||
|
const char* sf_get_string (SNDFILE *sndfile, int str_type) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Return the library version string. */
|
||||||
|
|
||||||
|
const char * sf_version_string (void) ;
|
||||||
|
|
||||||
|
/* Return the current byterate at this point in the file. The byte rate in this
|
||||||
|
** case is the number of bytes per second of audio data. For instance, for a
|
||||||
|
** stereo, 18 bit PCM encoded file with an 16kHz sample rate, the byte rate
|
||||||
|
** would be 2 (stereo) * 2 (two bytes per sample) * 16000 => 64000 bytes/sec.
|
||||||
|
** For some file formats the returned value will be accurate and exact, for some
|
||||||
|
** it will be a close approximation, for some it will be the average bitrate for
|
||||||
|
** the whole file and for some it will be a time varying value that was accurate
|
||||||
|
** when the file was most recently read or written.
|
||||||
|
** To get the bitrate, multiple this value by 8.
|
||||||
|
** Returns -1 for unknown.
|
||||||
|
*/
|
||||||
|
int sf_current_byterate (SNDFILE *sndfile) ;
|
||||||
|
|
||||||
|
/* Functions for reading/writing the waveform data of a sound file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
sf_count_t sf_read_raw (SNDFILE *sndfile, void *ptr, sf_count_t bytes) ;
|
||||||
|
sf_count_t sf_write_raw (SNDFILE *sndfile, const void *ptr, sf_count_t bytes) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Functions for reading and writing the data chunk in terms of frames.
|
||||||
|
** The number of items actually read/written = frames * number of channels.
|
||||||
|
** sf_xxxx_raw read/writes the raw data bytes from/to the file
|
||||||
|
** sf_xxxx_short passes data in the native short format
|
||||||
|
** sf_xxxx_int passes data in the native int format
|
||||||
|
** sf_xxxx_float passes data in the native float format
|
||||||
|
** sf_xxxx_double passes data in the native double format
|
||||||
|
** All of these read/write function return number of frames read/written.
|
||||||
|
*/
|
||||||
|
|
||||||
|
sf_count_t sf_readf_short (SNDFILE *sndfile, short *ptr, sf_count_t frames) ;
|
||||||
|
sf_count_t sf_writef_short (SNDFILE *sndfile, const short *ptr, sf_count_t frames) ;
|
||||||
|
|
||||||
|
sf_count_t sf_readf_int (SNDFILE *sndfile, int *ptr, sf_count_t frames) ;
|
||||||
|
sf_count_t sf_writef_int (SNDFILE *sndfile, const int *ptr, sf_count_t frames) ;
|
||||||
|
|
||||||
|
sf_count_t sf_readf_float (SNDFILE *sndfile, float *ptr, sf_count_t frames) ;
|
||||||
|
sf_count_t sf_writef_float (SNDFILE *sndfile, const float *ptr, sf_count_t frames) ;
|
||||||
|
|
||||||
|
sf_count_t sf_readf_double (SNDFILE *sndfile, double *ptr, sf_count_t frames) ;
|
||||||
|
sf_count_t sf_writef_double (SNDFILE *sndfile, const double *ptr, sf_count_t frames) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Functions for reading and writing the data chunk in terms of items.
|
||||||
|
** Otherwise similar to above.
|
||||||
|
** All of these read/write function return number of items read/written.
|
||||||
|
*/
|
||||||
|
|
||||||
|
sf_count_t sf_read_short (SNDFILE *sndfile, short *ptr, sf_count_t items) ;
|
||||||
|
sf_count_t sf_write_short (SNDFILE *sndfile, const short *ptr, sf_count_t items) ;
|
||||||
|
|
||||||
|
sf_count_t sf_read_int (SNDFILE *sndfile, int *ptr, sf_count_t items) ;
|
||||||
|
sf_count_t sf_write_int (SNDFILE *sndfile, const int *ptr, sf_count_t items) ;
|
||||||
|
|
||||||
|
sf_count_t sf_read_float (SNDFILE *sndfile, float *ptr, sf_count_t items) ;
|
||||||
|
sf_count_t sf_write_float (SNDFILE *sndfile, const float *ptr, sf_count_t items) ;
|
||||||
|
|
||||||
|
sf_count_t sf_read_double (SNDFILE *sndfile, double *ptr, sf_count_t items) ;
|
||||||
|
sf_count_t sf_write_double (SNDFILE *sndfile, const double *ptr, sf_count_t items) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Close the SNDFILE and clean up all memory allocations associated with this
|
||||||
|
** file.
|
||||||
|
** Returns 0 on success, or an error number.
|
||||||
|
*/
|
||||||
|
|
||||||
|
int sf_close (SNDFILE *sndfile) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* If the file is opened SFM_WRITE or SFM_RDWR, call fsync() on the file
|
||||||
|
** to force the writing of data to disk. If the file is opened SFM_READ
|
||||||
|
** no action is taken.
|
||||||
|
*/
|
||||||
|
|
||||||
|
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 <windows.h>
|
||||||
|
** #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
|
||||||
|
** #including <sndfile.h>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if (defined (ENABLE_SNDFILE_WINDOWS_PROTOTYPES) && ENABLE_SNDFILE_WINDOWS_PROTOTYPES)
|
||||||
|
SNDFILE* sf_wchar_open (LPCWSTR wpath, int mode, SF_INFO *sfinfo) ;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* Getting and setting of chunks from within a sound file.
|
||||||
|
**
|
||||||
|
** These functions allow the getting and setting of chunks within a sound file
|
||||||
|
** (for those formats which allow it).
|
||||||
|
**
|
||||||
|
** These functions fail safely. Specifically, they will not allow you to overwrite
|
||||||
|
** existing chunks or add extra versions of format specific reserved chunks but
|
||||||
|
** should allow you to retrieve any and all chunks (may not be implemented for
|
||||||
|
** all chunks or all file formats).
|
||||||
|
*/
|
||||||
|
|
||||||
|
struct SF_CHUNK_INFO
|
||||||
|
{ char id [64] ; /* The chunk identifier. */
|
||||||
|
unsigned id_size ; /* The size of the chunk identifier. */
|
||||||
|
unsigned datalen ; /* The size of that data. */
|
||||||
|
void *data ; /* Pointer to the data. */
|
||||||
|
} ;
|
||||||
|
|
||||||
|
typedef struct SF_CHUNK_INFO SF_CHUNK_INFO ;
|
||||||
|
|
||||||
|
/* Set the specified chunk info (must be done before any audio data is written
|
||||||
|
** to the file). This will fail for format specific reserved chunks.
|
||||||
|
** The chunk_info->data pointer must be valid until the file is closed.
|
||||||
|
** Returns SF_ERR_NO_ERROR on success or non-zero on failure.
|
||||||
|
*/
|
||||||
|
int sf_set_chunk (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info) ;
|
||||||
|
|
||||||
|
/*
|
||||||
|
** An opaque structure to an iterator over the all chunks of a given id
|
||||||
|
*/
|
||||||
|
typedef struct SF_CHUNK_ITERATOR SF_CHUNK_ITERATOR ;
|
||||||
|
|
||||||
|
/* Get an iterator for all chunks matching chunk_info.
|
||||||
|
** The iterator will point to the first chunk matching chunk_info.
|
||||||
|
** Chunks are matching, if (chunk_info->id) matches the first
|
||||||
|
** (chunk_info->id_size) bytes of a chunk found in the SNDFILE* handle.
|
||||||
|
** If chunk_info is NULL, an iterator to all chunks in the SNDFILE* handle
|
||||||
|
** is returned.
|
||||||
|
** The values of chunk_info->datalen and chunk_info->data are ignored.
|
||||||
|
** If no matching chunks are found in the sndfile, NULL is returned.
|
||||||
|
** The returned iterator will stay valid until one of the following occurs:
|
||||||
|
** a) The sndfile is closed.
|
||||||
|
** b) A new chunk is added using sf_set_chunk().
|
||||||
|
** c) Another chunk iterator function is called on the same SNDFILE* handle
|
||||||
|
** that causes the iterator to be modified.
|
||||||
|
** The memory for the iterator belongs to the SNDFILE* handle and is freed when
|
||||||
|
** sf_close() is called.
|
||||||
|
*/
|
||||||
|
SF_CHUNK_ITERATOR *
|
||||||
|
sf_get_chunk_iterator (SNDFILE * sndfile, const SF_CHUNK_INFO * chunk_info) ;
|
||||||
|
|
||||||
|
/* Iterate through chunks by incrementing the iterator.
|
||||||
|
** Increments the iterator and returns a handle to the new one.
|
||||||
|
** After this call, iterator will no longer be valid, and you must use the
|
||||||
|
** newly returned handle from now on.
|
||||||
|
** The returned handle can be used to access the next chunk matching
|
||||||
|
** the criteria as defined in sf_get_chunk_iterator().
|
||||||
|
** If iterator points to the last chunk, this will free all resources
|
||||||
|
** associated with iterator and return NULL.
|
||||||
|
** The returned iterator will stay valid until sf_get_chunk_iterator_next
|
||||||
|
** is called again, the sndfile is closed or a new chunk us added.
|
||||||
|
*/
|
||||||
|
SF_CHUNK_ITERATOR *
|
||||||
|
sf_next_chunk_iterator (SF_CHUNK_ITERATOR * iterator) ;
|
||||||
|
|
||||||
|
|
||||||
|
/* Get the size of the specified chunk.
|
||||||
|
** If the specified chunk exists, the size will be returned in the
|
||||||
|
** datalen field of the SF_CHUNK_INFO struct.
|
||||||
|
** Additionally, the id of the chunk will be copied to the id
|
||||||
|
** field of the SF_CHUNK_INFO struct and it's id_size field will
|
||||||
|
** be updated accordingly.
|
||||||
|
** If the chunk doesn't exist chunk_info->datalen will be zero, and the
|
||||||
|
** id and id_size fields will be undefined.
|
||||||
|
** The function will return SF_ERR_NO_ERROR on success or non-zero on
|
||||||
|
** failure.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
sf_get_chunk_size (const SF_CHUNK_ITERATOR * it, SF_CHUNK_INFO * chunk_info) ;
|
||||||
|
|
||||||
|
/* Get the specified chunk data.
|
||||||
|
** If the specified chunk exists, up to chunk_info->datalen bytes of
|
||||||
|
** the chunk data will be copied into the chunk_info->data buffer
|
||||||
|
** (allocated by the caller) and the chunk_info->datalen field
|
||||||
|
** updated to reflect the size of the data. The id and id_size
|
||||||
|
** field will be updated according to the retrieved chunk
|
||||||
|
** If the chunk doesn't exist chunk_info->datalen will be zero, and the
|
||||||
|
** id and id_size fields will be undefined.
|
||||||
|
** The function will return SF_ERR_NO_ERROR on success or non-zero on
|
||||||
|
** failure.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
sf_get_chunk_data (const SF_CHUNK_ITERATOR * it, SF_CHUNK_INFO * chunk_info) ;
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
|
#endif /* SNDFILE_H */
|
||||||
|
|
||||||
446
libsndfile/include/sndfile.hh
Normal file
446
libsndfile/include/sndfile.hh
Normal file
@ -0,0 +1,446 @@
|
|||||||
|
/*
|
||||||
|
** Copyright (C) 2005-2012 Erik de Castro Lopo <erikd@mega-nerd.com>
|
||||||
|
**
|
||||||
|
** All rights reserved.
|
||||||
|
**
|
||||||
|
** Redistribution and use in source and binary forms, with or without
|
||||||
|
** modification, are permitted provided that the following conditions are
|
||||||
|
** met:
|
||||||
|
**
|
||||||
|
** * Redistributions of source code must retain the above copyright
|
||||||
|
** notice, this list of conditions and the following disclaimer.
|
||||||
|
** * Redistributions in binary form must reproduce the above copyright
|
||||||
|
** notice, this list of conditions and the following disclaimer in
|
||||||
|
** the documentation and/or other materials provided with the
|
||||||
|
** distribution.
|
||||||
|
** * Neither the author nor the names of any contributors may be used
|
||||||
|
** to endorse or promote products derived from this software without
|
||||||
|
** specific prior written permission.
|
||||||
|
**
|
||||||
|
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||||
|
** TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
** PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
||||||
|
** CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
|
** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||||
|
** OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||||
|
** WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||||
|
** OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
|
** ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
** The above modified BSD style license (GPL and LGPL compatible) applies to
|
||||||
|
** this file. It does not apply to libsndfile itself which is released under
|
||||||
|
** the GNU LGPL or the libsndfile test suite which is released under the GNU
|
||||||
|
** GPL.
|
||||||
|
** This means that this header file can be used under this modified BSD style
|
||||||
|
** license, but the LGPL still holds for the libsndfile library itself.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
** sndfile.hh -- A lightweight C++ wrapper for the libsndfile API.
|
||||||
|
**
|
||||||
|
** All the methods are inlines and all functionality is contained in this
|
||||||
|
** file. There is no separate implementation file.
|
||||||
|
**
|
||||||
|
** API documentation is in the doc/ directory of the source code tarball
|
||||||
|
** and at http://www.mega-nerd.com/libsndfile/api.html.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef SNDFILE_HH
|
||||||
|
#define SNDFILE_HH
|
||||||
|
|
||||||
|
#include <sndfile.h>
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <new> // for std::nothrow
|
||||||
|
|
||||||
|
class SndfileHandle
|
||||||
|
{ private :
|
||||||
|
struct SNDFILE_ref
|
||||||
|
{ SNDFILE_ref (void) ;
|
||||||
|
~SNDFILE_ref (void) ;
|
||||||
|
|
||||||
|
SNDFILE *sf ;
|
||||||
|
SF_INFO sfinfo ;
|
||||||
|
int ref ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
SNDFILE_ref *p ;
|
||||||
|
|
||||||
|
public :
|
||||||
|
/* Default constructor */
|
||||||
|
SndfileHandle (void) : p (NULL) {} ;
|
||||||
|
SndfileHandle (const char *path, int mode = SFM_READ,
|
||||||
|
int format = 0, int channels = 0, int samplerate = 0) ;
|
||||||
|
SndfileHandle (std::string const & path, int mode = SFM_READ,
|
||||||
|
int format = 0, int channels = 0, int samplerate = 0) ;
|
||||||
|
SndfileHandle (int fd, bool close_desc, int mode = SFM_READ,
|
||||||
|
int format = 0, int channels = 0, int samplerate = 0) ;
|
||||||
|
SndfileHandle (SF_VIRTUAL_IO &sfvirtual, void *user_data, int mode = SFM_READ,
|
||||||
|
int format = 0, int channels = 0, int samplerate = 0) ;
|
||||||
|
|
||||||
|
#ifdef ENABLE_SNDFILE_WINDOWS_PROTOTYPES
|
||||||
|
SndfileHandle (LPCWSTR wpath, int mode = SFM_READ,
|
||||||
|
int format = 0, int channels = 0, int samplerate = 0) ;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
~SndfileHandle (void) ;
|
||||||
|
|
||||||
|
SndfileHandle (const SndfileHandle &orig) ;
|
||||||
|
SndfileHandle & operator = (const SndfileHandle &rhs) ;
|
||||||
|
|
||||||
|
/* Mainly for debugging/testing. */
|
||||||
|
int refCount (void) const { return (p == NULL) ? 0 : p->ref ; }
|
||||||
|
|
||||||
|
operator bool () const { return (p != NULL) ; }
|
||||||
|
|
||||||
|
bool operator == (const SndfileHandle &rhs) const { return (p == rhs.p) ; }
|
||||||
|
|
||||||
|
sf_count_t frames (void) const { return p ? p->sfinfo.frames : 0 ; }
|
||||||
|
int format (void) const { return p ? p->sfinfo.format : 0 ; }
|
||||||
|
int channels (void) const { return p ? p->sfinfo.channels : 0 ; }
|
||||||
|
int samplerate (void) const { return p ? p->sfinfo.samplerate : 0 ; }
|
||||||
|
|
||||||
|
int error (void) const ;
|
||||||
|
const char * strError (void) const ;
|
||||||
|
|
||||||
|
int command (int cmd, void *data, int datasize) ;
|
||||||
|
|
||||||
|
sf_count_t seek (sf_count_t frames, int whence) ;
|
||||||
|
|
||||||
|
void writeSync (void) ;
|
||||||
|
|
||||||
|
int setString (int str_type, const char* str) ;
|
||||||
|
|
||||||
|
const char* getString (int str_type) const ;
|
||||||
|
|
||||||
|
static int formatCheck (int format, int channels, int samplerate) ;
|
||||||
|
|
||||||
|
sf_count_t read (short *ptr, sf_count_t items) ;
|
||||||
|
sf_count_t read (int *ptr, sf_count_t items) ;
|
||||||
|
sf_count_t read (float *ptr, sf_count_t items) ;
|
||||||
|
sf_count_t read (double *ptr, sf_count_t items) ;
|
||||||
|
|
||||||
|
sf_count_t write (const short *ptr, sf_count_t items) ;
|
||||||
|
sf_count_t write (const int *ptr, sf_count_t items) ;
|
||||||
|
sf_count_t write (const float *ptr, sf_count_t items) ;
|
||||||
|
sf_count_t write (const double *ptr, sf_count_t items) ;
|
||||||
|
|
||||||
|
sf_count_t readf (short *ptr, sf_count_t frames) ;
|
||||||
|
sf_count_t readf (int *ptr, sf_count_t frames) ;
|
||||||
|
sf_count_t readf (float *ptr, sf_count_t frames) ;
|
||||||
|
sf_count_t readf (double *ptr, sf_count_t frames) ;
|
||||||
|
|
||||||
|
sf_count_t writef (const short *ptr, sf_count_t frames) ;
|
||||||
|
sf_count_t writef (const int *ptr, sf_count_t frames) ;
|
||||||
|
sf_count_t writef (const float *ptr, sf_count_t frames) ;
|
||||||
|
sf_count_t writef (const double *ptr, sf_count_t frames) ;
|
||||||
|
|
||||||
|
sf_count_t readRaw (void *ptr, sf_count_t bytes) ;
|
||||||
|
sf_count_t writeRaw (const void *ptr, sf_count_t bytes) ;
|
||||||
|
|
||||||
|
/**< Raw access to the handle. SndfileHandle keeps ownership. */
|
||||||
|
SNDFILE * rawHandle (void) ;
|
||||||
|
|
||||||
|
/**< Take ownership of handle, if reference count is 1. */
|
||||||
|
SNDFILE * takeOwnership (void) ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
/*==============================================================================
|
||||||
|
** Nothing but implementation below.
|
||||||
|
*/
|
||||||
|
|
||||||
|
inline
|
||||||
|
SndfileHandle::SNDFILE_ref::SNDFILE_ref (void)
|
||||||
|
: sf (NULL), sfinfo (), ref (1)
|
||||||
|
{}
|
||||||
|
|
||||||
|
inline
|
||||||
|
SndfileHandle::SNDFILE_ref::~SNDFILE_ref (void)
|
||||||
|
{ if (sf != NULL) sf_close (sf) ; }
|
||||||
|
|
||||||
|
inline
|
||||||
|
SndfileHandle::SndfileHandle (const char *path, int mode, int fmt, int chans, int srate)
|
||||||
|
: p (NULL)
|
||||||
|
{
|
||||||
|
p = new (std::nothrow) SNDFILE_ref () ;
|
||||||
|
|
||||||
|
if (p != NULL)
|
||||||
|
{ p->ref = 1 ;
|
||||||
|
|
||||||
|
p->sfinfo.frames = 0 ;
|
||||||
|
p->sfinfo.channels = chans ;
|
||||||
|
p->sfinfo.format = fmt ;
|
||||||
|
p->sfinfo.samplerate = srate ;
|
||||||
|
p->sfinfo.sections = 0 ;
|
||||||
|
p->sfinfo.seekable = 0 ;
|
||||||
|
|
||||||
|
p->sf = sf_open (path, mode, &p->sfinfo) ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
return ;
|
||||||
|
} /* SndfileHandle const char * constructor */
|
||||||
|
|
||||||
|
inline
|
||||||
|
SndfileHandle::SndfileHandle (std::string const & path, int mode, int fmt, int chans, int srate)
|
||||||
|
: p (NULL)
|
||||||
|
{
|
||||||
|
p = new (std::nothrow) SNDFILE_ref () ;
|
||||||
|
|
||||||
|
if (p != NULL)
|
||||||
|
{ p->ref = 1 ;
|
||||||
|
|
||||||
|
p->sfinfo.frames = 0 ;
|
||||||
|
p->sfinfo.channels = chans ;
|
||||||
|
p->sfinfo.format = fmt ;
|
||||||
|
p->sfinfo.samplerate = srate ;
|
||||||
|
p->sfinfo.sections = 0 ;
|
||||||
|
p->sfinfo.seekable = 0 ;
|
||||||
|
|
||||||
|
p->sf = sf_open (path.c_str (), mode, &p->sfinfo) ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
return ;
|
||||||
|
} /* SndfileHandle std::string constructor */
|
||||||
|
|
||||||
|
inline
|
||||||
|
SndfileHandle::SndfileHandle (int fd, bool close_desc, int mode, int fmt, int chans, int srate)
|
||||||
|
: p (NULL)
|
||||||
|
{
|
||||||
|
if (fd < 0)
|
||||||
|
return ;
|
||||||
|
|
||||||
|
p = new (std::nothrow) SNDFILE_ref () ;
|
||||||
|
|
||||||
|
if (p != NULL)
|
||||||
|
{ p->ref = 1 ;
|
||||||
|
|
||||||
|
p->sfinfo.frames = 0 ;
|
||||||
|
p->sfinfo.channels = chans ;
|
||||||
|
p->sfinfo.format = fmt ;
|
||||||
|
p->sfinfo.samplerate = srate ;
|
||||||
|
p->sfinfo.sections = 0 ;
|
||||||
|
p->sfinfo.seekable = 0 ;
|
||||||
|
|
||||||
|
p->sf = sf_open_fd (fd, mode, &p->sfinfo, close_desc) ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
return ;
|
||||||
|
} /* SndfileHandle fd constructor */
|
||||||
|
|
||||||
|
inline
|
||||||
|
SndfileHandle::SndfileHandle (SF_VIRTUAL_IO &sfvirtual, void *user_data, int mode, int fmt, int chans, int srate)
|
||||||
|
: p (NULL)
|
||||||
|
{
|
||||||
|
p = new (std::nothrow) SNDFILE_ref () ;
|
||||||
|
|
||||||
|
if (p != NULL)
|
||||||
|
{ p->ref = 1 ;
|
||||||
|
|
||||||
|
p->sfinfo.frames = 0 ;
|
||||||
|
p->sfinfo.channels = chans ;
|
||||||
|
p->sfinfo.format = fmt ;
|
||||||
|
p->sfinfo.samplerate = srate ;
|
||||||
|
p->sfinfo.sections = 0 ;
|
||||||
|
p->sfinfo.seekable = 0 ;
|
||||||
|
|
||||||
|
p->sf = sf_open_virtual (&sfvirtual, mode, &p->sfinfo, user_data) ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
return ;
|
||||||
|
} /* SndfileHandle std::string constructor */
|
||||||
|
|
||||||
|
inline
|
||||||
|
SndfileHandle::~SndfileHandle (void)
|
||||||
|
{ if (p != NULL && --p->ref == 0)
|
||||||
|
delete p ;
|
||||||
|
} /* SndfileHandle destructor */
|
||||||
|
|
||||||
|
|
||||||
|
inline
|
||||||
|
SndfileHandle::SndfileHandle (const SndfileHandle &orig)
|
||||||
|
: p (orig.p)
|
||||||
|
{ if (p != NULL)
|
||||||
|
++p->ref ;
|
||||||
|
} /* SndfileHandle copy constructor */
|
||||||
|
|
||||||
|
inline SndfileHandle &
|
||||||
|
SndfileHandle::operator = (const SndfileHandle &rhs)
|
||||||
|
{
|
||||||
|
if (&rhs == this)
|
||||||
|
return *this ;
|
||||||
|
if (p != NULL && --p->ref == 0)
|
||||||
|
delete p ;
|
||||||
|
|
||||||
|
p = rhs.p ;
|
||||||
|
if (p != NULL)
|
||||||
|
++p->ref ;
|
||||||
|
|
||||||
|
return *this ;
|
||||||
|
} /* SndfileHandle assignment operator */
|
||||||
|
|
||||||
|
inline int
|
||||||
|
SndfileHandle::error (void) const
|
||||||
|
{ return sf_error (p->sf) ; }
|
||||||
|
|
||||||
|
inline const char *
|
||||||
|
SndfileHandle::strError (void) const
|
||||||
|
{ return sf_strerror (p->sf) ; }
|
||||||
|
|
||||||
|
inline int
|
||||||
|
SndfileHandle::command (int cmd, void *data, int datasize)
|
||||||
|
{ return sf_command (p->sf, cmd, data, datasize) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::seek (sf_count_t frame_count, int whence)
|
||||||
|
{ return sf_seek (p->sf, frame_count, whence) ; }
|
||||||
|
|
||||||
|
inline void
|
||||||
|
SndfileHandle::writeSync (void)
|
||||||
|
{ sf_write_sync (p->sf) ; }
|
||||||
|
|
||||||
|
inline int
|
||||||
|
SndfileHandle::setString (int str_type, const char* str)
|
||||||
|
{ return sf_set_string (p->sf, str_type, str) ; }
|
||||||
|
|
||||||
|
inline const char*
|
||||||
|
SndfileHandle::getString (int str_type) const
|
||||||
|
{ return sf_get_string (p->sf, str_type) ; }
|
||||||
|
|
||||||
|
inline int
|
||||||
|
SndfileHandle::formatCheck (int fmt, int chans, int srate)
|
||||||
|
{
|
||||||
|
SF_INFO sfinfo ;
|
||||||
|
|
||||||
|
sfinfo.frames = 0 ;
|
||||||
|
sfinfo.channels = chans ;
|
||||||
|
sfinfo.format = fmt ;
|
||||||
|
sfinfo.samplerate = srate ;
|
||||||
|
sfinfo.sections = 0 ;
|
||||||
|
sfinfo.seekable = 0 ;
|
||||||
|
|
||||||
|
return sf_format_check (&sfinfo) ;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*---------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::read (short *ptr, sf_count_t items)
|
||||||
|
{ return sf_read_short (p->sf, ptr, items) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::read (int *ptr, sf_count_t items)
|
||||||
|
{ return sf_read_int (p->sf, ptr, items) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::read (float *ptr, sf_count_t items)
|
||||||
|
{ return sf_read_float (p->sf, ptr, items) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::read (double *ptr, sf_count_t items)
|
||||||
|
{ return sf_read_double (p->sf, ptr, items) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::write (const short *ptr, sf_count_t items)
|
||||||
|
{ return sf_write_short (p->sf, ptr, items) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::write (const int *ptr, sf_count_t items)
|
||||||
|
{ return sf_write_int (p->sf, ptr, items) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::write (const float *ptr, sf_count_t items)
|
||||||
|
{ return sf_write_float (p->sf, ptr, items) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::write (const double *ptr, sf_count_t items)
|
||||||
|
{ return sf_write_double (p->sf, ptr, items) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::readf (short *ptr, sf_count_t frame_count)
|
||||||
|
{ return sf_readf_short (p->sf, ptr, frame_count) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::readf (int *ptr, sf_count_t frame_count)
|
||||||
|
{ return sf_readf_int (p->sf, ptr, frame_count) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::readf (float *ptr, sf_count_t frame_count)
|
||||||
|
{ return sf_readf_float (p->sf, ptr, frame_count) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::readf (double *ptr, sf_count_t frame_count)
|
||||||
|
{ return sf_readf_double (p->sf, ptr, frame_count) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::writef (const short *ptr, sf_count_t frame_count)
|
||||||
|
{ return sf_writef_short (p->sf, ptr, frame_count) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::writef (const int *ptr, sf_count_t frame_count)
|
||||||
|
{ return sf_writef_int (p->sf, ptr, frame_count) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::writef (const float *ptr, sf_count_t frame_count)
|
||||||
|
{ return sf_writef_float (p->sf, ptr, frame_count) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::writef (const double *ptr, sf_count_t frame_count)
|
||||||
|
{ return sf_writef_double (p->sf, ptr, frame_count) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::readRaw (void *ptr, sf_count_t bytes)
|
||||||
|
{ return sf_read_raw (p->sf, ptr, bytes) ; }
|
||||||
|
|
||||||
|
inline sf_count_t
|
||||||
|
SndfileHandle::writeRaw (const void *ptr, sf_count_t bytes)
|
||||||
|
{ return sf_write_raw (p->sf, ptr, bytes) ; }
|
||||||
|
|
||||||
|
inline SNDFILE *
|
||||||
|
SndfileHandle::rawHandle (void)
|
||||||
|
{ return (p ? p->sf : NULL) ; }
|
||||||
|
|
||||||
|
inline SNDFILE *
|
||||||
|
SndfileHandle::takeOwnership (void)
|
||||||
|
{
|
||||||
|
if (p == NULL || (p->ref != 1))
|
||||||
|
return NULL ;
|
||||||
|
|
||||||
|
SNDFILE * sf = p->sf ;
|
||||||
|
p->sf = NULL ;
|
||||||
|
delete p ;
|
||||||
|
p = NULL ;
|
||||||
|
return sf ;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef ENABLE_SNDFILE_WINDOWS_PROTOTYPES
|
||||||
|
|
||||||
|
inline
|
||||||
|
SndfileHandle::SndfileHandle (LPCWSTR wpath, int mode, int fmt, int chans, int srate)
|
||||||
|
: p (NULL)
|
||||||
|
{
|
||||||
|
p = new (std::nothrow) SNDFILE_ref () ;
|
||||||
|
|
||||||
|
if (p != NULL)
|
||||||
|
{ p->ref = 1 ;
|
||||||
|
|
||||||
|
p->sfinfo.frames = 0 ;
|
||||||
|
p->sfinfo.channels = chans ;
|
||||||
|
p->sfinfo.format = fmt ;
|
||||||
|
p->sfinfo.samplerate = srate ;
|
||||||
|
p->sfinfo.sections = 0 ;
|
||||||
|
p->sfinfo.seekable = 0 ;
|
||||||
|
|
||||||
|
p->sf = sf_wchar_open (wpath, mode, &p->sfinfo) ;
|
||||||
|
} ;
|
||||||
|
|
||||||
|
return ;
|
||||||
|
} /* SndfileHandle const wchar_t * constructor */
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* SNDFILE_HH */
|
||||||
|
|
||||||
47
libsndfile/lib/libsndfile-1.def
Normal file
47
libsndfile/lib/libsndfile-1.def
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
; Auto-generated by create_symbols_file.py
|
||||||
|
|
||||||
|
LIBRARY libsndfile-1.dll
|
||||||
|
EXPORTS
|
||||||
|
|
||||||
|
sf_command @1
|
||||||
|
sf_open @2
|
||||||
|
sf_close @3
|
||||||
|
sf_seek @4
|
||||||
|
sf_error @7
|
||||||
|
sf_perror @8
|
||||||
|
sf_error_str @9
|
||||||
|
sf_error_number @10
|
||||||
|
sf_format_check @11
|
||||||
|
sf_read_raw @16
|
||||||
|
sf_readf_short @17
|
||||||
|
sf_readf_int @18
|
||||||
|
sf_readf_float @19
|
||||||
|
sf_readf_double @20
|
||||||
|
sf_read_short @21
|
||||||
|
sf_read_int @22
|
||||||
|
sf_read_float @23
|
||||||
|
sf_read_double @24
|
||||||
|
sf_write_raw @32
|
||||||
|
sf_writef_short @33
|
||||||
|
sf_writef_int @34
|
||||||
|
sf_writef_float @35
|
||||||
|
sf_writef_double @36
|
||||||
|
sf_write_short @37
|
||||||
|
sf_write_int @38
|
||||||
|
sf_write_float @39
|
||||||
|
sf_write_double @40
|
||||||
|
sf_strerror @50
|
||||||
|
sf_get_string @60
|
||||||
|
sf_set_string @61
|
||||||
|
sf_version_string @68
|
||||||
|
sf_open_fd @70
|
||||||
|
sf_wchar_open @71
|
||||||
|
sf_open_virtual @80
|
||||||
|
sf_write_sync @90
|
||||||
|
sf_set_chunk @100
|
||||||
|
sf_get_chunk_size @101
|
||||||
|
sf_get_chunk_data @102
|
||||||
|
sf_get_chunk_iterator @103
|
||||||
|
sf_next_chunk_iterator @104
|
||||||
|
sf_current_byterate @110
|
||||||
|
|
||||||
BIN
libsndfile/lib/libsndfile-1.lib
Normal file
BIN
libsndfile/lib/libsndfile-1.lib
Normal file
Binary file not shown.
12
libsndfile/lib/pkgconfig/sndfile.pc
Normal file
12
libsndfile/lib/pkgconfig/sndfile.pc
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
prefix=c:/devel/target/libsndfile
|
||||||
|
exec_prefix=${prefix}
|
||||||
|
libdir=${exec_prefix}/lib
|
||||||
|
includedir=${prefix}/include
|
||||||
|
|
||||||
|
Name: sndfile
|
||||||
|
Description: A library for reading and writing audio files
|
||||||
|
Requires:
|
||||||
|
Version: 1.0.28
|
||||||
|
Libs: -L${libdir} -lsndfile
|
||||||
|
Libs.private: Ext/libflac.la Ext/libvorbis.la Ext/libogg.la
|
||||||
|
Cflags: -I${includedir}
|
||||||
BIN
mpg123/dist/libmpg123.dll
vendored
Normal file
BIN
mpg123/dist/libmpg123.dll
vendored
Normal file
Binary file not shown.
1034
mpg123/include/mpg123.h
Normal file
1034
mpg123/include/mpg123.h
Normal file
File diff suppressed because it is too large
Load Diff
40
mpg123/include/mpg123_pre.h
Normal file
40
mpg123/include/mpg123_pre.h
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
/*
|
||||||
|
mpg123_msvc: MPEG Audio Decoder library wrapper header for MS VC++ 2005
|
||||||
|
|
||||||
|
copyright 2008 by the mpg123 project - free software under the terms of the LGPL 2.1
|
||||||
|
initially written by Patrick Dehne and Thomas Orgis.
|
||||||
|
*/
|
||||||
|
#ifndef MPG123_MSVC_H
|
||||||
|
#define MPG123_MSVC_H
|
||||||
|
|
||||||
|
#include <tchar.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
typedef long ssize_t;
|
||||||
|
typedef __int32 int32_t;
|
||||||
|
typedef unsigned __int32 uint32_t;
|
||||||
|
|
||||||
|
#define PRIiMAX "I64i"
|
||||||
|
typedef __int64 intmax_t;
|
||||||
|
// ftell returns long, _ftelli64 returns __int64
|
||||||
|
// off_t is long, not __int64, use ftell
|
||||||
|
#define ftello ftell
|
||||||
|
|
||||||
|
#define MPG123_NO_CONFIGURE
|
||||||
|
#include "mpg123.h" /* Yes, .h.in; we include the configure template! */
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Wrapper around mpg123_open that supports path names with unicode
|
||||||
|
// characters
|
||||||
|
EXPORT int mpg123_topen(mpg123_handle *fr, const _TCHAR *path);
|
||||||
|
EXPORT int mpg123_tclose(mpg123_handle *fr);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
BIN
mpg123/lib/libmpg123.lib
Normal file
BIN
mpg123/lib/libmpg123.lib
Normal file
Binary file not shown.
@ -1,20 +1,21 @@
|
|||||||
#include "channel.h"
|
#include "channel.h"
|
||||||
|
|
||||||
#ifdef AUDIO_OAL
|
#ifdef AUDIO_OAL
|
||||||
|
#include "common.h"
|
||||||
#include "sampman.h"
|
#include "sampman.h"
|
||||||
|
|
||||||
extern bool IsFXSupported();
|
extern bool IsFXSupported();
|
||||||
|
|
||||||
CChannel::CChannel()
|
CChannel::CChannel()
|
||||||
{
|
{
|
||||||
alChannel = AL_NONE;
|
alSource = AL_NONE;
|
||||||
alFilter = AL_FILTER_NULL;
|
alFilter = AL_FILTER_NULL;
|
||||||
SetDefault();
|
SetDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::SetDefault()
|
void CChannel::SetDefault()
|
||||||
{
|
{
|
||||||
Buffer = AL_NONE;
|
alBuffer = AL_NONE;
|
||||||
|
|
||||||
Pitch = 1.0f;
|
Pitch = 1.0f;
|
||||||
Gain = 1.0f;
|
Gain = 1.0f;
|
||||||
@ -37,17 +38,17 @@ void CChannel::Reset()
|
|||||||
void CChannel::Init(bool Is2D)
|
void CChannel::Init(bool Is2D)
|
||||||
{
|
{
|
||||||
ASSERT(!HasSource());
|
ASSERT(!HasSource());
|
||||||
alGenSources(1, &alChannel);
|
alGenSources(1, &alSource);
|
||||||
if ( HasSource() )
|
if ( HasSource() )
|
||||||
{
|
{
|
||||||
alSourcei(alChannel, AL_SOURCE_RELATIVE, AL_TRUE);
|
alSourcei(alSource, AL_SOURCE_RELATIVE, AL_TRUE);
|
||||||
if ( IsFXSupported() )
|
if ( IsFXSupported() )
|
||||||
alSource3i(alChannel, AL_AUXILIARY_SEND_FILTER, AL_EFFECTSLOT_NULL, 0, AL_FILTER_NULL);
|
alSource3i(alSource, AL_AUXILIARY_SEND_FILTER, AL_EFFECTSLOT_NULL, 0, AL_FILTER_NULL);
|
||||||
|
|
||||||
if ( Is2D )
|
if ( Is2D )
|
||||||
{
|
{
|
||||||
alSource3f(alChannel, AL_POSITION, 0.0f, 0.0f, 0.0f);
|
alSource3f(alSource, AL_POSITION, 0.0f, 0.0f, 0.0f);
|
||||||
alSourcef (alChannel, AL_GAIN, 1.0f);
|
alSourcef (alSource, AL_GAIN, 1.0f);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -64,15 +65,15 @@ void CChannel::Term()
|
|||||||
{
|
{
|
||||||
if ( IsFXSupported() )
|
if ( IsFXSupported() )
|
||||||
{
|
{
|
||||||
alSource3i(alChannel, AL_AUXILIARY_SEND_FILTER, AL_EFFECTSLOT_NULL, 0, AL_FILTER_NULL);
|
alSource3i(alSource, AL_AUXILIARY_SEND_FILTER, AL_EFFECTSLOT_NULL, 0, AL_FILTER_NULL);
|
||||||
|
|
||||||
if(alFilter != AL_FILTER_NULL)
|
if(alFilter != AL_FILTER_NULL)
|
||||||
alDeleteFilters(1,&alFilter);
|
alDeleteFilters(1,&alFilter);
|
||||||
}
|
}
|
||||||
|
|
||||||
alDeleteSources(1, &alChannel);
|
alDeleteSources(1, &alSource);
|
||||||
}
|
}
|
||||||
alChannel = AL_NONE;
|
alSource = AL_NONE;
|
||||||
alFilter = AL_FILTER_NULL;
|
alFilter = AL_FILTER_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,22 +82,22 @@ void CChannel::Start()
|
|||||||
if ( !HasSource() ) return;
|
if ( !HasSource() ) return;
|
||||||
|
|
||||||
if ( LoopPoints[0] != 0 && LoopPoints[0] != -1 )
|
if ( LoopPoints[0] != 0 && LoopPoints[0] != -1 )
|
||||||
alBufferiv(Buffer, AL_LOOP_POINTS_SOFT, LoopPoints);
|
alBufferiv(alBuffer, AL_LOOP_POINTS_SOFT, LoopPoints);
|
||||||
alSourcei (alChannel, AL_BUFFER, Buffer);
|
alSourcei (alSource, AL_BUFFER, alBuffer);
|
||||||
alSourcePlay(alChannel);
|
alSourcePlay(alSource);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::Stop()
|
void CChannel::Stop()
|
||||||
{
|
{
|
||||||
if ( HasSource() )
|
if ( HasSource() )
|
||||||
alSourceStop(alChannel);
|
alSourceStop(alSource);
|
||||||
|
|
||||||
Reset();
|
Reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CChannel::HasSource()
|
bool CChannel::HasSource()
|
||||||
{
|
{
|
||||||
return alChannel != AL_NONE;
|
return alSource != AL_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CChannel::IsUsed()
|
bool CChannel::IsUsed()
|
||||||
@ -104,7 +105,7 @@ bool CChannel::IsUsed()
|
|||||||
if ( HasSource() )
|
if ( HasSource() )
|
||||||
{
|
{
|
||||||
ALint sourceState;
|
ALint sourceState;
|
||||||
alGetSourcei(alChannel, AL_SOURCE_STATE, &sourceState);
|
alGetSourcei(alSource, AL_SOURCE_STATE, &sourceState);
|
||||||
return sourceState == AL_PLAYING;
|
return sourceState == AL_PLAYING;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -113,13 +114,13 @@ bool CChannel::IsUsed()
|
|||||||
void CChannel::SetPitch(float pitch)
|
void CChannel::SetPitch(float pitch)
|
||||||
{
|
{
|
||||||
if ( !HasSource() ) return;
|
if ( !HasSource() ) return;
|
||||||
alSourcef(alChannel, AL_PITCH, pitch);
|
alSourcef(alSource, AL_PITCH, pitch);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::SetGain(float gain)
|
void CChannel::SetGain(float gain)
|
||||||
{
|
{
|
||||||
if ( !HasSource() ) return;
|
if ( !HasSource() ) return;
|
||||||
alSourcef(alChannel, AL_GAIN, gain);
|
alSourcef(alSource, AL_GAIN, gain);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::SetVolume(int32 vol)
|
void CChannel::SetVolume(int32 vol)
|
||||||
@ -145,7 +146,7 @@ void CChannel::SetCurrentFreq(uint32 freq)
|
|||||||
void CChannel::SetLoopCount(int32 loopCount) // fake. TODO:
|
void CChannel::SetLoopCount(int32 loopCount) // fake. TODO:
|
||||||
{
|
{
|
||||||
if ( !HasSource() ) return;
|
if ( !HasSource() ) return;
|
||||||
alSourcei(alChannel, AL_LOOPING, loopCount == 1 ? AL_FALSE : AL_TRUE);
|
alSourcei(alSource, AL_LOOPING, loopCount == 1 ? AL_FALSE : AL_TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::SetLoopPoints(ALint start, ALint end)
|
void CChannel::SetLoopPoints(ALint start, ALint end)
|
||||||
@ -157,33 +158,33 @@ void CChannel::SetLoopPoints(ALint start, ALint end)
|
|||||||
void CChannel::SetPosition(float x, float y, float z)
|
void CChannel::SetPosition(float x, float y, float z)
|
||||||
{
|
{
|
||||||
if ( !HasSource() ) return;
|
if ( !HasSource() ) return;
|
||||||
alSource3f(alChannel, AL_POSITION, x, y, z);
|
alSource3f(alSource, AL_POSITION, x, y, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::SetDistances(float max, float min)
|
void CChannel::SetDistances(float max, float min)
|
||||||
{
|
{
|
||||||
if ( !HasSource() ) return;
|
if ( !HasSource() ) return;
|
||||||
alSourcef (alChannel, AL_MAX_DISTANCE, max);
|
alSourcef (alSource, AL_MAX_DISTANCE, max);
|
||||||
alSourcef (alChannel, AL_REFERENCE_DISTANCE, min);
|
alSourcef (alSource, AL_REFERENCE_DISTANCE, min);
|
||||||
alSourcef (alChannel, AL_MAX_GAIN, 1.0f);
|
alSourcef (alSource, AL_MAX_GAIN, 1.0f);
|
||||||
alSourcef (alChannel, AL_ROLLOFF_FACTOR, 1.0f);
|
alSourcef (alSource, AL_ROLLOFF_FACTOR, 1.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::SetPan(uint32 pan)
|
void CChannel::SetPan(uint32 pan)
|
||||||
{
|
{
|
||||||
SetPosition((pan-63)/64.0f, 0.0f, sqrtf(1.0f-SQR((pan-63)/64.0f)));
|
SetPosition((pan-63)/64.0f, 0.0f, Sqrt(1.0f-SQR((pan-63)/64.0f)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::SetBuffer(ALuint buffer)
|
void CChannel::SetBuffer(ALuint buffer)
|
||||||
{
|
{
|
||||||
Buffer = buffer;
|
alBuffer = buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::ClearBuffer()
|
void CChannel::ClearBuffer()
|
||||||
{
|
{
|
||||||
if ( !HasSource() ) return;
|
if ( !HasSource() ) return;
|
||||||
SetBuffer(AL_NONE);
|
SetBuffer(AL_NONE);
|
||||||
alSourcei(alChannel, AL_BUFFER, AL_NONE);
|
alSourcei(alSource, AL_BUFFER, AL_NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::SetReverbMix(ALuint slot, float mix)
|
void CChannel::SetReverbMix(ALuint slot, float mix)
|
||||||
@ -194,7 +195,7 @@ void CChannel::SetReverbMix(ALuint slot, float mix)
|
|||||||
|
|
||||||
Mix = mix;
|
Mix = mix;
|
||||||
EAX3_SetReverbMix(alFilter, mix);
|
EAX3_SetReverbMix(alFilter, mix);
|
||||||
alSource3i(alChannel, AL_AUXILIARY_SEND_FILTER, slot, 0, alFilter);
|
alSource3i(alSource, AL_AUXILIARY_SEND_FILTER, slot, 0, alFilter);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CChannel::UpdateReverb(ALuint slot)
|
void CChannel::UpdateReverb(ALuint slot)
|
||||||
@ -203,7 +204,7 @@ void CChannel::UpdateReverb(ALuint slot)
|
|||||||
if ( !HasSource() ) return;
|
if ( !HasSource() ) return;
|
||||||
if ( alFilter == AL_FILTER_NULL ) return;
|
if ( alFilter == AL_FILTER_NULL ) return;
|
||||||
EAX3_SetReverbMix(alFilter, Mix);
|
EAX3_SetReverbMix(alFilter, Mix);
|
||||||
alSource3i(alChannel, AL_AUXILIARY_SEND_FILTER, slot, 0, alFilter);
|
alSource3i(alSource, AL_AUXILIARY_SEND_FILTER, slot, 0, alFilter);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@ -10,9 +10,9 @@
|
|||||||
|
|
||||||
class CChannel
|
class CChannel
|
||||||
{
|
{
|
||||||
ALuint alChannel;
|
ALuint alSource;
|
||||||
ALuint alFilter;
|
ALuint alFilter;
|
||||||
ALuint Buffer;
|
ALuint alBuffer;
|
||||||
float Pitch, Gain;
|
float Pitch, Gain;
|
||||||
float Mix;
|
float Mix;
|
||||||
int32 Frequency;
|
int32 Frequency;
|
||||||
|
|||||||
@ -1,48 +1,223 @@
|
|||||||
#include "stream.h"
|
#include "stream.h"
|
||||||
#include "common.h"
|
|
||||||
|
|
||||||
#ifdef AUDIO_OAL
|
#ifdef AUDIO_OAL
|
||||||
|
#include "common.h"
|
||||||
|
#include "sampman.h"
|
||||||
|
|
||||||
|
typedef long ssize_t;
|
||||||
|
|
||||||
|
#include <sndfile.h>
|
||||||
|
#include <mpg123.h>
|
||||||
|
|
||||||
|
#pragma comment( lib, "libsndfile-1.lib" )
|
||||||
|
#pragma comment( lib, "libmpg123.lib" )
|
||||||
|
|
||||||
|
class CSndFile : public IDecoder
|
||||||
|
{
|
||||||
|
SNDFILE *m_pfSound;
|
||||||
|
SF_INFO m_soundInfo;
|
||||||
|
public:
|
||||||
|
CSndFile(const char *path) :
|
||||||
|
m_pfSound(nil)
|
||||||
|
{
|
||||||
|
memset(&m_soundInfo, 0, sizeof(m_soundInfo));
|
||||||
|
m_pfSound = sf_open(path, SFM_READ, &m_soundInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
~CSndFile()
|
||||||
|
{
|
||||||
|
if ( m_pfSound )
|
||||||
|
{
|
||||||
|
sf_close(m_pfSound);
|
||||||
|
m_pfSound = nil;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsOpened()
|
||||||
|
{
|
||||||
|
return m_pfSound != nil;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 GetSampleSize()
|
||||||
|
{
|
||||||
|
return sizeof(uint16);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 GetSampleCount()
|
||||||
|
{
|
||||||
|
return m_soundInfo.frames;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 GetSampleRate()
|
||||||
|
{
|
||||||
|
return m_soundInfo.samplerate;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 GetChannels()
|
||||||
|
{
|
||||||
|
return m_soundInfo.channels;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Seek(uint32 milliseconds)
|
||||||
|
{
|
||||||
|
if ( !IsOpened() ) return;
|
||||||
|
sf_seek(m_pfSound, ms2samples(milliseconds), SF_SEEK_SET);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 Tell()
|
||||||
|
{
|
||||||
|
if ( !IsOpened() ) return 0;
|
||||||
|
return samples2ms(sf_seek(m_pfSound, 0, SF_SEEK_CUR));
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 Decode(void *buffer)
|
||||||
|
{
|
||||||
|
if ( !IsOpened() ) return 0;
|
||||||
|
return sf_read_short(m_pfSound, (short *)buffer, GetBufferSamples()) * GetSampleSize();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
class CMP3File : public IDecoder
|
||||||
|
{
|
||||||
|
mpg123_handle *m_pMH;
|
||||||
|
bool m_bOpened;
|
||||||
|
uint32 m_nRate;
|
||||||
|
uint32 m_nChannels;
|
||||||
|
public:
|
||||||
|
CMP3File(const char *path) :
|
||||||
|
m_pMH(nil),
|
||||||
|
m_bOpened(false),
|
||||||
|
m_nRate(0),
|
||||||
|
m_nChannels(0)
|
||||||
|
{
|
||||||
|
m_pMH = mpg123_new(nil, nil);
|
||||||
|
if ( m_pMH )
|
||||||
|
{
|
||||||
|
long rate = 0;
|
||||||
|
int channels = 0;
|
||||||
|
int encoding = 0;
|
||||||
|
|
||||||
|
m_bOpened = mpg123_open(m_pMH, path) == MPG123_OK
|
||||||
|
&& mpg123_getformat(m_pMH, &rate, &channels, &encoding) == MPG123_OK;
|
||||||
|
m_nRate = rate;
|
||||||
|
m_nChannels = channels;
|
||||||
|
|
||||||
|
if ( IsOpened() )
|
||||||
|
{
|
||||||
|
mpg123_format_none(m_pMH);
|
||||||
|
mpg123_format(m_pMH, rate, channels, encoding);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
~CMP3File()
|
||||||
|
{
|
||||||
|
if ( m_pMH )
|
||||||
|
{
|
||||||
|
mpg123_close(m_pMH);
|
||||||
|
mpg123_delete(m_pMH);
|
||||||
|
m_pMH = nil;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsOpened()
|
||||||
|
{
|
||||||
|
return m_bOpened;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 GetSampleSize()
|
||||||
|
{
|
||||||
|
return sizeof(uint16);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 GetSampleCount()
|
||||||
|
{
|
||||||
|
if ( !IsOpened() ) return 0;
|
||||||
|
return mpg123_length(m_pMH);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 GetSampleRate()
|
||||||
|
{
|
||||||
|
return m_nRate;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 GetChannels()
|
||||||
|
{
|
||||||
|
return m_nChannels;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Seek(uint32 milliseconds)
|
||||||
|
{
|
||||||
|
if ( !IsOpened() ) return;
|
||||||
|
mpg123_seek(m_pMH, ms2samples(milliseconds)*GetSampleSize(), SEEK_SET);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 Tell()
|
||||||
|
{
|
||||||
|
if ( !IsOpened() ) return 0;
|
||||||
|
return samples2ms(mpg123_tell(m_pMH)/GetSampleSize());
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 Decode(void *buffer)
|
||||||
|
{
|
||||||
|
if ( !IsOpened() ) return 0;
|
||||||
|
|
||||||
|
size_t size;
|
||||||
|
int err = mpg123_read(m_pMH, (unsigned char *)buffer, GetBufferSize(), &size);
|
||||||
|
if (err != MPG123_OK && err != MPG123_DONE) return 0;
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
void CStream::Initialise()
|
void CStream::Initialise()
|
||||||
{
|
{
|
||||||
//mpg123_init();
|
mpg123_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CStream::Terminate()
|
void CStream::Terminate()
|
||||||
{
|
{
|
||||||
//mpg123_exit();
|
mpg123_exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
CStream::CStream(char *filename, ALuint &source, ALuint (&buffers)[NUM_STREAMBUFFERS]) :
|
CStream::CStream(char *filename, ALuint &source, ALuint (&buffers)[NUM_STREAMBUFFERS]) :
|
||||||
m_alSource(source),
|
m_alSource(source),
|
||||||
m_alBuffers(buffers),
|
m_alBuffers(buffers),
|
||||||
m_nBitRate(0),
|
m_pBuffer(nil),
|
||||||
m_nFormat(0),
|
m_bPaused(false),
|
||||||
m_nFreq(0),
|
m_bActive(false),
|
||||||
m_nLength(0),
|
m_pSoundFile(nil),
|
||||||
m_nLengthMS(0),
|
m_bReset(false),
|
||||||
m_nBufferSize(0),
|
m_nVolume(0),
|
||||||
m_pBuffer(NULL),
|
m_nPan(0),
|
||||||
m_bIsOpened(false),
|
m_nPosBeforeReset(0)
|
||||||
m_bPaused(true)
|
|
||||||
|
|
||||||
{
|
{
|
||||||
strcpy(m_aFilename, filename);
|
strcpy(m_aFilename, filename);
|
||||||
|
|
||||||
//DEV("Stream %s\n", m_aFilename);
|
DEV("Stream %s\n", m_aFilename);
|
||||||
|
|
||||||
/*
|
if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".mp3")], ".mp3"))
|
||||||
if ( true )
|
m_pSoundFile = new CMP3File(m_aFilename);
|
||||||
|
else if (!strcasecmp(&m_aFilename[strlen(m_aFilename) - strlen(".wav")], ".wav"))
|
||||||
|
m_pSoundFile = new CSndFile(m_aFilename);
|
||||||
|
else
|
||||||
|
m_pSoundFile = nil;
|
||||||
|
ASSERT(m_pSoundFile != nil);
|
||||||
|
if (m_pSoundFile && m_pSoundFile->IsOpened() )
|
||||||
{
|
{
|
||||||
m_nBitRate = (wBitsPerSample * nChannels * wfex.nSamplesPerSec)/1000;
|
m_pBuffer = malloc(m_pSoundFile->GetBufferSize());
|
||||||
m_nLength = ulDataSize;
|
ASSERT(m_pBuffer!=nil);
|
||||||
m_nLengthMS = m_nLength*8 / m_nBitRate;
|
|
||||||
m_nBufferSize = nAvgBytesPerSec >> 2;
|
DEV("AvgSamplesPerSec: %d\n", m_pSoundFile->GetAvgSamplesPerSec());
|
||||||
m_nBufferSize -= (m_nLength % wfex.nBlockAlign);
|
DEV("SampleCount: %d\n", m_pSoundFile->GetSampleCount());
|
||||||
m_pBuffer = malloc(m_nBufferSize);
|
DEV("SampleRate: %d\n", m_pSoundFile->GetSampleRate());
|
||||||
m_bIsOpened = true;
|
DEV("Channels: %d\n", m_pSoundFile->GetChannels());
|
||||||
|
DEV("Buffer Samples: %d\n", m_pSoundFile->GetBufferSamples());
|
||||||
|
DEV("Buffer sec: %f\n", (float(m_pSoundFile->GetBufferSamples()) / float(m_pSoundFile->GetChannels())/ float(m_pSoundFile->GetSampleRate())));
|
||||||
|
DEV("Length MS: %02d:%02d\n", (m_pSoundFile->GetLength() / 1000) / 60, (m_pSoundFile->GetLength() / 1000) % 60);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}*/
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CStream::~CStream()
|
CStream::~CStream()
|
||||||
@ -52,67 +227,294 @@ CStream::~CStream()
|
|||||||
|
|
||||||
void CStream::Delete()
|
void CStream::Delete()
|
||||||
{
|
{
|
||||||
|
Stop();
|
||||||
|
ClearBuffers();
|
||||||
|
|
||||||
|
if ( m_pSoundFile )
|
||||||
|
{
|
||||||
|
delete m_pSoundFile;
|
||||||
|
m_pSoundFile = nil;
|
||||||
|
}
|
||||||
|
|
||||||
if ( m_pBuffer )
|
if ( m_pBuffer )
|
||||||
{
|
{
|
||||||
free(m_pBuffer);
|
free(m_pBuffer);
|
||||||
m_pBuffer = NULL;
|
m_pBuffer = nil;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CStream::HasSource()
|
||||||
|
{
|
||||||
|
return m_alSource != AL_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
bool CStream::IsOpened()
|
bool CStream::IsOpened()
|
||||||
{
|
{
|
||||||
return m_bIsOpened;
|
return m_pSoundFile->IsOpened();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CStream::IsPlaying()
|
bool CStream::IsPlaying()
|
||||||
{
|
{
|
||||||
|
if ( !HasSource() || !IsOpened() ) return false;
|
||||||
|
|
||||||
|
if ( m_pSoundFile->IsOpened() && !m_bPaused )
|
||||||
|
{
|
||||||
|
ALint sourceState;
|
||||||
|
alGetSourcei(m_alSource, AL_SOURCE_STATE, &sourceState);
|
||||||
|
if ( m_bActive || sourceState == AL_PLAYING )
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CStream::Pause()
|
||||||
|
{
|
||||||
|
if ( !HasSource() ) return;
|
||||||
|
ALint sourceState = AL_PAUSED;
|
||||||
|
alGetSourcei(m_alSource, AL_SOURCE_STATE, &sourceState);
|
||||||
|
if (sourceState != AL_PAUSED )
|
||||||
|
alSourcePause(m_alSource);
|
||||||
|
}
|
||||||
|
|
||||||
void CStream::SetPause(bool bPause)
|
void CStream::SetPause(bool bPause)
|
||||||
{
|
{
|
||||||
|
if ( !HasSource() ) return;
|
||||||
|
if ( bPause )
|
||||||
|
{
|
||||||
|
Pause();
|
||||||
|
m_bPaused = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (m_bPaused)
|
||||||
|
SetPlay(true);
|
||||||
|
m_bPaused = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CStream::SetPitch(float pitch)
|
||||||
|
{
|
||||||
|
if ( !HasSource() ) return;
|
||||||
|
alSourcef(m_alSource, AL_PITCH, pitch);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CStream::SetGain(float gain)
|
||||||
|
{
|
||||||
|
if ( !HasSource() ) return;
|
||||||
|
alSourcef(m_alSource, AL_GAIN, gain);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CStream::SetPosition(float x, float y, float z)
|
||||||
|
{
|
||||||
|
if ( !HasSource() ) return;
|
||||||
|
alSource3f(m_alSource, AL_POSITION, x, y, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CStream::SetVolume(uint32 nVol)
|
void CStream::SetVolume(uint32 nVol)
|
||||||
{
|
{
|
||||||
|
m_nVolume = nVol;
|
||||||
|
SetGain(ALfloat(nVol) / MAX_VOLUME);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CStream::SetPan(uint8 nPan)
|
void CStream::SetPan(uint8 nPan)
|
||||||
{
|
{
|
||||||
|
m_nPan = nPan;
|
||||||
|
SetPosition((nPan - 63)/64.0f, 0.0f, Sqrt(1.0f-SQR((nPan-63)/64.0f)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void CStream::SetPos(uint32 nPos)
|
void CStream::SetPosMS(uint32 nPos)
|
||||||
{
|
{
|
||||||
|
if ( !m_pSoundFile->IsOpened() ) return;
|
||||||
|
m_pSoundFile->Seek(nPos);
|
||||||
|
ClearBuffers();
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32 CStream::GetPos()
|
uint32 CStream::GetPosMS()
|
||||||
{
|
{
|
||||||
return 0;
|
if ( !HasSource() ) return 0;
|
||||||
|
if ( !m_pSoundFile->IsOpened() ) return 0;
|
||||||
|
|
||||||
|
ALint offset;
|
||||||
|
//alGetSourcei(m_alSource, AL_SAMPLE_OFFSET, &offset);
|
||||||
|
alGetSourcei(m_alSource, AL_BYTE_OFFSET, &offset);
|
||||||
|
|
||||||
|
return m_pSoundFile->Tell()
|
||||||
|
- m_pSoundFile->samples2ms(m_pSoundFile->GetBufferSamples() * (NUM_STREAMBUFFERS-1))
|
||||||
|
+ m_pSoundFile->samples2ms(offset/m_pSoundFile->GetSampleSize());
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32 CStream::GetLength()
|
uint32 CStream::GetLengthMS()
|
||||||
{
|
{
|
||||||
return m_nLengthMS;
|
if ( !m_pSoundFile->IsOpened() ) return 0;
|
||||||
|
return m_pSoundFile->GetLength();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CStream::FillBuffer(ALuint alBuffer)
|
||||||
|
{
|
||||||
|
if ( !HasSource() )
|
||||||
|
return false;
|
||||||
|
if ( !m_pSoundFile->IsOpened() )
|
||||||
|
return false;
|
||||||
|
if ( !(alBuffer != AL_NONE && alIsBuffer(alBuffer)) )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
uint32 size = m_pSoundFile->Decode(m_pBuffer);
|
||||||
|
if( size == 0 )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
alBufferData(alBuffer, m_pSoundFile->GetChannels() == 1 ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16,
|
||||||
|
m_pBuffer, size, m_pSoundFile->GetSampleRate());
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
int32 CStream::FillBuffers()
|
||||||
|
{
|
||||||
|
int32 i = 0;
|
||||||
|
for ( i = 0; i < NUM_STREAMBUFFERS; i++ )
|
||||||
|
{
|
||||||
|
if ( !FillBuffer(m_alBuffers[i]) )
|
||||||
|
break;
|
||||||
|
alSourceQueueBuffers(m_alSource, 1, &m_alBuffers[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
void CStream::ClearBuffers()
|
||||||
|
{
|
||||||
|
if ( !HasSource() ) return;
|
||||||
|
|
||||||
|
ALint buffersQueued;
|
||||||
|
alGetSourcei(m_alSource, AL_BUFFERS_QUEUED, &buffersQueued);
|
||||||
|
|
||||||
|
ALuint value;
|
||||||
|
while (buffersQueued--)
|
||||||
|
alSourceUnqueueBuffers(m_alSource, 1, &value);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CStream::Setup()
|
bool CStream::Setup()
|
||||||
{
|
{
|
||||||
if ( !IsOpened() )
|
if ( m_pSoundFile->IsOpened() )
|
||||||
return false;
|
{
|
||||||
|
m_pSoundFile->Seek(0);
|
||||||
|
alSourcei(m_alSource, AL_SOURCE_RELATIVE, AL_TRUE);
|
||||||
|
//SetPosition(0.0f, 0.0f, 0.0f);
|
||||||
|
SetPitch(1.0f);
|
||||||
|
//SetPan(m_nPan);
|
||||||
|
//SetVolume(100);
|
||||||
|
}
|
||||||
|
|
||||||
return IsOpened();
|
return IsOpened();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CStream::SetPlay(bool state)
|
||||||
|
{
|
||||||
|
if ( !HasSource() ) return;
|
||||||
|
if ( state )
|
||||||
|
{
|
||||||
|
ALint sourceState = AL_PLAYING;
|
||||||
|
alGetSourcei(m_alSource, AL_SOURCE_STATE, &sourceState);
|
||||||
|
if (sourceState != AL_PLAYING )
|
||||||
|
alSourcePlay(m_alSource);
|
||||||
|
m_bActive = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ALint sourceState = AL_STOPPED;
|
||||||
|
alGetSourcei(m_alSource, AL_SOURCE_STATE, &sourceState);
|
||||||
|
if (sourceState != AL_STOPPED )
|
||||||
|
alSourceStop(m_alSource);
|
||||||
|
m_bActive = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void CStream::Start()
|
void CStream::Start()
|
||||||
{
|
{
|
||||||
|
if ( !HasSource() ) return;
|
||||||
|
if ( FillBuffers() != 0 )
|
||||||
|
SetPlay(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CStream::Stop()
|
||||||
|
{
|
||||||
|
if ( !HasSource() ) return;
|
||||||
|
SetPlay(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CStream::Update()
|
void CStream::Update()
|
||||||
{
|
{
|
||||||
if ( !IsOpened() )
|
if ( !IsOpened() )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if ( !HasSource() )
|
||||||
|
return;
|
||||||
|
|
||||||
|
if ( m_bReset )
|
||||||
|
return;
|
||||||
|
|
||||||
|
if ( !m_bPaused )
|
||||||
|
{
|
||||||
|
ALint sourceState;
|
||||||
|
ALint buffersProcessed = 0;
|
||||||
|
|
||||||
|
alGetSourcei(m_alSource, AL_SOURCE_STATE, &sourceState);
|
||||||
|
alGetSourcei(m_alSource, AL_BUFFERS_PROCESSED, &buffersProcessed);
|
||||||
|
|
||||||
|
ALint looping = AL_FALSE;
|
||||||
|
alGetSourcei(m_alSource, AL_LOOPING, &looping);
|
||||||
|
|
||||||
|
if ( looping == AL_TRUE )
|
||||||
|
{
|
||||||
|
TRACE("stream set looping");
|
||||||
|
alSourcei(m_alSource, AL_LOOPING, AL_TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
while( buffersProcessed-- )
|
||||||
|
{
|
||||||
|
ALuint buffer;
|
||||||
|
|
||||||
|
alSourceUnqueueBuffers(m_alSource, 1, &buffer);
|
||||||
|
|
||||||
|
if ( m_bActive && FillBuffer(buffer) )
|
||||||
|
alSourceQueueBuffers(m_alSource, 1, &buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( sourceState != AL_PLAYING )
|
||||||
|
{
|
||||||
|
alGetSourcei(m_alSource, AL_BUFFERS_PROCESSED, &buffersProcessed);
|
||||||
|
SetPlay(buffersProcessed!=0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CStream::ProviderInit()
|
||||||
|
{
|
||||||
|
if ( m_bReset )
|
||||||
|
{
|
||||||
|
if ( Setup() )
|
||||||
|
{
|
||||||
|
SetPan(m_nPan);
|
||||||
|
SetVolume(m_nVolume);
|
||||||
|
SetPosMS(m_nPosBeforeReset);
|
||||||
|
if (m_bActive)
|
||||||
|
FillBuffers();
|
||||||
|
SetPlay(m_bActive);
|
||||||
|
if ( m_bPaused )
|
||||||
|
Pause();
|
||||||
|
}
|
||||||
|
|
||||||
|
m_bReset = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CStream::ProviderTerm()
|
||||||
|
{
|
||||||
|
m_bReset = true;
|
||||||
|
m_nPosBeforeReset = GetPosMS();
|
||||||
|
|
||||||
|
ClearBuffers();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@ -4,8 +4,56 @@
|
|||||||
#ifdef AUDIO_OAL
|
#ifdef AUDIO_OAL
|
||||||
#include <AL/al.h>
|
#include <AL/al.h>
|
||||||
|
|
||||||
#define NUM_STREAMBUFFERS 5
|
#define NUM_STREAMBUFFERS 4
|
||||||
#define STREAMBUFFER_SIZE 0x4000
|
|
||||||
|
class IDecoder
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual ~IDecoder() { }
|
||||||
|
|
||||||
|
virtual bool IsOpened() = 0;
|
||||||
|
|
||||||
|
virtual uint32 GetSampleSize() = 0;
|
||||||
|
virtual uint32 GetSampleCount() = 0;
|
||||||
|
virtual uint32 GetSampleRate() = 0;
|
||||||
|
virtual uint32 GetChannels() = 0;
|
||||||
|
|
||||||
|
uint32 GetAvgSamplesPerSec()
|
||||||
|
{
|
||||||
|
return GetChannels() * GetSampleRate();
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 ms2samples(uint32 ms)
|
||||||
|
{
|
||||||
|
return float(ms) / 1000.0f * float(GetChannels()) * float(GetSampleRate());
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 samples2ms(uint32 sm)
|
||||||
|
{
|
||||||
|
return float(sm) * 1000.0f / float(GetChannels()) / float(GetSampleRate());
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 GetBufferSamples()
|
||||||
|
{
|
||||||
|
//return (GetAvgSamplesPerSec() >> 2) - (GetSampleCount() % GetChannels());
|
||||||
|
return (GetAvgSamplesPerSec() / 4); // 250ms
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32 GetBufferSize()
|
||||||
|
{
|
||||||
|
return GetBufferSamples() * GetSampleSize();
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void Seek(uint32 milliseconds) = 0;
|
||||||
|
virtual uint32 Tell() = 0;
|
||||||
|
|
||||||
|
uint32 GetLength()
|
||||||
|
{
|
||||||
|
return float(GetSampleCount()) * 1000.0f / float(GetSampleRate());
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual uint32 Decode(void *buffer) = 0;
|
||||||
|
};
|
||||||
|
|
||||||
class CStream
|
class CStream
|
||||||
{
|
{
|
||||||
@ -13,30 +61,34 @@ class CStream
|
|||||||
ALuint &m_alSource;
|
ALuint &m_alSource;
|
||||||
ALuint (&m_alBuffers)[NUM_STREAMBUFFERS];
|
ALuint (&m_alBuffers)[NUM_STREAMBUFFERS];
|
||||||
|
|
||||||
bool m_bIsOpened;
|
|
||||||
bool m_bPaused;
|
bool m_bPaused;
|
||||||
|
bool m_bActive;
|
||||||
|
|
||||||
uint32 m_nLength;
|
|
||||||
uint32 m_nLengthMS;
|
|
||||||
uint32 m_nBitRate;
|
|
||||||
|
|
||||||
unsigned long m_nFormat;
|
|
||||||
unsigned long m_nFreq;
|
|
||||||
|
|
||||||
uint32 m_nBufferSize;
|
|
||||||
void *m_pBuffer;
|
void *m_pBuffer;
|
||||||
|
|
||||||
ALint iTotalBuffersProcessed;
|
bool m_bReset;
|
||||||
|
uint32 m_nVolume;
|
||||||
|
uint8 m_nPan;
|
||||||
|
uint32 m_nPosBeforeReset;
|
||||||
|
|
||||||
|
IDecoder *m_pSoundFile;
|
||||||
|
|
||||||
|
bool HasSource();
|
||||||
|
void SetPosition(float x, float y, float z);
|
||||||
|
void SetPitch(float pitch);
|
||||||
|
void SetGain(float gain);
|
||||||
|
void Pause();
|
||||||
|
void SetPlay(bool state);
|
||||||
|
|
||||||
bool FillBuffer(ALuint alBuffer);
|
bool FillBuffer(ALuint alBuffer);
|
||||||
int32 FillBuffers();
|
int32 FillBuffers();
|
||||||
|
void ClearBuffers();
|
||||||
public:
|
public:
|
||||||
static void Initialise();
|
static void Initialise();
|
||||||
static void Terminate();
|
static void Terminate();
|
||||||
|
|
||||||
CStream(char *filename, ALuint &source, ALuint (&buffers)[NUM_STREAMBUFFERS]);
|
CStream(char *filename, ALuint &source, ALuint (&buffers)[NUM_STREAMBUFFERS]);
|
||||||
~CStream();
|
~CStream();
|
||||||
|
|
||||||
void Delete();
|
void Delete();
|
||||||
|
|
||||||
bool IsOpened();
|
bool IsOpened();
|
||||||
@ -44,14 +96,17 @@ public:
|
|||||||
void SetPause (bool bPause);
|
void SetPause (bool bPause);
|
||||||
void SetVolume(uint32 nVol);
|
void SetVolume(uint32 nVol);
|
||||||
void SetPan (uint8 nPan);
|
void SetPan (uint8 nPan);
|
||||||
void SetPos (uint32 nPos);
|
void SetPosMS (uint32 nPos);
|
||||||
|
uint32 GetPosMS();
|
||||||
uint32 GetPos();
|
uint32 GetLengthMS();
|
||||||
uint32 GetLength();
|
|
||||||
|
|
||||||
bool Setup();
|
bool Setup();
|
||||||
void Start();
|
void Start();
|
||||||
|
void Stop();
|
||||||
void Update(void);
|
void Update(void);
|
||||||
|
|
||||||
|
void ProviderInit();
|
||||||
|
void ProviderTerm();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@ -29,7 +29,6 @@
|
|||||||
//TODO: fix eax3 reverb
|
//TODO: fix eax3 reverb
|
||||||
//TODO: max channals
|
//TODO: max channals
|
||||||
//TODO: loop count
|
//TODO: loop count
|
||||||
//TODO: mp3/wav stream
|
|
||||||
//TODO: mp3 player
|
//TODO: mp3 player
|
||||||
|
|
||||||
#pragma comment( lib, "OpenAL32.lib" )
|
#pragma comment( lib, "OpenAL32.lib" )
|
||||||
@ -179,9 +178,9 @@ add_providers()
|
|||||||
defaultProvider = pDeviceList->GetDefaultDevice();
|
defaultProvider = pDeviceList->GetDefaultDevice();
|
||||||
if ( defaultProvider > MAXPROVIDERS )
|
if ( defaultProvider > MAXPROVIDERS )
|
||||||
defaultProvider = 0;
|
defaultProvider = 0;
|
||||||
|
|
||||||
delete pDeviceList;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
delete pDeviceList;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -211,6 +210,10 @@ release_existing()
|
|||||||
|
|
||||||
for ( int32 i = 0; i < MAX_STREAMS; i++ )
|
for ( int32 i = 0; i < MAX_STREAMS; i++ )
|
||||||
{
|
{
|
||||||
|
CStream *stream = aStream[i];
|
||||||
|
if (stream)
|
||||||
|
stream->ProviderTerm();
|
||||||
|
|
||||||
alDeleteSources(1, &ALStreamSources[i]);
|
alDeleteSources(1, &ALStreamSources[i]);
|
||||||
alDeleteBuffers(NUM_STREAMBUFFERS, ALStreamBuffers[i]);
|
alDeleteBuffers(NUM_STREAMBUFFERS, ALStreamBuffers[i]);
|
||||||
}
|
}
|
||||||
@ -298,6 +301,10 @@ set_new_provider(int index)
|
|||||||
{
|
{
|
||||||
alGenSources(1, &ALStreamSources[i]);
|
alGenSources(1, &ALStreamSources[i]);
|
||||||
alGenBuffers(NUM_STREAMBUFFERS, ALStreamBuffers[i]);
|
alGenBuffers(NUM_STREAMBUFFERS, ALStreamBuffers[i]);
|
||||||
|
|
||||||
|
CStream *stream = aStream[i];
|
||||||
|
if (stream)
|
||||||
|
stream->ProviderInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
for ( int32 i = 0; i < SAMPLEBANK_MAX; i++ )
|
for ( int32 i = 0; i < SAMPLEBANK_MAX; i++ )
|
||||||
@ -523,6 +530,18 @@ cSampleManager::Initialise(void)
|
|||||||
nChannelVolume[i] = 0;
|
nChannelVolume[i] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
for ( int32 i = 0; i < MAX_STREAMS; i++ )
|
||||||
|
{
|
||||||
|
aStream[i] = NULL;
|
||||||
|
nStreamVolume[i] = 100;
|
||||||
|
nStreamPan[i] = 63;
|
||||||
|
}
|
||||||
|
|
||||||
|
for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ )
|
||||||
|
nStreamLength[i] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
add_providers();
|
add_providers();
|
||||||
|
|
||||||
@ -545,17 +564,6 @@ cSampleManager::Initialise(void)
|
|||||||
ASSERT(nSampleBankMemoryStartAddress[SAMPLEBANK_PED] != NULL);
|
ASSERT(nSampleBankMemoryStartAddress[SAMPLEBANK_PED] != NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
|
||||||
for ( int32 i = 0; i < MAX_STREAMS; i++ )
|
|
||||||
{
|
|
||||||
aStream[i] = NULL;
|
|
||||||
nStreamVolume[i] = 100;
|
|
||||||
nStreamPan[i] = 63;
|
|
||||||
}
|
|
||||||
|
|
||||||
for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ )
|
|
||||||
nStreamLength[i] = 3600000;
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
{
|
||||||
_bSampmanInitialised = true;
|
_bSampmanInitialised = true;
|
||||||
@ -571,6 +579,25 @@ cSampleManager::Initialise(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ )
|
||||||
|
{
|
||||||
|
aStream[0] = new CStream(StreamedNameTable[i], ALStreamSources[0], ALStreamBuffers[0]);
|
||||||
|
|
||||||
|
if ( aStream[0] && aStream[0]->IsOpened() )
|
||||||
|
{
|
||||||
|
uint32 tatalms = aStream[0]->GetLengthMS();
|
||||||
|
delete aStream[0];
|
||||||
|
aStream[0] = NULL;
|
||||||
|
|
||||||
|
nStreamLength[i] = tatalms;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
USERERROR("Can't open '%s'\n", StreamedNameTable[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
LoadSampleBank(SAMPLEBANK_MAIN);
|
LoadSampleBank(SAMPLEBANK_MAIN);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -653,7 +680,7 @@ cSampleManager::UpdateEffectsVolume(void)
|
|||||||
if ( GetChannelUsedFlag(i) )
|
if ( GetChannelUsedFlag(i) )
|
||||||
{
|
{
|
||||||
if ( nChannelVolume[i] != 0 )
|
if ( nChannelVolume[i] != 0 )
|
||||||
aChannel[i].SetVolume(m_nEffectsFadeVolume * nChannelVolume[i] * m_nEffectsVolume >> 14);
|
aChannel[i].SetVolume(m_nEffectsFadeVolume*nChannelVolume[i]*m_nEffectsVolume >> 14);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -853,7 +880,7 @@ uint32
|
|||||||
cSampleManager::GetSampleLength(uint32 nSample)
|
cSampleManager::GetSampleLength(uint32 nSample)
|
||||||
{
|
{
|
||||||
ASSERT( nSample < TOTAL_AUDIO_SAMPLES );
|
ASSERT( nSample < TOTAL_AUDIO_SAMPLES );
|
||||||
return m_aSamples[nSample].nSize >> 1;
|
return m_aSamples[nSample].nSize / sizeof(uint16);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cSampleManager::UpdateReverb(void)
|
bool cSampleManager::UpdateReverb(void)
|
||||||
@ -1018,7 +1045,7 @@ cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume)
|
|||||||
&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_NEWS_INTRO
|
&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_NEWS_INTRO
|
||||||
&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD )
|
&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD )
|
||||||
{
|
{
|
||||||
nChannelVolume[nChannel] >>= 2;
|
nChannelVolume[nChannel] = vol / 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
// no idea, does this one looks like a bug or it's SetChannelVolume ?
|
// no idea, does this one looks like a bug or it's SetChannelVolume ?
|
||||||
@ -1060,7 +1087,7 @@ cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume)
|
|||||||
&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_NEWS_INTRO
|
&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_NEWS_INTRO
|
||||||
&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD )
|
&& MusicManager.GetCurrentTrack() != STREAMED_SOUND_CUTSCENE_SAL4_BDBD )
|
||||||
{
|
{
|
||||||
nChannelVolume[nChannel] >>= 2;
|
nChannelVolume[nChannel] = vol / 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
aChannel[nChannel].SetVolume(m_nEffectsFadeVolume*vol*m_nEffectsVolume >> 14);
|
aChannel[nChannel].SetVolume(m_nEffectsFadeVolume*vol*m_nEffectsVolume >> 14);
|
||||||
@ -1209,11 +1236,11 @@ cSampleManager::StartStreamedFile(uint8 nFile, uint32 nPos, uint8 nStream)
|
|||||||
|
|
||||||
if ( stream->IsOpened() )
|
if ( stream->IsOpened() )
|
||||||
{
|
{
|
||||||
nStreamLength[nFile] = stream->GetLength();
|
nStreamLength[nFile] = stream->GetLengthMS();
|
||||||
if ( stream->Setup() )
|
if ( stream->Setup() )
|
||||||
{
|
{
|
||||||
if ( nPos != 0 )
|
if ( nPos != 0 )
|
||||||
stream->SetPos(nPos);
|
stream->SetPosMS(nPos);
|
||||||
|
|
||||||
stream->Start();
|
stream->Start();
|
||||||
}
|
}
|
||||||
@ -1253,7 +1280,7 @@ cSampleManager::GetStreamedFilePosition(uint8 nStream)
|
|||||||
|
|
||||||
if ( stream )
|
if ( stream )
|
||||||
{
|
{
|
||||||
return stream->GetPos();
|
return stream->GetPosMS();
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@ -1270,7 +1297,7 @@ cSampleManager::SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffect
|
|||||||
if ( nPan > MAX_VOLUME )
|
if ( nPan > MAX_VOLUME )
|
||||||
nPan = MAX_VOLUME;
|
nPan = MAX_VOLUME;
|
||||||
|
|
||||||
nStreamVolume[nStream] = m_nMusicFadeVolume * nVolume;
|
nStreamVolume[nStream] = nVolume;
|
||||||
nStreamPan [nStream] = nPan;
|
nStreamPan [nStream] = nPan;
|
||||||
|
|
||||||
CStream *stream = aStream[nStream];
|
CStream *stream = aStream[nStream];
|
||||||
|
|||||||
@ -209,6 +209,7 @@ void mysrand(unsigned int seed);
|
|||||||
void re3_debug(const char *format, ...);
|
void re3_debug(const char *format, ...);
|
||||||
void re3_trace(const char *filename, unsigned int lineno, const char *func, const char *format, ...);
|
void re3_trace(const char *filename, unsigned int lineno, const char *func, const char *format, ...);
|
||||||
void re3_assert(const char *expr, const char *filename, unsigned int lineno, const char *func);
|
void re3_assert(const char *expr, const char *filename, unsigned int lineno, const char *func);
|
||||||
|
void re3_usererror(const char *format, ...);
|
||||||
|
|
||||||
#define DEBUGBREAK() __debugbreak();
|
#define DEBUGBREAK() __debugbreak();
|
||||||
|
|
||||||
@ -216,6 +217,7 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con
|
|||||||
#define DEV(f, ...) re3_debug("[DEV]: " f, ## __VA_ARGS__)
|
#define DEV(f, ...) re3_debug("[DEV]: " f, ## __VA_ARGS__)
|
||||||
#define TRACE(f, ...) re3_trace(__FILE__, __LINE__, __FUNCTION__, f, ## __VA_ARGS__)
|
#define TRACE(f, ...) re3_trace(__FILE__, __LINE__, __FUNCTION__, f, ## __VA_ARGS__)
|
||||||
#define Error(f, ...) re3_debug("[ERROR]: " f, ## __VA_ARGS__)
|
#define Error(f, ...) re3_debug("[ERROR]: " f, ## __VA_ARGS__)
|
||||||
|
#define USERERROR(f, ...) re3_usererror(f, ## __VA_ARGS__)
|
||||||
|
|
||||||
#define assert(_Expression) (void)( (!!(_Expression)) || (re3_assert(#_Expression, __FILE__, __LINE__, __FUNCTION__), 0) )
|
#define assert(_Expression) (void)( (!!(_Expression)) || (re3_assert(#_Expression, __FILE__, __LINE__, __FUNCTION__), 0) )
|
||||||
#define ASSERT assert
|
#define ASSERT assert
|
||||||
|
|||||||
@ -456,6 +456,20 @@ void re3_trace(const char *filename, unsigned int lineno, const char *func, cons
|
|||||||
OutputDebugStringA(buff);
|
OutputDebugStringA(buff);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void re3_usererror(const char *format, ...)
|
||||||
|
{
|
||||||
|
va_list va;
|
||||||
|
va_start(va, format);
|
||||||
|
vsprintf_s(re3_buff, re3_buffsize, format, va);
|
||||||
|
va_end(va);
|
||||||
|
|
||||||
|
::MessageBoxA(nil, re3_buff, "RE3 Error!",
|
||||||
|
MB_OK|MB_ICONHAND|MB_SETFOREGROUND|MB_TASKMODAL);
|
||||||
|
|
||||||
|
raise(SIGABRT);
|
||||||
|
_exit(3);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef VALIDATE_SAVE_SIZE
|
#ifdef VALIDATE_SAVE_SIZE
|
||||||
int32 _saveBufCount;
|
int32 _saveBufCount;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user