mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-03 00:58:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

WAV: Avoid using a magic number.

Browse Source
This commit is contained in:
Tsuda Kageyu 2015-06-30 15:59:01 +09:00
parent 9c8e36d3be
commit 801c9db810
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
taglib/riff/wav/wavproperties.cpp
View File

@ -29,6 +29,16 @@
using namespace TagLib;
namespace
{
// Quoted from RFC 2361.
enum WaveFormat
{
FORMAT_UNKNOWN = 0x0000,
FORMAT_PCM = 0x0001
};
}
class RIFF::WAV::Properties::PropertiesPrivate
{
public:
@ -173,7 +183,7 @@ void RIFF::WAV::Properties::read(File *file)
}
d->format = data.toShort(0, false);
if(d->format != 1 && totalSamples == 0) {
if(d->format != FORMAT_PCM && totalSamples == 0) {
debug("RIFF::WAV::Properties::read() - Non-PCM format, but 'fact' chunk not found.");
return;
}

6
taglib/riff/wav/wavproperties.h
View File

@ -139,9 +139,11 @@ namespace TagLib {
/*!
* Returns the format ID of the file.
* 0 for unknown, 1 for PCM, 2 for ADPCM, 3 for 32/64-bit IEEE754, and so forth.
* 0 for unknown, 1 for PCM, 2 for ADPCM, 3 for 32/64-bit IEEE754, and
* so forth.
*
* \note For further information, refer to RFC 2361.
* \note For further information, refer to the WAVE Form Registration
* Numbers in RFC 2361.
*/
int format() const;