added extra functions to AudioParameters class

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7612 90c681e8-e032-0410-971d-27865f9a5e38

6 files changed, 16 insertions, 22 deletions

diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp
index ea4e7f12b..71468ef5c 100644
--- a/src/plugins/General/converter/converter.cpp
+++ b/src/plugins/General/converter/converter.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2011-2017 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -308,7 +308,7 @@ bool Converter::convert(Decoder *decoder, FILE *file, bool use16bit)
 
     int outSampleSize = AudioParameters::sampleSize(outFormat);
 
-    unsigned char input_buffer[QMMP_BLOCK_FRAMES * ap.sampleSize() * ap.channels() * 4];
+    unsigned char input_buffer[QMMP_BLOCK_FRAMES * ap.frameSize() * 4];
     float converter_buffer[QMMP_BLOCK_FRAMES * ap.channels() * 4];
     unsigned char output_buffer[QMMP_BLOCK_FRAMES * outSampleSize * ap.channels() * 4];
 
diff --git a/src/plugins/General/rgscan/rgscanner.cpp b/src/plugins/General/rgscan/rgscanner.cpp
index d7a66b7ac..65a045d3e 100644
--- a/src/plugins/General/rgscan/rgscanner.cpp
+++ b/src/plugins/General/rgscan/rgscanner.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2013-2017 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -182,7 +182,7 @@ void RGScanner::run()
     //buffers
     double out_left[BUFFER_FRAMES], out_right[BUFFER_FRAMES]; //replay gain buffers
     float float_buf[BUFFER_FRAMES*ap.channels()]; //float buffer
-    qint64 buf_size = BUFFER_FRAMES*ap.channels()*ap.sampleSize();
+    qint64 buf_size = BUFFER_FRAMES*ap.frameSize();
     unsigned char char_buf[buf_size]; //char buffer
 
 
diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp
index 2bdb35d94..b25e2d631 100644
--- a/src/plugins/Input/cue/decoder_cue.cpp
+++ b/src/plugins/Input/cue/decoder_cue.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2017 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -99,11 +99,10 @@ bool DecoderCUE::initialize()
     configure(m_decoder->audioParameters());
     setReplayGainInfo(m_parser->replayGain(m_track));
     length_in_bytes = audioParameters().sampleRate() *
-                      audioParameters().channels() *
-                      audioParameters().sampleSize() * m_length/1000;
+                      audioParameters().frameSize() * m_length/1000;
     m_totalBytes = 0;
 
-    m_sz = audioParameters().sampleSize() * audioParameters().channels();
+    m_sz = audioParameters().frameSize();
 
     addMetaData(m_parser->info(m_track)->metaData());
     return true;
@@ -118,8 +117,7 @@ void DecoderCUE::seek(qint64 pos)
 {
      m_decoder->seek(m_offset + pos);
      m_totalBytes = audioParameters().sampleRate() *
-                    audioParameters().channels() *
-                    audioParameters().sampleSize() * pos/1000;
+                    audioParameters().frameSize() * pos/1000;
 }
 
 qint64 DecoderCUE::read(unsigned char *data, qint64 size)
@@ -187,8 +185,7 @@ void DecoderCUE::next()
         m_length = m_parser->length(m_track);
         m_offset = m_parser->offset(m_track);
         length_in_bytes = audioParameters().sampleRate() *
-                          audioParameters().channels() *
-                          audioParameters().sampleSize() * m_length/1000;
+                          audioParameters().frameSize() * m_length/1000;
         addMetaData(m_parser->info(m_track)->metaData());
         setReplayGainInfo(m_parser->replayGain(m_track));
         m_totalBytes = 0;
diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp
index 0ecfb7259..395b0eb6e 100644
--- a/src/plugins/Input/flac/decoder_flac.cpp
+++ b/src/plugins/Input/flac/decoder_flac.cpp
@@ -462,13 +462,12 @@ bool DecoderFLAC::initialize()
         m_length = m_parser->length(m_track);
         m_offset = m_parser->offset(m_track);
         length_in_bytes = audioParameters().sampleRate() *
-                          audioParameters().channels() *
-                          audioParameters().sampleSize() * m_length/1000;
+                          audioParameters().frameSize() * m_length/1000;
         setReplayGainInfo(m_parser->replayGain(m_track));
         seek(0);
     }
     m_totalBytes = 0;
-    m_sz = audioParameters().sampleSize() * audioParameters().channels();
+    m_sz = audioParameters().frameSize();
 
     qDebug("DecoderFLAC: initialize succes");
     return true;
diff --git a/src/plugins/Input/sid/decoder_sid.cpp b/src/plugins/Input/sid/decoder_sid.cpp
index 2205ac2c8..351db3754 100644
--- a/src/plugins/Input/sid/decoder_sid.cpp
+++ b/src/plugins/Input/sid/decoder_sid.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2013-2017 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -142,8 +142,7 @@ bool DecoderSID::initialize()
 
     configure(44100, 2);
     m_length_in_bytes = audioParameters().sampleRate() *
-            audioParameters().channels() *
-            audioParameters().sampleSize() * m_length;
+            audioParameters().frameSize() * m_length;
     qDebug("DecoderSID: initialize succes");
     return true;
 }
diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp
index 09177f873..0adf85449 100644
--- a/src/plugins/Input/wavpack/decoder_wavpack.cpp
+++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2017 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -144,13 +144,12 @@ bool DecoderWavPack::initialize()
         m_length = m_parser->length(m_track);
         m_offset = m_parser->offset(m_track);
         m_length_in_bytes = audioParameters().sampleRate() *
-                          audioParameters().channels() *
-                          audioParameters().sampleSize() * m_length/1000;
+                          audioParameters().frameSize() * m_length/1000;
         setReplayGainInfo(m_parser->replayGain(m_track));
         seek(0);
     }
     m_totalBytes = 0;
-    m_frame_size = audioParameters().sampleSize() * audioParameters().channels();
+    m_frame_size = audioParameters().frameSize();
     qDebug("DecoderWavPack: initialize succes");
     return true;
 }