diff --git a/src/lib_ccaligner/read_wav_file.cpp b/src/lib_ccaligner/read_wav_file.cpp index 9a33128..01b05a1 100644 --- a/src/lib_ccaligner/read_wav_file.cpp +++ b/src/lib_ccaligner/read_wav_file.cpp @@ -12,7 +12,7 @@ WaveFileData::WaveFileData(std::string fileName) _samples.resize(0); } -bool WaveFileData::checkValidWave (std::vector& fileData) +bool WaveFileData::checkValidWave (std::vector& fileData) { /*Offset Size Name Description * 0 4 ChunkID Contains the letters "RIFF" in ASCII form @@ -44,8 +44,8 @@ bool WaveFileData::openFile () */ std::noskipws(infile); - std::istream_iterator begin (infile), end; - std::vector fileData (begin, end); + std::istream_iterator begin (infile), end; + std::vector fileData (begin, end); if(checkValidWave(fileData)) { @@ -210,8 +210,6 @@ bool WaveFileData::parse() } } - std::cout<& fileData, int index) +unsigned long WaveFileData::fourBytesToInt (std::vector& fileData, int index) { return ((fileData[index + 3] << 24) | (fileData[index + 2] << 16) | (fileData[index + 1] << 8) | fileData[index]); } -int WaveFileData::twoBytesToInt (std::vector& fileData, int index) +int WaveFileData::twoBytesToInt (std::vector& fileData, int index) { return ((fileData[index + 1] << 8) | fileData[index]); } diff --git a/src/lib_ccaligner/read_wav_file.h b/src/lib_ccaligner/read_wav_file.h index fa97528..071b8dd 100644 --- a/src/lib_ccaligner/read_wav_file.h +++ b/src/lib_ccaligner/read_wav_file.h @@ -16,14 +16,14 @@ class WaveFileData { std::string _fileName; - std::vector _fileData; + std::vector _fileData; std::vector> _samples; - bool checkValidWave (std::vector& fileData); + bool checkValidWave (std::vector& fileData); bool parse(); - unsigned long fourBytesToInt (std::vector& fileData, int index); - int twoBytesToInt (std::vector& fileData, int index); + unsigned long fourBytesToInt (std::vector& fileData, int index); + int twoBytesToInt (std::vector& fileData, int index); double twoBytesToDouble (int sample); public: