Merge branch 'hotfix-0.6.1'

NEWS

@@ -1,3 +1,10 @@
+Version 0.6.1
+=============
+
+Bugfix release: The playback-level property reported a wrong value when read.
+Setting it to a specfic value worked corectly; also the default was correctly
+set to 92dB (although it was incorrectly reported as 28.24dB).
+
 Version 0.6
 ===========
 

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ(2.60)
 
-AC_INIT([GstPEAQ], [0.6], [[email protected]], , [http://ant.hsu-hh.de/gstpeaq])
+AC_INIT([GstPEAQ], [0.6.1], [[email protected]], , [http://ant.hsu-hh.de/gstpeaq])
 AC_CONFIG_AUX_DIR([misc])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.9 gnu])

src/fftearmodel.c

@@ -298,7 +298,7 @@ get_playback_level (PeaqEarModel const *model)
 {
   PeaqFFTEarModel *fft_model = PEAQ_FFTEARMODEL (model);
   return 10. * log10 (fft_model->level_factor *
-                      (GAMMA / 4 * (FFT_FRAMESIZE - 1) / FFT_FRAMESIZE));
+                      8. / 3. * (GAMMA / 4 * (FFT_FRAMESIZE - 1)) * (GAMMA / 4 * (FFT_FRAMESIZE - 1)));
 }
 
 static void

vs/gstpeaq.props

@@ -5,7 +5,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>PACKAGE="gstpeaq";PACKAGE_BUGREPORT="[email protected]";PACKAGE_NAME="GstPEAQ";PACKAGE_STRING="GstPEAQ 0.6";PACKAGE_URL="http://ant.hsu-hh.de/gstpeaq";PACKAGE_VERSION="0.6";VERSION="0.6";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>PACKAGE="gstpeaq";PACKAGE_BUGREPORT="[email protected]";PACKAGE_NAME="GstPEAQ";PACKAGE_STRING="GstPEAQ 0.6.1";PACKAGE_URL="http://ant.hsu-hh.de/gstpeaq";PACKAGE_VERSION="0.6.1";VERSION="0.6.1";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>

xcode/GstPEAQ.xcodeproj/project.pbxproj

@@ -256,10 +256,10 @@
 				"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = (
 					"$(inherited)",
 					"PACKAGE_URL=\\\"http://ant.hsu-hh.de/gstpeaq\\\"",
-					"PACKAGE_STRING=\"\\\"GstPEAQ 0.6\\\"\"",
+					"PACKAGE_STRING=\"\\\"GstPEAQ 0.6.1\\\"\"",
 					"PACKAGE=\\\"gstpeaq\\\"",
 					"PACKAGE_NAME=\\\"GstPEAQ\\\"",
-					"PACKAGE_VERSION=\\\"0.6\\\"",
+					"PACKAGE_VERSION=\\\"0.6.1\\\"",
 					"PACKAGE_BUGREPORT=\\\"[email protected]\\\"",
 				);
 				HEADER_SEARCH_PATHS = (
@@ -277,10 +277,10 @@
 				"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = (
 					"$(inherited)",
 					"PACKAGE_URL=\\\"http://ant.hsu-hh.de/gstpeaq\\\"",
-					"PACKAGE_STRING=\"\\\"GstPEAQ 0.6\\\"\"",
+					"PACKAGE_STRING=\"\\\"GstPEAQ 0.6.1\\\"\"",
 					"PACKAGE=\\\"gstpeaq\\\"",
 					"PACKAGE_NAME=\\\"GstPEAQ\\\"",
-					"PACKAGE_VERSION=\\\"0.6\\\"",
+					"PACKAGE_VERSION=\\\"0.6.1\\\"",
 					"PACKAGE_BUGREPORT=\\\"[email protected]\\\"",
 				);
 				HEADER_SEARCH_PATHS = (