From 49284bb0d33a2598f96645182984bc3fa671b932 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 22 Oct 2017 11:08:50 +0000 Subject: 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 --- src/plugins/General/converter/converter.cpp | 4 ++-- src/plugins/General/rgscan/rgscanner.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/General') 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 -- cgit v1.2.3-13-gbd6f