consistency

include/libnyquist/AudioDevice.h

@@ -39,9 +39,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace nqr
 {
     
-const unsigned int FRAME_SIZE = 512;
-const int CHANNELS = 2;
-const int BUFFER_LENGTH = FRAME_SIZE * CHANNELS;
+const uint32_t FRAME_SIZE = 512;
+const int32_t CHANNELS = 2;
+const int32_t BUFFER_LENGTH = FRAME_SIZE * CHANNELS;
 
 struct DeviceInfo
 {

src/AudioDevice.cpp

@@ -33,7 +33,7 @@ using namespace nqr;
 
 static RingBufferT<float> buffer(BUFFER_LENGTH);
 
-static int rt_callback(void * output_buffer, void * input_buffer, unsigned int num_bufferframes, double stream_time, RtAudioStreamStatus status, void * user_data)
+static int rt_callback(void * output_buffer, void * input_buffer, uint32_t num_bufferframes, double stream_time, RtAudioStreamStatus status, void * user_data)
 {
     if (status) std::cerr << "[rtaudio] Buffer over or underflow" << std::endl;
 
@@ -73,11 +73,11 @@ void AudioDevice::ListAudioDevices()
     std::unique_ptr<RtAudio> tempDevice(new RtAudio);
 
     RtAudio::DeviceInfo info;
-    unsigned int devices = tempDevice->getDeviceCount();
+    uint32_t devices = tempDevice->getDeviceCount();
 
     std::cout << "[rtaudio] Found: " << devices << " device(s)\n";
 
-    for (unsigned int i = 0; i < devices; ++i)
+    for (uint32_t i = 0; i < devices; ++i)
     {
         info = tempDevice->getDeviceInfo(i);
         std::cout << "\tDevice: " << i << " - " << info.name << std::endl;

src/FlacDecoder.cpp

@@ -36,7 +36,7 @@ class FlacDecoderInternal
     
 public:
     
-    // N.B.: FLAC is a big-endian format. All values are unsigned.
+    // FLAC is a big-endian format. All values are unsigned.
     FlacDecoderInternal(AudioData * d, std::string filepath) : d(d)
     {
         
@@ -118,7 +118,7 @@ public:
     // libflab callbacks //
     ///////////////////////
     
-    static FLAC__StreamDecoderWriteStatus s_writeCallback(const FLAC__StreamDecoder*, const FLAC__Frame* frame, const FLAC__int32* const buffer[], void* userPtr)
+    static FLAC__StreamDecoderWriteStatus s_writeCallback(const FLAC__StreamDecoder *, const FLAC__Frame* frame, const FLAC__int32 * const buffer[], void * userPtr)
     {
         FlacDecoderInternal * decoder = reinterpret_cast<FlacDecoderInternal *>(userPtr);
         
@@ -126,7 +126,7 @@ public:
         
         auto dataPtr = decoder->internalBuffer.data();
         
-        for(unsigned int i = 0;  i < frame->header.blocksize; i++)
+        for (uint32_t i = 0;  i < frame->header.blocksize; i++)
         {
             for(int j = 0; j < decoder->d->channelCount; j++)
             {
@@ -138,12 +138,12 @@ public:
         return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
     }
     
-    static void s_metadataCallback (const FLAC__StreamDecoder*, const FLAC__StreamMetadata* metadata, void* userPtr)
+    static void s_metadataCallback (const FLAC__StreamDecoder *, const FLAC__StreamMetadata * metadata, void * userPtr)
     {
         static_cast<FlacDecoderInternal*>(userPtr)->processMetadata(metadata->data.stream_info);
     }
     
-    static void s_errorCallback (const FLAC__StreamDecoder *, FLAC__StreamDecoderErrorStatus status, void*)
+    static void s_errorCallback (const FLAC__StreamDecoder *, FLAC__StreamDecoderErrorStatus status, void *)
     {
         std::cerr << "FLAC Decoder Error: " << FLAC__StreamDecoderErrorStatusString[status] << std::endl;
     }

src/MusepackDecoder.cpp

@@ -134,7 +134,7 @@ public:
         
         size_t totalSamplesRead = 0;
         
-        while(MPC_TRUE)
+        while (true)
         {
             mpc_frame_info frame;
             

src/MusepackDependencies.c

@@ -36,12 +36,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include "musepack/libmpcdec/huffman.c"
-
-//#include "musepack/libmpcdec/mpc_decoder.c"
-//#include "musepack/libmpcdec/mpc_reader.c"
-//#include "musepack/libmpcdec/mpc_bits_reader.c"
-//#include "musepack/libmpcdec/mpc_demux.c"
-
 #include "musepack/libmpcdec/requant.c"
 #include "musepack/libmpcdec/streaminfo.c"
 #include "musepack/libmpcdec/synth_filter.c"

src/RiffUtils.cpp

@@ -59,7 +59,7 @@ WaveChunkHeader nqr::MakeWaveHeader(const EncoderParams param, const int sampleR
     header.channel_count = param.channelCount;
     header.sample_rate = sampleRate;
     header.data_rate = sampleRate * param.channelCount * (bitdepth / 8);
-    header.frame_size = param.channelCount * (bitdepth/ 8);
+    header.frame_size = param.channelCount * (bitdepth / 8);
     header.bit_depth = bitdepth;
     
     return header;