diff --git a/lib-src/libflac/AUTHORS b/lib-src/libflac/AUTHORS index fe3d3b4a9..ef22b507d 100644 --- a/lib-src/libflac/AUTHORS +++ b/lib-src/libflac/AUTHORS @@ -1,6 +1,6 @@ /* FLAC - Free Lossless Audio Codec * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This file is part the FLAC project. FLAC is comprised of several * components distributed under different licenses. The codec libraries @@ -17,11 +17,27 @@ * distribution. */ +Current FLAC maintainer: Erik de Castro Lopo -FLAC (http://flac.sourceforge.net/) is an Open Source lossless audio -codec developed by Josh Coalson . +Original author: Josh Coalson + +Website : https://www.xiph.org/flac/ + +FLAC is an Open Source lossless audio codec originally developed by Josh Coalson +between 2001 and 2009. From 2009 to 2012 FLAC was basically unmaintained. In +2012 the Erik de Castro Lopo became the chief maintainer as part of the +Xiph.Org Foundation. Other major contributors and their contributions: + +"lvqcl" +* Visual Studio build system. +* Optimisations in the encoder and decoder. + +"Janne Hyvärinen" +* Visual Studio build system. +* Unicode handling on Windows. + "Andrey Astafiev" * Russian translation of the HTML documentation diff --git a/lib-src/libflac/COPYING.Xiph b/lib-src/libflac/COPYING.Xiph index 6b9c2ff0e..c0361fd97 100644 --- a/lib-src/libflac/COPYING.Xiph +++ b/lib-src/libflac/COPYING.Xiph @@ -1,5 +1,5 @@ Copyright (C) 2000-2009 Josh Coalson -Copyright (C) 2011-2013 Xiph.Org Foundation +Copyright (C) 2011-2014 Xiph.Org Foundation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/FLAC-vs2005.sln b/lib-src/libflac/FLAC-vs2005.sln new file mode 100644 index 000000000..c727edae1 --- /dev/null +++ b/lib-src/libflac/FLAC-vs2005.sln @@ -0,0 +1,272 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual C++ Express 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_c_decode_file", "examples\c\decode\file\example_c_decode_file.vcproj", "{4CEFBD00-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_c_encode_file", "examples\c\encode\file\example_c_encode_file.vcproj", "{4CEFBD01-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_cpp_decode_file", "examples\cpp\decode\file\example_cpp_decode_file.vcproj", "{4CEFBE00-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_cpp_encode_file", "examples\cpp\encode\file\example_cpp_encode_file.vcproj", "{4CEFBE01-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flac", "src\flac\flac.vcproj", "{4CEFBC7D-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66} + {4CEFBC89-C215-11DB-8314-0800200C9A66} = {4CEFBC89-C215-11DB-8314-0800200C9A66} + {4CEFBC92-C215-11DB-8314-0800200C9A66} = {4CEFBC92-C215-11DB-8314-0800200C9A66} + {4CEFBC80-C215-11DB-8314-0800200C9A66} = {4CEFBC80-C215-11DB-8314-0800200C9A66} + {4CEFBC8A-C215-11DB-8314-0800200C9A66} = {4CEFBC8A-C215-11DB-8314-0800200C9A66} + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iffscan", "src\flac\iffscan.vcproj", "{4CEFBC94-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flacdiff", "src\utils\flacdiff\flacdiff.vcproj", "{4CEFBC93-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flactimer", "src\utils\flactimer\flactimer.vcproj", "{4CEFBC95-C215-11DB-8314-0800200C9A66}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt_static", "src\share\getopt\getopt_static.vcproj", "{4CEFBC80-C215-11DB-8314-0800200C9A66}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grabbag_static", "src\share\grabbag\grabbag_static.vcproj", "{4CEFBC81-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBC89-C215-11DB-8314-0800200C9A66} = {4CEFBC89-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_dynamic", "src\libFLAC\libFLAC_dynamic.vcproj", "{4CEFBC83-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_static", "src\libFLAC\libFLAC_static.vcproj", "{4CEFBC84-C215-11DB-8314-0800200C9A66}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC++_dynamic", "src\libFLAC++\libFLAC++_dynamic.vcproj", "{4CEFBC85-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC83-C215-11DB-8314-0800200C9A66} = {4CEFBC83-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC++_static", "src\libFLAC++\libFLAC++_static.vcproj", "{4CEFBC86-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metaflac", "src\metaflac\metaflac.vcproj", "{4CEFBC87-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBC80-C215-11DB-8314-0800200C9A66} = {4CEFBC80-C215-11DB-8314-0800200C9A66} + {4CEFBC92-C215-11DB-8314-0800200C9A66} = {4CEFBC92-C215-11DB-8314-0800200C9A66} + {4CEFBC89-C215-11DB-8314-0800200C9A66} = {4CEFBC89-C215-11DB-8314-0800200C9A66} + {4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_common_static", "src\plugin_common\plugin_common_static.vcproj", "{4CEFBC88-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66} + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "replaygain_analysis_static", "src\share\replaygain_analysis\replaygain_analysis_static.vcproj", "{4CEFBC89-C215-11DB-8314-0800200C9A66}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "replaygain_synthesis_static", "src\share\replaygain_synthesis\replaygain_synthesis_static.vcproj", "{4CEFBC8A-C215-11DB-8314-0800200C9A66}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cuesheet", "src\test_grabbag\cuesheet\test_cuesheet.vcproj", "{4CEFBC8B-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libFLAC", "src\test_libFLAC\test_libFLAC.vcproj", "{4CEFBC8C-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC8E-C215-11DB-8314-0800200C9A66} = {4CEFBC8E-C215-11DB-8314-0800200C9A66} + {4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66} + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libFLAC++", "src\test_libFLAC++\test_libFLAC++.vcproj", "{4CEFBC8D-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66} + {4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66} + {4CEFBC8E-C215-11DB-8314-0800200C9A66} = {4CEFBC8E-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libs_common_static", "src\test_libs_common\test_libs_common_static.vcproj", "{4CEFBC8E-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_picture", "src\test_grabbag\picture\test_picture.vcproj", "{4CEFBC8F-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_seeking", "src\test_seeking\test_seeking.vcproj", "{4CEFBC90-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_streams", "src\test_streams\test_streams.vcproj", "{4CEFBC91-C215-11DB-8314-0800200C9A66}" + ProjectSection(ProjectDependencies) = postProject + {4CEFBC81-C215-11DB-8314-0800200C9A66} = {4CEFBC81-C215-11DB-8314-0800200C9A66} + {4CEFBE02-C215-11DB-8314-0800200C9A66} = {4CEFBE02-C215-11DB-8314-0800200C9A66} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utf8_static", "src\share\utf8\utf8_static.vcproj", "{4CEFBC92-C215-11DB-8314-0800200C9A66}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_utf8_io_static", "src\share\win_utf8_io\win_utf8_io_static.vcproj", "{4CEFBE02-C215-11DB-8314-0800200C9A66}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/lib-src/libflac/FLAC.sln b/lib-src/libflac/FLAC.sln index 1bb087b26..e16ac9eb9 100644 --- a/lib-src/libflac/FLAC.sln +++ b/lib-src/libflac/FLAC.sln @@ -1,291 +1,286 @@  -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "example_c_decode_file", "examples\c\decode\file\example_c_decode_file.vcproj", "{4cefbd00-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2013 for Windows Desktop +VisualStudioVersion = 12.0.30501.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_c_decode_file", "examples\c\decode\file\example_c_decode_file.vcxproj", "{4CEFBD00-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "example_c_encode_file", "examples\c\encode\file\example_c_encode_file.vcproj", "{4cefbd01-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_c_encode_file", "examples\c\encode\file\example_c_encode_file.vcxproj", "{4CEFBD01-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "example_cpp_decode_file", "examples\cpp\decode\file\example_cpp_decode_file.vcproj", "{4cefbe00-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbc86-c215-11db-8314-0800200c9a66} = {4cefbc86-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_cpp_decode_file", "examples\cpp\decode\file\example_cpp_decode_file.vcxproj", "{4CEFBE00-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "example_cpp_encode_file", "examples\cpp\encode\file\example_cpp_encode_file.vcproj", "{4cefbe01-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbc86-c215-11db-8314-0800200c9a66} = {4cefbc86-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_cpp_encode_file", "examples\cpp\encode\file\example_cpp_encode_file.vcxproj", "{4CEFBE01-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "flac", "src\flac\flac.vcproj", "{4cefbc7d-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66} - {4cefbc89-c215-11db-8314-0800200c9a66} = {4cefbc89-c215-11db-8314-0800200c9a66} - {4cefbc92-c215-11db-8314-0800200c9a66} = {4cefbc92-c215-11db-8314-0800200c9a66} - {4cefbc80-c215-11db-8314-0800200c9a66} = {4cefbc80-c215-11db-8314-0800200c9a66} - {4cefbc8a-c215-11db-8314-0800200c9a66} = {4cefbc8a-c215-11db-8314-0800200c9a66} - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flac", "src\flac\flac.vcxproj", "{4CEFBC7D-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "iffscan", "src\flac\iffscan.vcproj", "{4cefbc94-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iffscan", "src\flac\iffscan.vcxproj", "{4CEFBC94-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "flac_mac", "src\monkeys_audio_utilities\flac_mac\flac_mac.vcproj", "{4cefbc7e-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flacdiff", "src\utils\flacdiff\flacdiff.vcxproj", "{4CEFBC93-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "flac_ren", "src\monkeys_audio_utilities\flac_ren\flac_ren.vcproj", "{4cefbc7f-c215-11db-8314-0800200c9a66}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flactimer", "src\utils\flactimer\flactimer.vcxproj", "{4CEFBC95-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "flacdiff", "src\utils\flacdiff\flacdiff.vcproj", "{4cefbc93-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc86-c215-11db-8314-0800200c9a66} = {4cefbc86-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt_static", "src\share\getopt\getopt_static.vcxproj", "{4CEFBC80-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "flactimer", "src\utils\flactimer\flactimer.vcproj", "{4cefbc95-c215-11db-8314-0800200c9a66}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grabbag_static", "src\share\grabbag\grabbag_static.vcxproj", "{4CEFBC81-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "getopt_static", "src\share\getopt\getopt_static.vcproj", "{4cefbc80-c215-11db-8314-0800200c9a66}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_dynamic", "src\libFLAC\libFLAC_dynamic.vcxproj", "{4CEFBC83-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "grabbag_static", "src\share\grabbag\grabbag_static.vcproj", "{4cefbc81-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbc89-c215-11db-8314-0800200c9a66} = {4cefbc89-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_static", "src\libFLAC\libFLAC_static.vcxproj", "{4CEFBC84-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "libFLAC_dynamic", "src\libFLAC\libFLAC_dynamic.vcproj", "{4cefbc83-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC++_dynamic", "src\libFLAC++\libFLAC++_dynamic.vcxproj", "{4CEFBC85-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "libFLAC_static", "src\libFLAC\libFLAC_static.vcproj", "{4cefbc84-c215-11db-8314-0800200c9a66}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC++_static", "src\libFLAC++\libFLAC++_static.vcxproj", "{4CEFBC86-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "libFLAC++_dynamic", "src\libFLAC++\libFLAC++_dynamic.vcproj", "{4cefbc85-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc83-c215-11db-8314-0800200c9a66} = {4cefbc83-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metaflac", "src\metaflac\metaflac.vcxproj", "{4CEFBC87-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "libFLAC++_static", "src\libFLAC++\libFLAC++_static.vcproj", "{4cefbc86-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_common_static", "src\plugin_common\plugin_common_static.vcxproj", "{4CEFBC88-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "metaflac", "src\metaflac\metaflac.vcproj", "{4cefbc87-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbc80-c215-11db-8314-0800200c9a66} = {4cefbc80-c215-11db-8314-0800200c9a66} - {4cefbc92-c215-11db-8314-0800200c9a66} = {4cefbc92-c215-11db-8314-0800200c9a66} - {4cefbc89-c215-11db-8314-0800200c9a66} = {4cefbc89-c215-11db-8314-0800200c9a66} - {4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "replaygain_analysis_static", "src\share\replaygain_analysis\replaygain_analysis_static.vcxproj", "{4CEFBC89-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "plugin_common_static", "src\plugin_common\plugin_common_static.vcproj", "{4cefbc88-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66} - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "replaygain_synthesis_static", "src\share\replaygain_synthesis\replaygain_synthesis_static.vcxproj", "{4CEFBC8A-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "replaygain_analysis_static", "src\share\replaygain_analysis\replaygain_analysis_static.vcproj", "{4cefbc89-c215-11db-8314-0800200c9a66}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cuesheet", "src\test_grabbag\cuesheet\test_cuesheet.vcxproj", "{4CEFBC8B-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "replaygain_synthesis_static", "src\share\replaygain_synthesis\replaygain_synthesis_static.vcproj", "{4cefbc8a-c215-11db-8314-0800200c9a66}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libFLAC", "src\test_libFLAC\test_libFLAC.vcxproj", "{4CEFBC8C-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "test_cuesheet", "src\test_grabbag\cuesheet\test_cuesheet.vcproj", "{4cefbc8b-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libFLAC++", "src\test_libFLAC++\test_libFLAC++.vcxproj", "{4CEFBC8D-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "test_libFLAC", "src\test_libFLAC\test_libFLAC.vcproj", "{4cefbc8c-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc8e-c215-11db-8314-0800200c9a66} = {4cefbc8e-c215-11db-8314-0800200c9a66} - {4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66} - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_libs_common_static", "src\test_libs_common\test_libs_common_static.vcxproj", "{4CEFBC8E-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "test_libFLAC++", "src\test_libFLAC++\test_libFLAC++.vcproj", "{4cefbc8d-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc86-c215-11db-8314-0800200c9a66} = {4cefbc86-c215-11db-8314-0800200c9a66} - {4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66} - {4cefbc8e-c215-11db-8314-0800200c9a66} = {4cefbc8e-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_picture", "src\test_grabbag\picture\test_picture.vcxproj", "{4CEFBC8F-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "test_libs_common_static", "src\test_libs_common\test_libs_common_static.vcproj", "{4cefbc8e-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_seeking", "src\test_seeking\test_seeking.vcxproj", "{4CEFBC90-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "test_picture", "src\test_grabbag\picture\test_picture.vcproj", "{4cefbc8f-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_streams", "src\test_streams\test_streams.vcxproj", "{4CEFBC91-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "test_seeking", "src\test_seeking\test_seeking.vcproj", "{4cefbc90-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc84-c215-11db-8314-0800200c9a66} = {4cefbc84-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utf8_static", "src\share\utf8\utf8_static.vcxproj", "{4CEFBC92-C215-11DB-8314-0800200C9A66}" EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "test_streams", "src\test_streams\test_streams.vcproj", "{4cefbc91-c215-11db-8314-0800200c9a66}" - ProjectSection(ProjectDependencies) = postProject - {4cefbc81-c215-11db-8314-0800200c9a66} = {4cefbc81-c215-11db-8314-0800200c9a66} - {4cefbe02-c215-11db-8314-0800200c9a66} = {4cefbe02-c215-11db-8314-0800200c9a66} - EndProjectSection -EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "utf8_static", "src\share\utf8\utf8_static.vcproj", "{4cefbc92-c215-11db-8314-0800200c9a66}" -EndProject -EndProject -Project("{4cefbc7c-c215-11db-8314-0800200c9a66}") = "win_utf8_io", "src\share\win_utf8_io\win_utf8_io.vcproj", "{4cefbe02-c215-11db-8314-0800200c9a66}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win_utf8_io_static", "src\share\win_utf8_io\win_utf8_io_static.vcxproj", "{4CEFBE02-C215-11DB-8314-0800200C9A66}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4cefbc7d-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc7d-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc7d-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc7d-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc7e-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc7e-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc7e-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc7e-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc7f-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc7f-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc7f-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc7f-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc80-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc80-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc80-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc80-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc81-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc81-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc81-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc81-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc82-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc82-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc82-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc82-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc83-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc83-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc83-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc83-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc84-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc84-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc84-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc84-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc85-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc85-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc85-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc85-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc86-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc86-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc86-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc86-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc87-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc87-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc87-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc87-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc88-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc88-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc88-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc88-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc89-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc89-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc89-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc89-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc8a-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc8a-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc8a-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc8a-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc8b-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc8b-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc8b-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc8b-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc8c-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc8c-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc8c-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc8c-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc8d-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc8d-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc8d-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc8d-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc8e-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc8e-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc8e-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc8e-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc8f-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc8f-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc8f-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc8f-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc90-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc90-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc90-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc90-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc91-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc91-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc91-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc91-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc92-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc92-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc92-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc92-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc93-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc93-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc93-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc93-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc94-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc94-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc94-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc94-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbc95-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbc95-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbc95-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbc95-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbd00-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbd00-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbd00-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbd00-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbd01-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbd01-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbd01-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbd01-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbe00-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbe00-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbe00-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbe00-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbe01-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbe01-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbe01-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbe01-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 - {4cefbe02-c215-11db-8314-0800200c9a66}.Debug|Win32.ActiveCfg = Debug|Win32 - {4cefbe02-c215-11db-8314-0800200c9a66}.Debug|Win32.Build.0 = Debug|Win32 - {4cefbe02-c215-11db-8314-0800200c9a66}.Release|Win32.ActiveCfg = Release|Win32 - {4cefbe02-c215-11db-8314-0800200c9a66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBD00-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBD01-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBE00-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBE01-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC7D-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC94-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC93-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC95-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC80-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC81-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC83-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC84-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC85-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC86-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC87-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC88-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC89-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC8A-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC8B-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC8C-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC8D-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC8E-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC8F-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC90-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC91-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBC92-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Debug|x64.ActiveCfg = Debug|x64 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Debug|x64.Build.0 = Debug|x64 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Release|Win32.Build.0 = Release|Win32 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Release|x64.ActiveCfg = Release|x64 + {4CEFBE02-C215-11DB-8314-0800200C9A66}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/lib-src/libflac/Makefile.am b/lib-src/libflac/Makefile.am index 451921daa..ba09d1d73 100644 --- a/lib-src/libflac/Makefile.am +++ b/lib-src/libflac/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -39,6 +39,7 @@ EXTRA_DIST = \ COPYING.LGPL \ COPYING.Xiph \ FLAC.sln \ + FLAC-vs2005.sln \ Makefile.lite \ autogen.sh \ config.rpath \ diff --git a/lib-src/libflac/Makefile.in b/lib-src/libflac/Makefile.in index 3f1dca164..4266c6adc 100644 --- a/lib-src/libflac/Makefile.in +++ b/lib-src/libflac/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -46,23 +45,51 @@ # distclean: remove everything except what goes in the distribution # VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -82,20 +109,23 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS ar-lib compile config.guess \ - config.rpath config.sub depcomp install-sh ltmain.sh missing +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in AUTHORS README ar-lib compile \ + config.guess config.rpath config.sub depcomp install-sh \ + missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -104,21 +134,28 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -126,11 +163,33 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -141,6 +200,7 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -168,6 +228,7 @@ am__relativize = \ reldir="$$dir2" GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.xz +DIST_TARGETS = dist-xz distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -209,7 +270,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -229,8 +289,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -331,6 +389,7 @@ EXTRA_DIST = \ COPYING.LGPL \ COPYING.Xiph \ FLAC.sln \ + FLAC-vs2005.sln \ Makefile.lite \ autogen.sh \ config.rpath \ @@ -345,7 +404,7 @@ all: config.h .SUFFIXES: am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -372,20 +431,20 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) $(am__cd) $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(srcdir)/config.h.in: $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -403,22 +462,25 @@ distclean-libtool: -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -433,57 +495,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -499,12 +516,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -516,15 +528,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -533,9 +541,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -603,39 +633,41 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -646,8 +678,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -659,18 +689,19 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -693,7 +724,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -829,24 +860,24 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am fullcheck: diff --git a/lib-src/libflac/Makefile.lite b/lib-src/libflac/Makefile.lite index 29b34ad2f..445347459 100644 --- a/lib-src/libflac/Makefile.lite +++ b/lib-src/libflac/Makefile.lite @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -31,8 +31,8 @@ topdir = . -.PHONY: all doc src examples libFLAC libFLAC++ share plugin_common plugin_xmms flac metaflac test_grabbag test_libFLAC test_libFLAC++ test_seeking test_streams utils flacdiff flactimer -all: doc src examples +.PHONY: all doc src examples libFLAC libFLAC++ share/win_utf8_io share plugin_common flac metaflac test_grabbag test_libFLAC test_libFLAC++ test_seeking test_streams flacdiff flactimer +all: src examples DEFAULT_CONFIG = release @@ -52,7 +52,7 @@ doc: src examples: (cd $@ && $(MAKE) -f Makefile.lite $(CONFIG)) -libFLAC libFLAC++ share flac metaflac plugin_common plugin_xmms test_libs_common test_seeking test_streams test_grabbag test_libFLAC test_libFLAC++: +libFLAC libFLAC++ share/win_utf8_io share flac metaflac plugin_common plugin_xmms test_libs_common test_seeking test_streams test_grabbag test_libFLAC test_libFLAC++: (cd src/$@ && $(MAKE) -f Makefile.lite $(CONFIG)) flacdiff flactimer: diff --git a/lib-src/libflac/README b/lib-src/libflac/README index 7eaec95ef..9178882fe 100644 --- a/lib-src/libflac/README +++ b/lib-src/libflac/README @@ -1,6 +1,6 @@ /* FLAC - Free Lossless Audio Codec * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This file is part the FLAC project. FLAC is comprised of several * components distributed under different licenses. The codec libraries @@ -31,7 +31,7 @@ FLAC is comprised of * `flac', a command-line program for encoding and decoding files * `metaflac', a command-line program for viewing and editing FLAC metadata - * player plugins for XMMS and Winamp + * player plugin for XMMS * user and API documentation The libraries (libFLAC, libFLAC++) are @@ -42,7 +42,7 @@ Documentation License (see COPYING.FDL). =============================================================================== -FLAC - 1.3.0 - Contents +FLAC - 1.3.1 - Contents =============================================================================== - Introduction @@ -67,11 +67,17 @@ for full documentation. A brief description of the directory tree: doc/ the HTML documentation + examples/ example programs demonstrating the use of libFLAC and libFLAC++ include/ public include files for libFLAC and libFLAC++ - man/ the man page for `flac' + man/ the man pages for `flac' and `metaflac' src/ the source code and private headers test/ the test scripts +If you have questions about building FLAC that this document does not answer, +please submit them at the following tracker so this document can be improved: + + https://sourceforge.net/p/flac/support-requests/ + =============================================================================== Prerequisites @@ -152,7 +158,7 @@ extra (and more verbose) error checking. assembly routines. Many routines have assembly versions for speed and `configure' is pretty good about knowing what is supported, but you can use this option to build only from the -C sources. May be necessary for building on OS X (Intel) +C sources. May be necessary for building on OS X (Intel). --enable-sse : If you are building for an x86 CPU that supports SSE instructions, you can enable some of the faster routines @@ -214,10 +220,9 @@ Prerequisite: you must have nasm installed, and nasm.exe must be in your PATH, or the path to nasm.exe must be added to the list of directories for executable files in the MSVC global options. -VC++ 2005: To build everything, run Visual Studio, do File|Open and open FLAC.sln. From the dropdown in the toolbar, select "Release" instead of "Debug", -then hit F7 to build. +then do Build|Build Solution. This will build all libraries both statically (e.g. objs\release\lib\libFLAC_static.lib) and as DLLs (e.g. diff --git a/lib-src/libflac/aclocal.m4 b/lib-src/libflac/aclocal.m4 new file mode 100644 index 000000000..b04064d95 --- /dev/null +++ b/lib-src/libflac/aclocal.m4 @@ -0,0 +1,1248 @@ +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.14' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.14.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.14.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_AR([ACT-IF-FAIL]) +# ------------------------- +# Try to determine the archiver interface, and trigger the ar-lib wrapper +# if it is needed. If the detection of archiver interface fails, run +# ACT-IF-FAIL (default is to abort configure with a proper error message). +AC_DEFUN([AM_PROG_AR], +[AC_BEFORE([$0], [LT_INIT])dnl +AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([ar-lib])dnl +AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) +: ${AR=ar} + +AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], + [AC_LANG_PUSH([C]) + am_cv_ar_interface=ar + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], + [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + ]) + AC_LANG_POP([C])]) + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + m4_default([$1], + [AC_MSG_ERROR([could not determine $AR interface])]) + ;; +esac +AC_SUBST([AR])dnl +]) + +# Figure out how to run the assembler. -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_AS +# ---------- +AC_DEFUN([AM_PROG_AS], +[# By default we simply use the C compiler to build assembly code. +AC_REQUIRE([AC_PROG_CC]) +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS +AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) +AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) +_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl +]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([m4/add_cflags.m4]) +m4_include([m4/add_cxxflags.m4]) +m4_include([m4/bswap.m4]) +m4_include([m4/clang.m4]) +m4_include([m4/codeset.m4]) +m4_include([m4/gcc_version.m4]) +m4_include([m4/iconv.m4]) +m4_include([m4/lib-ld.m4]) +m4_include([m4/lib-link.m4]) +m4_include([m4/lib-prefix.m4]) +m4_include([m4/libtool.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) +m4_include([m4/ogg.m4]) +m4_include([m4/really_gcc.m4]) +m4_include([m4/stack_protect.m4]) +m4_include([m4/xmms.m4]) diff --git a/lib-src/libflac/autogen.sh b/lib-src/libflac/autogen.sh old mode 100644 new mode 100755 index f8b273848..02ca64429 --- a/lib-src/libflac/autogen.sh +++ b/lib-src/libflac/autogen.sh @@ -40,5 +40,5 @@ test -n "$srcdir" && cd "$srcdir" echo "Updating build configuration files for FLAC, please wait...." touch config.rpath -autoreconf -isf +autoreconf --install --symlink --force #./configure "$@" && echo diff --git a/lib-src/libflac/build/Makefile.am b/lib-src/libflac/build/Makefile.am index 1db1db447..0bead7e2e 100644 --- a/lib-src/libflac/build/Makefile.am +++ b/lib-src/libflac/build/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/build/Makefile.in b/lib-src/libflac/build/Makefile.in index b6202cc6e..556e83e73 100644 --- a/lib-src/libflac/build/Makefile.in +++ b/lib-src/libflac/build/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,29 +96,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = build -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -99,6 +134,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -137,7 +173,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -157,8 +192,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -260,7 +293,7 @@ EXTRA_DIST = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -285,9 +318,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -296,11 +329,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -436,15 +469,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/build/compile.mk b/lib-src/libflac/build/compile.mk index 205cb3046..ae2e3743a 100644 --- a/lib-src/libflac/build/compile.mk +++ b/lib-src/libflac/build/compile.mk @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -23,36 +23,21 @@ %.debug.o %.release.o : %.c $(CC) $(CFLAGS) -c $< -o $@ %.debug.o %.release.o : %.cc - $(CCC) $(CFLAGS) -c $< -o $@ + $(CCC) $(CXXFLAGS) -c $< -o $@ %.debug.o %.release.o : %.cpp - $(CCC) $(CFLAGS) -c $< -o $@ + $(CCC) $(CXXFLAGS) -c $< -o $@ %.debug.pic.o %.release.pic.o : %.c - $(CC) $(CFLAGS) -fPIC -DPIC -c $< -o $@ + $(CC) $(CFLAGS) $(F_PIC) -DPIC -c $< -o $@ %.debug.pic.o %.release.pic.o : %.cc - $(CCC) $(CFLAGS) -fPIC -DPIC -c $< -o $@ + $(CCC) $(CXXFLAGS) $(F_PIC) -DPIC -c $< -o $@ %.debug.pic.o %.release.pic.o : %.cpp - $(CCC) $(CFLAGS) -fPIC -DPIC -c $< -o $@ + $(CCC) $(CXXFLAGS) $(F_PIC) -DPIC -c $< -o $@ %.debug.i %.release.i : %.c $(CC) $(CFLAGS) -E $< -o $@ %.debug.i %.release.i : %.cc - $(CCC) $(CFLAGS) -E $< -o $@ + $(CCC) $(CXXFLAGS) -E $< -o $@ %.debug.i %.release.i : %.cpp - $(CCC) $(CFLAGS) -E $< -o $@ - -%.debug.o %.release.o : %.s -ifeq ($(OS),Darwin) - #$(CC) -c -arch $(PROC) -Wall -force_cpusubtype_ALL $< -o $@ - $(AS) -arch $(PROC) -force_cpusubtype_ALL $< -o $@ -else - $(AS) $< -o $@ -endif -%.debug.pic.o %.release.pic.o : %.s -ifeq ($(OS),Darwin) - #$(CC) -c -arch $(PROC) -Wall -force_cpusubtype_ALL $< -o $@ - $(AS) -arch $(PROC) -force_cpusubtype_ALL $< -o $@ -else - $(AS) $< -o $@ -endif + $(CCC) $(CXXFLAGS) -E $< -o $@ %.debug.o : %.nasm $(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ -g $< -o $@ diff --git a/lib-src/libflac/build/config.mk b/lib-src/libflac/build/config.mk index 64161935f..a889578ac 100644 --- a/lib-src/libflac/build/config.mk +++ b/lib-src/libflac/build/config.mk @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -22,6 +22,9 @@ USE_OGG ?= 1 USE_ICONV ?= 1 +USE_LROUND ?= 1 +USE_FSEEKO ?= 1 +USE_LANGINFO_CODESET ?= 1 # # debug/release selection @@ -29,24 +32,25 @@ USE_ICONV ?= 1 DEFAULT_BUILD = release +F_PIC := -fPIC + # returns Linux, Darwin, FreeBSD, etc. -ifdef OS_OVERRIDE - OS := $(OS_OVERRIDE) -else +ifndef OS OS := $(shell uname -s) endif # returns i386, x86_64, powerpc, etc. -ifdef PROC_OVERRIDE - PROC := $(PROC_OVERRIDE) -else - ifeq ($(findstring MINGW,$(OS)),MINGW) +ifndef PROC + ifeq ($(findstring Windows,$(OS)),Windows) PROC := i386 # failsafe - # ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32 - ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32 - USE_ICONV := 0 - else ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32 - USE_ICONV := 0 + USE_ICONV := 0 + USE_LANGINFO_CODESET := 0 + ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32 + USE_FSEEKO := 0 + endif + # ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32 + ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32 PROC := x86_64 + F_PIC := endif else PROC := $(shell uname -p) @@ -80,9 +84,9 @@ all default: $(DEFAULT_BUILD) # GNU makefile fragment for emulating stuff normally done by configure # -VERSION=\"1.3.0\" +VERSION=\"1.3.1\" -CONFIG_CFLAGS=-DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -DHAVE_LANGINFO_CODESET -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +CONFIG_CFLAGS=$(CUSTOM_CFLAGS) -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 ifeq ($(OS),Darwin) CONFIG_CFLAGS += -DFLAC__SYS_DARWIN -arch $(PROC) @@ -91,9 +95,9 @@ else endif ifeq ($(PROC),ppc) - CONFIG_CFLAGS += -DWORDS_BIGENDIAN=1 + CONFIG_CFLAGS += -DWORDS_BIGENDIAN=1 -DCPU_IS_LITTLE_ENDIAN=0 else - CONFIG_CFLAGS += -DWORDS_BIGENDIAN=0 + CONFIG_CFLAGS += -DWORDS_BIGENDIAN=0 -DCPU_IS_LITTLE_ENDIAN=1 endif ifeq ($(OS),Linux) @@ -125,3 +129,15 @@ endif OGG_INCLUDE_DIR=$(HOME)/local/include OGG_LIB_DIR=$(HOME)/local/lib + +ifneq (0,$(USE_LROUND)) + CONFIG_CFLAGS += -DHAVE_LROUND +endif + +ifneq (0,$(USE_FSEEKO)) + CONFIG_CFLAGS += -DHAVE_FSEEKO +endif + +ifneq (0,$(USE_LANGINFO_CODESET)) + CONFIG_CFLAGS += -DHAVE_LANGINFO_CODESET +endif diff --git a/lib-src/libflac/build/exe.mk b/lib-src/libflac/build/exe.mk index 8c52f8a8a..6bf149e36 100644 --- a/lib-src/libflac/build/exe.mk +++ b/lib-src/libflac/build/exe.mk @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -42,17 +42,20 @@ PROGRAM = $(BINPATH)/$(PROGRAM_NAME) DEBUG_PROGRAM = $(DEBUG_BINPATH)/$(PROGRAM_NAME) RELEASE_PROGRAM = $(RELEASE_BINPATH)/$(PROGRAM_NAME) -debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -LFLAGS = -L$(LIBPATH) +CFLAGS = $(CFLAGS) -Wmissing-prototypes -Wstrict-prototypes +CXXFLAGS = $(CFLAGS) -DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o) -RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o) +LFLAGS = -L$(LIBPATH) + +DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) +RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) ifeq ($(PROC),x86_64) -DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) $(SRCS_S:%.s=%.debug.pic.o) -RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) $(SRCS_S:%.s=%.release.pic.o) +DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) +RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) endif debug : $(DEBUG_PROGRAM) diff --git a/lib-src/libflac/build/lib.mk b/lib-src/libflac/build/lib.mk index d5645b7f2..28e0d5ca1 100644 --- a/lib-src/libflac/build/lib.mk +++ b/lib-src/libflac/build/lib.mk @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -29,7 +29,6 @@ else CC = gcc CCC = g++ endif -AS = as NASM = nasm LINK = ar cru OBJPATH = $(topdir)/objs @@ -39,13 +38,15 @@ RELEASE_LIBPATH = $(OBJPATH)/release/lib ifeq ($(OS),Darwin) STATIC_LIB_SUFFIX = a DYNAMIC_LIB_SUFFIX = dylib -else ifeq ($(findstring MINGW,$(OS)),MINGW) +else +ifeq ($(findstring Windows,$(OS)),Windows) STATIC_LIB_SUFFIX = a DYNAMIC_LIB_SUFFIX = dll else STATIC_LIB_SUFFIX = a DYNAMIC_LIB_SUFFIX = so endif +endif STATIC_LIB_NAME = $(LIB_NAME).$(STATIC_LIB_SUFFIX) DYNAMIC_LIB_NAME = $(LIB_NAME).$(DYNAMIC_LIB_SUFFIX) STATIC_LIB = $(LIBPATH)/$(STATIC_LIB_NAME) @@ -60,17 +61,20 @@ else LINKD = $(CC) -shared endif -debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -LFLAGS = -L$(LIBPATH) +CFLAGS = $(CFLAGS) -Wmissing-prototypes -Wstrict-prototypes +CXXFLAGS = $(CFLAGS) -DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o) -RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o) +LFLAGS = -L$(LIBPATH) + +DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) +RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) ifeq ($(PROC),x86_64) -DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) $(SRCS_S:%.s=%.debug.pic.o) -RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) $(SRCS_S:%.s=%.release.pic.o) +DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) +RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) endif debug : $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB) diff --git a/lib-src/libflac/config.guess b/lib-src/libflac/config.guess old mode 100644 new mode 100755 index b79252d6b..1f5c50c0d --- a/lib-src/libflac/config.guess +++ b/lib-src/libflac/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,16 +1260,26 @@ EOF if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1361,154 +1371,6 @@ EOF exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 < is available. */ +#undef FLAC__HAS_X86INTRIN + /* define to disable use of assembly code */ #undef FLAC__NO_ASM @@ -51,21 +51,24 @@ /* define if building for Linux */ #undef FLAC__SYS_LINUX -/* define to enable use of 3Dnow! instructions */ -#undef FLAC__USE_3DNOW - /* define to enable use of Altivec instructions */ #undef FLAC__USE_ALTIVEC /* Define to 1 if `TIOCGWINSZ' requires . */ #undef GWINSZ_IN_SYS_IOCTL +/* Compiler has the __builtin_bswap16 intrinsic */ +#undef HAVE_BSWAP16 + /* Compiler has the __builtin_bswap32 intrinsic */ #undef HAVE_BSWAP32 /* Define to 1 if you have the header file. */ #undef HAVE_BYTESWAP_H +/* Define to 1 if you have the header file. */ +#undef HAVE_CPUID_H + /* Define to 1 if C++ supports variable-length arrays. */ #undef HAVE_CXX_VARARRAYS @@ -129,6 +132,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_X86INTRIN_H + /* Define as const if the declaration of iconv() needs const. */ #undef ICONV_CONST @@ -136,9 +142,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff --git a/lib-src/libflac/config.rpath b/lib-src/libflac/config.rpath old mode 100755 new mode 100644 diff --git a/lib-src/libflac/config.sub b/lib-src/libflac/config.sub old mode 100644 new mode 100755 index 9633db704..bba4efb80 --- a/lib-src/libflac/config.sub +++ b/lib-src/libflac/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-08-10' +timestamp='2014-09-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -265,6 +265,7 @@ case $basic_machine in | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,11 +298,11 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -324,7 +327,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -381,6 +384,7 @@ case $basic_machine in | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +404,10 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,6 +419,7 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -822,6 +829,10 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1367,14 +1378,14 @@ case $os in | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1592,9 +1603,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff --git a/lib-src/libflac/configure b/lib-src/libflac/configure index 6a8e80a32..1c296bfc0 100755 --- a/lib-src/libflac/configure +++ b/lib-src/libflac/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for flac 1.3.0. +# Generated by GNU Autoconf 2.69 for flac 1.3.1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='flac' PACKAGE_TARNAME='flac' -PACKAGE_VERSION='1.3.0' -PACKAGE_STRING='flac 1.3.0' +PACKAGE_VERSION='1.3.1' +PACKAGE_STRING='flac 1.3.1' PACKAGE_BUGREPORT='flac-dev@xiph.org' PACKAGE_URL='https://www.xiph.org/flac/' @@ -636,18 +636,9 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE -FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE -FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE -FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE GCC_MINOR_VERSION GCC_MAJOR_VERSION GCC_VERSION -FLaC__HAS_GAS_FALSE -FLaC__HAS_GAS_TRUE -FLaC__HAS_AS_FALSE -FLaC__HAS_AS_TRUE -GAS FLaC__HAS_NASM_FALSE FLaC__HAS_NASM_TRUE NASM @@ -685,21 +676,16 @@ FLAC__TEST_WITH_VALGRIND FLAC__TEST_LEVEL FLaC__USE_ALTIVEC_FALSE FLaC__USE_ALTIVEC_TRUE -FLaC__USE_3DNOW_FALSE -FLaC__USE_3DNOW_TRUE FLaC__SSE_OS_FALSE FLaC__SSE_OS_TRUE DEBUG_FALSE DEBUG_TRUE -FLaC__NO_ASM_FALSE -FLaC__NO_ASM_TRUE FLaC__SYS_LINUX_FALSE FLaC__SYS_LINUX_TRUE FLaC__SYS_DARWIN_FALSE FLaC__SYS_DARWIN_TRUE OS_IS_WINDOWS_FALSE OS_IS_WINDOWS_TRUE -LT_NO_UNDEFINED FLaC__CPU_PPC_SPE_FALSE FLaC__CPU_PPC_SPE_TRUE OBJ_FORMAT @@ -709,6 +695,10 @@ FLaC__CPU_PPC_FALSE FLaC__CPU_PPC_TRUE FLaC__CPU_IA32_FALSE FLaC__CPU_IA32_TRUE +FLAC__CPU_X86_64_FALSE +FLAC__CPU_X86_64_TRUE +FLaC__NO_ASM_FALSE +FLaC__NO_ASM_TRUE CXXCPP am__fastdepCXX_FALSE am__fastdepCXX_TRUE @@ -773,9 +763,6 @@ AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -840,7 +827,6 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_silent_rules enable_dependency_tracking enable_static @@ -854,11 +840,10 @@ enable_largefile enable_asm_optimizations enable_debug enable_sse -enable_3dnow enable_altivec enable_thorough_tests enable_exhaustive_tests -enable_gcc_werror +enable_werror enable_stack_smash_protection enable_valgrind_testing enable_doxygen_docs @@ -1430,7 +1415,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures flac 1.3.0 to adapt to many kinds of systems. +\`configure' configures flac 1.3.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1500,7 +1485,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of flac 1.3.0:";; + short | recursive ) echo "Configuration of flac 1.3.1:";; esac cat <<\_ACEOF @@ -1508,12 +1493,12 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] @@ -1523,15 +1508,14 @@ Optional Features: --disable-asm-optimizations Don't use any assembly optimization routines --enable-debug Turn on debugging - --enable-sse Enable SSE support by asserting that the OS supports - SSE instructions - --disable-3dnow Disable 3DNOW! optimizations + --disable-sse Disable SSE if the OS does not support SSE + instructions --disable-altivec Disable Altivec optimizations --disable-thorough-tests Disable thorough (long) testing, do only basic tests --enable-exhaustive-tests Enable exhaustive testing (VERY long) - --enable-gcc-werror Enable -Werror in all Makefiles + --enable-werror Enable -Werror in all Makefiles --enable-stack-smash-protection Enable GNU GCC stack smash protection --enable-valgrind-testing @@ -1648,7 +1632,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -flac configure 1.3.0 +flac configure 1.3.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2375,7 +2359,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by flac $as_me 1.3.0, which was +It was created by flac $as_me 1.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2727,7 +2711,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.11' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2853,9 +2837,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2866,32 +2847,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2903,6 +2892,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2913,8 +2912,8 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2925,12 +2924,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2942,10 +2941,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -3084,12 +3083,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3172,6 +3165,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3194,7 +3226,7 @@ fi # Define the identity of the package. PACKAGE='flac' - VERSION='1.3.0' + VERSION='1.3.1' cat >>confdefs.h <<_ACEOF @@ -3222,6 +3254,12 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used @@ -3229,86 +3267,94 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} AMTAR='$${TAR-tar}' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5 -$as_echo_n "checking how to create a pax tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar pax cpio none' -_am_tools=${am_cv_prog_tar_pax-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5 +$as_echo_n "checking how to create a pax tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_pax-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=posix -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=posix -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x pax -w "$$tardir"' - am__tar_='pax -L -x pax -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H pax -L' - am__tar_='find "$tardir" -print | cpio -o -H pax -L' - am__untar='cpio -i -H pax -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac + done + am__tar="$_am_tar --format=posix -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=posix -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x pax -w "$$tardir"' + am__tar_='pax -L -x pax -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H pax -L' + am__tar_='find "$tardir" -print | cpio -o -H pax -L' + am__untar='cpio -i -H pax -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_pax}" && break + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_pax}" && break - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_pax+:} false; then : + if ${am_cv_prog_tar_pax+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_pax=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5 $as_echo "$am_cv_prog_tar_pax" >&6; } @@ -3316,37 +3362,57 @@ $as_echo "$am_cv_prog_tar_pax" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -3400,7 +3466,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -4233,6 +4299,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4244,8 +4369,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4280,16 +4405,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4298,8 +4423,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4307,7 +4432,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5219,7 +5344,13 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; } if ${am_cv_ar_interface+:} false; then : $as_echo_n "(cached) " >&6 else - am_cv_ar_interface=ar + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int some_variable = 0; @@ -5250,6 +5381,11 @@ if ac_fn_c_try_compile "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 @@ -7542,7 +7678,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7567,7 +7703,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7586,7 +7725,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -12773,8 +12915,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -12807,16 +12949,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -12825,8 +12967,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -12834,7 +12976,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -13156,8 +13298,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -13192,16 +13334,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -13210,8 +13352,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -13219,7 +13361,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -16473,6 +16615,71 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the CLANG C compiler" >&5 +$as_echo_n "checking whether we are using the CLANG C compiler... " >&6; } +if ${xiph_cv_c_compiler_clang+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + #ifndef __clang__ + This is not clang! + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + xiph_cv_c_compiler_clang=yes +else + xiph_cv_c_compiler_clang=no + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xiph_cv_c_compiler_clang" >&5 +$as_echo "$xiph_cv_c_compiler_clang" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + + if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + #ifdef __clang__ + This is clang! + #endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_c_compiler_gnu=yes +else + ac_cv_c_compiler_gnu=no + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} @@ -16505,6 +16712,7 @@ $as_echo "no" >&6; } fi + # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; @@ -16530,7 +16738,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -16576,7 +16784,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -16600,7 +16808,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -16645,7 +16853,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -16669,7 +16877,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17063,131 +17271,6 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } @@ -17318,7 +17401,7 @@ _ACEOF fi -for ac_header in stdint.h inttypes.h byteswap.h sys/param.h termios.h +for ac_header in stdint.h inttypes.h byteswap.h sys/param.h termios.h x86intrin.h cpuid.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -17393,16 +17476,16 @@ $as_echo "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking has bswap32 instrinsic" >&5 -$as_echo_n "checking has bswap32 instrinsic... " >&6; } -if ${ac_cv_c_bswap+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap32 instrinsic" >&5 +$as_echo_n "checking for bswap32 instrinsic... " >&6; } +if ${ac_cv_c_bswap32+:} false; then : $as_echo_n "(cached) " >&6 else # Initialize to no - ac_cv_c_bswap=no - HAVE_BSWAP32=0 + ac_cv_c_bswap32=no + HAVE_BSWAP32=0 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -17414,8 +17497,8 @@ return __builtin_bswap32 (0) ; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_c_bswap=yes - HAVE_BSWAP32=1 + ac_cv_c_bswap32=yes + HAVE_BSWAP32=1 fi rm -f core conftest.err conftest.$ac_objext \ @@ -17428,8 +17511,46 @@ _ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bswap" >&5 -$as_echo "$ac_cv_c_bswap" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bswap32" >&5 +$as_echo "$ac_cv_c_bswap32" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap16 instrinsic" >&5 +$as_echo_n "checking for bswap16 instrinsic... " >&6; } +if ${ac_cv_c_bswap16+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Initialize to no + ac_cv_c_bswap16=no + HAVE_BSWAP16=0 + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +return __builtin_bswap16 (0) ; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_c_bswap16=yes + HAVE_BSWAP16=1 + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +cat >>confdefs.h <<_ACEOF +#define HAVE_BSWAP16 ${HAVE_BSWAP16} +_ACEOF + + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bswap16" >&5 +$as_echo "$ac_cv_c_bswap16" >&6; } ac_cv_c_big_endian=0 @@ -17683,6 +17804,27 @@ cat >>confdefs.h <<_ACEOF _ACEOF +# Check whether --enable-asm-optimizations was given. +if test "${enable_asm_optimizations+set}" = set; then : + enableval=$enable_asm_optimizations; asm_opt=no +else + asm_opt=yes +fi + + if test "x$asm_opt" = xno; then + FLaC__NO_ASM_TRUE= + FLaC__NO_ASM_FALSE='#' +else + FLaC__NO_ASM_TRUE='#' + FLaC__NO_ASM_FALSE= +fi + +if test "x$asm_opt" = xno ; then +$as_echo "#define FLAC__NO_ASM 1" >>confdefs.h + + +fi + # For the XMMS plugin. ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default" if test "x$ac_cv_type_socklen_t" = xyes; then : @@ -17707,26 +17849,89 @@ fi done +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5 +$as_echo_n "checking size of void*... " >&6; } +if ${ac_cv_sizeof_voidp+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_voidp" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (void*) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_voidp=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5 +$as_echo "$ac_cv_sizeof_voidp" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_VOIDP $ac_cv_sizeof_voidp +_ACEOF + + + +asm_optimisation=no case "$host_cpu" in + x86_64) + if test $ac_cv_sizeof_voidp = 4 ; then + # This must be a 32 bit user space running on 64 bit kernel so treat + # this as ia32. + cpu_ia32=true + $as_echo "#define FLAC__CPU_IA32 1" >>confdefs.h + + + else + # x86_64 user space and kernel. + cpu_x86_64=true + $as_echo "#define FLAC__CPU_X86_64 1" >>confdefs.h + + + fi + asm_optimisation=$asm_opt + ;; i*86) cpu_ia32=true $as_echo "#define FLAC__CPU_IA32 1" >>confdefs.h + asm_optimisation=$asm_opt ;; powerpc|powerpc64) cpu_ppc=true $as_echo "#define FLAC__CPU_PPC 1" >>confdefs.h + asm_optimisation=$asm_opt ;; sparc) cpu_sparc=true $as_echo "#define FLAC__CPU_SPARC 1" >>confdefs.h + asm_optimisation=$asm_opt ;; esac + if test "x$cpu_x86_64" = xtrue; then + FLAC__CPU_X86_64_TRUE= + FLAC__CPU_X86_64_FALSE='#' +else + FLAC__CPU_X86_64_TRUE='#' + FLAC__CPU_X86_64_FALSE= +fi + if test "x$cpu_ia32" = xtrue; then FLaC__CPU_IA32_TRUE= FLaC__CPU_IA32_FALSE='#' @@ -17752,6 +17957,12 @@ else fi + +cat >>confdefs.h <<_ACEOF +#define FLAC__HAS_X86INTRIN ${HAVE_X86INTRIN_H} +_ACEOF + + case "$host" in i386-*-openbsd3.[0-3]) OBJ_FORMAT=aoutb ;; *-*-cygwin|*mingw*) OBJ_FORMAT=win32 ;; @@ -17780,17 +17991,9 @@ fi os_is_windows=no case "$host" in *-*-cygwin|*mingw*) - # define this variable for enabling strict exports with libtool; for now, it's supported by Win32 and OS/2 - LT_NO_UNDEFINED="-no-undefined" CPPFLAGS="-D__MSVCRT_VERSION__=0x0601 $CPPFLAGS" os_is_windows=yes ;; - *emx*) - LT_NO_UNDEFINED="-no-undefined" - ;; - *) - LT_NO_UNDEFINED= - ;; esac if test "x$os_is_windows" = xyes; then @@ -17833,31 +18036,10 @@ else fi -if test "x$cpu_ia32" = xtrue ; then +if test "x$cpu_ia32" = xtrue || test "x$cpu_x86_64" = xtrue ; then $as_echo "#define FLAC__ALIGN_MALLOC_DATA 1" >>confdefs.h -fi - -# Check whether --enable-asm-optimizations was given. -if test "${enable_asm_optimizations+set}" = set; then : - enableval=$enable_asm_optimizations; asm_opt=no -else - asm_opt=yes -fi - - if test "x$asm_opt" = xno; then - FLaC__NO_ASM_TRUE= - FLaC__NO_ASM_FALSE='#' -else - FLaC__NO_ASM_TRUE='#' - FLaC__NO_ASM_FALSE= -fi - -if test "x$asm_opt" = xno ; then -$as_echo "#define FLAC__NO_ASM 1" >>confdefs.h - - fi # Check whether --enable-debug was given. @@ -17883,12 +18065,12 @@ fi # Check whether --enable-sse was given. if test "${enable_sse+set}" = set; then : enableval=$enable_sse; case "${enableval}" in - yes) sse_os=true ;; - no) sse_os=false ;; + yes) sse_os=yes ;; + no) sse_os=no ;; *) as_fn_error $? "bad value ${enableval} for --enable-sse" "$LINENO" 5 ;; esac else - sse_os=false + sse_os=yes fi if test "x$sse_os" = xtrue; then @@ -17899,35 +18081,10 @@ else FLaC__SSE_OS_FALSE= fi -if test "x$sse_os" = xtrue ; then +if test "x$sse_os" = xyes ; then $as_echo "#define FLAC__SSE_OS 1" >>confdefs.h -fi - -# Check whether --enable-3dnow was given. -if test "${enable_3dnow+set}" = set; then : - enableval=$enable_3dnow; case "${enableval}" in - yes) use_3dnow=true ;; - no) use_3dnow=false ;; - *) as_fn_error $? "bad value ${enableval} for --enable-3dnow" "$LINENO" 5 ;; -esac -else - use_3dnow=true -fi - - if test "x$use_3dnow" = xtrue; then - FLaC__USE_3DNOW_TRUE= - FLaC__USE_3DNOW_FALSE='#' -else - FLaC__USE_3DNOW_TRUE='#' - FLaC__USE_3DNOW_FALSE= -fi - -if test "x$use_3dnow" = xtrue ; then -$as_echo "#define FLAC__USE_3DNOW 1" >>confdefs.h - - fi # Check whether --enable-altivec was given. @@ -17986,9 +18143,9 @@ FLAC__TEST_LEVEL=2 fi -# Check whether --enable-gcc-werror was given. -if test "${enable_gcc_werror+set}" = set; then : - enableval=$enable_gcc_werror; +# Check whether --enable-werror was given. +if test "${enable_werror+set}" = set; then : + enableval=$enable_werror; fi @@ -18559,6 +18716,7 @@ else #define FLAC__HAS_OGG 0 _ACEOF + have_ogg=no fi @@ -19708,137 +19866,16 @@ if test -n "$NASM" ; then $as_echo "#define FLAC__HAS_NASM 1" >>confdefs.h -fi - -# only matters for PowerPC -for ac_prog in as -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AS+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AS="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 -$as_echo "$AS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AS" && break -done -test -n "$AS" || AS="as" - -for ac_prog in gas -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GAS+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$GAS"; then - ac_cv_prog_GAS="$GAS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GAS="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -GAS=$ac_cv_prog_GAS -if test -n "$GAS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GAS" >&5 -$as_echo "$GAS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$GAS" && break -done -test -n "$GAS" || GAS="gas" - - -# try -v (apple as) and --version (gas) at the same time -test "$AS" = "as" && as --version -v < /dev/null 2>&1 | grep Apple >/dev/null || AS=gas - - if test "$AS" = "as"; then - FLaC__HAS_AS_TRUE= - FLaC__HAS_AS_FALSE='#' -else - FLaC__HAS_AS_TRUE='#' - FLaC__HAS_AS_FALSE= -fi - - if test "$AS" = "gas"; then - FLaC__HAS_GAS_TRUE= - FLaC__HAS_GAS_FALSE='#' -else - FLaC__HAS_GAS_TRUE='#' - FLaC__HAS_GAS_FALSE= -fi - -if test "$AS" = "as" ; then -$as_echo "#define FLAC__HAS_AS 1" >>confdefs.h - - -fi -if test "$AS" = "gas" ; then -# funniest. macro. ever. -$as_echo "#define FLAC__HAS_GAS 1" >>confdefs.h - - fi if test "x$debug" = xtrue; then CPPFLAGS="-DDEBUG $CPPFLAGS" + CFLAGS=$(echo "$CFLAGS" | sed 's/-g//') CFLAGS="-g $CFLAGS" else CPPFLAGS="-DNDEBUG $CPPFLAGS" - if test "x$GCC" = xyes; then - if test "x$user_cflags" = x; then - CFLAGS="-O3 -funroll-loops -Wall -W -Winline" - fi - fi + CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') + CFLAGS="-O3 -funroll-loops $CFLAGS" fi @@ -19861,14 +19898,113 @@ $as_echo "$GCC_VERSION" >&6; } if test x$ac_cv_c_compiler_gnu = xyes ; then - CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Winline -Wconversion - CXXFLAGS="$CXXFLAGS -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations + CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations -Wunreachable-code -Winline " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Wconversion + CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef -Wunreachable-code " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wdeclaration-after-statement" >&5 +$as_echo_n "checking if $CC accepts -Wdeclaration-after-statement... " >&6; } + ac_add_cflags__old_cflags="$CFLAGS" + CFLAGS="-Wdeclaration-after-statement" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ +puts("Hello, World!"); return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CFLAGS="$ac_add_cflags__old_cflags -Wdeclaration-after-statement" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + CFLAGS="$ac_add_cflags__old_cflags" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -D_FORTIFY_SOURCE=2" >&5 +$as_echo_n "checking if $CC accepts -D_FORTIFY_SOURCE=2... " >&6; } + ac_add_cflags__old_cflags="$CFLAGS" + CFLAGS="-D_FORTIFY_SOURCE=2" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ +puts("Hello, World!"); return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CFLAGS="$ac_add_cflags__old_cflags -D_FORTIFY_SOURCE=2" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + CFLAGS="$ac_add_cflags__old_cflags" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext - if test x$enable_gcc_werror = "xyes" ; then - CFLAGS="$CFLAGS -Wall -Wextra -Werror " - CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror " - fi + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -Weffc++" >&5 +$as_echo_n "checking if $CXX accepts -Weffc++... " >&6; } + + ac_add_cxxflags__old_cxxflags="$CXXFLAGS" + CXXFLAGS="-Weffc++" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ +puts("Hello, World!"); return 0; + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CXXFLAGS="$ac_add_cxxflags__old_cxxflags -Weffc++" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + CXXFLAGS="$ac_add_cxxflags__old_cxxflags" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$GCC_MAJOR_VERSION" -ge 4 && test "$OBJ_FORMAT" = elf; then CPPFLAGS="$CPPFLAGS -DFLAC__USE_VISIBILITY_ATTR" @@ -19876,6 +20012,12 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then CXXFLAGS="$CXXFLAGS -fvisibility=hidden" fi + if test "$GCC_MAJOR_VERSION" -ge 4 && test "$OBJ_FORMAT" = macho; then + CPPFLAGS="$CPPFLAGS -DFLAC__USE_VISIBILITY_ATTR" + CFLAGS="$CFLAGS -fvisibility=hidden" + CXXFLAGS="$CXXFLAGS -fvisibility=hidden" + fi + if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fgnu89-inline" >&5 $as_echo_n "checking if $CC accepts -fgnu89-inline... " >&6; } @@ -19908,8 +20050,41 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi - fi + if test "x$asm_optimisation$sse_os" = "xyesyes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -msse2" >&5 +$as_echo_n "checking if $CC accepts -msse2... " >&6; } + ac_add_cflags__old_cflags="$CFLAGS" + CFLAGS="-msse2" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ +puts("Hello, World!"); return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CFLAGS="$ac_add_cflags__old_cflags -msse2" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + CFLAGS="$ac_add_cflags__old_cflags" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + fi + + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wextra" >&5 $as_echo_n "checking if $CC accepts -Wextra... " >&6; } @@ -19941,10 +20116,12 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wdeclaration-after-statement" >&5 -$as_echo_n "checking if $CC accepts -Wdeclaration-after-statement... " >&6; } + +if test x$enable_werror = "xyes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Werror" >&5 +$as_echo_n "checking if $CC accepts -Werror... " >&6; } ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="-Wdeclaration-after-statement" + CFLAGS="-Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19961,7 +20138,7 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CFLAGS="$ac_add_cflags__old_cflags -Wdeclaration-after-statement" + CFLAGS="$ac_add_cflags__old_cflags -Werror" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -19971,14 +20148,21 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -D_FORTIFY_SOURCE=2" >&5 -$as_echo_n "checking if $CC accepts -D_FORTIFY_SOURCE=2... " >&6; } - ac_add_cflags__old_cflags="$CFLAGS" - CFLAGS="-D_FORTIFY_SOURCE=2" + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -Werror" >&5 +$as_echo_n "checking if $CXX accepts -Werror... " >&6; } + + ac_add_cxxflags__old_cxxflags="$CXXFLAGS" + CXXFLAGS="-Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () @@ -19988,19 +20172,26 @@ puts("Hello, World!"); return 0; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CFLAGS="$ac_add_cflags__old_cflags -D_FORTIFY_SOURCE=2" + CXXFLAGS="$ac_add_cxxflags__old_cxxflags -Werror" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - CFLAGS="$ac_add_cflags__old_cflags" + CXXFLAGS="$ac_add_cxxflags__old_cxxflags" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi if test x$enable_stack_smash_protection = "xyes" ; then @@ -20080,25 +20271,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -#@@@ - if test "yes" = "no"; then - FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE= - FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE='#' -else - FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE='#' - FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE= -fi - - if test "yes" = "no"; then - FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE= - FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE='#' -else - FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE='#' - FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE= -fi - - -ac_config_files="$ac_config_files Makefile src/Makefile src/libFLAC/Makefile src/libFLAC/flac.pc src/libFLAC/ia32/Makefile src/libFLAC/ppc/Makefile src/libFLAC/ppc/as/Makefile src/libFLAC/ppc/gas/Makefile src/libFLAC/include/Makefile src/libFLAC/include/private/Makefile src/libFLAC/include/protected/Makefile src/libFLAC++/Makefile src/libFLAC++/flac++.pc src/flac/Makefile src/metaflac/Makefile src/monkeys_audio_utilities/Makefile src/monkeys_audio_utilities/flac_mac/Makefile src/monkeys_audio_utilities/flac_ren/Makefile src/plugin_common/Makefile src/plugin_xmms/Makefile src/share/Makefile src/test_grabbag/Makefile src/test_grabbag/cuesheet/Makefile src/test_grabbag/picture/Makefile src/test_libs_common/Makefile src/test_libFLAC/Makefile src/test_libFLAC++/Makefile src/test_seeking/Makefile src/test_streams/Makefile src/utils/Makefile src/utils/flacdiff/Makefile src/utils/flactimer/Makefile examples/Makefile examples/c/Makefile examples/c/decode/Makefile examples/c/decode/file/Makefile examples/c/encode/Makefile examples/c/encode/file/Makefile examples/cpp/Makefile examples/cpp/decode/Makefile examples/cpp/decode/file/Makefile examples/cpp/encode/Makefile examples/cpp/encode/file/Makefile include/Makefile include/FLAC/Makefile include/FLAC++/Makefile include/share/Makefile include/share/grabbag/Makefile include/test_libs_common/Makefile doc/Doxyfile doc/Makefile doc/html/Makefile doc/html/images/Makefile doc/html/images/hw/Makefile doc/html/ru/Makefile m4/Makefile man/Makefile test/Makefile test/cuesheets/Makefile test/flac-to-flac-metadata-test-files/Makefile test/metaflac-test-files/Makefile test/pictures/Makefile build/Makefile objs/Makefile objs/debug/Makefile objs/debug/bin/Makefile objs/debug/lib/Makefile objs/release/Makefile objs/release/bin/Makefile objs/release/lib/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/libFLAC/Makefile src/libFLAC/flac.pc src/libFLAC/ia32/Makefile src/libFLAC/include/Makefile src/libFLAC/include/private/Makefile src/libFLAC/include/protected/Makefile src/libFLAC++/Makefile src/libFLAC++/flac++.pc src/flac/Makefile src/metaflac/Makefile src/plugin_common/Makefile src/plugin_xmms/Makefile src/share/Makefile src/test_grabbag/Makefile src/test_grabbag/cuesheet/Makefile src/test_grabbag/picture/Makefile src/test_libs_common/Makefile src/test_libFLAC/Makefile src/test_libFLAC++/Makefile src/test_seeking/Makefile src/test_streams/Makefile src/utils/Makefile src/utils/flacdiff/Makefile src/utils/flactimer/Makefile examples/Makefile examples/c/Makefile examples/c/decode/Makefile examples/c/decode/file/Makefile examples/c/encode/Makefile examples/c/encode/file/Makefile examples/cpp/Makefile examples/cpp/decode/Makefile examples/cpp/decode/file/Makefile examples/cpp/encode/Makefile examples/cpp/encode/file/Makefile include/Makefile include/FLAC/Makefile include/FLAC++/Makefile include/share/Makefile include/share/grabbag/Makefile include/test_libs_common/Makefile doc/Doxyfile doc/Makefile doc/html/Makefile doc/html/images/Makefile m4/Makefile man/Makefile test/common.sh test/Makefile test/cuesheets/Makefile test/flac-to-flac-metadata-test-files/Makefile test/metaflac-test-files/Makefile test/pictures/Makefile build/Makefile objs/Makefile objs/debug/Makefile objs/debug/bin/Makefile objs/debug/lib/Makefile objs/release/Makefile objs/release/bin/Makefile objs/release/lib/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -20209,6 +20382,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -20217,10 +20398,6 @@ else am__EXEEXT_FALSE= fi -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20238,6 +20415,14 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${FLaC__NO_ASM_TRUE}" && test -z "${FLaC__NO_ASM_FALSE}"; then + as_fn_error $? "conditional \"FLaC__NO_ASM\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${FLAC__CPU_X86_64_TRUE}" && test -z "${FLAC__CPU_X86_64_FALSE}"; then + as_fn_error $? "conditional \"FLAC__CPU_X86_64\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${FLaC__CPU_IA32_TRUE}" && test -z "${FLaC__CPU_IA32_FALSE}"; then as_fn_error $? "conditional \"FLaC__CPU_IA32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20266,10 +20451,6 @@ if test -z "${FLaC__SYS_LINUX_TRUE}" && test -z "${FLaC__SYS_LINUX_FALSE}"; then as_fn_error $? "conditional \"FLaC__SYS_LINUX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${FLaC__NO_ASM_TRUE}" && test -z "${FLaC__NO_ASM_FALSE}"; then - as_fn_error $? "conditional \"FLaC__NO_ASM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then as_fn_error $? "conditional \"DEBUG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20278,10 +20459,6 @@ if test -z "${FLaC__SSE_OS_TRUE}" && test -z "${FLaC__SSE_OS_FALSE}"; then as_fn_error $? "conditional \"FLaC__SSE_OS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${FLaC__USE_3DNOW_TRUE}" && test -z "${FLaC__USE_3DNOW_FALSE}"; then - as_fn_error $? "conditional \"FLaC__USE_3DNOW\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${FLaC__USE_ALTIVEC_TRUE}" && test -z "${FLaC__USE_ALTIVEC_FALSE}"; then as_fn_error $? "conditional \"FLaC__USE_ALTIVEC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20314,22 +20491,6 @@ if test -z "${FLaC__HAS_NASM_TRUE}" && test -z "${FLaC__HAS_NASM_FALSE}"; then as_fn_error $? "conditional \"FLaC__HAS_NASM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${FLaC__HAS_AS_TRUE}" && test -z "${FLaC__HAS_AS_FALSE}"; then - as_fn_error $? "conditional \"FLaC__HAS_AS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${FLaC__HAS_GAS_TRUE}" && test -z "${FLaC__HAS_GAS_FALSE}"; then - as_fn_error $? "conditional \"FLaC__HAS_GAS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE}" && test -z "${FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE}"; then - as_fn_error $? "conditional \"FLaC__HAS_AS__TEMPORARILY_DISABLED\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE}" && test -z "${FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE}"; then - as_fn_error $? "conditional \"FLaC__HAS_GAS__TEMPORARILY_DISABLED\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -20727,7 +20888,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by flac $as_me 1.3.0, which was +This file was extended by flac $as_me 1.3.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20794,7 +20955,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -flac config.status 1.3.0 +flac config.status 1.3.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -21308,9 +21469,6 @@ do "src/libFLAC/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/Makefile" ;; "src/libFLAC/flac.pc") CONFIG_FILES="$CONFIG_FILES src/libFLAC/flac.pc" ;; "src/libFLAC/ia32/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/ia32/Makefile" ;; - "src/libFLAC/ppc/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/ppc/Makefile" ;; - "src/libFLAC/ppc/as/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/ppc/as/Makefile" ;; - "src/libFLAC/ppc/gas/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/ppc/gas/Makefile" ;; "src/libFLAC/include/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/include/Makefile" ;; "src/libFLAC/include/private/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/include/private/Makefile" ;; "src/libFLAC/include/protected/Makefile") CONFIG_FILES="$CONFIG_FILES src/libFLAC/include/protected/Makefile" ;; @@ -21318,9 +21476,6 @@ do "src/libFLAC++/flac++.pc") CONFIG_FILES="$CONFIG_FILES src/libFLAC++/flac++.pc" ;; "src/flac/Makefile") CONFIG_FILES="$CONFIG_FILES src/flac/Makefile" ;; "src/metaflac/Makefile") CONFIG_FILES="$CONFIG_FILES src/metaflac/Makefile" ;; - "src/monkeys_audio_utilities/Makefile") CONFIG_FILES="$CONFIG_FILES src/monkeys_audio_utilities/Makefile" ;; - "src/monkeys_audio_utilities/flac_mac/Makefile") CONFIG_FILES="$CONFIG_FILES src/monkeys_audio_utilities/flac_mac/Makefile" ;; - "src/monkeys_audio_utilities/flac_ren/Makefile") CONFIG_FILES="$CONFIG_FILES src/monkeys_audio_utilities/flac_ren/Makefile" ;; "src/plugin_common/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugin_common/Makefile" ;; "src/plugin_xmms/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugin_xmms/Makefile" ;; "src/share/Makefile") CONFIG_FILES="$CONFIG_FILES src/share/Makefile" ;; @@ -21356,10 +21511,9 @@ do "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/html/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/Makefile" ;; "doc/html/images/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/images/Makefile" ;; - "doc/html/images/hw/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/images/hw/Makefile" ;; - "doc/html/ru/Makefile") CONFIG_FILES="$CONFIG_FILES doc/html/ru/Makefile" ;; "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "test/common.sh") CONFIG_FILES="$CONFIG_FILES test/common.sh" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "test/cuesheets/Makefile") CONFIG_FILES="$CONFIG_FILES test/cuesheets/Makefile" ;; "test/flac-to-flac-metadata-test-files/Makefile") CONFIG_FILES="$CONFIG_FILES test/flac-to-flac-metadata-test-files/Makefile" ;; @@ -21969,7 +22123,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -21982,7 +22136,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -22016,21 +22170,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -22929,4 +23081,8 @@ $as_echo " if test x$ac_cv_c_compiler_gnu = xyes ; then echo " GCC version : ......................... ${GCC_VERSION}" fi + echo " Compiler is Clang : ................... ${xiph_cv_c_compiler_clang}" + echo " SSE optimizations : ................... ${sse_os}" + echo " Asm optimizations : ................... ${asm_optimisation}" + echo " Ogg/FLAC support : .................... ${have_ogg}" echo diff --git a/lib-src/libflac/configure.ac b/lib-src/libflac/configure.ac index 8649281e0..3d647ed44 100644 --- a/lib-src/libflac/configure.ac +++ b/lib-src/libflac/configure.ac @@ -19,12 +19,11 @@ # instead of FLAC__ since autoconf triggers off 'AC_' in strings AC_PREREQ(2.60) -AC_INIT([flac], [1.3.0], [flac-dev@xiph.org], [flac], [https://www.xiph.org/flac/]) +AC_INIT([flac], [1.3.1], [flac-dev@xiph.org], [flac], [https://www.xiph.org/flac/]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/flac/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign 1.11 -Wall tar-pax no-dist-gzip dist-xz subdir-objects]) -AM_MAINTAINER_MODE([disable]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) user_cflags=$CFLAGS @@ -36,7 +35,10 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) LT_INIT([win32-dll disable-static pic-only]) AM_PROG_AS AC_PROG_CXX +XIPH_C_COMPILER_IS_CLANG +XIPH_GCC_REALLY_IS_GCC AC_PROG_MAKE_SET +AC_PROG_MKDIR_P AC_SYS_LARGEFILE AC_FUNC_FSEEKO @@ -60,11 +62,12 @@ AC_C_INLINE AC_C_VARARRAYS AC_C_TYPEOF -AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h termios.h]) +AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h termios.h x86intrin.h cpuid.h]) AC_HEADER_TIOCGWINSZ XIPH_C_BSWAP32 +XIPH_C_BSWAP16 ac_cv_c_big_endian=0 ac_cv_c_little_endian=0 @@ -82,6 +85,14 @@ AC_DEFINE_UNQUOTED(CPU_IS_LITTLE_ENDIAN, ${ac_cv_c_little_endian}, AC_DEFINE_UNQUOTED(WORDS_BIGENDIAN, ${ac_cv_c_big_endian}, [Target processor is big endian.]) +AC_ARG_ENABLE(asm-optimizations, AC_HELP_STRING([--disable-asm-optimizations], [Don't use any assembly optimization routines]), asm_opt=no, asm_opt=yes) +dnl ' Terminate the damn single quote +AM_CONDITIONAL(FLaC__NO_ASM, test "x$asm_opt" = xno) +if test "x$asm_opt" = xno ; then +AC_DEFINE(FLAC__NO_ASM) +AH_TEMPLATE(FLAC__NO_ASM, [define to disable use of assembly code]) +fi + # For the XMMS plugin. AC_CHECK_TYPES(socklen_t, [], []) @@ -89,27 +100,51 @@ dnl check for getopt in standard library dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) AC_CHECK_FUNCS(getopt_long, [], []) +AC_CHECK_SIZEOF(void*,1) + +asm_optimisation=no case "$host_cpu" in + x86_64) + if test $ac_cv_sizeof_voidp = 4 ; then + # This must be a 32 bit user space running on 64 bit kernel so treat + # this as ia32. + cpu_ia32=true + AC_DEFINE(FLAC__CPU_IA32) + AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386]) + else + # x86_64 user space and kernel. + cpu_x86_64=true + AC_DEFINE(FLAC__CPU_X86_64) + AH_TEMPLATE(FLAC__CPU_X86_64, [define if building for x86_64]) + fi + asm_optimisation=$asm_opt + ;; i*86) cpu_ia32=true AC_DEFINE(FLAC__CPU_IA32) AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386]) + asm_optimisation=$asm_opt ;; powerpc|powerpc64) cpu_ppc=true AC_DEFINE(FLAC__CPU_PPC) AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC]) + asm_optimisation=$asm_opt ;; sparc) cpu_sparc=true AC_DEFINE(FLAC__CPU_SPARC) AH_TEMPLATE(FLAC__CPU_SPARC, [define if building for SPARC]) + asm_optimisation=$asm_opt ;; esac +AM_CONDITIONAL(FLAC__CPU_X86_64, test "x$cpu_x86_64" = xtrue) AM_CONDITIONAL(FLaC__CPU_IA32, test "x$cpu_ia32" = xtrue) AM_CONDITIONAL(FLaC__CPU_PPC, test "x$cpu_ppc" = xtrue) AM_CONDITIONAL(FLaC__CPU_SPARC, test "x$cpu_sparc" = xtrue) +AC_DEFINE_UNQUOTED([FLAC__HAS_X86INTRIN],${HAVE_X86INTRIN_H}, [Set to 1 if is available.]) + case "$host" in i386-*-openbsd3.[[0-3]]) OBJ_FORMAT=aoutb ;; *-*-cygwin|*mingw*) OBJ_FORMAT=win32 ;; @@ -130,19 +165,11 @@ AM_CONDITIONAL(FLaC__CPU_PPC_SPE, test "x$abi_spe" = xtrue) os_is_windows=no case "$host" in *-*-cygwin|*mingw*) - # define this variable for enabling strict exports with libtool; for now, it's supported by Win32 and OS/2 - LT_NO_UNDEFINED="-no-undefined" CPPFLAGS="-D__MSVCRT_VERSION__=0x0601 $CPPFLAGS" os_is_windows=yes ;; - *emx*) - LT_NO_UNDEFINED="-no-undefined" - ;; - *) - LT_NO_UNDEFINED= - ;; esac -AC_SUBST(LT_NO_UNDEFINED) + AM_CONDITIONAL(OS_IS_WINDOWS, test "x$os_is_windows" = xyes) case "$host" in @@ -160,19 +187,11 @@ esac AM_CONDITIONAL(FLaC__SYS_DARWIN, test "x$sys_darwin" = xtrue) AM_CONDITIONAL(FLaC__SYS_LINUX, test "x$sys_linux" = xtrue) -if test "x$cpu_ia32" = xtrue ; then +if test "x$cpu_ia32" = xtrue || test "x$cpu_x86_64" = xtrue ; then AC_DEFINE(FLAC__ALIGN_MALLOC_DATA) AH_TEMPLATE(FLAC__ALIGN_MALLOC_DATA, [define to align allocated memory on 32-byte boundaries]) fi -AC_ARG_ENABLE(asm-optimizations, AC_HELP_STRING([--disable-asm-optimizations], [Don't use any assembly optimization routines]), asm_opt=no, asm_opt=yes) -dnl ' Terminate the damn single quote -AM_CONDITIONAL(FLaC__NO_ASM, test "x$asm_opt" = xno) -if test "x$asm_opt" = xno ; then -AC_DEFINE(FLAC__NO_ASM) -AH_TEMPLATE(FLAC__NO_ASM, [define to disable use of assembly code]) -fi - AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Turn on debugging]), [case "${enableval}" in @@ -183,31 +202,18 @@ esac],[debug=false]) AM_CONDITIONAL(DEBUG, test "x$debug" = xtrue) AC_ARG_ENABLE(sse, -AC_HELP_STRING([--enable-sse], [Enable SSE support by asserting that the OS supports SSE instructions]), +AC_HELP_STRING([--disable-sse], [Disable SSE if the OS does not support SSE instructions]), [case "${enableval}" in - yes) sse_os=true ;; - no) sse_os=false ;; + yes) sse_os=yes ;; + no) sse_os=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-sse) ;; -esac],[sse_os=false]) +esac],[sse_os=yes]) AM_CONDITIONAL(FLaC__SSE_OS, test "x$sse_os" = xtrue) -if test "x$sse_os" = xtrue ; then +if test "x$sse_os" = xyes ; then AC_DEFINE(FLAC__SSE_OS) AH_TEMPLATE(FLAC__SSE_OS, [define if your operating system supports SSE instructions]) fi -AC_ARG_ENABLE(3dnow, -AC_HELP_STRING([--disable-3dnow], [Disable 3DNOW! optimizations]), -[case "${enableval}" in - yes) use_3dnow=true ;; - no) use_3dnow=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-3dnow) ;; -esac],[use_3dnow=true]) -AM_CONDITIONAL(FLaC__USE_3DNOW, test "x$use_3dnow" = xtrue) -if test "x$use_3dnow" = xtrue ; then -AC_DEFINE(FLAC__USE_3DNOW) -AH_TEMPLATE(FLAC__USE_3DNOW, [define to enable use of 3Dnow! instructions]) -fi - AC_ARG_ENABLE(altivec, AC_HELP_STRING([--disable-altivec], [Disable Altivec optimizations]), [case "${enableval}" in @@ -244,8 +250,8 @@ FLAC__TEST_LEVEL=2 fi AC_SUBST(FLAC__TEST_LEVEL) -AC_ARG_ENABLE(gcc-werror, - AC_HELP_STRING([--enable-gcc-werror], [Enable -Werror in all Makefiles])) +AC_ARG_ENABLE(werror, + AC_HELP_STRING([--enable-werror], [Enable -Werror in all Makefiles])) AC_ARG_ENABLE(stack-smash-protection, AC_HELP_STRING([--enable-stack-smash-protection], [Enable GNU GCC stack smash protection])) @@ -317,6 +323,7 @@ if test "x$have_ogg" = xyes ; then OGG_PACKAGE="ogg" else AC_DEFINE_UNQUOTED([FLAC__HAS_OGG],0) + have_ogg=no fi AC_SUBST(OGG_PACKAGE) @@ -339,48 +346,28 @@ AC_DEFINE(FLAC__HAS_NASM) AH_TEMPLATE(FLAC__HAS_NASM, [define if you are compiling for x86 and have the NASM assembler]) fi -# only matters for PowerPC -AC_CHECK_PROGS(AS, as, as) -AC_CHECK_PROGS(GAS, gas, gas) - -# try -v (apple as) and --version (gas) at the same time -test "$AS" = "as" && as --version -v < /dev/null 2>&1 | grep Apple >/dev/null || AS=gas - -AM_CONDITIONAL(FLaC__HAS_AS, test "$AS" = "as") -AM_CONDITIONAL(FLaC__HAS_GAS, test "$AS" = "gas") -if test "$AS" = "as" ; then -AC_DEFINE(FLAC__HAS_AS) -AH_TEMPLATE(FLAC__HAS_AS, [define if you are compiling for PowerPC and have the 'as' assembler]) -fi -if test "$AS" = "gas" ; then -# funniest. macro. ever. -AC_DEFINE(FLAC__HAS_GAS) -AH_TEMPLATE(FLAC__HAS_GAS, [define if you are compiling for PowerPC and have the 'gas' assembler]) -fi - if test "x$debug" = xtrue; then CPPFLAGS="-DDEBUG $CPPFLAGS" + CFLAGS=$(echo "$CFLAGS" | sed 's/-g//') CFLAGS="-g $CFLAGS" else CPPFLAGS="-DNDEBUG $CPPFLAGS" - if test "x$GCC" = xyes; then - if test "x$user_cflags" = x; then - CFLAGS="-O3 -funroll-loops -Wall -W -Winline" - fi - fi + CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//') + CFLAGS="-O3 -funroll-loops $CFLAGS" fi XIPH_GCC_VERSION if test x$ac_cv_c_compiler_gnu = xyes ; then - CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Winline -Wconversion - CXXFLAGS="$CXXFLAGS -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations + CFLAGS="$CFLAGS -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations -Wunreachable-code -Winline " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Wconversion + CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef -Wunreachable-code " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations + XIPH_ADD_CFLAGS([-Wdeclaration-after-statement]) + XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2]) - if test x$enable_gcc_werror = "xyes" ; then - CFLAGS="$CFLAGS -Wall -Wextra -Werror " - CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror " - fi + AC_LANG_PUSH([C++]) + XIPH_ADD_CXXFLAGS([-Weffc++]) + AC_LANG_POP([C++]) if test "$GCC_MAJOR_VERSION" -ge 4 && test "$OBJ_FORMAT" = elf; then CPPFLAGS="$CPPFLAGS -DFLAC__USE_VISIBILITY_ATTR" @@ -388,34 +375,42 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then CXXFLAGS="$CXXFLAGS -fvisibility=hidden" fi + if test "$GCC_MAJOR_VERSION" -ge 4 && test "$OBJ_FORMAT" = macho; then + CPPFLAGS="$CPPFLAGS -DFLAC__USE_VISIBILITY_ATTR" + CFLAGS="$CFLAGS -fvisibility=hidden" + CXXFLAGS="$CXXFLAGS -fvisibility=hidden" + fi + if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then XIPH_ADD_CFLAGS([-fgnu89-inline]) fi + + if test "x$asm_optimisation$sse_os" = "xyesyes" ; then + XIPH_ADD_CFLAGS([-msse2]) + fi + fi - XIPH_ADD_CFLAGS([-Wextra]) -XIPH_ADD_CFLAGS([-Wdeclaration-after-statement]) -XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2]) + +if test x$enable_werror = "xyes" ; then + XIPH_ADD_CFLAGS([-Werror]) + AC_LANG_PUSH([C++]) + XIPH_ADD_CXXFLAGS([-Werror]) + AC_LANG_POP([C++]) + fi if test x$enable_stack_smash_protection = "xyes" ; then XIPH_GCC_STACK_PROTECTOR XIPH_GXX_STACK_PROTECTOR fi -#@@@ -AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no") -AM_CONDITIONAL(FLaC__HAS_GAS__TEMPORARILY_DISABLED, test "yes" = "no") - AC_CONFIG_FILES([ \ Makefile \ src/Makefile \ src/libFLAC/Makefile \ src/libFLAC/flac.pc \ src/libFLAC/ia32/Makefile \ - src/libFLAC/ppc/Makefile \ - src/libFLAC/ppc/as/Makefile \ - src/libFLAC/ppc/gas/Makefile \ src/libFLAC/include/Makefile \ src/libFLAC/include/private/Makefile \ src/libFLAC/include/protected/Makefile \ @@ -423,9 +418,6 @@ AC_CONFIG_FILES([ \ src/libFLAC++/flac++.pc \ src/flac/Makefile \ src/metaflac/Makefile \ - src/monkeys_audio_utilities/Makefile \ - src/monkeys_audio_utilities/flac_mac/Makefile \ - src/monkeys_audio_utilities/flac_ren/Makefile \ src/plugin_common/Makefile \ src/plugin_xmms/Makefile \ src/share/Makefile \ @@ -461,10 +453,9 @@ AC_CONFIG_FILES([ \ doc/Makefile \ doc/html/Makefile \ doc/html/images/Makefile \ - doc/html/images/hw/Makefile \ - doc/html/ru/Makefile \ m4/Makefile \ man/Makefile \ + test/common.sh \ test/Makefile \ test/cuesheets/Makefile \ test/flac-to-flac-metadata-test-files/Makefile \ @@ -497,4 +488,8 @@ AC_MSG_RESULT([ if test x$ac_cv_c_compiler_gnu = xyes ; then echo " GCC version : ......................... ${GCC_VERSION}" fi + echo " Compiler is Clang : ................... ${xiph_cv_c_compiler_clang}" + echo " SSE optimizations : ................... ${sse_os}" + echo " Asm optimizations : ................... ${asm_optimisation}" + echo " Ogg/FLAC support : .................... ${have_ogg}" echo diff --git a/lib-src/libflac/depcomp b/lib-src/libflac/depcomp old mode 100644 new mode 100755 diff --git a/lib-src/libflac/doc/Doxyfile.in b/lib-src/libflac/doc/Doxyfile.in index 0d42fef73..2ec96a6d2 100644 --- a/lib-src/libflac/doc/Doxyfile.in +++ b/lib-src/libflac/doc/Doxyfile.in @@ -23,7 +23,7 @@ PROJECT_NAME = FLAC # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.3.0 +PROJECT_NUMBER = 1.3.1 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/lib-src/libflac/doc/FLAC.tag b/lib-src/libflac/doc/FLAC.tag new file mode 100644 index 000000000..e38672232 --- /dev/null +++ b/lib-src/libflac/doc/FLAC.tag @@ -0,0 +1,10375 @@ + + + + decoder.h + /home/erikd/Git/flac/include/FLAC++/ + decoder_8h + export.h + FLAC/stream_decoder.h + FLAC::Decoder::Stream + FLAC::Decoder::Stream::State + FLAC::Decoder::File + + + encoder.h + /home/erikd/Git/flac/include/FLAC++/ + encoder_8h + export.h + FLAC/stream_encoder.h + decoder.h + metadata.h + FLAC::Encoder::Stream + FLAC::Encoder::Stream::State + FLAC::Encoder::File + + + callback.h + /home/erikd/Git/flac/include/FLAC/ + callback_8h + FLAC__IOCallbacks + + void * + FLAC__IOHandle + group__flac__callbacks.html + ga4c329c3168dee6e352384c5e9306260d + + + + size_t(* + FLAC__IOCallback_Read + group__flac__callbacks.html + ga5d75bd553bd041db0d30d869455bab38 + )(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) + + + size_t(* + FLAC__IOCallback_Write + group__flac__callbacks.html + ga473cbe45055fe15c967de13181d01e87 + )(const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) + + + int(* + FLAC__IOCallback_Seek + group__flac__callbacks.html + ga5090a35604829d8178f4f2d1a40a38d0 + )(FLAC__IOHandle handle, FLAC__int64 offset, int whence) + + + FLAC__int64(* + FLAC__IOCallback_Tell + group__flac__callbacks.html + ga016e3dd2d006975ea1031970dac232fb + )(FLAC__IOHandle handle) + + + int(* + FLAC__IOCallback_Eof + group__flac__callbacks.html + gac9fe1afad0426a8f1756d136b3442990 + )(FLAC__IOHandle handle) + + + int(* + FLAC__IOCallback_Close + group__flac__callbacks.html + ga3749f8621f43e937eb69a9536db3b19a + )(FLAC__IOHandle handle) + + + + export.h + /home/erikd/Git/flac/include/FLAC/ + export_8h + + #define + FLAC_API_VERSION_CURRENT + group__flac__export.html + ga31180fe15eea416cd8957cfca1a4c4f8 + + + + #define + FLAC_API_VERSION_REVISION + group__flac__export.html + ga811641dd9f8c542d9260240e7fbe8e93 + + + + #define + FLAC_API_VERSION_AGE + group__flac__export.html + ga1add3e09c8dfd57e8c921f299f0bbec1 + + + + int + FLAC_API_SUPPORTS_OGG_FLAC + group__flac__export.html + ga84ffcb0af1038c60eb3e21fd002093cf + + + + + export.h + /home/erikd/Git/flac/include/FLAC++/ + _09_2export_8h + + + format.h + /home/erikd/Git/flac/include/FLAC/ + format_8h + export.h + FLAC__EntropyCodingMethod_PartitionedRiceContents + FLAC__EntropyCodingMethod_PartitionedRice + FLAC__EntropyCodingMethod + FLAC__Subframe_Constant + FLAC__Subframe_Verbatim + FLAC__Subframe_Fixed + FLAC__Subframe_LPC + FLAC__Subframe + FLAC__FrameHeader + FLAC__FrameFooter + FLAC__Frame + FLAC__StreamMetadata_StreamInfo + FLAC__StreamMetadata_Padding + FLAC__StreamMetadata_Application + FLAC__StreamMetadata_SeekPoint + FLAC__StreamMetadata_SeekTable + FLAC__StreamMetadata_VorbisComment_Entry + FLAC__StreamMetadata_VorbisComment + FLAC__StreamMetadata_CueSheet_Index + FLAC__StreamMetadata_CueSheet_Track + FLAC__StreamMetadata_CueSheet + FLAC__StreamMetadata_Picture + FLAC__StreamMetadata_Unknown + FLAC__StreamMetadata + + #define + FLAC__MAX_METADATA_TYPE_CODE + group__flac__format.html + ga626a412545818c2271fa2202c02ff1d6 + + + + #define + FLAC__MIN_BLOCK_SIZE + group__flac__format.html + gaa5a85c2ea434221ce684be3469517003 + + + + #define + FLAC__MAX_BLOCK_SIZE + group__flac__format.html + gaef78bc1b04f721e7b4563381f5514e8d + + + + #define + FLAC__SUBSET_MAX_BLOCK_SIZE_48000HZ + group__flac__format.html + ga8f6ba2c28fbfcf52326d115c95b0a751 + + + + #define + FLAC__MAX_CHANNELS + group__flac__format.html + ga488aa5678a58d08f984f5d39185b763d + + + + #define + FLAC__MIN_BITS_PER_SAMPLE + group__flac__format.html + ga30b0f21abbb2cdfd461fe04b425b5438 + + + + #define + FLAC__MAX_BITS_PER_SAMPLE + group__flac__format.html + gad0156d56751e80241fa349d1e25064a6 + + + + #define + FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE + group__flac__format.html + ga0fc418d96053d385fd2f56dce8007fbc + + + + #define + FLAC__MAX_SAMPLE_RATE + group__flac__format.html + ga99abeef0c05c6bc76eacfa865abbfa70 + + + + #define + FLAC__MAX_LPC_ORDER + group__flac__format.html + ga16108d413f524329f338cff6e05f3aff + + + + #define + FLAC__SUBSET_MAX_LPC_ORDER_48000HZ + group__flac__format.html + ga9791efa78147196820c86a6041d7774d + + + + #define + FLAC__MIN_QLP_COEFF_PRECISION + group__flac__format.html + gaf52033b2950b9396dd92b167b3bbe4db + + + + #define + FLAC__MAX_QLP_COEFF_PRECISION + group__flac__format.html + ga6aa38a4bc5b9d96a78253ccb8b08bd1f + + + + #define + FLAC__MAX_FIXED_ORDER + group__flac__format.html + gabd0d5d6fe71b337244712b244ae7cb0f + + + + #define + FLAC__MAX_RICE_PARTITION_ORDER + group__flac__format.html + ga78a2e97e230b2aa7f99edc94a466f5bb + + + + #define + FLAC__SUBSET_MAX_RICE_PARTITION_ORDER + group__flac__format.html + gab19dec1b56de482ccfeb5f9843f60a14 + + + + #define + FLAC__STREAM_SYNC_LENGTH + group__flac__format.html + gae7ddaf298d3ceb83aae6301908675c1d + + + + #define + FLAC__STREAM_METADATA_STREAMINFO_LENGTH + group__flac__format.html + ga06dfae7260da40e4c5f8fc4d531b326c + + + + #define + FLAC__STREAM_METADATA_SEEKPOINT_LENGTH + group__flac__format.html + gabdf85aa2c9a483378dfe850b85ab93ef + + + + #define + FLAC__STREAM_METADATA_HEADER_LENGTH + group__flac__format.html + ga706a29b8a14902c457783bfd4fd7bab2 + + + + + FLAC__EntropyCodingMethodType + group__flac__format.html + ga951733d2ea01943514290012cd622d3a + + + + @ + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE + group__flac__format.html + gga951733d2ea01943514290012cd622d3aa5253f8b8edc61220739f229a299775dd + + + + @ + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2 + group__flac__format.html + gga951733d2ea01943514290012cd622d3aa202960a608ee91f9f11c2575b9ecc5aa + + + + + FLAC__SubframeType + group__flac__format.html + ga1f431eaf213e74d7747589932d263348 + + + + @ + FLAC__SUBFRAME_TYPE_CONSTANT + group__flac__format.html + gga1f431eaf213e74d7747589932d263348a9bf56d836aeffb11d614e29ea1cdf2a9 + + + + @ + FLAC__SUBFRAME_TYPE_VERBATIM + group__flac__format.html + gga1f431eaf213e74d7747589932d263348a8520596ef07d6c8577f07025f137657b + + + + @ + FLAC__SUBFRAME_TYPE_FIXED + group__flac__format.html + gga1f431eaf213e74d7747589932d263348a6b3cce73039a513f9afefdc8e4f664a5 + + + + @ + FLAC__SUBFRAME_TYPE_LPC + group__flac__format.html + gga1f431eaf213e74d7747589932d263348a31437462c3e4c3a5a214a91eff8cc3af + + + + + FLAC__ChannelAssignment + group__flac__format.html + ga79855f8525672e37f299bbe02952ef9c + + + + @ + FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT + group__flac__format.html + gga79855f8525672e37f299bbe02952ef9ca3c554e4c8512c2de31dfd3305f8b31b3 + + + + @ + FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE + group__flac__format.html + gga79855f8525672e37f299bbe02952ef9ca28d41295b20593561dc9934cc977d5cb + + + + @ + FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE + group__flac__format.html + gga79855f8525672e37f299bbe02952ef9cad155b61582140b2b90362005f1a93e2e + + + + @ + FLAC__CHANNEL_ASSIGNMENT_MID_SIDE + group__flac__format.html + gga79855f8525672e37f299bbe02952ef9ca85c1512c0473b5ede364a9943759a80c + + + + + FLAC__FrameNumberType + group__flac__format.html + ga8fe9ebc78386cd2a3d23b7b8e3818e1c + + + + @ + FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER + group__flac__format.html + gga8fe9ebc78386cd2a3d23b7b8e3818e1ca0b9cbf3853f0ae105cf9b5360164f794 + + + + @ + FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER + group__flac__format.html + gga8fe9ebc78386cd2a3d23b7b8e3818e1ca9220ce93dcc151e5edd5db7e7155b35a + + + + + FLAC__MetadataType + group__flac__format.html + gac71714ba8ddbbd66d26bb78a427fac01 + + + + @ + FLAC__METADATA_TYPE_STREAMINFO + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01acffa517e969ba6a868dcf10e5da75c28 + + + + @ + FLAC__METADATA_TYPE_PADDING + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01a6dcb741fc0aef389580f110e88beb896 + + + + @ + FLAC__METADATA_TYPE_APPLICATION + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01a2b287a22a1ac9440b309127884c8d41b + + + + @ + FLAC__METADATA_TYPE_SEEKTABLE + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01a5f6323e489be1318f0e3747960ebdd91 + + + + @ + FLAC__METADATA_TYPE_VORBIS_COMMENT + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01ad013576bc5196b907547739518605520 + + + + @ + FLAC__METADATA_TYPE_CUESHEET + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01a0b3f07ae60609126562cd0233ce00a65 + + + + @ + FLAC__METADATA_TYPE_PICTURE + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01acf28ae2788366617c1aeab81d5961c6e + + + + @ + FLAC__METADATA_TYPE_UNDEFINED + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01acf6ac61fcc866608f5583c275dc34d47 + + + + @ + FLAC__MAX_METADATA_TYPE + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01a1a2f283a3dd9e7b46181d7a114ec5805 + + + + + FLAC__StreamMetadata_Picture_Type + group__flac__format.html + gaf6d3e836cee023e0b8d897f1fdc9825d + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dadd6d6af32499b1973e48c9e8f13357ce + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da5eca52e5cfcb718f33f5fce9b1021a49 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825daaf44b9d5fb75dde6941463e5029aa351 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da3e20b405fd4e835ff3a4465b8bcb7c36 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_BACK_COVER + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da9ae132f2ee7d3baf35f94a9dc9640f62 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_LEAFLET_PAGE + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dad3cb471b7925ae5034d9fd9ecfafb87a + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dac994edc4166107ab5790e49f0b57ffd9 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_LEAD_ARTIST + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da1282e252e20553c39907074052960f42 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_ARTIST + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da4cead70f8720f180fc220e6df8d55cce + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_CONDUCTOR + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dae01a47af0b0c4d89500b755ebca866ce + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_BAND + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da8515523b4c9ab65ffef7db98bc09ceb1 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_COMPOSER + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da5ea1554bc96deb45731bc5897600d1c2 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_LYRICIST + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da86159eda8969514f5992b3e341103f22 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_RECORDING_LOCATION + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dac96e810cdd81465709b4a3a03289e89c + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_RECORDING + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da8cee3bb376ed1044b3a7e20b9c971ff1 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_PERFORMANCE + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da4d4dc6904984370501865988d948de3f + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_VIDEO_SCREEN_CAPTURE + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da7adc2b194968b51768721de7bda39df9 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_FISH + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dabbf0d7c519ae8ba8cec7d1f165f67b0f + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_ILLUSTRATION + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da89ba412c9d89c937c28afdab508d047a + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_BAND_LOGOTYPE + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da751716a4528a78a8d53f435c816c4917 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_PUBLISHER_LOGOTYPE + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da31d75150a4079482fe122e703eff9141 + + + + FLAC__bool + FLAC__format_sample_rate_is_valid + group__flac__format.html + ga985a32bf66e3a69a48e8f9ccd7c5e2e9 + (unsigned sample_rate) + + + FLAC__bool + FLAC__format_blocksize_is_subset + group__flac__format.html + ga5370258a7aae32ad18b4c69fbd5e4a36 + (unsigned blocksize, unsigned sample_rate) + + + FLAC__bool + FLAC__format_sample_rate_is_subset + group__flac__format.html + gae305f200f9f4fca80f8ee3d004cf1164 + (unsigned sample_rate) + + + FLAC__bool + FLAC__format_vorbiscomment_entry_name_is_legal + group__flac__format.html + gae5fb55cd5977ebf178c5b38da831c057 + (const char *name) + + + FLAC__bool + FLAC__format_vorbiscomment_entry_value_is_legal + group__flac__format.html + gad4509984c8a8a0b926a4fb1ba25ec449 + (const FLAC__byte *value, unsigned length) + + + FLAC__bool + FLAC__format_vorbiscomment_entry_is_legal + group__flac__format.html + gab98da8754f99fdf7ba0583275b200de3 + (const FLAC__byte *entry, unsigned length) + + + FLAC__bool + FLAC__format_seektable_is_legal + group__flac__format.html + ga02ed0843553fb8f718fe8e7c54d12244 + (const FLAC__StreamMetadata_SeekTable *seek_table) + + + unsigned + FLAC__format_seektable_sort + group__flac__format.html + ga64dede2811616c7aa41caaed9c855cd4 + (FLAC__StreamMetadata_SeekTable *seek_table) + + + FLAC__bool + FLAC__format_cuesheet_is_legal + group__flac__format.html + gaa9ed0fa4ed04dbfdaa163d0f5308c080 + (const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation) + + + FLAC__bool + FLAC__format_picture_is_legal + group__flac__format.html + ga82ca3ffc97c106c61882134f1a7fb1be + (const FLAC__StreamMetadata_Picture *picture, const char **violation) + + + const char * + FLAC__VERSION_STRING + group__flac__format.html + ga52e2616f9a0b94881cd7711c18d62a35 + + + + const char * + FLAC__VENDOR_STRING + group__flac__format.html + gad5cccab0de3adda58914edf3c31fd64f + + + + const FLAC__byte + FLAC__STREAM_SYNC_STRING + group__flac__format.html + ga3f275a3a6056e0d53df3b72b03adde4b + [4] + + + const unsigned + FLAC__STREAM_SYNC + group__flac__format.html + ga21e4646e61486382c6d91234474fce66 + + + + const unsigned + FLAC__STREAM_SYNC_LEN + group__flac__format.html + ga5f4f9e89655ecc48a7a539f92da1b7e7 + + + + const char *const + FLAC__EntropyCodingMethodTypeString + group__flac__format.html + ga41603ac35eed8c77c2f2e0b12067d88a + [] + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN + group__flac__format.html + ga5056169ee48d8ece011d05f0fb9b3d43 + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN + group__flac__format.html + gace7a2a1c6b75dc4b02d34933dae21cde + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN + group__flac__format.html + ga0b08df429809f9a78710c5251c9615ea + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN + group__flac__format.html + ga2299e09372ce2d652ad215ad5d57f6f7 + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER + group__flac__format.html + ga8c0af33a0ef538cd8e9e04e8a25913af + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER + group__flac__format.html + gaad1bb90d3f58a38aab4509e43e2be1fd + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_TYPE_LEN + group__flac__format.html + ga224222cd46f6613456c5efd75d713946 + + + + const char *const + FLAC__SubframeTypeString + group__flac__format.html + ga78d78f45f123cfbb50cebd61b96097df + [] + + + const unsigned + FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN + group__flac__format.html + ga5fe1e86b574141cd1e11d9be6b1b8202 + + + + const unsigned + FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN + group__flac__format.html + ga1d957b042a1e673e39a815427c6aa494 + + + + const unsigned + FLAC__SUBFRAME_ZERO_PAD_LEN + group__flac__format.html + ga9aace0e3dfa3bd2a3195e134852082c2 + + + + const unsigned + FLAC__SUBFRAME_TYPE_LEN + group__flac__format.html + gab4b4a36a869e404834e01e288f9105a6 + + + + const unsigned + FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN + group__flac__format.html + gacf0f85d0592281227a5a1400087c466e + + + + const unsigned + FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK + group__flac__format.html + gad783daf32785798dcc3a23e1a4cecefc + + + + const unsigned + FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK + group__flac__format.html + gadf86648f3eb3ffecd547019577a2ab0f + + + + const unsigned + FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK + group__flac__format.html + ga3d8dbb2da910837bc5811f8b12bb60f7 + + + + const unsigned + FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK + group__flac__format.html + gaf4edf4982798602f2793f907ee7d7695 + + + + const char *const + FLAC__ChannelAssignmentString + group__flac__format.html + gab1a1d3929a4e5a5aff2c15010742aa21 + [] + + + const char *const + FLAC__FrameNumberTypeString + group__flac__format.html + ga931a0e63c0f2b31fab801e1dd693fa4e + [] + + + const unsigned + FLAC__FRAME_HEADER_SYNC + group__flac__format.html + ga100c4e86ebb9b85b2a987d1ad383596b + + + + const unsigned + FLAC__FRAME_HEADER_SYNC_LEN + group__flac__format.html + ga6be66feb8358e5a39869ce3e39f7b47a + + + + const unsigned + FLAC__FRAME_HEADER_RESERVED_LEN + group__flac__format.html + gad9a46acc93058fb6aba6e0cf8f9c2713 + + + + const unsigned + FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN + group__flac__format.html + gaa1f482e9172cd95795b32724784d8be9 + + + + const unsigned + FLAC__FRAME_HEADER_BLOCK_SIZE_LEN + group__flac__format.html + ga2c5c93ba19375583ca27c3d288e90a03 + + + + const unsigned + FLAC__FRAME_HEADER_SAMPLE_RATE_LEN + group__flac__format.html + ga1ec5825f1a07d1136204840d5d89feca + + + + const unsigned + FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN + group__flac__format.html + gafa9050a64f02d18ea7426e4c382bb6a6 + + + + const unsigned + FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN + group__flac__format.html + ga9d6055c79974497dc99912b0e9ebbe41 + + + + const unsigned + FLAC__FRAME_HEADER_ZERO_PAD_LEN + group__flac__format.html + gaf761899e8a95a7bce3f429e6648ca14e + + + + const unsigned + FLAC__FRAME_HEADER_CRC_LEN + group__flac__format.html + ga82e91fc3b93cd8573c814dd282b5b6ed + + + + const unsigned + FLAC__FRAME_FOOTER_CRC_LEN + group__flac__format.html + ga238b33bf853ea3ab0fc0dbaad5e41f4e + + + + const char *const + FLAC__MetadataTypeString + group__flac__format.html + gaa9ad23f06a579d1110d61d54c8c999f0 + [] + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN + group__flac__format.html + gac10f1ca2318884d9ed142350744eca1a + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN + group__flac__format.html + ga9049314bc422ba321414afdafad76d04 + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN + group__flac__format.html + ga3abb82a701c670c7a9f8f47fc4df5edc + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN + group__flac__format.html + ga4e7c5315f21eaa0e3f0dfb6517eb4545 + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN + group__flac__format.html + ga7c5529d77e0cf806e709dc147ff83452 + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN + group__flac__format.html + ga719aee1e62d71e1e03d6299aade7a7c4 + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN + group__flac__format.html + ga4d8a3f1a75a24e8d0a966f8ad01f15ed + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN + group__flac__format.html + gaeb69211400ad50dd6c3503e8092c6afb + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN + group__flac__format.html + ga492d4321cbd601ed24489ad59d9ddaf8 + + + + const unsigned + FLAC__STREAM_METADATA_APPLICATION_ID_LEN + group__flac__format.html + gac374cf68c046406a062daf0b811e9020 + + + + const unsigned + FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN + group__flac__format.html + ga2afc4c1f5b9c522274e4fb7236d645f5 + + + + const unsigned + FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN + group__flac__format.html + gafa894a5e0e9f5fa40a76c5a9f19800cf + + + + const unsigned + FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN + group__flac__format.html + ga330813fcf2c4ebb133843511134b6c11 + + + + const FLAC__uint64 + FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER + group__flac__format.html + gad5d58774aea926635e6841c411d60566 + + + + const unsigned + FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN + group__flac__format.html + gad73e13be54a583adfa4d2e43c1a4bdff + + + + const unsigned + FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN + group__flac__format.html + gabdd8ad7a3de9abd96358fe10f4b0e6a0 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN + group__flac__format.html + gaec8a23f851fb225d16b996282413704b + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN + group__flac__format.html + gad7e0ce539714d0cc47053a6b11711227 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN + group__flac__format.html + ga8cafc79f8b98b5ced139b37c46b4f4bf + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN + group__flac__format.html + gaccf9e6a290a44763f2616ff65dd4e422 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN + group__flac__format.html + gad0a4822167882a1321467b0dc67f145b + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN + group__flac__format.html + gac63e5eb63aa52b1fe780bc89c55dec92 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN + group__flac__format.html + gac32d5288f0f80fbd9101bb0352850a4f + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN + group__flac__format.html + gafb26465f020a51491ecad3c2fe8839be + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN + group__flac__format.html + gad825e57e995f161d945a51bb363e4650 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN + group__flac__format.html + ga443798929acc94f4b7b6c19ab92c5b25 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN + group__flac__format.html + ga380732fda7b866b075b138e9153717b9 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN + group__flac__format.html + ga9e47028762ec6709a14d8b81e7712285 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN + group__flac__format.html + gaf1817667af48cd8c122488664972fd0c + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN + group__flac__format.html + ga1ceaba7fd5e900d423b6d9537d1979fd + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN + group__flac__format.html + gaa0046d3f2bc430feb97a4b04053db01e + + + + const char *const + FLAC__StreamMetadata_Picture_TypeString + group__flac__format.html + ga2d27672452696cb97fd39db1cf43486b + [] + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_TYPE_LEN + group__flac__format.html + gaa06ecd0960798a4e16e6b6a218008da7 + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN + group__flac__format.html + gafe9e4d8a4942eef747612e0cab836c4e + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN + group__flac__format.html + ga96910250e54bb335a3c11940372c6585 + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN + group__flac__format.html + ga729da59256030685bf9f29cdbf571e4d + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN + group__flac__format.html + ga173238fb8a7499b67b1658bb3ac6a81a + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN + group__flac__format.html + ga6b9cf7c11b6fb7f96dfbc197db280128 + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_COLORS_LEN + group__flac__format.html + ga6ed3603f4d9092d99e4b4d57bb431cc5 + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN + group__flac__format.html + ga808843e986308268c5dc6c841c67a74a + + + + const unsigned + FLAC__STREAM_METADATA_IS_LAST_LEN + group__flac__format.html + ga2a2e0d9428b90662b6790404dd393830 + + + + const unsigned + FLAC__STREAM_METADATA_TYPE_LEN + group__flac__format.html + gaf88b0f6621a4b22b37a8fe2ef82a7204 + + + + const unsigned + FLAC__STREAM_METADATA_LENGTH_LEN + group__flac__format.html + gaa16818a9f8de9e3bd75e832cc6149eb8 + + + + + metadata.h + /home/erikd/Git/flac/include/FLAC/ + metadata_8h + export.h + callback.h + format.h + + struct FLAC__Metadata_SimpleIterator + FLAC__Metadata_SimpleIterator + group__flac__metadata__level1.html + ga6accccddbb867dfc2eece9ee3ffecb3a + + + + struct FLAC__Metadata_Chain + FLAC__Metadata_Chain + group__flac__metadata__level2.html + gaec6993c60b88f222a52af86f8f47bfdf + + + + struct FLAC__Metadata_Iterator + FLAC__Metadata_Iterator + group__flac__metadata__level2.html + ga9f3e135a07cdef7e51597646aa7b89b2 + + + + + FLAC__Metadata_SimpleIteratorStatus + group__flac__metadata__level1.html + gac926e7d2773a05066115cac9048bbec9 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a33aadd73194c0d7e307d643237e0ddcd + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a0a3933cb38c8957a8d5c3d1afb4766f9 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a20e835bbb74b4d039e598617f68d2af6 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a7785f77a612be8956fbe7cab73497220 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9af055d8c0c663e72134fe2db8037b6880 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a14c897124887858109200723826f85b7 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a088df964f0852dd7e19304e920c3ee8e + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a2ad85a32e291d1e918692d68cc22fd40 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9ac2337299c2347ca311caeaa7d71d857c + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a2e073843fa99419d76a0b210da96ceb6 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a4f855433038c576da127fc1de9d18f9b + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9aa8386ed0a20d7e91b0022d203ec3cdec + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_INTERNAL_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a9d821ae65a1c5de619daa88c850906df + + + + + FLAC__Metadata_ChainStatus + group__flac__metadata__level2.html + gafe2a924893b0800b020bea8160fd4531 + + + + @ + FLAC__METADATA_CHAIN_STATUS_OK + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a293be942ec54576f2b3c73613af968e9 + + + + @ + FLAC__METADATA_CHAIN_STATUS_ILLEGAL_INPUT + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a1be9400982f411173af46bf0c3acbdc7 + + + + @ + FLAC__METADATA_CHAIN_STATUS_ERROR_OPENING_FILE + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a43d2741a650576052fa3615d8cd64d86 + + + + @ + FLAC__METADATA_CHAIN_STATUS_NOT_A_FLAC_FILE + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a99748a4b12ed10f9368375cc8deeb143 + + + + @ + FLAC__METADATA_CHAIN_STATUS_NOT_WRITABLE + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531ac469c6543ebb117e99064572c16672d4 + + + + @ + FLAC__METADATA_CHAIN_STATUS_BAD_METADATA + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a8efd2c76dc06308eb6eba59e1bc6300b + + + + @ + FLAC__METADATA_CHAIN_STATUS_READ_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a0525de5fb5d8aeeb4e848e33a8d503c6 + + + + @ + FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a5814bc26bcf92143198b8e7f028f43a2 + + + + @ + FLAC__METADATA_CHAIN_STATUS_WRITE_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a66460c735e4745788b40889329e8489f + + + + @ + FLAC__METADATA_CHAIN_STATUS_RENAME_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531af4ecf22bc3e5adf78a9c765f856efb0d + + + + @ + FLAC__METADATA_CHAIN_STATUS_UNLINK_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a1cd3138ed493f6a0f5b95fb8481edd1e + + + + @ + FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531ab12ec938f7556a163c609194ee0aede0 + + + + @ + FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a36b9bcf93da8e0f111738a65eab36e9d + + + + @ + FLAC__METADATA_CHAIN_STATUS_INVALID_CALLBACKS + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531ab8a6aa5f115db3f07ad2ed4adbcbe060 + + + + @ + FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a0d9e64ad6514c88b8ea9e9171c42ec9a + + + + @ + FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531af86670707345e2d02cc84aec059459d0 + + + + FLAC__bool + FLAC__metadata_get_streaminfo + group__flac__metadata__level0.html + ga804b42d9da714199b4b383ce51078d51 + (const char *filename, FLAC__StreamMetadata *streaminfo) + + + FLAC__bool + FLAC__metadata_get_tags + group__flac__metadata__level0.html + ga1626af09cd39d4fa37d5b46ebe3790fd + (const char *filename, FLAC__StreamMetadata **tags) + + + FLAC__bool + FLAC__metadata_get_cuesheet + group__flac__metadata__level0.html + ga0f47949dca514506718276205a4fae0b + (const char *filename, FLAC__StreamMetadata **cuesheet) + + + FLAC__bool + FLAC__metadata_get_picture + group__flac__metadata__level0.html + ga0c9cd22296400c8ce16ee1db011342cb + (const char *filename, FLAC__StreamMetadata **picture, FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors) + + + FLAC__Metadata_SimpleIterator * + FLAC__metadata_simple_iterator_new + group__flac__metadata__level1.html + ga017ae86f3351888f50feb47026ed2482 + (void) + + + void + FLAC__metadata_simple_iterator_delete + group__flac__metadata__level1.html + ga4619be06f51429fea71e5b98900cec3e + (FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__Metadata_SimpleIteratorStatus + FLAC__metadata_simple_iterator_status + group__flac__metadata__level1.html + gae8fd236fe6049c61f7f3b4a6ecbcd240 + (FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_init + group__flac__metadata__level1.html + gaba8daf276fd7da863a2522ac050125fd + (FLAC__Metadata_SimpleIterator *iterator, const char *filename, FLAC__bool read_only, FLAC__bool preserve_file_stats) + + + FLAC__bool + FLAC__metadata_simple_iterator_is_writable + group__flac__metadata__level1.html + ga5150ecd8668c610f79192a2838667790 + (const FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_next + group__flac__metadata__level1.html + gabb7de0a1067efae353e0792dc6e51905 + (FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_prev + group__flac__metadata__level1.html + ga6db5313b31120b28e210ae721d6525a8 + (FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_is_last + group__flac__metadata__level1.html + ga9eb215059840960de69aa84469ba954f + (const FLAC__Metadata_SimpleIterator *iterator) + + + off_t + FLAC__metadata_simple_iterator_get_block_offset + group__flac__metadata__level1.html + gade0a61723420daeb4bc226713671c6f0 + (const FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__MetadataType + FLAC__metadata_simple_iterator_get_block_type + group__flac__metadata__level1.html + ga17b61d17e83432913abf4334d6e0c073 + (const FLAC__Metadata_SimpleIterator *iterator) + + + unsigned + FLAC__metadata_simple_iterator_get_block_length + group__flac__metadata__level1.html + ga93ec66e9cfb99f04ce4125b8be906cef + (const FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_get_application_id + group__flac__metadata__level1.html + gad4fea2d7d98d16e75e6d8260f690a5dc + (FLAC__Metadata_SimpleIterator *iterator, FLAC__byte *id) + + + FLAC__StreamMetadata * + FLAC__metadata_simple_iterator_get_block + group__flac__metadata__level1.html + ga1b7374cafd886ceb880b050dfa1e387a + (FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_set_block + group__flac__metadata__level1.html + gae1dd863561606658f88c492682de7b80 + (FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding) + + + FLAC__bool + FLAC__metadata_simple_iterator_insert_block_after + group__flac__metadata__level1.html + ga7a0c00e93bb37324a20926e92e604102 + (FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding) + + + FLAC__bool + FLAC__metadata_simple_iterator_delete_block + group__flac__metadata__level1.html + gac3116c8e6e7f59914ae22c0c4c6b0a23 + (FLAC__Metadata_SimpleIterator *iterator, FLAC__bool use_padding) + + + FLAC__Metadata_Chain * + FLAC__metadata_chain_new + group__flac__metadata__level2.html + ga381a1b6efff8d4e9d793f1dda515bd73 + (void) + + + void + FLAC__metadata_chain_delete + group__flac__metadata__level2.html + ga46b6c67f30db2955798dfb5556f63aa3 + (FLAC__Metadata_Chain *chain) + + + FLAC__Metadata_ChainStatus + FLAC__metadata_chain_status + group__flac__metadata__level2.html + ga8e74773f8ca2bb2bc0b56a65ca0299f4 + (FLAC__Metadata_Chain *chain) + + + FLAC__bool + FLAC__metadata_chain_read + group__flac__metadata__level2.html + ga5a4f2056c30f78af5a79f6b64d5bfdcd + (FLAC__Metadata_Chain *chain, const char *filename) + + + FLAC__bool + FLAC__metadata_chain_read_ogg + group__flac__metadata__level2.html + ga3995010aab28a483ad9905669e5c4954 + (FLAC__Metadata_Chain *chain, const char *filename) + + + FLAC__bool + FLAC__metadata_chain_read_with_callbacks + group__flac__metadata__level2.html + ga595f55b611ed588d4d55a9b2eb9d2add + (FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks) + + + FLAC__bool + FLAC__metadata_chain_read_ogg_with_callbacks + group__flac__metadata__level2.html + gaccc2f991722682d3c31d36f51985066c + (FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks) + + + FLAC__bool + FLAC__metadata_chain_check_if_tempfile_needed + group__flac__metadata__level2.html + ga46602f64d423cfe5d5f8a4155f8a97e2 + (FLAC__Metadata_Chain *chain, FLAC__bool use_padding) + + + FLAC__bool + FLAC__metadata_chain_write + group__flac__metadata__level2.html + ga46bf9cf7d426078101b9297ba80bb835 + (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__bool preserve_file_stats) + + + FLAC__bool + FLAC__metadata_chain_write_with_callbacks + group__flac__metadata__level2.html + ga70532b3705294dc891d8db649a4d4843 + (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks) + + + FLAC__bool + FLAC__metadata_chain_write_with_callbacks_and_tempfile + group__flac__metadata__level2.html + ga72facaa621e8d798036a4a7da3643e41 + (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, FLAC__IOHandle temp_handle, FLAC__IOCallbacks temp_callbacks) + + + void + FLAC__metadata_chain_merge_padding + group__flac__metadata__level2.html + ga0a43897914edb751cb87f7e281aff3dc + (FLAC__Metadata_Chain *chain) + + + void + FLAC__metadata_chain_sort_padding + group__flac__metadata__level2.html + ga82b66fe71c727adb9cf80a1da9834ce5 + (FLAC__Metadata_Chain *chain) + + + FLAC__Metadata_Iterator * + FLAC__metadata_iterator_new + group__flac__metadata__level2.html + ga1941ca04671813fc039ea7fd35ae6461 + (void) + + + void + FLAC__metadata_iterator_delete + group__flac__metadata__level2.html + ga374c246e1aeafd803d29a6e99b226241 + (FLAC__Metadata_Iterator *iterator) + + + void + FLAC__metadata_iterator_init + group__flac__metadata__level2.html + ga2e93196b17a1c73e949e661e33d7311a + (FLAC__Metadata_Iterator *iterator, FLAC__Metadata_Chain *chain) + + + FLAC__bool + FLAC__metadata_iterator_next + group__flac__metadata__level2.html + ga60449d0c1d76a73978159e3aa5e79459 + (FLAC__Metadata_Iterator *iterator) + + + FLAC__bool + FLAC__metadata_iterator_prev + group__flac__metadata__level2.html + gaa28df1c5aa56726f573f90e4bae2fe50 + (FLAC__Metadata_Iterator *iterator) + + + FLAC__MetadataType + FLAC__metadata_iterator_get_block_type + group__flac__metadata__level2.html + ga83ecb59ffa16bfbb1e286e64f9270de1 + (const FLAC__Metadata_Iterator *iterator) + + + FLAC__StreamMetadata * + FLAC__metadata_iterator_get_block + group__flac__metadata__level2.html + gad3e7fbc3b3d9c192a3ac425c7b263641 + (FLAC__Metadata_Iterator *iterator) + + + FLAC__bool + FLAC__metadata_iterator_set_block + group__flac__metadata__level2.html + gaf61795b21300a2b0c9940c11974aab53 + (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block) + + + FLAC__bool + FLAC__metadata_iterator_delete_block + group__flac__metadata__level2.html + gadf860af967d2ee483be01fc0ed8767a9 + (FLAC__Metadata_Iterator *iterator, FLAC__bool replace_with_padding) + + + FLAC__bool + FLAC__metadata_iterator_insert_block_before + group__flac__metadata__level2.html + ga8ac45e2df8b6fd6f5db345c4293aa435 + (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block) + + + FLAC__bool + FLAC__metadata_iterator_insert_block_after + group__flac__metadata__level2.html + ga55e53757f91696e2578196a2799fc632 + (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block) + + + FLAC__StreamMetadata * + FLAC__metadata_object_new + group__flac__metadata__object.html + ga5df7bc8c72cafed1391bdc5ffc876e0f + (FLAC__MetadataType type) + + + FLAC__StreamMetadata * + FLAC__metadata_object_clone + group__flac__metadata__object.html + ga29af0ecc2a015ef22289f206bc308d80 + (const FLAC__StreamMetadata *object) + + + void + FLAC__metadata_object_delete + group__flac__metadata__object.html + ga6b3159744a1e5c4ce9d349fd0ebae800 + (FLAC__StreamMetadata *object) + + + FLAC__bool + FLAC__metadata_object_is_equal + group__flac__metadata__object.html + ga6853bcafe731b1db37105d49f3085349 + (const FLAC__StreamMetadata *block1, const FLAC__StreamMetadata *block2) + + + FLAC__bool + FLAC__metadata_object_application_set_data + group__flac__metadata__object.html + ga07cd39bbe12f4f4e144e38c5265b997d + (FLAC__StreamMetadata *object, FLAC__byte *data, unsigned length, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_seektable_resize_points + group__flac__metadata__object.html + gaffa16bae5e3683c983dc137fd56f0c26 + (FLAC__StreamMetadata *object, unsigned new_num_points) + + + void + FLAC__metadata_object_seektable_set_point + group__flac__metadata__object.html + gaa1a69eb95a3c17aa973466589e85f3c1 + (FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point) + + + FLAC__bool + FLAC__metadata_object_seektable_insert_point + group__flac__metadata__object.html + ga794109d40ff0065659c005f1cf86d3c9 + (FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point) + + + FLAC__bool + FLAC__metadata_object_seektable_delete_point + group__flac__metadata__object.html + ga8e42ac803f857eaa7814838c49a15c5f + (FLAC__StreamMetadata *object, unsigned point_num) + + + FLAC__bool + FLAC__metadata_object_seektable_is_legal + group__flac__metadata__object.html + gacd3e1b83fabc1dabccb725b2876c8f53 + (const FLAC__StreamMetadata *object) + + + FLAC__bool + FLAC__metadata_object_seektable_template_append_placeholders + group__flac__metadata__object.html + ga6280327ed000ee85846a5533fd40a33b + (FLAC__StreamMetadata *object, unsigned num) + + + FLAC__bool + FLAC__metadata_object_seektable_template_append_point + group__flac__metadata__object.html + ga0b3aca4fbebc206cd79f13ac36f653f0 + (FLAC__StreamMetadata *object, FLAC__uint64 sample_number) + + + FLAC__bool + FLAC__metadata_object_seektable_template_append_points + group__flac__metadata__object.html + gac838116fa0e48242651944ab94bab508 + (FLAC__StreamMetadata *object, FLAC__uint64 sample_numbers[], unsigned num) + + + FLAC__bool + FLAC__metadata_object_seektable_template_append_spaced_points + group__flac__metadata__object.html + ga7dcbd38a3a71a8aa26e93a6992a8f83e + (FLAC__StreamMetadata *object, unsigned num, FLAC__uint64 total_samples) + + + FLAC__bool + FLAC__metadata_object_seektable_template_append_spaced_points_by_samples + group__flac__metadata__object.html + ga6bce5ee9332ea070d65482a2c1ce1c2d + (FLAC__StreamMetadata *object, unsigned samples, FLAC__uint64 total_samples) + + + FLAC__bool + FLAC__metadata_object_seektable_template_sort + group__flac__metadata__object.html + gafb0449b639ba5c618826d893c2961260 + (FLAC__StreamMetadata *object, FLAC__bool compact) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_set_vendor_string + group__flac__metadata__object.html + ga5cf1a57afab200b4b67730a77d3ee162 + (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_resize_comments + group__flac__metadata__object.html + ga829152404c9d160c7bc67699dd7f857e + (FLAC__StreamMetadata *object, unsigned new_num_comments) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_set_comment + group__flac__metadata__object.html + gaefadb16fe0fff9600beab0edbac8d226 + (FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_insert_comment + group__flac__metadata__object.html + ga44ec196a99c8cd7d1d50817c8532ddb3 + (FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_append_comment + group__flac__metadata__object.html + ga889b8b9c5bbd1070a1214c3da8b72863 + (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_replace_comment + group__flac__metadata__object.html + ga0608308e8c4c09aa610747d8dff90a34 + (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_delete_comment + group__flac__metadata__object.html + gafe14896322f7d638f5de0c61addd1dc7 + (FLAC__StreamMetadata *object, unsigned comment_num) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair + group__flac__metadata__object.html + gab644c34515c04630c62a7645fab2947e + (FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair + group__flac__metadata__object.html + ga29079764fabda53cb3e890e6d05c8345 + (const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_entry_matches + group__flac__metadata__object.html + gac4c32b1055642b11cd77628ac9508ded + (const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length) + + + int + FLAC__metadata_object_vorbiscomment_find_entry_from + group__flac__metadata__object.html + ga23d79d11e427e1590f406a7137c8bff2 + (const FLAC__StreamMetadata *object, unsigned offset, const char *field_name) + + + int + FLAC__metadata_object_vorbiscomment_remove_entry_matching + group__flac__metadata__object.html + ga017d743b3200a27b8567ef33592224b8 + (FLAC__StreamMetadata *object, const char *field_name) + + + int + FLAC__metadata_object_vorbiscomment_remove_entries_matching + group__flac__metadata__object.html + ga5a3ff5856098c449622ba850684aec75 + (FLAC__StreamMetadata *object, const char *field_name) + + + FLAC__StreamMetadata_CueSheet_Track * + FLAC__metadata_object_cuesheet_track_new + group__flac__metadata__object.html + gafe2983a9c09685e34626cab39b3fb52c + (void) + + + FLAC__StreamMetadata_CueSheet_Track * + FLAC__metadata_object_cuesheet_track_clone + group__flac__metadata__object.html + ga1293d6df6daf2d65143d8bb40eed9261 + (const FLAC__StreamMetadata_CueSheet_Track *object) + + + void + FLAC__metadata_object_cuesheet_track_delete + group__flac__metadata__object.html + gaa533fd7b72fa079e783de4b155b241ce + (FLAC__StreamMetadata_CueSheet_Track *object) + + + FLAC__bool + FLAC__metadata_object_cuesheet_track_resize_indices + group__flac__metadata__object.html + ga484f21de7d533e4825cf807d29ef0204 + (FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices) + + + FLAC__bool + FLAC__metadata_object_cuesheet_track_insert_index + group__flac__metadata__object.html + gae8be6ad7b27a18c91eb0b91dc305e433 + (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index) + + + FLAC__bool + FLAC__metadata_object_cuesheet_track_insert_blank_index + group__flac__metadata__object.html + gafd40ef6dcc277f99934deee5367cc627 + (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num) + + + FLAC__bool + FLAC__metadata_object_cuesheet_track_delete_index + group__flac__metadata__object.html + ga84584f2244b7d8597b8fec1d81ea5fb8 + (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num) + + + FLAC__bool + FLAC__metadata_object_cuesheet_resize_tracks + group__flac__metadata__object.html + gac99e38ed08f342665c63913bd0cc33fc + (FLAC__StreamMetadata *object, unsigned new_num_tracks) + + + FLAC__bool + FLAC__metadata_object_cuesheet_set_track + group__flac__metadata__object.html + gaa4708c652be442b19227695621b62088 + (FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_cuesheet_insert_track + group__flac__metadata__object.html + gaa974947ae8ec1c86cbb155e0af7593e9 + (FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_cuesheet_insert_blank_track + group__flac__metadata__object.html + gab4a8c0855971e650df3331daf84d3fd1 + (FLAC__StreamMetadata *object, unsigned track_num) + + + FLAC__bool + FLAC__metadata_object_cuesheet_delete_track + group__flac__metadata__object.html + gae1912dfbc599c79732025fd5a5f279cc + (FLAC__StreamMetadata *object, unsigned track_num) + + + FLAC__bool + FLAC__metadata_object_cuesheet_is_legal + group__flac__metadata__object.html + ga1a443d9299ce69694ad59bec4519d7b2 + (const FLAC__StreamMetadata *object, FLAC__bool check_cd_da_subset, const char **violation) + + + FLAC__uint32 + FLAC__metadata_object_cuesheet_calculate_cddb_id + group__flac__metadata__object.html + gaff2f825950b3e4dda4c8ddbf8e2f7ecd + (const FLAC__StreamMetadata *object) + + + FLAC__bool + FLAC__metadata_object_picture_set_mime_type + group__flac__metadata__object.html + ga4511ae9ca994c9f4ab035a3c1aa98f45 + (FLAC__StreamMetadata *object, char *mime_type, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_picture_set_description + group__flac__metadata__object.html + ga293fe7d8b8b9e49d2414db0925b0f442 + (FLAC__StreamMetadata *object, FLAC__byte *description, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_picture_set_data + group__flac__metadata__object.html + ga00c330534ef8336ed92b30f9e676bb5f + (FLAC__StreamMetadata *object, FLAC__byte *data, FLAC__uint32 length, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_picture_is_legal + group__flac__metadata__object.html + ga88268a5186e37d4b98b4df7870561128 + (const FLAC__StreamMetadata *object, const char **violation) + + + const char *const + FLAC__Metadata_SimpleIteratorStatusString + group__flac__metadata__level1.html + gaa2a8b972800c34f9f5807cadf6ecdb57 + [] + + + const char *const + FLAC__Metadata_ChainStatusString + group__flac__metadata__level2.html + ga6498d1976b0d9fa3f8f6295c02e622dd + [] + + + + metadata.h + /home/erikd/Git/flac/include/FLAC++/ + _09_2metadata_8h + export.h + FLAC/metadata.h + FLAC::Metadata::Prototype + FLAC::Metadata::StreamInfo + FLAC::Metadata::Padding + FLAC::Metadata::Application + FLAC::Metadata::SeekTable + FLAC::Metadata::VorbisComment + FLAC::Metadata::VorbisComment::Entry + FLAC::Metadata::CueSheet + FLAC::Metadata::CueSheet::Track + FLAC::Metadata::Picture + FLAC::Metadata::Unknown + FLAC::Metadata::SimpleIterator + FLAC::Metadata::SimpleIterator::Status + FLAC::Metadata::Chain + FLAC::Metadata::Chain::Status + FLAC::Metadata::Iterator + + Prototype * + clone + group__flacpp__metadata__object.html + gae18d91726a320349b2c3fb45e79d21fc + (const Prototype *) + + + bool + get_streaminfo + group__flacpp__metadata__level0.html + ga8fa8da652f33edeb4dabb4ce39fda04b + (const char *filename, StreamInfo &streaminfo) + + + bool + get_tags + group__flacpp__metadata__level0.html + ga533a71ba745ca03068523a4a45fb0329 + (const char *filename, VorbisComment *&tags) + + + bool + get_tags + group__flacpp__metadata__level0.html + ga85166e6206f3d5635684de4257f2b00e + (const char *filename, VorbisComment &tags) + + + bool + get_cuesheet + group__flacpp__metadata__level0.html + ga4fad03d91f22d78acf35dd2f35df9ac7 + (const char *filename, CueSheet *&cuesheet) + + + bool + get_cuesheet + group__flacpp__metadata__level0.html + gaea8f05f89e36af143d73b4280f05cc0e + (const char *filename, CueSheet &cuesheet) + + + bool + get_picture + group__flacpp__metadata__level0.html + ga2ca454c644cb6548b05545c129e4d6ef + (const char *filename, Picture *&picture,::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors) + + + bool + get_picture + group__flacpp__metadata__level0.html + ga82705f1c0ac6d36c0a508dc33e5e7181 + (const char *filename, Picture &picture,::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors) + + + + stream_decoder.h + /home/erikd/Git/flac/include/FLAC/ + stream__decoder_8h + export.h + format.h + FLAC__StreamDecoder + + FLAC__StreamDecoderReadStatus(* + FLAC__StreamDecoderReadCallback + group__flac__stream__decoder.html + ga7a5f593b9bc2d163884348b48c4285fd + )(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) + + + FLAC__StreamDecoderSeekStatus(* + FLAC__StreamDecoderSeekCallback + group__flac__stream__decoder.html + ga375614289a1b868f1ead7fa70a581171 + )(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) + + + FLAC__StreamDecoderTellStatus(* + FLAC__StreamDecoderTellCallback + group__flac__stream__decoder.html + ga02990309a9d30acc43ba01fe48021e39 + )(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) + + + FLAC__StreamDecoderLengthStatus(* + FLAC__StreamDecoderLengthCallback + group__flac__stream__decoder.html + ga453ffb5215a522fb74dc61d694e1453c + )(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) + + + FLAC__bool(* + FLAC__StreamDecoderEofCallback + group__flac__stream__decoder.html + gacc214f6b3cdae1c0f98577267ce19bdd + )(const FLAC__StreamDecoder *decoder, void *client_data) + + + FLAC__StreamDecoderWriteStatus(* + FLAC__StreamDecoderWriteCallback + group__flac__stream__decoder.html + gaf98a4f9e2cac5747da6018c3dfc8dde1 + )(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data) + + + void(* + FLAC__StreamDecoderMetadataCallback + group__flac__stream__decoder.html + ga43e2329c15731c002ac4182a47990f85 + )(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) + + + void(* + FLAC__StreamDecoderErrorCallback + group__flac__stream__decoder.html + ga4fab6730ff0b22bf45ca4cd04d706569 + )(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) + + + + FLAC__StreamDecoderState + group__flac__stream__decoder.html + ga3adb6891c5871a87cd5bbae6c770ba2d + + + + @ + FLAC__STREAM_DECODER_SEARCH_FOR_METADATA + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2dacf4455f4f681a6737a553e10f614704a + + + + @ + FLAC__STREAM_DECODER_READ_METADATA + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da4c1853ed1babdcede9a908e12cf7ccf7 + + + + @ + FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2daccff915757978117720ba1613d088ddf + + + + @ + FLAC__STREAM_DECODER_READ_FRAME + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da06dc6158a51a8eb9537b65f2fbb6dc49 + + + + @ + FLAC__STREAM_DECODER_END_OF_STREAM + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da28ce845052d9d1a780f4107e97f4c853 + + + + @ + FLAC__STREAM_DECODER_OGG_ERROR + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da3bc0343f47153c5779baf7f37f6e95cf + + + + @ + FLAC__STREAM_DECODER_SEEK_ERROR + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2daf2c6efcabdfe889081c2260e6681db49 + + + + @ + FLAC__STREAM_DECODER_ABORTED + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2dadb52ab4785bd2eb84a95e8aa82311cd5 + + + + @ + FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da0d08c527252420813e6a6d6d3e19324a + + + + @ + FLAC__STREAM_DECODER_UNINITIALIZED + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da565eaf4d5e68b440ecec771cb22d3427 + + + + + FLAC__StreamDecoderInitStatus + group__flac__stream__decoder.html + gaaed54a24ac6310d29c5cafba79759c44 + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_OK + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44ac94c7e9396f30642f34805e5d626e011 + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44a8f2188c616c9bc09638eece3ae55f152 + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44a798ad4b6c4e556fd4cb1afbc29562eca + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44a0110567f0715c6f87357388bc7fa98f9 + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44a8184c306e0cd2565a8c5adc1381cb469 + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44a98bc501c9b2fb5d92d8bb0b3321d504f + + + + + FLAC__StreamDecoderReadStatus + group__flac__stream__decoder.html + gad793ead451206c64a91dc0b851027b93 + + + + @ + FLAC__STREAM_DECODER_READ_STATUS_CONTINUE + group__flac__stream__decoder.html + ggad793ead451206c64a91dc0b851027b93a9a5be0fcf0279b98b2fd462bc4871d06 + + + + @ + FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM + group__flac__stream__decoder.html + ggad793ead451206c64a91dc0b851027b93a0a0687d25dc9f7163e6e5e294672170f + + + + @ + FLAC__STREAM_DECODER_READ_STATUS_ABORT + group__flac__stream__decoder.html + ggad793ead451206c64a91dc0b851027b93a923123aebb349e35662e35a7621b7535 + + + + + FLAC__StreamDecoderSeekStatus + group__flac__stream__decoder.html + gac8d269e3c7af1a5889d3bd38409ed67d + + + + @ + FLAC__STREAM_DECODER_SEEK_STATUS_OK + group__flac__stream__decoder.html + ggac8d269e3c7af1a5889d3bd38409ed67daca58132d896ad7755827d3f2b72488cc + + + + @ + FLAC__STREAM_DECODER_SEEK_STATUS_ERROR + group__flac__stream__decoder.html + ggac8d269e3c7af1a5889d3bd38409ed67da969ce92a42a2a95609452e9cf01fcc09 + + + + @ + FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED + group__flac__stream__decoder.html + ggac8d269e3c7af1a5889d3bd38409ed67da4a01f1e48baf015e78535cc20683ec53 + + + + + FLAC__StreamDecoderTellStatus + group__flac__stream__decoder.html + ga83708207969383bd7b5c1e9148528845 + + + + @ + FLAC__STREAM_DECODER_TELL_STATUS_OK + group__flac__stream__decoder.html + gga83708207969383bd7b5c1e9148528845a516a202ebf4bb61d4a1fb5b029a104dd + + + + @ + FLAC__STREAM_DECODER_TELL_STATUS_ERROR + group__flac__stream__decoder.html + gga83708207969383bd7b5c1e9148528845aceefd3feb853d5e68a149f2bdd1a9db1 + + + + @ + FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED + group__flac__stream__decoder.html + gga83708207969383bd7b5c1e9148528845add75538234493c9f7a20a846a223ca91 + + + + + FLAC__StreamDecoderLengthStatus + group__flac__stream__decoder.html + gad5860157c2bb34501b8b9370472d727a + + + + @ + FLAC__STREAM_DECODER_LENGTH_STATUS_OK + group__flac__stream__decoder.html + ggad5860157c2bb34501b8b9370472d727aaef01bfcdc3099686e106d8f88397653d + + + + @ + FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR + group__flac__stream__decoder.html + ggad5860157c2bb34501b8b9370472d727aab000e31c0c20c0d19df4f2203b01ea23 + + + + @ + FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED + group__flac__stream__decoder.html + ggad5860157c2bb34501b8b9370472d727aae35949f46f887e6d826fe0fe4b2a32c1 + + + + + FLAC__StreamDecoderWriteStatus + group__flac__stream__decoder.html + ga73f67eb9e0ab57945afe038751bc62c8 + + + + @ + FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE + group__flac__stream__decoder.html + gga73f67eb9e0ab57945afe038751bc62c8acea48326e0ab8370d2814f4126fcb84e + + + + @ + FLAC__STREAM_DECODER_WRITE_STATUS_ABORT + group__flac__stream__decoder.html + gga73f67eb9e0ab57945afe038751bc62c8a23bd6bfec34af704e0d5ea273f14d95d + + + + + FLAC__StreamDecoderErrorStatus + group__flac__stream__decoder.html + ga130e70bd9a73d3c2416247a3e5132ecf + + + + @ + FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC + group__flac__stream__decoder.html + gga130e70bd9a73d3c2416247a3e5132ecfa3ceec2a553dc142ad487ae88eb6f7222 + + + + @ + FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER + group__flac__stream__decoder.html + gga130e70bd9a73d3c2416247a3e5132ecfae393a9b91a6b2f23398675b5b57e1e86 + + + + @ + FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH + group__flac__stream__decoder.html + gga130e70bd9a73d3c2416247a3e5132ecfa208fe77a04e6ff684e50f0eae1214e26 + + + + @ + FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM + group__flac__stream__decoder.html + gga130e70bd9a73d3c2416247a3e5132ecfa8b6864ad65edd8fea039838b6d3e5575 + + + + FLAC__StreamDecoder * + FLAC__stream_decoder_new + group__flac__stream__decoder.html + ga529c3c1e46417570767fb8e4c76f5477 + (void) + + + void + FLAC__stream_decoder_delete + group__flac__stream__decoder.html + gad9cf299956da091111d13e83517d8c44 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_set_ogg_serial_number + group__flac__stream__decoder.html + ga7fd232e7a2b5070bd26450487edbc2a1 + (FLAC__StreamDecoder *decoder, long serial_number) + + + FLAC__bool + FLAC__stream_decoder_set_md5_checking + group__flac__stream__decoder.html + ga8f402243eed54f400ddd2f296ff54497 + (FLAC__StreamDecoder *decoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_respond + group__flac__stream__decoder.html + gad4e685f3d055f70fbaed9ffa4f70f74b + (FLAC__StreamDecoder *decoder, FLAC__MetadataType type) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_respond_application + group__flac__stream__decoder.html + gaee1196ff5fa97df9810f708dc2bc8326 + (FLAC__StreamDecoder *decoder, const FLAC__byte id[4]) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_respond_all + group__flac__stream__decoder.html + ga1ce03d8f305a818ff9a573473af99dc4 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_ignore + group__flac__stream__decoder.html + gad75f067720da89c4e9d96dedc45f73e6 + (FLAC__StreamDecoder *decoder, FLAC__MetadataType type) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_ignore_application + group__flac__stream__decoder.html + gaab41e8bc505b24df4912de53de06b085 + (FLAC__StreamDecoder *decoder, const FLAC__byte id[4]) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_ignore_all + group__flac__stream__decoder.html + gaa1307f07fae5d7a4a0c18beeae7ec5e6 + (FLAC__StreamDecoder *decoder) + + + FLAC__StreamDecoderState + FLAC__stream_decoder_get_state + group__flac__stream__decoder.html + gaf99dac2d9255f7db4df8a6d9974a9a9a + (const FLAC__StreamDecoder *decoder) + + + const char * + FLAC__stream_decoder_get_resolved_state_string + group__flac__stream__decoder.html + gad28257412951ca266751a19e2cf54be2 + (const FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_get_md5_checking + group__flac__stream__decoder.html + gae27a6b30b55beda03559c12a5df21537 + (const FLAC__StreamDecoder *decoder) + + + FLAC__uint64 + FLAC__stream_decoder_get_total_samples + group__flac__stream__decoder.html + ga930d9b591fcfaea74359c722cdfb980c + (const FLAC__StreamDecoder *decoder) + + + unsigned + FLAC__stream_decoder_get_channels + group__flac__stream__decoder.html + gadefff696d65e72afeb2f058e45066be1 + (const FLAC__StreamDecoder *decoder) + + + FLAC__ChannelAssignment + FLAC__stream_decoder_get_channel_assignment + group__flac__stream__decoder.html + gae62fdf93c1fedd5fea9258ecdc78bb53 + (const FLAC__StreamDecoder *decoder) + + + unsigned + FLAC__stream_decoder_get_bits_per_sample + group__flac__stream__decoder.html + ga51dc941b24bfe01f8311c9aba86e77f8 + (const FLAC__StreamDecoder *decoder) + + + unsigned + FLAC__stream_decoder_get_sample_rate + group__flac__stream__decoder.html + ga1b0170d020b47c1b841ce8437b564429 + (const FLAC__StreamDecoder *decoder) + + + unsigned + FLAC__stream_decoder_get_blocksize + group__flac__stream__decoder.html + ga568a710a87dbd051b0edba6b53ae52ee + (const FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_get_decode_position + group__flac__stream__decoder.html + gaffd9b0d0832ed01e6d75930b5391def5 + (const FLAC__StreamDecoder *decoder, FLAC__uint64 *position) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_stream + group__flac__stream__decoder.html + ga150d381abc5249168e439bc076544b29 + (FLAC__StreamDecoder *decoder, FLAC__StreamDecoderReadCallback read_callback, FLAC__StreamDecoderSeekCallback seek_callback, FLAC__StreamDecoderTellCallback tell_callback, FLAC__StreamDecoderLengthCallback length_callback, FLAC__StreamDecoderEofCallback eof_callback, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_ogg_stream + group__flac__stream__decoder.html + ga1b043adeb805c779c1e97cb68959d1ab + (FLAC__StreamDecoder *decoder, FLAC__StreamDecoderReadCallback read_callback, FLAC__StreamDecoderSeekCallback seek_callback, FLAC__StreamDecoderTellCallback tell_callback, FLAC__StreamDecoderLengthCallback length_callback, FLAC__StreamDecoderEofCallback eof_callback, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_FILE + group__flac__stream__decoder.html + ga80aa83631460a53263c84e654586dff0 + (FLAC__StreamDecoder *decoder, FILE *file, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_ogg_FILE + group__flac__stream__decoder.html + ga4cc7fbaf905c24d6db48b53b7942fe72 + (FLAC__StreamDecoder *decoder, FILE *file, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_file + group__flac__stream__decoder.html + ga4021ead5cff29fd589c915756f902f1a + (FLAC__StreamDecoder *decoder, const char *filename, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_ogg_file + group__flac__stream__decoder.html + ga548f15d7724f3bff7f2608abe8b12f6c + (FLAC__StreamDecoder *decoder, const char *filename, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__bool + FLAC__stream_decoder_finish + group__flac__stream__decoder.html + ga96c47c96920f363cd0972b54067818a9 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_flush + group__flac__stream__decoder.html + ga95570a455e582b2ab46ab9bb529f26ac + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_reset + group__flac__stream__decoder.html + gaa4183c2d925d5a5edddde9d1ca145725 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_process_single + group__flac__stream__decoder.html + ga9d6df4a39892c05955122cf7f987f856 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_process_until_end_of_metadata + group__flac__stream__decoder.html + ga027ffb5b75dc39b3d26f55c5e6b42682 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_process_until_end_of_stream + group__flac__stream__decoder.html + ga89a0723812fa6ef7cdb173715f1bc81f + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_skip_single_frame + group__flac__stream__decoder.html + ga85b666aba976f29e8dd9d7956fce4301 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_seek_absolute + group__flac__stream__decoder.html + ga6a2eb6072b9fafefc3f80f1959805ccb + (FLAC__StreamDecoder *decoder, FLAC__uint64 sample) + + + const char *const + FLAC__StreamDecoderStateString + group__flac__stream__decoder.html + gac192360ac435614394bf43235cb7981e + [] + + + const char *const + FLAC__StreamDecoderInitStatusString + group__flac__stream__decoder.html + ga0effa1d3031c3206a1719faf984a4f21 + [] + + + const char *const + FLAC__StreamDecoderReadStatusString + group__flac__stream__decoder.html + gab1ee941839b05045ae1d73ee0fdcb8c9 + [] + + + const char *const + FLAC__StreamDecoderSeekStatusString + group__flac__stream__decoder.html + gac49aff0593584b7ed5fd0b2508f824fc + [] + + + const char *const + FLAC__StreamDecoderTellStatusString + group__flac__stream__decoder.html + ga3c1b7d5a174d6c2e6bcf1b9a87b5a5cb + [] + + + const char *const + FLAC__StreamDecoderLengthStatusString + group__flac__stream__decoder.html + ga792933fa9e8b65bfcac62d82e52415f5 + [] + + + const char *const + FLAC__StreamDecoderWriteStatusString + group__flac__stream__decoder.html + ga9df7f0fd8cf9888f97a52b5f3f33cdb0 + [] + + + const char *const + FLAC__StreamDecoderErrorStatusString + group__flac__stream__decoder.html + gac428c69b084529322df05ee793440b88 + [] + + + + stream_encoder.h + /home/erikd/Git/flac/include/FLAC/ + stream__encoder_8h + export.h + format.h + stream_decoder.h + FLAC__StreamEncoder + + FLAC__StreamEncoderReadStatus(* + FLAC__StreamEncoderReadCallback + group__flac__stream__encoder.html + ga97d25c75f49897422d93a9d8405043cd + )(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data) + + + FLAC__StreamEncoderWriteStatus(* + FLAC__StreamEncoderWriteCallback + group__flac__stream__encoder.html + gabf2f9bb39c806111c83dd16936ff6d09 + )(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) + + + FLAC__StreamEncoderSeekStatus(* + FLAC__StreamEncoderSeekCallback + group__flac__stream__encoder.html + ga3005a69a7883da53262ec8a124d48c9e + )(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) + + + FLAC__StreamEncoderTellStatus(* + FLAC__StreamEncoderTellCallback + group__flac__stream__encoder.html + ga4cab0b7556d8509a9f74693804c8c86e + )(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) + + + void(* + FLAC__StreamEncoderMetadataCallback + group__flac__stream__encoder.html + ga87778e16cdd0834a301ee8d8258cf946 + )(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data) + + + void(* + FLAC__StreamEncoderProgressCallback + group__flac__stream__encoder.html + gac65f8ae0583b665933744b60fd5ba0d9 + )(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data) + + + + FLAC__StreamEncoderState + group__flac__stream__encoder.html + gac5e9db4fc32ca2fa74abd9c8a87c02a5 + + + + @ + FLAC__STREAM_ENCODER_OK + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a3a6666ae61a64d955341cec285695bf6 + + + + @ + FLAC__STREAM_ENCODER_UNINITIALIZED + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a04912e04a3c57d3c53de34742f96d635 + + + + @ + FLAC__STREAM_ENCODER_OGG_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5abb312cc8318c7a541cadacd23ceb3bbb + + + + @ + FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a4cb80be4f83eb71f04e74968af1d259e + + + + @ + FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a011e3d8b2d02a940bfd0e59c05cf5ae0 + + + + @ + FLAC__STREAM_ENCODER_CLIENT_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a8c2b2e9efb43a4f9b25b1d2bd9af5f23 + + + + @ + FLAC__STREAM_ENCODER_IO_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5af0e4738522e05a7248435c7148f58f91 + + + + @ + FLAC__STREAM_ENCODER_FRAMING_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a2c2937b7f1600a4ac7c84fc70ab34cf1 + + + + @ + FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a35db99d9958bd6c2301a04715fbc44fd + + + + + FLAC__StreamEncoderInitStatus + group__flac__stream__encoder.html + ga3bb869620af2b188d77982a5c30b047d + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_OK + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da20501dce552da74c5df935eeaa0c9ee3 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da9c64e5f9020d8799e1cd9d39d50e6955 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da8a822b011de88b67c114505ffef39327 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047dac2cf461f02e20513003b8cadeae03f9f + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_NUMBER_OF_CHANNELS + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da0541c4f827f081b9f1c54c9441e4aa65 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047dad6d2631f464183c0c165155200882e6b + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da6fdcde9e18c37450c79e8f12b9d9c134 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BLOCK_SIZE + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da652c445f1bd8b6cfb963a30bf416c95a + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da38a69e94b3333e4ba779d2ff8f43f64e + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da5be80403bd7a43450139442e0f34ad7e + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da62a17a3ed3c05ddf8ea7f6fecbd4e4a1 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047daa793405c858c7606539082750080a47e + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047daa85afdd1849c75a19594416cef63e3e9 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047dab4e7b50d176a127575df90383cb15e1d + + + + + FLAC__StreamEncoderReadStatus + group__flac__stream__encoder.html + ga2e81f007fb0a7414c0bbb453f37ea37f + + + + @ + FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE + group__flac__stream__encoder.html + gga2e81f007fb0a7414c0bbb453f37ea37fa4bdd691d3666f19ec96ff99402347a2e + + + + @ + FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM + group__flac__stream__encoder.html + gga2e81f007fb0a7414c0bbb453f37ea37fa562fef84bf86a9a39682e23066d9cfee + + + + @ + FLAC__STREAM_ENCODER_READ_STATUS_ABORT + group__flac__stream__encoder.html + gga2e81f007fb0a7414c0bbb453f37ea37fa69b94eeab60e07d5fd33f2b3c8b85759 + + + + @ + FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED + group__flac__stream__encoder.html + gga2e81f007fb0a7414c0bbb453f37ea37fa9bb730b8f6354cc1e810017a2f700316 + + + + + FLAC__StreamEncoderWriteStatus + group__flac__stream__encoder.html + ga3737471fd49730bb8cf9b182bdeda05e + + + + @ + FLAC__STREAM_ENCODER_WRITE_STATUS_OK + group__flac__stream__encoder.html + gga3737471fd49730bb8cf9b182bdeda05ea5622e0199f0203c402fcb7b4ca76f808 + + + + @ + FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR + group__flac__stream__encoder.html + gga3737471fd49730bb8cf9b182bdeda05ea18e7cd6a443fb8bd303c3ba89946bc85 + + + + + FLAC__StreamEncoderSeekStatus + group__flac__stream__encoder.html + ga6d5be3489f45fcf0c252022c65d87aca + + + + @ + FLAC__STREAM_ENCODER_SEEK_STATUS_OK + group__flac__stream__encoder.html + gga6d5be3489f45fcf0c252022c65d87acaa99853066610d798627888ec2e5afa667 + + + + @ + FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR + group__flac__stream__encoder.html + gga6d5be3489f45fcf0c252022c65d87acaabf93227938b4e1bf3656fe4ba4159c60 + + + + @ + FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED + group__flac__stream__encoder.html + gga6d5be3489f45fcf0c252022c65d87acaa8930179a426134caf30a70147448f037 + + + + + FLAC__StreamEncoderTellStatus + group__flac__stream__encoder.html + gab628f63181250eb977a28bf12b7dd9ff + + + + @ + FLAC__STREAM_ENCODER_TELL_STATUS_OK + group__flac__stream__encoder.html + ggab628f63181250eb977a28bf12b7dd9ffa48e071d89494ac8f5471e7c0d7a6f43b + + + + @ + FLAC__STREAM_ENCODER_TELL_STATUS_ERROR + group__flac__stream__encoder.html + ggab628f63181250eb977a28bf12b7dd9ffaf638882e04d7c58e6c29dcc7f410864b + + + + @ + FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED + group__flac__stream__encoder.html + ggab628f63181250eb977a28bf12b7dd9ffa9d6bbd317f85fd2d6fc72f64e3cb56e7 + + + + FLAC__StreamEncoder * + FLAC__stream_encoder_new + group__flac__stream__encoder.html + gab09f7620a0ba9c30020c189ce112a52f + (void) + + + void + FLAC__stream_encoder_delete + group__flac__stream__encoder.html + ga7212e6846f543618b6289666de216b29 + (FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_set_ogg_serial_number + group__flac__stream__encoder.html + gaf4f75f7689b6b3fff16b03028aa38326 + (FLAC__StreamEncoder *encoder, long serial_number) + + + FLAC__bool + FLAC__stream_encoder_set_verify + group__flac__stream__encoder.html + ga795be6527a9eb1219331afef2f182a41 + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_streamable_subset + group__flac__stream__encoder.html + ga35a18815a58141b88db02317892d059b + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_channels + group__flac__stream__encoder.html + gab151c81577dc385196b10727ec24459d + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_bits_per_sample + group__flac__stream__encoder.html + gabfa3c989377785cda7c496b69dcb98cb + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_sample_rate + group__flac__stream__encoder.html + ga07fc8c7806381a055a1eef26387e509f + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_compression_level + group__flac__stream__encoder.html + gae49cf32f5256cb47eecd33779493ac85 + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_blocksize + group__flac__stream__encoder.html + ga3f2d344e090d0f6df5dfe8825c28bd61 + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_do_mid_side_stereo + group__flac__stream__encoder.html + ga3bff001a1efc2e4eb520c954066330f4 + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_loose_mid_side_stereo + group__flac__stream__encoder.html + ga7965d51b93f14cbd6ad5bb9d34f10536 + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_apodization + group__flac__stream__encoder.html + ga6598f09ac782a1f2a5743ddf247c81c8 + (FLAC__StreamEncoder *encoder, const char *specification) + + + FLAC__bool + FLAC__stream_encoder_set_max_lpc_order + group__flac__stream__encoder.html + gac256b4ef560fcf099c02eb52bb6c30e9 + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_qlp_coeff_precision + group__flac__stream__encoder.html + gaa325049ebb02d6fbe820d2268850c6de + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_do_qlp_coeff_prec_search + group__flac__stream__encoder.html + ga495890067203958e5d67a641f8757b1c + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_do_escape_coding + group__flac__stream__encoder.html + gaed594c373d829f77808a935c54a25fa4 + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_do_exhaustive_model_search + group__flac__stream__encoder.html + ga054313e7f6eaf5c6122d82c6a8b3b808 + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_min_residual_partition_order + group__flac__stream__encoder.html + ga31867a9cf8bc7276942381e4a8145969 + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_max_residual_partition_order + group__flac__stream__encoder.html + gac2e2147be6e4edf68e02d011349fa08c + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_rice_parameter_search_dist + group__flac__stream__encoder.html + ga11f0c589113b17507c0a620b7872036c + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_total_samples_estimate + group__flac__stream__encoder.html + gab943094585d1c0a4bec497e73567cf85 + (FLAC__StreamEncoder *encoder, FLAC__uint64 value) + + + FLAC__bool + FLAC__stream_encoder_set_metadata + group__flac__stream__encoder.html + ga9c1098e664d7997947493901ed869b64 + (FLAC__StreamEncoder *encoder, FLAC__StreamMetadata **metadata, unsigned num_blocks) + + + FLAC__StreamEncoderState + FLAC__stream_encoder_get_state + group__flac__stream__encoder.html + ga0803321b37189dc5eea4fe1cea25c29a + (const FLAC__StreamEncoder *encoder) + + + FLAC__StreamDecoderState + FLAC__stream_encoder_get_verify_decoder_state + group__flac__stream__encoder.html + ga820704b95a711e77d55363e8753f9f9f + (const FLAC__StreamEncoder *encoder) + + + const char * + FLAC__stream_encoder_get_resolved_state_string + group__flac__stream__encoder.html + ga0916f813358eb6f1e44148353acd4d42 + (const FLAC__StreamEncoder *encoder) + + + void + FLAC__stream_encoder_get_verify_decoder_error_stats + group__flac__stream__encoder.html + ga48197fd6507314858222a8e6903292ba + (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got) + + + FLAC__bool + FLAC__stream_encoder_get_verify + group__flac__stream__encoder.html + ga9efc4964992e001bcec0a8eaedee8d60 + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_streamable_subset + group__flac__stream__encoder.html + ga201e64032ea4298b2379c93652b28245 + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_channels + group__flac__stream__encoder.html + ga535991ba463573d7ad2271ea943051e8 + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_bits_per_sample + group__flac__stream__encoder.html + ga44afb2b8e2623b1dff02e4116c6c58cb + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_sample_rate + group__flac__stream__encoder.html + ga830bc5489b60fbe814a683a8c4ebc81d + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_blocksize + group__flac__stream__encoder.html + ga21da057fd9c30bc2475b9bd18b9a1504 + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_do_mid_side_stereo + group__flac__stream__encoder.html + ga32da1f89997ab94ce5d677fcd7e24d56 + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_loose_mid_side_stereo + group__flac__stream__encoder.html + ga1455859cf3d233bd4dfff86af010f4fa + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_max_lpc_order + group__flac__stream__encoder.html + gadce7c7d6af89c3bbac0bb0c76d6e257b + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_qlp_coeff_precision + group__flac__stream__encoder.html + ga5b311992ac47554ae90c8f5a8ed745a7 + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_do_qlp_coeff_prec_search + group__flac__stream__encoder.html + ga65bee5a769d4c5fdc95b81c2fb95061c + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_do_escape_coding + group__flac__stream__encoder.html + ga0c944049800991422c1bfb3b1c0567a5 + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_do_exhaustive_model_search + group__flac__stream__encoder.html + ga7bc8b32f58df5564db4b6114cb11042d + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_min_residual_partition_order + group__flac__stream__encoder.html + ga1f29fb94e5c54f1d46ad31c2af0dc5ac + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_max_residual_partition_order + group__flac__stream__encoder.html + ga55773d82163302c52936299068510e9d + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_rice_parameter_search_dist + group__flac__stream__encoder.html + gafd70690deb118136ca4baed350d99cb8 + (const FLAC__StreamEncoder *encoder) + + + FLAC__uint64 + FLAC__stream_encoder_get_total_samples_estimate + group__flac__stream__encoder.html + gaa22d8935bd985b9cccf6592160ffc6f2 + (const FLAC__StreamEncoder *encoder) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_stream + group__flac__stream__encoder.html + ga7d801879812b48fcbc40f409800c453c + (FLAC__StreamEncoder *encoder, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_ogg_stream + group__flac__stream__encoder.html + ga9d1981bcd30b8db4d73b5466be5570f5 + (FLAC__StreamEncoder *encoder, FLAC__StreamEncoderReadCallback read_callback, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_FILE + group__flac__stream__encoder.html + ga12789a1c4a4e31cd2e7187259fe127f8 + (FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_ogg_FILE + group__flac__stream__encoder.html + ga57fc668f50ffd99a93df326bfab5e2b1 + (FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_file + group__flac__stream__encoder.html + ga9d5117c2ac0eeb572784116bf2eb541b + (FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_ogg_file + group__flac__stream__encoder.html + ga4891de2f56045941ae222b61b0fd83a4 + (FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data) + + + FLAC__bool + FLAC__stream_encoder_finish + group__flac__stream__encoder.html + ga3522f9de5af29807df1b9780a418b7f3 + (FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_process + group__flac__stream__encoder.html + gad462406ff4d5a985eac6b4aa5472df57 + (FLAC__StreamEncoder *encoder, const FLAC__int32 *const buffer[], unsigned samples) + + + FLAC__bool + FLAC__stream_encoder_process_interleaved + group__flac__stream__encoder.html + ga4c56bc287efb1a0f69b117a84401baad + (FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], unsigned samples) + + + const char *const + FLAC__StreamEncoderStateString + group__flac__stream__encoder.html + ga1410b7a076b0c8401682f9f812b66df5 + [] + + + const char *const + FLAC__StreamEncoderInitStatusString + group__flac__stream__encoder.html + ga0ec1fa7b3f55b4f07a2727846c285776 + [] + + + const char *const + FLAC__StreamEncoderReadStatusString + group__flac__stream__encoder.html + ga1654422c81846b9b399ac5fb98df61dd + [] + + + const char *const + FLAC__StreamEncoderWriteStatusString + group__flac__stream__encoder.html + ga9f64480accd01525cbfa25c11e6bb74e + [] + + + const char *const + FLAC__StreamEncoderSeekStatusString + group__flac__stream__encoder.html + gabb137b2d787756bf97398f0b60e54c20 + [] + + + const char *const + FLAC__StreamEncoderTellStatusString + group__flac__stream__encoder.html + gaf8ab921ae968be2be255be1f136e1eec + [] + + + + porting + Porting Guide for New Versions + group__porting.html + porting_1_1_2_to_1_1_3 + porting_1_1_3_to_1_1_4 + porting_1_1_4_to_1_2_0 + + + porting_1_1_2_to_1_1_3 + Porting from FLAC 1.1.2 to 1.1.3 + group__porting__1__1__2__to__1__1__3.html + + + porting_1_1_3_to_1_1_4 + Porting from FLAC 1.1.3 to 1.1.4 + group__porting__1__1__3__to__1__1__4.html + + + porting_1_1_4_to_1_2_0 + Porting from FLAC 1.1.4 to 1.2.0 + group__porting__1__1__4__to__1__2__0.html + + + flac + FLAC C API + group__flac.html + flac_callbacks + flac_export + flac_format + flac_metadata + flac_decoder + flac_encoder + + + flac_callbacks + FLAC/callback.h: I/O callback structures + group__flac__callbacks.html + FLAC__IOCallbacks + + void * + FLAC__IOHandle + group__flac__callbacks.html + ga4c329c3168dee6e352384c5e9306260d + + + + size_t(* + FLAC__IOCallback_Read + group__flac__callbacks.html + ga5d75bd553bd041db0d30d869455bab38 + )(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) + + + size_t(* + FLAC__IOCallback_Write + group__flac__callbacks.html + ga473cbe45055fe15c967de13181d01e87 + )(const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) + + + int(* + FLAC__IOCallback_Seek + group__flac__callbacks.html + ga5090a35604829d8178f4f2d1a40a38d0 + )(FLAC__IOHandle handle, FLAC__int64 offset, int whence) + + + FLAC__int64(* + FLAC__IOCallback_Tell + group__flac__callbacks.html + ga016e3dd2d006975ea1031970dac232fb + )(FLAC__IOHandle handle) + + + int(* + FLAC__IOCallback_Eof + group__flac__callbacks.html + gac9fe1afad0426a8f1756d136b3442990 + )(FLAC__IOHandle handle) + + + int(* + FLAC__IOCallback_Close + group__flac__callbacks.html + ga3749f8621f43e937eb69a9536db3b19a + )(FLAC__IOHandle handle) + + + + flac_export + FLAC/export.h: export symbols + group__flac__export.html + + #define + FLAC_API_VERSION_CURRENT + group__flac__export.html + ga31180fe15eea416cd8957cfca1a4c4f8 + + + + #define + FLAC_API_VERSION_REVISION + group__flac__export.html + ga811641dd9f8c542d9260240e7fbe8e93 + + + + #define + FLAC_API_VERSION_AGE + group__flac__export.html + ga1add3e09c8dfd57e8c921f299f0bbec1 + + + + int + FLAC_API_SUPPORTS_OGG_FLAC + group__flac__export.html + ga84ffcb0af1038c60eb3e21fd002093cf + + + + + flac_format + FLAC/format.h: format components + group__flac__format.html + FLAC__EntropyCodingMethod_PartitionedRiceContents + FLAC__EntropyCodingMethod_PartitionedRice + FLAC__EntropyCodingMethod + FLAC__Subframe_Constant + FLAC__Subframe_Verbatim + FLAC__Subframe_Fixed + FLAC__Subframe_LPC + FLAC__Subframe + FLAC__FrameHeader + FLAC__FrameFooter + FLAC__Frame + FLAC__StreamMetadata_StreamInfo + FLAC__StreamMetadata_Padding + FLAC__StreamMetadata_Application + FLAC__StreamMetadata_SeekPoint + FLAC__StreamMetadata_SeekTable + FLAC__StreamMetadata_VorbisComment_Entry + FLAC__StreamMetadata_VorbisComment + FLAC__StreamMetadata_CueSheet_Index + FLAC__StreamMetadata_CueSheet_Track + FLAC__StreamMetadata_CueSheet + FLAC__StreamMetadata_Picture + FLAC__StreamMetadata_Unknown + FLAC__StreamMetadata + + #define + FLAC__MAX_METADATA_TYPE_CODE + group__flac__format.html + ga626a412545818c2271fa2202c02ff1d6 + + + + #define + FLAC__MIN_BLOCK_SIZE + group__flac__format.html + gaa5a85c2ea434221ce684be3469517003 + + + + #define + FLAC__MAX_BLOCK_SIZE + group__flac__format.html + gaef78bc1b04f721e7b4563381f5514e8d + + + + #define + FLAC__SUBSET_MAX_BLOCK_SIZE_48000HZ + group__flac__format.html + ga8f6ba2c28fbfcf52326d115c95b0a751 + + + + #define + FLAC__MAX_CHANNELS + group__flac__format.html + ga488aa5678a58d08f984f5d39185b763d + + + + #define + FLAC__MIN_BITS_PER_SAMPLE + group__flac__format.html + ga30b0f21abbb2cdfd461fe04b425b5438 + + + + #define + FLAC__MAX_BITS_PER_SAMPLE + group__flac__format.html + gad0156d56751e80241fa349d1e25064a6 + + + + #define + FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE + group__flac__format.html + ga0fc418d96053d385fd2f56dce8007fbc + + + + #define + FLAC__MAX_SAMPLE_RATE + group__flac__format.html + ga99abeef0c05c6bc76eacfa865abbfa70 + + + + #define + FLAC__MAX_LPC_ORDER + group__flac__format.html + ga16108d413f524329f338cff6e05f3aff + + + + #define + FLAC__SUBSET_MAX_LPC_ORDER_48000HZ + group__flac__format.html + ga9791efa78147196820c86a6041d7774d + + + + #define + FLAC__MIN_QLP_COEFF_PRECISION + group__flac__format.html + gaf52033b2950b9396dd92b167b3bbe4db + + + + #define + FLAC__MAX_QLP_COEFF_PRECISION + group__flac__format.html + ga6aa38a4bc5b9d96a78253ccb8b08bd1f + + + + #define + FLAC__MAX_FIXED_ORDER + group__flac__format.html + gabd0d5d6fe71b337244712b244ae7cb0f + + + + #define + FLAC__MAX_RICE_PARTITION_ORDER + group__flac__format.html + ga78a2e97e230b2aa7f99edc94a466f5bb + + + + #define + FLAC__SUBSET_MAX_RICE_PARTITION_ORDER + group__flac__format.html + gab19dec1b56de482ccfeb5f9843f60a14 + + + + #define + FLAC__STREAM_SYNC_LENGTH + group__flac__format.html + gae7ddaf298d3ceb83aae6301908675c1d + + + + #define + FLAC__STREAM_METADATA_STREAMINFO_LENGTH + group__flac__format.html + ga06dfae7260da40e4c5f8fc4d531b326c + + + + #define + FLAC__STREAM_METADATA_SEEKPOINT_LENGTH + group__flac__format.html + gabdf85aa2c9a483378dfe850b85ab93ef + + + + #define + FLAC__STREAM_METADATA_HEADER_LENGTH + group__flac__format.html + ga706a29b8a14902c457783bfd4fd7bab2 + + + + + FLAC__EntropyCodingMethodType + group__flac__format.html + ga951733d2ea01943514290012cd622d3a + + + + @ + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE + group__flac__format.html + gga951733d2ea01943514290012cd622d3aa5253f8b8edc61220739f229a299775dd + + + + @ + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2 + group__flac__format.html + gga951733d2ea01943514290012cd622d3aa202960a608ee91f9f11c2575b9ecc5aa + + + + + FLAC__SubframeType + group__flac__format.html + ga1f431eaf213e74d7747589932d263348 + + + + @ + FLAC__SUBFRAME_TYPE_CONSTANT + group__flac__format.html + gga1f431eaf213e74d7747589932d263348a9bf56d836aeffb11d614e29ea1cdf2a9 + + + + @ + FLAC__SUBFRAME_TYPE_VERBATIM + group__flac__format.html + gga1f431eaf213e74d7747589932d263348a8520596ef07d6c8577f07025f137657b + + + + @ + FLAC__SUBFRAME_TYPE_FIXED + group__flac__format.html + gga1f431eaf213e74d7747589932d263348a6b3cce73039a513f9afefdc8e4f664a5 + + + + @ + FLAC__SUBFRAME_TYPE_LPC + group__flac__format.html + gga1f431eaf213e74d7747589932d263348a31437462c3e4c3a5a214a91eff8cc3af + + + + + FLAC__ChannelAssignment + group__flac__format.html + ga79855f8525672e37f299bbe02952ef9c + + + + @ + FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT + group__flac__format.html + gga79855f8525672e37f299bbe02952ef9ca3c554e4c8512c2de31dfd3305f8b31b3 + + + + @ + FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE + group__flac__format.html + gga79855f8525672e37f299bbe02952ef9ca28d41295b20593561dc9934cc977d5cb + + + + @ + FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE + group__flac__format.html + gga79855f8525672e37f299bbe02952ef9cad155b61582140b2b90362005f1a93e2e + + + + @ + FLAC__CHANNEL_ASSIGNMENT_MID_SIDE + group__flac__format.html + gga79855f8525672e37f299bbe02952ef9ca85c1512c0473b5ede364a9943759a80c + + + + + FLAC__FrameNumberType + group__flac__format.html + ga8fe9ebc78386cd2a3d23b7b8e3818e1c + + + + @ + FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER + group__flac__format.html + gga8fe9ebc78386cd2a3d23b7b8e3818e1ca0b9cbf3853f0ae105cf9b5360164f794 + + + + @ + FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER + group__flac__format.html + gga8fe9ebc78386cd2a3d23b7b8e3818e1ca9220ce93dcc151e5edd5db7e7155b35a + + + + + FLAC__MetadataType + group__flac__format.html + gac71714ba8ddbbd66d26bb78a427fac01 + + + + @ + FLAC__METADATA_TYPE_STREAMINFO + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01acffa517e969ba6a868dcf10e5da75c28 + + + + @ + FLAC__METADATA_TYPE_PADDING + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01a6dcb741fc0aef389580f110e88beb896 + + + + @ + FLAC__METADATA_TYPE_APPLICATION + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01a2b287a22a1ac9440b309127884c8d41b + + + + @ + FLAC__METADATA_TYPE_SEEKTABLE + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01a5f6323e489be1318f0e3747960ebdd91 + + + + @ + FLAC__METADATA_TYPE_VORBIS_COMMENT + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01ad013576bc5196b907547739518605520 + + + + @ + FLAC__METADATA_TYPE_CUESHEET + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01a0b3f07ae60609126562cd0233ce00a65 + + + + @ + FLAC__METADATA_TYPE_PICTURE + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01acf28ae2788366617c1aeab81d5961c6e + + + + @ + FLAC__METADATA_TYPE_UNDEFINED + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01acf6ac61fcc866608f5583c275dc34d47 + + + + @ + FLAC__MAX_METADATA_TYPE + group__flac__format.html + ggac71714ba8ddbbd66d26bb78a427fac01a1a2f283a3dd9e7b46181d7a114ec5805 + + + + + FLAC__StreamMetadata_Picture_Type + group__flac__format.html + gaf6d3e836cee023e0b8d897f1fdc9825d + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dadd6d6af32499b1973e48c9e8f13357ce + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da5eca52e5cfcb718f33f5fce9b1021a49 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825daaf44b9d5fb75dde6941463e5029aa351 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da3e20b405fd4e835ff3a4465b8bcb7c36 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_BACK_COVER + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da9ae132f2ee7d3baf35f94a9dc9640f62 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_LEAFLET_PAGE + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dad3cb471b7925ae5034d9fd9ecfafb87a + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dac994edc4166107ab5790e49f0b57ffd9 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_LEAD_ARTIST + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da1282e252e20553c39907074052960f42 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_ARTIST + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da4cead70f8720f180fc220e6df8d55cce + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_CONDUCTOR + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dae01a47af0b0c4d89500b755ebca866ce + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_BAND + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da8515523b4c9ab65ffef7db98bc09ceb1 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_COMPOSER + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da5ea1554bc96deb45731bc5897600d1c2 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_LYRICIST + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da86159eda8969514f5992b3e341103f22 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_RECORDING_LOCATION + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dac96e810cdd81465709b4a3a03289e89c + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_RECORDING + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da8cee3bb376ed1044b3a7e20b9c971ff1 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_PERFORMANCE + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da4d4dc6904984370501865988d948de3f + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_VIDEO_SCREEN_CAPTURE + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da7adc2b194968b51768721de7bda39df9 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_FISH + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825dabbf0d7c519ae8ba8cec7d1f165f67b0f + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_ILLUSTRATION + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da89ba412c9d89c937c28afdab508d047a + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_BAND_LOGOTYPE + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da751716a4528a78a8d53f435c816c4917 + + + + @ + FLAC__STREAM_METADATA_PICTURE_TYPE_PUBLISHER_LOGOTYPE + group__flac__format.html + ggaf6d3e836cee023e0b8d897f1fdc9825da31d75150a4079482fe122e703eff9141 + + + + FLAC__bool + FLAC__format_sample_rate_is_valid + group__flac__format.html + ga985a32bf66e3a69a48e8f9ccd7c5e2e9 + (unsigned sample_rate) + + + FLAC__bool + FLAC__format_blocksize_is_subset + group__flac__format.html + ga5370258a7aae32ad18b4c69fbd5e4a36 + (unsigned blocksize, unsigned sample_rate) + + + FLAC__bool + FLAC__format_sample_rate_is_subset + group__flac__format.html + gae305f200f9f4fca80f8ee3d004cf1164 + (unsigned sample_rate) + + + FLAC__bool + FLAC__format_vorbiscomment_entry_name_is_legal + group__flac__format.html + gae5fb55cd5977ebf178c5b38da831c057 + (const char *name) + + + FLAC__bool + FLAC__format_vorbiscomment_entry_value_is_legal + group__flac__format.html + gad4509984c8a8a0b926a4fb1ba25ec449 + (const FLAC__byte *value, unsigned length) + + + FLAC__bool + FLAC__format_vorbiscomment_entry_is_legal + group__flac__format.html + gab98da8754f99fdf7ba0583275b200de3 + (const FLAC__byte *entry, unsigned length) + + + FLAC__bool + FLAC__format_seektable_is_legal + group__flac__format.html + ga02ed0843553fb8f718fe8e7c54d12244 + (const FLAC__StreamMetadata_SeekTable *seek_table) + + + unsigned + FLAC__format_seektable_sort + group__flac__format.html + ga64dede2811616c7aa41caaed9c855cd4 + (FLAC__StreamMetadata_SeekTable *seek_table) + + + FLAC__bool + FLAC__format_cuesheet_is_legal + group__flac__format.html + gaa9ed0fa4ed04dbfdaa163d0f5308c080 + (const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation) + + + FLAC__bool + FLAC__format_picture_is_legal + group__flac__format.html + ga82ca3ffc97c106c61882134f1a7fb1be + (const FLAC__StreamMetadata_Picture *picture, const char **violation) + + + const char * + FLAC__VERSION_STRING + group__flac__format.html + ga52e2616f9a0b94881cd7711c18d62a35 + + + + const char * + FLAC__VENDOR_STRING + group__flac__format.html + gad5cccab0de3adda58914edf3c31fd64f + + + + const FLAC__byte + FLAC__STREAM_SYNC_STRING + group__flac__format.html + ga3f275a3a6056e0d53df3b72b03adde4b + [4] + + + const unsigned + FLAC__STREAM_SYNC + group__flac__format.html + ga21e4646e61486382c6d91234474fce66 + + + + const unsigned + FLAC__STREAM_SYNC_LEN + group__flac__format.html + ga5f4f9e89655ecc48a7a539f92da1b7e7 + + + + const char *const + FLAC__EntropyCodingMethodTypeString + group__flac__format.html + ga41603ac35eed8c77c2f2e0b12067d88a + [] + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN + group__flac__format.html + ga5056169ee48d8ece011d05f0fb9b3d43 + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN + group__flac__format.html + gace7a2a1c6b75dc4b02d34933dae21cde + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN + group__flac__format.html + ga0b08df429809f9a78710c5251c9615ea + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN + group__flac__format.html + ga2299e09372ce2d652ad215ad5d57f6f7 + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER + group__flac__format.html + ga8c0af33a0ef538cd8e9e04e8a25913af + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER + group__flac__format.html + gaad1bb90d3f58a38aab4509e43e2be1fd + + + + const unsigned + FLAC__ENTROPY_CODING_METHOD_TYPE_LEN + group__flac__format.html + ga224222cd46f6613456c5efd75d713946 + + + + const char *const + FLAC__SubframeTypeString + group__flac__format.html + ga78d78f45f123cfbb50cebd61b96097df + [] + + + const unsigned + FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN + group__flac__format.html + ga5fe1e86b574141cd1e11d9be6b1b8202 + + + + const unsigned + FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN + group__flac__format.html + ga1d957b042a1e673e39a815427c6aa494 + + + + const unsigned + FLAC__SUBFRAME_ZERO_PAD_LEN + group__flac__format.html + ga9aace0e3dfa3bd2a3195e134852082c2 + + + + const unsigned + FLAC__SUBFRAME_TYPE_LEN + group__flac__format.html + gab4b4a36a869e404834e01e288f9105a6 + + + + const unsigned + FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN + group__flac__format.html + gacf0f85d0592281227a5a1400087c466e + + + + const unsigned + FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK + group__flac__format.html + gad783daf32785798dcc3a23e1a4cecefc + + + + const unsigned + FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK + group__flac__format.html + gadf86648f3eb3ffecd547019577a2ab0f + + + + const unsigned + FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK + group__flac__format.html + ga3d8dbb2da910837bc5811f8b12bb60f7 + + + + const unsigned + FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK + group__flac__format.html + gaf4edf4982798602f2793f907ee7d7695 + + + + const char *const + FLAC__ChannelAssignmentString + group__flac__format.html + gab1a1d3929a4e5a5aff2c15010742aa21 + [] + + + const char *const + FLAC__FrameNumberTypeString + group__flac__format.html + ga931a0e63c0f2b31fab801e1dd693fa4e + [] + + + const unsigned + FLAC__FRAME_HEADER_SYNC + group__flac__format.html + ga100c4e86ebb9b85b2a987d1ad383596b + + + + const unsigned + FLAC__FRAME_HEADER_SYNC_LEN + group__flac__format.html + ga6be66feb8358e5a39869ce3e39f7b47a + + + + const unsigned + FLAC__FRAME_HEADER_RESERVED_LEN + group__flac__format.html + gad9a46acc93058fb6aba6e0cf8f9c2713 + + + + const unsigned + FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN + group__flac__format.html + gaa1f482e9172cd95795b32724784d8be9 + + + + const unsigned + FLAC__FRAME_HEADER_BLOCK_SIZE_LEN + group__flac__format.html + ga2c5c93ba19375583ca27c3d288e90a03 + + + + const unsigned + FLAC__FRAME_HEADER_SAMPLE_RATE_LEN + group__flac__format.html + ga1ec5825f1a07d1136204840d5d89feca + + + + const unsigned + FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN + group__flac__format.html + gafa9050a64f02d18ea7426e4c382bb6a6 + + + + const unsigned + FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN + group__flac__format.html + ga9d6055c79974497dc99912b0e9ebbe41 + + + + const unsigned + FLAC__FRAME_HEADER_ZERO_PAD_LEN + group__flac__format.html + gaf761899e8a95a7bce3f429e6648ca14e + + + + const unsigned + FLAC__FRAME_HEADER_CRC_LEN + group__flac__format.html + ga82e91fc3b93cd8573c814dd282b5b6ed + + + + const unsigned + FLAC__FRAME_FOOTER_CRC_LEN + group__flac__format.html + ga238b33bf853ea3ab0fc0dbaad5e41f4e + + + + const char *const + FLAC__MetadataTypeString + group__flac__format.html + gaa9ad23f06a579d1110d61d54c8c999f0 + [] + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN + group__flac__format.html + gac10f1ca2318884d9ed142350744eca1a + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN + group__flac__format.html + ga9049314bc422ba321414afdafad76d04 + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN + group__flac__format.html + ga3abb82a701c670c7a9f8f47fc4df5edc + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN + group__flac__format.html + ga4e7c5315f21eaa0e3f0dfb6517eb4545 + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN + group__flac__format.html + ga7c5529d77e0cf806e709dc147ff83452 + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN + group__flac__format.html + ga719aee1e62d71e1e03d6299aade7a7c4 + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN + group__flac__format.html + ga4d8a3f1a75a24e8d0a966f8ad01f15ed + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN + group__flac__format.html + gaeb69211400ad50dd6c3503e8092c6afb + + + + const unsigned + FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN + group__flac__format.html + ga492d4321cbd601ed24489ad59d9ddaf8 + + + + const unsigned + FLAC__STREAM_METADATA_APPLICATION_ID_LEN + group__flac__format.html + gac374cf68c046406a062daf0b811e9020 + + + + const unsigned + FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN + group__flac__format.html + ga2afc4c1f5b9c522274e4fb7236d645f5 + + + + const unsigned + FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN + group__flac__format.html + gafa894a5e0e9f5fa40a76c5a9f19800cf + + + + const unsigned + FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN + group__flac__format.html + ga330813fcf2c4ebb133843511134b6c11 + + + + const FLAC__uint64 + FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER + group__flac__format.html + gad5d58774aea926635e6841c411d60566 + + + + const unsigned + FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN + group__flac__format.html + gad73e13be54a583adfa4d2e43c1a4bdff + + + + const unsigned + FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN + group__flac__format.html + gabdd8ad7a3de9abd96358fe10f4b0e6a0 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN + group__flac__format.html + gaec8a23f851fb225d16b996282413704b + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN + group__flac__format.html + gad7e0ce539714d0cc47053a6b11711227 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN + group__flac__format.html + ga8cafc79f8b98b5ced139b37c46b4f4bf + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN + group__flac__format.html + gaccf9e6a290a44763f2616ff65dd4e422 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN + group__flac__format.html + gad0a4822167882a1321467b0dc67f145b + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN + group__flac__format.html + gac63e5eb63aa52b1fe780bc89c55dec92 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN + group__flac__format.html + gac32d5288f0f80fbd9101bb0352850a4f + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN + group__flac__format.html + gafb26465f020a51491ecad3c2fe8839be + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN + group__flac__format.html + gad825e57e995f161d945a51bb363e4650 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN + group__flac__format.html + ga443798929acc94f4b7b6c19ab92c5b25 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN + group__flac__format.html + ga380732fda7b866b075b138e9153717b9 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN + group__flac__format.html + ga9e47028762ec6709a14d8b81e7712285 + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN + group__flac__format.html + gaf1817667af48cd8c122488664972fd0c + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN + group__flac__format.html + ga1ceaba7fd5e900d423b6d9537d1979fd + + + + const unsigned + FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN + group__flac__format.html + gaa0046d3f2bc430feb97a4b04053db01e + + + + const char *const + FLAC__StreamMetadata_Picture_TypeString + group__flac__format.html + ga2d27672452696cb97fd39db1cf43486b + [] + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_TYPE_LEN + group__flac__format.html + gaa06ecd0960798a4e16e6b6a218008da7 + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN + group__flac__format.html + gafe9e4d8a4942eef747612e0cab836c4e + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN + group__flac__format.html + ga96910250e54bb335a3c11940372c6585 + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN + group__flac__format.html + ga729da59256030685bf9f29cdbf571e4d + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN + group__flac__format.html + ga173238fb8a7499b67b1658bb3ac6a81a + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN + group__flac__format.html + ga6b9cf7c11b6fb7f96dfbc197db280128 + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_COLORS_LEN + group__flac__format.html + ga6ed3603f4d9092d99e4b4d57bb431cc5 + + + + const unsigned + FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN + group__flac__format.html + ga808843e986308268c5dc6c841c67a74a + + + + const unsigned + FLAC__STREAM_METADATA_IS_LAST_LEN + group__flac__format.html + ga2a2e0d9428b90662b6790404dd393830 + + + + const unsigned + FLAC__STREAM_METADATA_TYPE_LEN + group__flac__format.html + gaf88b0f6621a4b22b37a8fe2ef82a7204 + + + + const unsigned + FLAC__STREAM_METADATA_LENGTH_LEN + group__flac__format.html + gaa16818a9f8de9e3bd75e832cc6149eb8 + + + + + flac_metadata + FLAC/metadata.h: metadata interfaces + group__flac__metadata.html + flac_metadata_level0 + flac_metadata_level1 + flac_metadata_level2 + flac_metadata_object + + + flac_metadata_level0 + FLAC/metadata.h: metadata level 0 interface + group__flac__metadata__level0.html + + FLAC__bool + FLAC__metadata_get_streaminfo + group__flac__metadata__level0.html + ga804b42d9da714199b4b383ce51078d51 + (const char *filename, FLAC__StreamMetadata *streaminfo) + + + FLAC__bool + FLAC__metadata_get_tags + group__flac__metadata__level0.html + ga1626af09cd39d4fa37d5b46ebe3790fd + (const char *filename, FLAC__StreamMetadata **tags) + + + FLAC__bool + FLAC__metadata_get_cuesheet + group__flac__metadata__level0.html + ga0f47949dca514506718276205a4fae0b + (const char *filename, FLAC__StreamMetadata **cuesheet) + + + FLAC__bool + FLAC__metadata_get_picture + group__flac__metadata__level0.html + ga0c9cd22296400c8ce16ee1db011342cb + (const char *filename, FLAC__StreamMetadata **picture, FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors) + + + + flac_metadata_level1 + FLAC/metadata.h: metadata level 1 interface + group__flac__metadata__level1.html + + struct FLAC__Metadata_SimpleIterator + FLAC__Metadata_SimpleIterator + group__flac__metadata__level1.html + ga6accccddbb867dfc2eece9ee3ffecb3a + + + + + FLAC__Metadata_SimpleIteratorStatus + group__flac__metadata__level1.html + gac926e7d2773a05066115cac9048bbec9 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a33aadd73194c0d7e307d643237e0ddcd + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a0a3933cb38c8957a8d5c3d1afb4766f9 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a20e835bbb74b4d039e598617f68d2af6 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a7785f77a612be8956fbe7cab73497220 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9af055d8c0c663e72134fe2db8037b6880 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a14c897124887858109200723826f85b7 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a088df964f0852dd7e19304e920c3ee8e + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a2ad85a32e291d1e918692d68cc22fd40 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9ac2337299c2347ca311caeaa7d71d857c + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a2e073843fa99419d76a0b210da96ceb6 + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a4f855433038c576da127fc1de9d18f9b + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9aa8386ed0a20d7e91b0022d203ec3cdec + + + + @ + FLAC__METADATA_SIMPLE_ITERATOR_STATUS_INTERNAL_ERROR + group__flac__metadata__level1.html + ggac926e7d2773a05066115cac9048bbec9a9d821ae65a1c5de619daa88c850906df + + + + FLAC__Metadata_SimpleIterator * + FLAC__metadata_simple_iterator_new + group__flac__metadata__level1.html + ga017ae86f3351888f50feb47026ed2482 + (void) + + + void + FLAC__metadata_simple_iterator_delete + group__flac__metadata__level1.html + ga4619be06f51429fea71e5b98900cec3e + (FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__Metadata_SimpleIteratorStatus + FLAC__metadata_simple_iterator_status + group__flac__metadata__level1.html + gae8fd236fe6049c61f7f3b4a6ecbcd240 + (FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_init + group__flac__metadata__level1.html + gaba8daf276fd7da863a2522ac050125fd + (FLAC__Metadata_SimpleIterator *iterator, const char *filename, FLAC__bool read_only, FLAC__bool preserve_file_stats) + + + FLAC__bool + FLAC__metadata_simple_iterator_is_writable + group__flac__metadata__level1.html + ga5150ecd8668c610f79192a2838667790 + (const FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_next + group__flac__metadata__level1.html + gabb7de0a1067efae353e0792dc6e51905 + (FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_prev + group__flac__metadata__level1.html + ga6db5313b31120b28e210ae721d6525a8 + (FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_is_last + group__flac__metadata__level1.html + ga9eb215059840960de69aa84469ba954f + (const FLAC__Metadata_SimpleIterator *iterator) + + + off_t + FLAC__metadata_simple_iterator_get_block_offset + group__flac__metadata__level1.html + gade0a61723420daeb4bc226713671c6f0 + (const FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__MetadataType + FLAC__metadata_simple_iterator_get_block_type + group__flac__metadata__level1.html + ga17b61d17e83432913abf4334d6e0c073 + (const FLAC__Metadata_SimpleIterator *iterator) + + + unsigned + FLAC__metadata_simple_iterator_get_block_length + group__flac__metadata__level1.html + ga93ec66e9cfb99f04ce4125b8be906cef + (const FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_get_application_id + group__flac__metadata__level1.html + gad4fea2d7d98d16e75e6d8260f690a5dc + (FLAC__Metadata_SimpleIterator *iterator, FLAC__byte *id) + + + FLAC__StreamMetadata * + FLAC__metadata_simple_iterator_get_block + group__flac__metadata__level1.html + ga1b7374cafd886ceb880b050dfa1e387a + (FLAC__Metadata_SimpleIterator *iterator) + + + FLAC__bool + FLAC__metadata_simple_iterator_set_block + group__flac__metadata__level1.html + gae1dd863561606658f88c492682de7b80 + (FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding) + + + FLAC__bool + FLAC__metadata_simple_iterator_insert_block_after + group__flac__metadata__level1.html + ga7a0c00e93bb37324a20926e92e604102 + (FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding) + + + FLAC__bool + FLAC__metadata_simple_iterator_delete_block + group__flac__metadata__level1.html + gac3116c8e6e7f59914ae22c0c4c6b0a23 + (FLAC__Metadata_SimpleIterator *iterator, FLAC__bool use_padding) + + + const char *const + FLAC__Metadata_SimpleIteratorStatusString + group__flac__metadata__level1.html + gaa2a8b972800c34f9f5807cadf6ecdb57 + [] + + + + flac_metadata_level2 + FLAC/metadata.h: metadata level 2 interface + group__flac__metadata__level2.html + + struct FLAC__Metadata_Chain + FLAC__Metadata_Chain + group__flac__metadata__level2.html + gaec6993c60b88f222a52af86f8f47bfdf + + + + struct FLAC__Metadata_Iterator + FLAC__Metadata_Iterator + group__flac__metadata__level2.html + ga9f3e135a07cdef7e51597646aa7b89b2 + + + + + FLAC__Metadata_ChainStatus + group__flac__metadata__level2.html + gafe2a924893b0800b020bea8160fd4531 + + + + @ + FLAC__METADATA_CHAIN_STATUS_OK + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a293be942ec54576f2b3c73613af968e9 + + + + @ + FLAC__METADATA_CHAIN_STATUS_ILLEGAL_INPUT + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a1be9400982f411173af46bf0c3acbdc7 + + + + @ + FLAC__METADATA_CHAIN_STATUS_ERROR_OPENING_FILE + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a43d2741a650576052fa3615d8cd64d86 + + + + @ + FLAC__METADATA_CHAIN_STATUS_NOT_A_FLAC_FILE + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a99748a4b12ed10f9368375cc8deeb143 + + + + @ + FLAC__METADATA_CHAIN_STATUS_NOT_WRITABLE + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531ac469c6543ebb117e99064572c16672d4 + + + + @ + FLAC__METADATA_CHAIN_STATUS_BAD_METADATA + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a8efd2c76dc06308eb6eba59e1bc6300b + + + + @ + FLAC__METADATA_CHAIN_STATUS_READ_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a0525de5fb5d8aeeb4e848e33a8d503c6 + + + + @ + FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a5814bc26bcf92143198b8e7f028f43a2 + + + + @ + FLAC__METADATA_CHAIN_STATUS_WRITE_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a66460c735e4745788b40889329e8489f + + + + @ + FLAC__METADATA_CHAIN_STATUS_RENAME_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531af4ecf22bc3e5adf78a9c765f856efb0d + + + + @ + FLAC__METADATA_CHAIN_STATUS_UNLINK_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a1cd3138ed493f6a0f5b95fb8481edd1e + + + + @ + FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531ab12ec938f7556a163c609194ee0aede0 + + + + @ + FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a36b9bcf93da8e0f111738a65eab36e9d + + + + @ + FLAC__METADATA_CHAIN_STATUS_INVALID_CALLBACKS + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531ab8a6aa5f115db3f07ad2ed4adbcbe060 + + + + @ + FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531a0d9e64ad6514c88b8ea9e9171c42ec9a + + + + @ + FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL + group__flac__metadata__level2.html + ggafe2a924893b0800b020bea8160fd4531af86670707345e2d02cc84aec059459d0 + + + + FLAC__Metadata_Chain * + FLAC__metadata_chain_new + group__flac__metadata__level2.html + ga381a1b6efff8d4e9d793f1dda515bd73 + (void) + + + void + FLAC__metadata_chain_delete + group__flac__metadata__level2.html + ga46b6c67f30db2955798dfb5556f63aa3 + (FLAC__Metadata_Chain *chain) + + + FLAC__Metadata_ChainStatus + FLAC__metadata_chain_status + group__flac__metadata__level2.html + ga8e74773f8ca2bb2bc0b56a65ca0299f4 + (FLAC__Metadata_Chain *chain) + + + FLAC__bool + FLAC__metadata_chain_read + group__flac__metadata__level2.html + ga5a4f2056c30f78af5a79f6b64d5bfdcd + (FLAC__Metadata_Chain *chain, const char *filename) + + + FLAC__bool + FLAC__metadata_chain_read_ogg + group__flac__metadata__level2.html + ga3995010aab28a483ad9905669e5c4954 + (FLAC__Metadata_Chain *chain, const char *filename) + + + FLAC__bool + FLAC__metadata_chain_read_with_callbacks + group__flac__metadata__level2.html + ga595f55b611ed588d4d55a9b2eb9d2add + (FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks) + + + FLAC__bool + FLAC__metadata_chain_read_ogg_with_callbacks + group__flac__metadata__level2.html + gaccc2f991722682d3c31d36f51985066c + (FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks) + + + FLAC__bool + FLAC__metadata_chain_check_if_tempfile_needed + group__flac__metadata__level2.html + ga46602f64d423cfe5d5f8a4155f8a97e2 + (FLAC__Metadata_Chain *chain, FLAC__bool use_padding) + + + FLAC__bool + FLAC__metadata_chain_write + group__flac__metadata__level2.html + ga46bf9cf7d426078101b9297ba80bb835 + (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__bool preserve_file_stats) + + + FLAC__bool + FLAC__metadata_chain_write_with_callbacks + group__flac__metadata__level2.html + ga70532b3705294dc891d8db649a4d4843 + (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks) + + + FLAC__bool + FLAC__metadata_chain_write_with_callbacks_and_tempfile + group__flac__metadata__level2.html + ga72facaa621e8d798036a4a7da3643e41 + (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, FLAC__IOHandle temp_handle, FLAC__IOCallbacks temp_callbacks) + + + void + FLAC__metadata_chain_merge_padding + group__flac__metadata__level2.html + ga0a43897914edb751cb87f7e281aff3dc + (FLAC__Metadata_Chain *chain) + + + void + FLAC__metadata_chain_sort_padding + group__flac__metadata__level2.html + ga82b66fe71c727adb9cf80a1da9834ce5 + (FLAC__Metadata_Chain *chain) + + + FLAC__Metadata_Iterator * + FLAC__metadata_iterator_new + group__flac__metadata__level2.html + ga1941ca04671813fc039ea7fd35ae6461 + (void) + + + void + FLAC__metadata_iterator_delete + group__flac__metadata__level2.html + ga374c246e1aeafd803d29a6e99b226241 + (FLAC__Metadata_Iterator *iterator) + + + void + FLAC__metadata_iterator_init + group__flac__metadata__level2.html + ga2e93196b17a1c73e949e661e33d7311a + (FLAC__Metadata_Iterator *iterator, FLAC__Metadata_Chain *chain) + + + FLAC__bool + FLAC__metadata_iterator_next + group__flac__metadata__level2.html + ga60449d0c1d76a73978159e3aa5e79459 + (FLAC__Metadata_Iterator *iterator) + + + FLAC__bool + FLAC__metadata_iterator_prev + group__flac__metadata__level2.html + gaa28df1c5aa56726f573f90e4bae2fe50 + (FLAC__Metadata_Iterator *iterator) + + + FLAC__MetadataType + FLAC__metadata_iterator_get_block_type + group__flac__metadata__level2.html + ga83ecb59ffa16bfbb1e286e64f9270de1 + (const FLAC__Metadata_Iterator *iterator) + + + FLAC__StreamMetadata * + FLAC__metadata_iterator_get_block + group__flac__metadata__level2.html + gad3e7fbc3b3d9c192a3ac425c7b263641 + (FLAC__Metadata_Iterator *iterator) + + + FLAC__bool + FLAC__metadata_iterator_set_block + group__flac__metadata__level2.html + gaf61795b21300a2b0c9940c11974aab53 + (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block) + + + FLAC__bool + FLAC__metadata_iterator_delete_block + group__flac__metadata__level2.html + gadf860af967d2ee483be01fc0ed8767a9 + (FLAC__Metadata_Iterator *iterator, FLAC__bool replace_with_padding) + + + FLAC__bool + FLAC__metadata_iterator_insert_block_before + group__flac__metadata__level2.html + ga8ac45e2df8b6fd6f5db345c4293aa435 + (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block) + + + FLAC__bool + FLAC__metadata_iterator_insert_block_after + group__flac__metadata__level2.html + ga55e53757f91696e2578196a2799fc632 + (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block) + + + const char *const + FLAC__Metadata_ChainStatusString + group__flac__metadata__level2.html + ga6498d1976b0d9fa3f8f6295c02e622dd + [] + + + + flac_metadata_object + FLAC/metadata.h: metadata object methods + group__flac__metadata__object.html + + FLAC__StreamMetadata * + FLAC__metadata_object_new + group__flac__metadata__object.html + ga5df7bc8c72cafed1391bdc5ffc876e0f + (FLAC__MetadataType type) + + + FLAC__StreamMetadata * + FLAC__metadata_object_clone + group__flac__metadata__object.html + ga29af0ecc2a015ef22289f206bc308d80 + (const FLAC__StreamMetadata *object) + + + void + FLAC__metadata_object_delete + group__flac__metadata__object.html + ga6b3159744a1e5c4ce9d349fd0ebae800 + (FLAC__StreamMetadata *object) + + + FLAC__bool + FLAC__metadata_object_is_equal + group__flac__metadata__object.html + ga6853bcafe731b1db37105d49f3085349 + (const FLAC__StreamMetadata *block1, const FLAC__StreamMetadata *block2) + + + FLAC__bool + FLAC__metadata_object_application_set_data + group__flac__metadata__object.html + ga07cd39bbe12f4f4e144e38c5265b997d + (FLAC__StreamMetadata *object, FLAC__byte *data, unsigned length, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_seektable_resize_points + group__flac__metadata__object.html + gaffa16bae5e3683c983dc137fd56f0c26 + (FLAC__StreamMetadata *object, unsigned new_num_points) + + + void + FLAC__metadata_object_seektable_set_point + group__flac__metadata__object.html + gaa1a69eb95a3c17aa973466589e85f3c1 + (FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point) + + + FLAC__bool + FLAC__metadata_object_seektable_insert_point + group__flac__metadata__object.html + ga794109d40ff0065659c005f1cf86d3c9 + (FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point) + + + FLAC__bool + FLAC__metadata_object_seektable_delete_point + group__flac__metadata__object.html + ga8e42ac803f857eaa7814838c49a15c5f + (FLAC__StreamMetadata *object, unsigned point_num) + + + FLAC__bool + FLAC__metadata_object_seektable_is_legal + group__flac__metadata__object.html + gacd3e1b83fabc1dabccb725b2876c8f53 + (const FLAC__StreamMetadata *object) + + + FLAC__bool + FLAC__metadata_object_seektable_template_append_placeholders + group__flac__metadata__object.html + ga6280327ed000ee85846a5533fd40a33b + (FLAC__StreamMetadata *object, unsigned num) + + + FLAC__bool + FLAC__metadata_object_seektable_template_append_point + group__flac__metadata__object.html + ga0b3aca4fbebc206cd79f13ac36f653f0 + (FLAC__StreamMetadata *object, FLAC__uint64 sample_number) + + + FLAC__bool + FLAC__metadata_object_seektable_template_append_points + group__flac__metadata__object.html + gac838116fa0e48242651944ab94bab508 + (FLAC__StreamMetadata *object, FLAC__uint64 sample_numbers[], unsigned num) + + + FLAC__bool + FLAC__metadata_object_seektable_template_append_spaced_points + group__flac__metadata__object.html + ga7dcbd38a3a71a8aa26e93a6992a8f83e + (FLAC__StreamMetadata *object, unsigned num, FLAC__uint64 total_samples) + + + FLAC__bool + FLAC__metadata_object_seektable_template_append_spaced_points_by_samples + group__flac__metadata__object.html + ga6bce5ee9332ea070d65482a2c1ce1c2d + (FLAC__StreamMetadata *object, unsigned samples, FLAC__uint64 total_samples) + + + FLAC__bool + FLAC__metadata_object_seektable_template_sort + group__flac__metadata__object.html + gafb0449b639ba5c618826d893c2961260 + (FLAC__StreamMetadata *object, FLAC__bool compact) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_set_vendor_string + group__flac__metadata__object.html + ga5cf1a57afab200b4b67730a77d3ee162 + (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_resize_comments + group__flac__metadata__object.html + ga829152404c9d160c7bc67699dd7f857e + (FLAC__StreamMetadata *object, unsigned new_num_comments) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_set_comment + group__flac__metadata__object.html + gaefadb16fe0fff9600beab0edbac8d226 + (FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_insert_comment + group__flac__metadata__object.html + ga44ec196a99c8cd7d1d50817c8532ddb3 + (FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_append_comment + group__flac__metadata__object.html + ga889b8b9c5bbd1070a1214c3da8b72863 + (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_replace_comment + group__flac__metadata__object.html + ga0608308e8c4c09aa610747d8dff90a34 + (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_delete_comment + group__flac__metadata__object.html + gafe14896322f7d638f5de0c61addd1dc7 + (FLAC__StreamMetadata *object, unsigned comment_num) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair + group__flac__metadata__object.html + gab644c34515c04630c62a7645fab2947e + (FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair + group__flac__metadata__object.html + ga29079764fabda53cb3e890e6d05c8345 + (const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value) + + + FLAC__bool + FLAC__metadata_object_vorbiscomment_entry_matches + group__flac__metadata__object.html + gac4c32b1055642b11cd77628ac9508ded + (const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length) + + + int + FLAC__metadata_object_vorbiscomment_find_entry_from + group__flac__metadata__object.html + ga23d79d11e427e1590f406a7137c8bff2 + (const FLAC__StreamMetadata *object, unsigned offset, const char *field_name) + + + int + FLAC__metadata_object_vorbiscomment_remove_entry_matching + group__flac__metadata__object.html + ga017d743b3200a27b8567ef33592224b8 + (FLAC__StreamMetadata *object, const char *field_name) + + + int + FLAC__metadata_object_vorbiscomment_remove_entries_matching + group__flac__metadata__object.html + ga5a3ff5856098c449622ba850684aec75 + (FLAC__StreamMetadata *object, const char *field_name) + + + FLAC__StreamMetadata_CueSheet_Track * + FLAC__metadata_object_cuesheet_track_new + group__flac__metadata__object.html + gafe2983a9c09685e34626cab39b3fb52c + (void) + + + FLAC__StreamMetadata_CueSheet_Track * + FLAC__metadata_object_cuesheet_track_clone + group__flac__metadata__object.html + ga1293d6df6daf2d65143d8bb40eed9261 + (const FLAC__StreamMetadata_CueSheet_Track *object) + + + void + FLAC__metadata_object_cuesheet_track_delete + group__flac__metadata__object.html + gaa533fd7b72fa079e783de4b155b241ce + (FLAC__StreamMetadata_CueSheet_Track *object) + + + FLAC__bool + FLAC__metadata_object_cuesheet_track_resize_indices + group__flac__metadata__object.html + ga484f21de7d533e4825cf807d29ef0204 + (FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices) + + + FLAC__bool + FLAC__metadata_object_cuesheet_track_insert_index + group__flac__metadata__object.html + gae8be6ad7b27a18c91eb0b91dc305e433 + (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index) + + + FLAC__bool + FLAC__metadata_object_cuesheet_track_insert_blank_index + group__flac__metadata__object.html + gafd40ef6dcc277f99934deee5367cc627 + (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num) + + + FLAC__bool + FLAC__metadata_object_cuesheet_track_delete_index + group__flac__metadata__object.html + ga84584f2244b7d8597b8fec1d81ea5fb8 + (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num) + + + FLAC__bool + FLAC__metadata_object_cuesheet_resize_tracks + group__flac__metadata__object.html + gac99e38ed08f342665c63913bd0cc33fc + (FLAC__StreamMetadata *object, unsigned new_num_tracks) + + + FLAC__bool + FLAC__metadata_object_cuesheet_set_track + group__flac__metadata__object.html + gaa4708c652be442b19227695621b62088 + (FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_cuesheet_insert_track + group__flac__metadata__object.html + gaa974947ae8ec1c86cbb155e0af7593e9 + (FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_cuesheet_insert_blank_track + group__flac__metadata__object.html + gab4a8c0855971e650df3331daf84d3fd1 + (FLAC__StreamMetadata *object, unsigned track_num) + + + FLAC__bool + FLAC__metadata_object_cuesheet_delete_track + group__flac__metadata__object.html + gae1912dfbc599c79732025fd5a5f279cc + (FLAC__StreamMetadata *object, unsigned track_num) + + + FLAC__bool + FLAC__metadata_object_cuesheet_is_legal + group__flac__metadata__object.html + ga1a443d9299ce69694ad59bec4519d7b2 + (const FLAC__StreamMetadata *object, FLAC__bool check_cd_da_subset, const char **violation) + + + FLAC__uint32 + FLAC__metadata_object_cuesheet_calculate_cddb_id + group__flac__metadata__object.html + gaff2f825950b3e4dda4c8ddbf8e2f7ecd + (const FLAC__StreamMetadata *object) + + + FLAC__bool + FLAC__metadata_object_picture_set_mime_type + group__flac__metadata__object.html + ga4511ae9ca994c9f4ab035a3c1aa98f45 + (FLAC__StreamMetadata *object, char *mime_type, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_picture_set_description + group__flac__metadata__object.html + ga293fe7d8b8b9e49d2414db0925b0f442 + (FLAC__StreamMetadata *object, FLAC__byte *description, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_picture_set_data + group__flac__metadata__object.html + ga00c330534ef8336ed92b30f9e676bb5f + (FLAC__StreamMetadata *object, FLAC__byte *data, FLAC__uint32 length, FLAC__bool copy) + + + FLAC__bool + FLAC__metadata_object_picture_is_legal + group__flac__metadata__object.html + ga88268a5186e37d4b98b4df7870561128 + (const FLAC__StreamMetadata *object, const char **violation) + + + + flac_decoder + FLAC/_decoder.h: decoder interfaces + group__flac__decoder.html + flac_stream_decoder + + + flac_stream_decoder + FLAC/stream_decoder.h: stream decoder interface + group__flac__stream__decoder.html + FLAC__StreamDecoder + + FLAC__StreamDecoderReadStatus(* + FLAC__StreamDecoderReadCallback + group__flac__stream__decoder.html + ga7a5f593b9bc2d163884348b48c4285fd + )(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) + + + FLAC__StreamDecoderSeekStatus(* + FLAC__StreamDecoderSeekCallback + group__flac__stream__decoder.html + ga375614289a1b868f1ead7fa70a581171 + )(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) + + + FLAC__StreamDecoderTellStatus(* + FLAC__StreamDecoderTellCallback + group__flac__stream__decoder.html + ga02990309a9d30acc43ba01fe48021e39 + )(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) + + + FLAC__StreamDecoderLengthStatus(* + FLAC__StreamDecoderLengthCallback + group__flac__stream__decoder.html + ga453ffb5215a522fb74dc61d694e1453c + )(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) + + + FLAC__bool(* + FLAC__StreamDecoderEofCallback + group__flac__stream__decoder.html + gacc214f6b3cdae1c0f98577267ce19bdd + )(const FLAC__StreamDecoder *decoder, void *client_data) + + + FLAC__StreamDecoderWriteStatus(* + FLAC__StreamDecoderWriteCallback + group__flac__stream__decoder.html + gaf98a4f9e2cac5747da6018c3dfc8dde1 + )(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data) + + + void(* + FLAC__StreamDecoderMetadataCallback + group__flac__stream__decoder.html + ga43e2329c15731c002ac4182a47990f85 + )(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) + + + void(* + FLAC__StreamDecoderErrorCallback + group__flac__stream__decoder.html + ga4fab6730ff0b22bf45ca4cd04d706569 + )(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) + + + + FLAC__StreamDecoderState + group__flac__stream__decoder.html + ga3adb6891c5871a87cd5bbae6c770ba2d + + + + @ + FLAC__STREAM_DECODER_SEARCH_FOR_METADATA + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2dacf4455f4f681a6737a553e10f614704a + + + + @ + FLAC__STREAM_DECODER_READ_METADATA + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da4c1853ed1babdcede9a908e12cf7ccf7 + + + + @ + FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2daccff915757978117720ba1613d088ddf + + + + @ + FLAC__STREAM_DECODER_READ_FRAME + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da06dc6158a51a8eb9537b65f2fbb6dc49 + + + + @ + FLAC__STREAM_DECODER_END_OF_STREAM + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da28ce845052d9d1a780f4107e97f4c853 + + + + @ + FLAC__STREAM_DECODER_OGG_ERROR + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da3bc0343f47153c5779baf7f37f6e95cf + + + + @ + FLAC__STREAM_DECODER_SEEK_ERROR + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2daf2c6efcabdfe889081c2260e6681db49 + + + + @ + FLAC__STREAM_DECODER_ABORTED + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2dadb52ab4785bd2eb84a95e8aa82311cd5 + + + + @ + FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da0d08c527252420813e6a6d6d3e19324a + + + + @ + FLAC__STREAM_DECODER_UNINITIALIZED + group__flac__stream__decoder.html + gga3adb6891c5871a87cd5bbae6c770ba2da565eaf4d5e68b440ecec771cb22d3427 + + + + + FLAC__StreamDecoderInitStatus + group__flac__stream__decoder.html + gaaed54a24ac6310d29c5cafba79759c44 + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_OK + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44ac94c7e9396f30642f34805e5d626e011 + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44a8f2188c616c9bc09638eece3ae55f152 + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44a798ad4b6c4e556fd4cb1afbc29562eca + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44a0110567f0715c6f87357388bc7fa98f9 + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44a8184c306e0cd2565a8c5adc1381cb469 + + + + @ + FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED + group__flac__stream__decoder.html + ggaaed54a24ac6310d29c5cafba79759c44a98bc501c9b2fb5d92d8bb0b3321d504f + + + + + FLAC__StreamDecoderReadStatus + group__flac__stream__decoder.html + gad793ead451206c64a91dc0b851027b93 + + + + @ + FLAC__STREAM_DECODER_READ_STATUS_CONTINUE + group__flac__stream__decoder.html + ggad793ead451206c64a91dc0b851027b93a9a5be0fcf0279b98b2fd462bc4871d06 + + + + @ + FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM + group__flac__stream__decoder.html + ggad793ead451206c64a91dc0b851027b93a0a0687d25dc9f7163e6e5e294672170f + + + + @ + FLAC__STREAM_DECODER_READ_STATUS_ABORT + group__flac__stream__decoder.html + ggad793ead451206c64a91dc0b851027b93a923123aebb349e35662e35a7621b7535 + + + + + FLAC__StreamDecoderSeekStatus + group__flac__stream__decoder.html + gac8d269e3c7af1a5889d3bd38409ed67d + + + + @ + FLAC__STREAM_DECODER_SEEK_STATUS_OK + group__flac__stream__decoder.html + ggac8d269e3c7af1a5889d3bd38409ed67daca58132d896ad7755827d3f2b72488cc + + + + @ + FLAC__STREAM_DECODER_SEEK_STATUS_ERROR + group__flac__stream__decoder.html + ggac8d269e3c7af1a5889d3bd38409ed67da969ce92a42a2a95609452e9cf01fcc09 + + + + @ + FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED + group__flac__stream__decoder.html + ggac8d269e3c7af1a5889d3bd38409ed67da4a01f1e48baf015e78535cc20683ec53 + + + + + FLAC__StreamDecoderTellStatus + group__flac__stream__decoder.html + ga83708207969383bd7b5c1e9148528845 + + + + @ + FLAC__STREAM_DECODER_TELL_STATUS_OK + group__flac__stream__decoder.html + gga83708207969383bd7b5c1e9148528845a516a202ebf4bb61d4a1fb5b029a104dd + + + + @ + FLAC__STREAM_DECODER_TELL_STATUS_ERROR + group__flac__stream__decoder.html + gga83708207969383bd7b5c1e9148528845aceefd3feb853d5e68a149f2bdd1a9db1 + + + + @ + FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED + group__flac__stream__decoder.html + gga83708207969383bd7b5c1e9148528845add75538234493c9f7a20a846a223ca91 + + + + + FLAC__StreamDecoderLengthStatus + group__flac__stream__decoder.html + gad5860157c2bb34501b8b9370472d727a + + + + @ + FLAC__STREAM_DECODER_LENGTH_STATUS_OK + group__flac__stream__decoder.html + ggad5860157c2bb34501b8b9370472d727aaef01bfcdc3099686e106d8f88397653d + + + + @ + FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR + group__flac__stream__decoder.html + ggad5860157c2bb34501b8b9370472d727aab000e31c0c20c0d19df4f2203b01ea23 + + + + @ + FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED + group__flac__stream__decoder.html + ggad5860157c2bb34501b8b9370472d727aae35949f46f887e6d826fe0fe4b2a32c1 + + + + + FLAC__StreamDecoderWriteStatus + group__flac__stream__decoder.html + ga73f67eb9e0ab57945afe038751bc62c8 + + + + @ + FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE + group__flac__stream__decoder.html + gga73f67eb9e0ab57945afe038751bc62c8acea48326e0ab8370d2814f4126fcb84e + + + + @ + FLAC__STREAM_DECODER_WRITE_STATUS_ABORT + group__flac__stream__decoder.html + gga73f67eb9e0ab57945afe038751bc62c8a23bd6bfec34af704e0d5ea273f14d95d + + + + + FLAC__StreamDecoderErrorStatus + group__flac__stream__decoder.html + ga130e70bd9a73d3c2416247a3e5132ecf + + + + @ + FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC + group__flac__stream__decoder.html + gga130e70bd9a73d3c2416247a3e5132ecfa3ceec2a553dc142ad487ae88eb6f7222 + + + + @ + FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER + group__flac__stream__decoder.html + gga130e70bd9a73d3c2416247a3e5132ecfae393a9b91a6b2f23398675b5b57e1e86 + + + + @ + FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH + group__flac__stream__decoder.html + gga130e70bd9a73d3c2416247a3e5132ecfa208fe77a04e6ff684e50f0eae1214e26 + + + + @ + FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM + group__flac__stream__decoder.html + gga130e70bd9a73d3c2416247a3e5132ecfa8b6864ad65edd8fea039838b6d3e5575 + + + + FLAC__StreamDecoder * + FLAC__stream_decoder_new + group__flac__stream__decoder.html + ga529c3c1e46417570767fb8e4c76f5477 + (void) + + + void + FLAC__stream_decoder_delete + group__flac__stream__decoder.html + gad9cf299956da091111d13e83517d8c44 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_set_ogg_serial_number + group__flac__stream__decoder.html + ga7fd232e7a2b5070bd26450487edbc2a1 + (FLAC__StreamDecoder *decoder, long serial_number) + + + FLAC__bool + FLAC__stream_decoder_set_md5_checking + group__flac__stream__decoder.html + ga8f402243eed54f400ddd2f296ff54497 + (FLAC__StreamDecoder *decoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_respond + group__flac__stream__decoder.html + gad4e685f3d055f70fbaed9ffa4f70f74b + (FLAC__StreamDecoder *decoder, FLAC__MetadataType type) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_respond_application + group__flac__stream__decoder.html + gaee1196ff5fa97df9810f708dc2bc8326 + (FLAC__StreamDecoder *decoder, const FLAC__byte id[4]) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_respond_all + group__flac__stream__decoder.html + ga1ce03d8f305a818ff9a573473af99dc4 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_ignore + group__flac__stream__decoder.html + gad75f067720da89c4e9d96dedc45f73e6 + (FLAC__StreamDecoder *decoder, FLAC__MetadataType type) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_ignore_application + group__flac__stream__decoder.html + gaab41e8bc505b24df4912de53de06b085 + (FLAC__StreamDecoder *decoder, const FLAC__byte id[4]) + + + FLAC__bool + FLAC__stream_decoder_set_metadata_ignore_all + group__flac__stream__decoder.html + gaa1307f07fae5d7a4a0c18beeae7ec5e6 + (FLAC__StreamDecoder *decoder) + + + FLAC__StreamDecoderState + FLAC__stream_decoder_get_state + group__flac__stream__decoder.html + gaf99dac2d9255f7db4df8a6d9974a9a9a + (const FLAC__StreamDecoder *decoder) + + + const char * + FLAC__stream_decoder_get_resolved_state_string + group__flac__stream__decoder.html + gad28257412951ca266751a19e2cf54be2 + (const FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_get_md5_checking + group__flac__stream__decoder.html + gae27a6b30b55beda03559c12a5df21537 + (const FLAC__StreamDecoder *decoder) + + + FLAC__uint64 + FLAC__stream_decoder_get_total_samples + group__flac__stream__decoder.html + ga930d9b591fcfaea74359c722cdfb980c + (const FLAC__StreamDecoder *decoder) + + + unsigned + FLAC__stream_decoder_get_channels + group__flac__stream__decoder.html + gadefff696d65e72afeb2f058e45066be1 + (const FLAC__StreamDecoder *decoder) + + + FLAC__ChannelAssignment + FLAC__stream_decoder_get_channel_assignment + group__flac__stream__decoder.html + gae62fdf93c1fedd5fea9258ecdc78bb53 + (const FLAC__StreamDecoder *decoder) + + + unsigned + FLAC__stream_decoder_get_bits_per_sample + group__flac__stream__decoder.html + ga51dc941b24bfe01f8311c9aba86e77f8 + (const FLAC__StreamDecoder *decoder) + + + unsigned + FLAC__stream_decoder_get_sample_rate + group__flac__stream__decoder.html + ga1b0170d020b47c1b841ce8437b564429 + (const FLAC__StreamDecoder *decoder) + + + unsigned + FLAC__stream_decoder_get_blocksize + group__flac__stream__decoder.html + ga568a710a87dbd051b0edba6b53ae52ee + (const FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_get_decode_position + group__flac__stream__decoder.html + gaffd9b0d0832ed01e6d75930b5391def5 + (const FLAC__StreamDecoder *decoder, FLAC__uint64 *position) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_stream + group__flac__stream__decoder.html + ga150d381abc5249168e439bc076544b29 + (FLAC__StreamDecoder *decoder, FLAC__StreamDecoderReadCallback read_callback, FLAC__StreamDecoderSeekCallback seek_callback, FLAC__StreamDecoderTellCallback tell_callback, FLAC__StreamDecoderLengthCallback length_callback, FLAC__StreamDecoderEofCallback eof_callback, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_ogg_stream + group__flac__stream__decoder.html + ga1b043adeb805c779c1e97cb68959d1ab + (FLAC__StreamDecoder *decoder, FLAC__StreamDecoderReadCallback read_callback, FLAC__StreamDecoderSeekCallback seek_callback, FLAC__StreamDecoderTellCallback tell_callback, FLAC__StreamDecoderLengthCallback length_callback, FLAC__StreamDecoderEofCallback eof_callback, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_FILE + group__flac__stream__decoder.html + ga80aa83631460a53263c84e654586dff0 + (FLAC__StreamDecoder *decoder, FILE *file, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_ogg_FILE + group__flac__stream__decoder.html + ga4cc7fbaf905c24d6db48b53b7942fe72 + (FLAC__StreamDecoder *decoder, FILE *file, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_file + group__flac__stream__decoder.html + ga4021ead5cff29fd589c915756f902f1a + (FLAC__StreamDecoder *decoder, const char *filename, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__StreamDecoderInitStatus + FLAC__stream_decoder_init_ogg_file + group__flac__stream__decoder.html + ga548f15d7724f3bff7f2608abe8b12f6c + (FLAC__StreamDecoder *decoder, const char *filename, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data) + + + FLAC__bool + FLAC__stream_decoder_finish + group__flac__stream__decoder.html + ga96c47c96920f363cd0972b54067818a9 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_flush + group__flac__stream__decoder.html + ga95570a455e582b2ab46ab9bb529f26ac + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_reset + group__flac__stream__decoder.html + gaa4183c2d925d5a5edddde9d1ca145725 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_process_single + group__flac__stream__decoder.html + ga9d6df4a39892c05955122cf7f987f856 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_process_until_end_of_metadata + group__flac__stream__decoder.html + ga027ffb5b75dc39b3d26f55c5e6b42682 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_process_until_end_of_stream + group__flac__stream__decoder.html + ga89a0723812fa6ef7cdb173715f1bc81f + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_skip_single_frame + group__flac__stream__decoder.html + ga85b666aba976f29e8dd9d7956fce4301 + (FLAC__StreamDecoder *decoder) + + + FLAC__bool + FLAC__stream_decoder_seek_absolute + group__flac__stream__decoder.html + ga6a2eb6072b9fafefc3f80f1959805ccb + (FLAC__StreamDecoder *decoder, FLAC__uint64 sample) + + + const char *const + FLAC__StreamDecoderStateString + group__flac__stream__decoder.html + gac192360ac435614394bf43235cb7981e + [] + + + const char *const + FLAC__StreamDecoderInitStatusString + group__flac__stream__decoder.html + ga0effa1d3031c3206a1719faf984a4f21 + [] + + + const char *const + FLAC__StreamDecoderReadStatusString + group__flac__stream__decoder.html + gab1ee941839b05045ae1d73ee0fdcb8c9 + [] + + + const char *const + FLAC__StreamDecoderSeekStatusString + group__flac__stream__decoder.html + gac49aff0593584b7ed5fd0b2508f824fc + [] + + + const char *const + FLAC__StreamDecoderTellStatusString + group__flac__stream__decoder.html + ga3c1b7d5a174d6c2e6bcf1b9a87b5a5cb + [] + + + const char *const + FLAC__StreamDecoderLengthStatusString + group__flac__stream__decoder.html + ga792933fa9e8b65bfcac62d82e52415f5 + [] + + + const char *const + FLAC__StreamDecoderWriteStatusString + group__flac__stream__decoder.html + ga9df7f0fd8cf9888f97a52b5f3f33cdb0 + [] + + + const char *const + FLAC__StreamDecoderErrorStatusString + group__flac__stream__decoder.html + gac428c69b084529322df05ee793440b88 + [] + + + + flac_encoder + FLAC/_encoder.h: encoder interfaces + group__flac__encoder.html + flac_stream_encoder + + + flac_stream_encoder + FLAC/stream_encoder.h: stream encoder interface + group__flac__stream__encoder.html + FLAC__StreamEncoder + + FLAC__StreamEncoderReadStatus(* + FLAC__StreamEncoderReadCallback + group__flac__stream__encoder.html + ga97d25c75f49897422d93a9d8405043cd + )(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data) + + + FLAC__StreamEncoderWriteStatus(* + FLAC__StreamEncoderWriteCallback + group__flac__stream__encoder.html + gabf2f9bb39c806111c83dd16936ff6d09 + )(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) + + + FLAC__StreamEncoderSeekStatus(* + FLAC__StreamEncoderSeekCallback + group__flac__stream__encoder.html + ga3005a69a7883da53262ec8a124d48c9e + )(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) + + + FLAC__StreamEncoderTellStatus(* + FLAC__StreamEncoderTellCallback + group__flac__stream__encoder.html + ga4cab0b7556d8509a9f74693804c8c86e + )(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) + + + void(* + FLAC__StreamEncoderMetadataCallback + group__flac__stream__encoder.html + ga87778e16cdd0834a301ee8d8258cf946 + )(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data) + + + void(* + FLAC__StreamEncoderProgressCallback + group__flac__stream__encoder.html + gac65f8ae0583b665933744b60fd5ba0d9 + )(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data) + + + + FLAC__StreamEncoderState + group__flac__stream__encoder.html + gac5e9db4fc32ca2fa74abd9c8a87c02a5 + + + + @ + FLAC__STREAM_ENCODER_OK + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a3a6666ae61a64d955341cec285695bf6 + + + + @ + FLAC__STREAM_ENCODER_UNINITIALIZED + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a04912e04a3c57d3c53de34742f96d635 + + + + @ + FLAC__STREAM_ENCODER_OGG_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5abb312cc8318c7a541cadacd23ceb3bbb + + + + @ + FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a4cb80be4f83eb71f04e74968af1d259e + + + + @ + FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a011e3d8b2d02a940bfd0e59c05cf5ae0 + + + + @ + FLAC__STREAM_ENCODER_CLIENT_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a8c2b2e9efb43a4f9b25b1d2bd9af5f23 + + + + @ + FLAC__STREAM_ENCODER_IO_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5af0e4738522e05a7248435c7148f58f91 + + + + @ + FLAC__STREAM_ENCODER_FRAMING_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a2c2937b7f1600a4ac7c84fc70ab34cf1 + + + + @ + FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR + group__flac__stream__encoder.html + ggac5e9db4fc32ca2fa74abd9c8a87c02a5a35db99d9958bd6c2301a04715fbc44fd + + + + + FLAC__StreamEncoderInitStatus + group__flac__stream__encoder.html + ga3bb869620af2b188d77982a5c30b047d + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_OK + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da20501dce552da74c5df935eeaa0c9ee3 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da9c64e5f9020d8799e1cd9d39d50e6955 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da8a822b011de88b67c114505ffef39327 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047dac2cf461f02e20513003b8cadeae03f9f + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_NUMBER_OF_CHANNELS + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da0541c4f827f081b9f1c54c9441e4aa65 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047dad6d2631f464183c0c165155200882e6b + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da6fdcde9e18c37450c79e8f12b9d9c134 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BLOCK_SIZE + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da652c445f1bd8b6cfb963a30bf416c95a + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da38a69e94b3333e4ba779d2ff8f43f64e + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da5be80403bd7a43450139442e0f34ad7e + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047da62a17a3ed3c05ddf8ea7f6fecbd4e4a1 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047daa793405c858c7606539082750080a47e + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047daa85afdd1849c75a19594416cef63e3e9 + + + + @ + FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED + group__flac__stream__encoder.html + gga3bb869620af2b188d77982a5c30b047dab4e7b50d176a127575df90383cb15e1d + + + + + FLAC__StreamEncoderReadStatus + group__flac__stream__encoder.html + ga2e81f007fb0a7414c0bbb453f37ea37f + + + + @ + FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE + group__flac__stream__encoder.html + gga2e81f007fb0a7414c0bbb453f37ea37fa4bdd691d3666f19ec96ff99402347a2e + + + + @ + FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM + group__flac__stream__encoder.html + gga2e81f007fb0a7414c0bbb453f37ea37fa562fef84bf86a9a39682e23066d9cfee + + + + @ + FLAC__STREAM_ENCODER_READ_STATUS_ABORT + group__flac__stream__encoder.html + gga2e81f007fb0a7414c0bbb453f37ea37fa69b94eeab60e07d5fd33f2b3c8b85759 + + + + @ + FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED + group__flac__stream__encoder.html + gga2e81f007fb0a7414c0bbb453f37ea37fa9bb730b8f6354cc1e810017a2f700316 + + + + + FLAC__StreamEncoderWriteStatus + group__flac__stream__encoder.html + ga3737471fd49730bb8cf9b182bdeda05e + + + + @ + FLAC__STREAM_ENCODER_WRITE_STATUS_OK + group__flac__stream__encoder.html + gga3737471fd49730bb8cf9b182bdeda05ea5622e0199f0203c402fcb7b4ca76f808 + + + + @ + FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR + group__flac__stream__encoder.html + gga3737471fd49730bb8cf9b182bdeda05ea18e7cd6a443fb8bd303c3ba89946bc85 + + + + + FLAC__StreamEncoderSeekStatus + group__flac__stream__encoder.html + ga6d5be3489f45fcf0c252022c65d87aca + + + + @ + FLAC__STREAM_ENCODER_SEEK_STATUS_OK + group__flac__stream__encoder.html + gga6d5be3489f45fcf0c252022c65d87acaa99853066610d798627888ec2e5afa667 + + + + @ + FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR + group__flac__stream__encoder.html + gga6d5be3489f45fcf0c252022c65d87acaabf93227938b4e1bf3656fe4ba4159c60 + + + + @ + FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED + group__flac__stream__encoder.html + gga6d5be3489f45fcf0c252022c65d87acaa8930179a426134caf30a70147448f037 + + + + + FLAC__StreamEncoderTellStatus + group__flac__stream__encoder.html + gab628f63181250eb977a28bf12b7dd9ff + + + + @ + FLAC__STREAM_ENCODER_TELL_STATUS_OK + group__flac__stream__encoder.html + ggab628f63181250eb977a28bf12b7dd9ffa48e071d89494ac8f5471e7c0d7a6f43b + + + + @ + FLAC__STREAM_ENCODER_TELL_STATUS_ERROR + group__flac__stream__encoder.html + ggab628f63181250eb977a28bf12b7dd9ffaf638882e04d7c58e6c29dcc7f410864b + + + + @ + FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED + group__flac__stream__encoder.html + ggab628f63181250eb977a28bf12b7dd9ffa9d6bbd317f85fd2d6fc72f64e3cb56e7 + + + + FLAC__StreamEncoder * + FLAC__stream_encoder_new + group__flac__stream__encoder.html + gab09f7620a0ba9c30020c189ce112a52f + (void) + + + void + FLAC__stream_encoder_delete + group__flac__stream__encoder.html + ga7212e6846f543618b6289666de216b29 + (FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_set_ogg_serial_number + group__flac__stream__encoder.html + gaf4f75f7689b6b3fff16b03028aa38326 + (FLAC__StreamEncoder *encoder, long serial_number) + + + FLAC__bool + FLAC__stream_encoder_set_verify + group__flac__stream__encoder.html + ga795be6527a9eb1219331afef2f182a41 + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_streamable_subset + group__flac__stream__encoder.html + ga35a18815a58141b88db02317892d059b + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_channels + group__flac__stream__encoder.html + gab151c81577dc385196b10727ec24459d + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_bits_per_sample + group__flac__stream__encoder.html + gabfa3c989377785cda7c496b69dcb98cb + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_sample_rate + group__flac__stream__encoder.html + ga07fc8c7806381a055a1eef26387e509f + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_compression_level + group__flac__stream__encoder.html + gae49cf32f5256cb47eecd33779493ac85 + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_blocksize + group__flac__stream__encoder.html + ga3f2d344e090d0f6df5dfe8825c28bd61 + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_do_mid_side_stereo + group__flac__stream__encoder.html + ga3bff001a1efc2e4eb520c954066330f4 + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_loose_mid_side_stereo + group__flac__stream__encoder.html + ga7965d51b93f14cbd6ad5bb9d34f10536 + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_apodization + group__flac__stream__encoder.html + ga6598f09ac782a1f2a5743ddf247c81c8 + (FLAC__StreamEncoder *encoder, const char *specification) + + + FLAC__bool + FLAC__stream_encoder_set_max_lpc_order + group__flac__stream__encoder.html + gac256b4ef560fcf099c02eb52bb6c30e9 + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_qlp_coeff_precision + group__flac__stream__encoder.html + gaa325049ebb02d6fbe820d2268850c6de + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_do_qlp_coeff_prec_search + group__flac__stream__encoder.html + ga495890067203958e5d67a641f8757b1c + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_do_escape_coding + group__flac__stream__encoder.html + gaed594c373d829f77808a935c54a25fa4 + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_do_exhaustive_model_search + group__flac__stream__encoder.html + ga054313e7f6eaf5c6122d82c6a8b3b808 + (FLAC__StreamEncoder *encoder, FLAC__bool value) + + + FLAC__bool + FLAC__stream_encoder_set_min_residual_partition_order + group__flac__stream__encoder.html + ga31867a9cf8bc7276942381e4a8145969 + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_max_residual_partition_order + group__flac__stream__encoder.html + gac2e2147be6e4edf68e02d011349fa08c + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_rice_parameter_search_dist + group__flac__stream__encoder.html + ga11f0c589113b17507c0a620b7872036c + (FLAC__StreamEncoder *encoder, unsigned value) + + + FLAC__bool + FLAC__stream_encoder_set_total_samples_estimate + group__flac__stream__encoder.html + gab943094585d1c0a4bec497e73567cf85 + (FLAC__StreamEncoder *encoder, FLAC__uint64 value) + + + FLAC__bool + FLAC__stream_encoder_set_metadata + group__flac__stream__encoder.html + ga9c1098e664d7997947493901ed869b64 + (FLAC__StreamEncoder *encoder, FLAC__StreamMetadata **metadata, unsigned num_blocks) + + + FLAC__StreamEncoderState + FLAC__stream_encoder_get_state + group__flac__stream__encoder.html + ga0803321b37189dc5eea4fe1cea25c29a + (const FLAC__StreamEncoder *encoder) + + + FLAC__StreamDecoderState + FLAC__stream_encoder_get_verify_decoder_state + group__flac__stream__encoder.html + ga820704b95a711e77d55363e8753f9f9f + (const FLAC__StreamEncoder *encoder) + + + const char * + FLAC__stream_encoder_get_resolved_state_string + group__flac__stream__encoder.html + ga0916f813358eb6f1e44148353acd4d42 + (const FLAC__StreamEncoder *encoder) + + + void + FLAC__stream_encoder_get_verify_decoder_error_stats + group__flac__stream__encoder.html + ga48197fd6507314858222a8e6903292ba + (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got) + + + FLAC__bool + FLAC__stream_encoder_get_verify + group__flac__stream__encoder.html + ga9efc4964992e001bcec0a8eaedee8d60 + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_streamable_subset + group__flac__stream__encoder.html + ga201e64032ea4298b2379c93652b28245 + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_channels + group__flac__stream__encoder.html + ga535991ba463573d7ad2271ea943051e8 + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_bits_per_sample + group__flac__stream__encoder.html + ga44afb2b8e2623b1dff02e4116c6c58cb + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_sample_rate + group__flac__stream__encoder.html + ga830bc5489b60fbe814a683a8c4ebc81d + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_blocksize + group__flac__stream__encoder.html + ga21da057fd9c30bc2475b9bd18b9a1504 + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_do_mid_side_stereo + group__flac__stream__encoder.html + ga32da1f89997ab94ce5d677fcd7e24d56 + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_loose_mid_side_stereo + group__flac__stream__encoder.html + ga1455859cf3d233bd4dfff86af010f4fa + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_max_lpc_order + group__flac__stream__encoder.html + gadce7c7d6af89c3bbac0bb0c76d6e257b + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_qlp_coeff_precision + group__flac__stream__encoder.html + ga5b311992ac47554ae90c8f5a8ed745a7 + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_do_qlp_coeff_prec_search + group__flac__stream__encoder.html + ga65bee5a769d4c5fdc95b81c2fb95061c + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_do_escape_coding + group__flac__stream__encoder.html + ga0c944049800991422c1bfb3b1c0567a5 + (const FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_get_do_exhaustive_model_search + group__flac__stream__encoder.html + ga7bc8b32f58df5564db4b6114cb11042d + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_min_residual_partition_order + group__flac__stream__encoder.html + ga1f29fb94e5c54f1d46ad31c2af0dc5ac + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_max_residual_partition_order + group__flac__stream__encoder.html + ga55773d82163302c52936299068510e9d + (const FLAC__StreamEncoder *encoder) + + + unsigned + FLAC__stream_encoder_get_rice_parameter_search_dist + group__flac__stream__encoder.html + gafd70690deb118136ca4baed350d99cb8 + (const FLAC__StreamEncoder *encoder) + + + FLAC__uint64 + FLAC__stream_encoder_get_total_samples_estimate + group__flac__stream__encoder.html + gaa22d8935bd985b9cccf6592160ffc6f2 + (const FLAC__StreamEncoder *encoder) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_stream + group__flac__stream__encoder.html + ga7d801879812b48fcbc40f409800c453c + (FLAC__StreamEncoder *encoder, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_ogg_stream + group__flac__stream__encoder.html + ga9d1981bcd30b8db4d73b5466be5570f5 + (FLAC__StreamEncoder *encoder, FLAC__StreamEncoderReadCallback read_callback, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_FILE + group__flac__stream__encoder.html + ga12789a1c4a4e31cd2e7187259fe127f8 + (FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_ogg_FILE + group__flac__stream__encoder.html + ga57fc668f50ffd99a93df326bfab5e2b1 + (FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_file + group__flac__stream__encoder.html + ga9d5117c2ac0eeb572784116bf2eb541b + (FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data) + + + FLAC__StreamEncoderInitStatus + FLAC__stream_encoder_init_ogg_file + group__flac__stream__encoder.html + ga4891de2f56045941ae222b61b0fd83a4 + (FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data) + + + FLAC__bool + FLAC__stream_encoder_finish + group__flac__stream__encoder.html + ga3522f9de5af29807df1b9780a418b7f3 + (FLAC__StreamEncoder *encoder) + + + FLAC__bool + FLAC__stream_encoder_process + group__flac__stream__encoder.html + gad462406ff4d5a985eac6b4aa5472df57 + (FLAC__StreamEncoder *encoder, const FLAC__int32 *const buffer[], unsigned samples) + + + FLAC__bool + FLAC__stream_encoder_process_interleaved + group__flac__stream__encoder.html + ga4c56bc287efb1a0f69b117a84401baad + (FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], unsigned samples) + + + const char *const + FLAC__StreamEncoderStateString + group__flac__stream__encoder.html + ga1410b7a076b0c8401682f9f812b66df5 + [] + + + const char *const + FLAC__StreamEncoderInitStatusString + group__flac__stream__encoder.html + ga0ec1fa7b3f55b4f07a2727846c285776 + [] + + + const char *const + FLAC__StreamEncoderReadStatusString + group__flac__stream__encoder.html + ga1654422c81846b9b399ac5fb98df61dd + [] + + + const char *const + FLAC__StreamEncoderWriteStatusString + group__flac__stream__encoder.html + ga9f64480accd01525cbfa25c11e6bb74e + [] + + + const char *const + FLAC__StreamEncoderSeekStatusString + group__flac__stream__encoder.html + gabb137b2d787756bf97398f0b60e54c20 + [] + + + const char *const + FLAC__StreamEncoderTellStatusString + group__flac__stream__encoder.html + gaf8ab921ae968be2be255be1f136e1eec + [] + + + + flacpp + FLAC C++ API + group__flacpp.html + flacpp_decoder + flacpp_encoder + flacpp_export + flacpp_metadata + + + flacpp_decoder + FLAC++/decoder.h: decoder classes + group__flacpp__decoder.html + FLAC::Decoder::Stream + FLAC::Decoder::Stream::State + FLAC::Decoder::File + + + flacpp_encoder + FLAC++/encoder.h: encoder classes + group__flacpp__encoder.html + FLAC::Encoder::Stream + FLAC::Encoder::Stream::State + FLAC::Encoder::File + + + flacpp_export + FLAC++/export.h: export symbols + group__flacpp__export.html + + + flacpp_metadata + FLAC++/metadata.h: metadata interfaces + group__flacpp__metadata.html + flacpp_metadata_object + flacpp_metadata_level0 + flacpp_metadata_level1 + flacpp_metadata_level2 + + + flacpp_metadata_object + FLAC++/metadata.h: metadata object classes + group__flacpp__metadata__object.html + FLAC::Metadata::Prototype + FLAC::Metadata::StreamInfo + FLAC::Metadata::Padding + FLAC::Metadata::Application + FLAC::Metadata::SeekTable + FLAC::Metadata::VorbisComment + FLAC::Metadata::VorbisComment::Entry + FLAC::Metadata::CueSheet + FLAC::Metadata::CueSheet::Track + FLAC::Metadata::Picture + FLAC::Metadata::Unknown + + Prototype * + clone + group__flacpp__metadata__object.html + gae18d91726a320349b2c3fb45e79d21fc + (const Prototype *) + + + bool + is_valid + group__flacpp__metadata__object.html + ga57adba3b3a548f7d9d8803762a8216d6 + () const + + + + operator const ::FLAC__StreamMetadata * + group__flacpp__metadata__object.html + gadad62834e7055e4996f3f6791553a214 + () const + + + bool + operator== + group__flacpp__metadata__object.html + ga6737ae25a19d76b88d9b2b4b7070d0cb + (const Prototype &) const + + + bool + operator== + group__flacpp__metadata__object.html + ga32f7d6acac0c6d49ff6b0f26c65a7f73 + (const ::FLAC__StreamMetadata &) const + + + bool + operator== + group__flacpp__metadata__object.html + ga2c78b58871feecfe32ff90c53ca1c7e1 + (const ::FLAC__StreamMetadata *) const + + + bool + operator!= + group__flacpp__metadata__object.html + ga54a7ff9432ea6e2ec6fccde29df97e7d + (const Prototype &) const + + + bool + operator!= + group__flacpp__metadata__object.html + gaf946e496c12c9ba30ce729dd76f8555b + (const ::FLAC__StreamMetadata &) const + + + bool + operator!= + group__flacpp__metadata__object.html + ga3ecae6a5b7caf789c484b86da262e7f7 + (const ::FLAC__StreamMetadata *) const + + + + flacpp_metadata_level0 + FLAC++/metadata.h: metadata level 0 interface + group__flacpp__metadata__level0.html + + bool + get_streaminfo + group__flacpp__metadata__level0.html + ga8fa8da652f33edeb4dabb4ce39fda04b + (const char *filename, StreamInfo &streaminfo) + + + bool + get_tags + group__flacpp__metadata__level0.html + ga533a71ba745ca03068523a4a45fb0329 + (const char *filename, VorbisComment *&tags) + + + bool + get_tags + group__flacpp__metadata__level0.html + ga85166e6206f3d5635684de4257f2b00e + (const char *filename, VorbisComment &tags) + + + bool + get_cuesheet + group__flacpp__metadata__level0.html + ga4fad03d91f22d78acf35dd2f35df9ac7 + (const char *filename, CueSheet *&cuesheet) + + + bool + get_cuesheet + group__flacpp__metadata__level0.html + gaea8f05f89e36af143d73b4280f05cc0e + (const char *filename, CueSheet &cuesheet) + + + bool + get_picture + group__flacpp__metadata__level0.html + ga2ca454c644cb6548b05545c129e4d6ef + (const char *filename, Picture *&picture,::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors) + + + bool + get_picture + group__flacpp__metadata__level0.html + ga82705f1c0ac6d36c0a508dc33e5e7181 + (const char *filename, Picture &picture,::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors) + + + + flacpp_metadata_level1 + FLAC++/metadata.h: metadata level 1 interface + group__flacpp__metadata__level1.html + FLAC::Metadata::SimpleIterator + FLAC::Metadata::SimpleIterator::Status + + + flacpp_metadata_level2 + FLAC++/metadata.h: metadata level 2 interface + group__flacpp__metadata__level2.html + FLAC::Metadata::Chain + FLAC::Metadata::Chain::Status + FLAC::Metadata::Iterator + + + Prototype + group__flacpp__metadata__level2.html + gae49fa399a6273ccad7cb0e6f787a3f5c + (const Prototype &) + + + + FLAC__EntropyCodingMethod + structFLAC____EntropyCodingMethod.html + + + FLAC__EntropyCodingMethod_PartitionedRice + structFLAC____EntropyCodingMethod__PartitionedRice.html + + unsigned + order + structFLAC____EntropyCodingMethod__PartitionedRice.html + a1e1c9049e31eab5113c245164b2c694a + + + + const FLAC__EntropyCodingMethod_PartitionedRiceContents * + contents + structFLAC____EntropyCodingMethod__PartitionedRice.html + a2fbfa1bd5656bf620c0bb9f8ba77f579 + + + + + FLAC__EntropyCodingMethod_PartitionedRiceContents + structFLAC____EntropyCodingMethod__PartitionedRiceContents.html + + unsigned * + parameters + structFLAC____EntropyCodingMethod__PartitionedRiceContents.html + a06e97d40923f195410a65da9311ab6a2 + + + + unsigned * + raw_bits + structFLAC____EntropyCodingMethod__PartitionedRiceContents.html + a915eb5369d39924bc29c948c29834279 + + + + unsigned + capacity_by_order + structFLAC____EntropyCodingMethod__PartitionedRiceContents.html + abb60aca8d98bf9299558f230dfe83bc1 + + + + + FLAC__Frame + structFLAC____Frame.html + + + FLAC__FrameFooter + structFLAC____FrameFooter.html + + FLAC__uint16 + crc + structFLAC____FrameFooter.html + abdd6d64bf281c49c720b97b955d4eee7 + + + + + FLAC__FrameHeader + structFLAC____FrameHeader.html + + unsigned + blocksize + structFLAC____FrameHeader.html + ace760def6dcbbde3d9d140e5bfda34b3 + + + + unsigned + sample_rate + structFLAC____FrameHeader.html + acc23daa576f4e75885bf4f2b69cee1be + + + + unsigned + channels + structFLAC____FrameHeader.html + a5950c6e4f03ad81f4a03c8c6188b9bf5 + + + + FLAC__ChannelAssignment + channel_assignment + structFLAC____FrameHeader.html + a9a31f752e16da9d690f8d5ff85aed89c + + + + unsigned + bits_per_sample + structFLAC____FrameHeader.html + ae1f4af58cbbb837adf670d12bc4e86f3 + + + + FLAC__FrameNumberType + number_type + structFLAC____FrameHeader.html + a7a62ec09e6f3029297179ef65377265f + + + + union FLAC__FrameHeader::@2 + number + structFLAC____FrameHeader.html + affc849f1d7c044302e4e5c6c733c4642 + + + + FLAC__uint8 + crc + structFLAC____FrameHeader.html + a980438c380697df6f332cb27dc4672c4 + + + + + FLAC__IOCallbacks + structFLAC____IOCallbacks.html + + + FLAC__StreamDecoder + structFLAC____StreamDecoder.html + + + FLAC__StreamEncoder + structFLAC____StreamEncoder.html + + + FLAC__StreamMetadata + structFLAC____StreamMetadata.html + + FLAC__MetadataType + type + structFLAC____StreamMetadata.html + a39fd0655464f2cc7c9c37ae715088aec + + + + FLAC__bool + is_last + structFLAC____StreamMetadata.html + aef40bbf85abe12e035f66f2d54ed316c + + + + unsigned + length + structFLAC____StreamMetadata.html + a3fd615e41609837a5672f9081d9d2183 + + + + union FLAC__StreamMetadata::@3 + data + structFLAC____StreamMetadata.html + ae1b9b35d9ee11764f0a796c53301c542 + + + + + FLAC__StreamMetadata_Application + structFLAC____StreamMetadata__Application.html + + + FLAC__StreamMetadata_CueSheet + structFLAC____StreamMetadata__CueSheet.html + + char + media_catalog_number + structFLAC____StreamMetadata__CueSheet.html + a776e6057ac7939fba52edecd44ec45bc + [129] + + + FLAC__uint64 + lead_in + structFLAC____StreamMetadata__CueSheet.html + a43fdc0a538ef2c3e0926ee22814baf40 + + + + FLAC__bool + is_cd + structFLAC____StreamMetadata__CueSheet.html + a6af66f921aefc6f779fbc0ab6daeab8a + + + + unsigned + num_tracks + structFLAC____StreamMetadata__CueSheet.html + a6924f26a8e8fa9023f23539b959fe2ae + + + + FLAC__StreamMetadata_CueSheet_Track * + tracks + structFLAC____StreamMetadata__CueSheet.html + a5c0c3440b01b773684d56aeb1e424fab + + + + + FLAC__StreamMetadata_CueSheet_Index + structFLAC____StreamMetadata__CueSheet__Index.html + + FLAC__uint64 + offset + structFLAC____StreamMetadata__CueSheet__Index.html + ac221421bca83976925e2a41438157bb9 + + + + FLAC__byte + number + structFLAC____StreamMetadata__CueSheet__Index.html + a71edc33c19a749f1dfb3d1429e08c77a + + + + + FLAC__StreamMetadata_CueSheet_Track + structFLAC____StreamMetadata__CueSheet__Track.html + + FLAC__uint64 + offset + structFLAC____StreamMetadata__CueSheet__Track.html + a40e1c888253a56b6dc4885a44138d1bf + + + + FLAC__byte + number + structFLAC____StreamMetadata__CueSheet__Track.html + a429103d63c44d1861b4dc0762726701a + + + + char + isrc + structFLAC____StreamMetadata__CueSheet__Track.html + a4990c8b13969f4c62683d915ebbf5744 + [13] + + + unsigned + type + structFLAC____StreamMetadata__CueSheet__Track.html + a848575fc7a7292867ce76a9b3705f6e7 + + + + unsigned + pre_emphasis + structFLAC____StreamMetadata__CueSheet__Track.html + ab4a97e43166ee16d1d16cccd901ddc3a + + + + FLAC__byte + num_indices + structFLAC____StreamMetadata__CueSheet__Track.html + a5f1c1d7e3ddc533938b83951c7b3dda5 + + + + FLAC__StreamMetadata_CueSheet_Index * + indices + structFLAC____StreamMetadata__CueSheet__Track.html + a14e0692a77b5b6689e208f48369edb90 + + + + + FLAC__StreamMetadata_Padding + structFLAC____StreamMetadata__Padding.html + + int + dummy + structFLAC____StreamMetadata__Padding.html + a5214437fcba7d6abdc3b2435dcaa4124 + + + + + FLAC__StreamMetadata_Picture + structFLAC____StreamMetadata__Picture.html + + FLAC__StreamMetadata_Picture_Type + type + structFLAC____StreamMetadata__Picture.html + addc05a87a1da1ec7dd2301944ff2819c + + + + char * + mime_type + structFLAC____StreamMetadata__Picture.html + a9b4af2e10b627c0e79abf4cdd79f80e0 + + + + FLAC__byte * + description + structFLAC____StreamMetadata__Picture.html + a5bbfb168b265edfb0b29cfdb71fb413c + + + + FLAC__uint32 + width + structFLAC____StreamMetadata__Picture.html + a18dc6cdef9fa6c815450671f631a1e04 + + + + FLAC__uint32 + height + structFLAC____StreamMetadata__Picture.html + a76dbd1212d330807cda289660f5ee754 + + + + FLAC__uint32 + depth + structFLAC____StreamMetadata__Picture.html + a0f2092ddf28a6803e9c8adb7328c1967 + + + + FLAC__uint32 + colors + structFLAC____StreamMetadata__Picture.html + af17c1738bab67eba049ee101acfd36f0 + + + + FLAC__uint32 + data_length + structFLAC____StreamMetadata__Picture.html + acb893f63a196f70263468770a90580a4 + + + + FLAC__byte * + data + structFLAC____StreamMetadata__Picture.html + a9c71b5d77920e6d3aee6893795c43605 + + + + + FLAC__StreamMetadata_SeekPoint + structFLAC____StreamMetadata__SeekPoint.html + + FLAC__uint64 + sample_number + structFLAC____StreamMetadata__SeekPoint.html + a96a62923f1443fd3a5a3498e701e6ecf + + + + FLAC__uint64 + stream_offset + structFLAC____StreamMetadata__SeekPoint.html + a6028398e99f937b002618af677d32c9f + + + + unsigned + frame_samples + structFLAC____StreamMetadata__SeekPoint.html + a247ce3f0d45a56c202e623742309fe61 + + + + + FLAC__StreamMetadata_SeekTable + structFLAC____StreamMetadata__SeekTable.html + + + FLAC__StreamMetadata_StreamInfo + structFLAC____StreamMetadata__StreamInfo.html + + + FLAC__StreamMetadata_Unknown + structFLAC____StreamMetadata__Unknown.html + + + FLAC__StreamMetadata_VorbisComment + structFLAC____StreamMetadata__VorbisComment.html + + + FLAC__StreamMetadata_VorbisComment_Entry + structFLAC____StreamMetadata__VorbisComment__Entry.html + + + FLAC__Subframe + structFLAC____Subframe.html + + + FLAC__Subframe_Constant + structFLAC____Subframe__Constant.html + + FLAC__int32 + value + structFLAC____Subframe__Constant.html + af1bcfcbb17f1e1edb115b002fdbaa70e + + + + + FLAC__Subframe_Fixed + structFLAC____Subframe__Fixed.html + + FLAC__EntropyCodingMethod + entropy_coding_method + structFLAC____Subframe__Fixed.html + a0f17f8f756cd2c8acc0262ef14c37088 + + + + unsigned + order + structFLAC____Subframe__Fixed.html + a73f6f3cce3f811c81532729dbad2df0d + + + + FLAC__int32 + warmup + structFLAC____Subframe__Fixed.html + a0e9a40fb89b8aa45f83bf8979d200f1f + [FLAC__MAX_FIXED_ORDER] + + + const FLAC__int32 * + residual + structFLAC____Subframe__Fixed.html + ab91be48874aec97177106a4086163188 + + + + + FLAC__Subframe_LPC + structFLAC____Subframe__LPC.html + + FLAC__EntropyCodingMethod + entropy_coding_method + structFLAC____Subframe__LPC.html + adb1401b2f8af05132420145a99f68c6e + + + + unsigned + order + structFLAC____Subframe__LPC.html + a0de317accaf8a9f86194f97c378b2f86 + + + + unsigned + qlp_coeff_precision + structFLAC____Subframe__LPC.html + a6123b031203f603eba966b95fd2ad855 + + + + int + quantization_level + structFLAC____Subframe__LPC.html + aedcf1a3e5e62485e7ce250eda1f3e588 + + + + FLAC__int32 + qlp_coeff + structFLAC____Subframe__LPC.html + ad0b37ee925e2124a37fe3a513d5410b8 + [FLAC__MAX_LPC_ORDER] + + + FLAC__int32 + warmup + structFLAC____Subframe__LPC.html + a91c6c71c6fc2b812da1d2a3761e29807 + [FLAC__MAX_LPC_ORDER] + + + const FLAC__int32 * + residual + structFLAC____Subframe__LPC.html + acae4d0d439ea8900c5771eb967aec9bf + + + + + FLAC__Subframe_Verbatim + structFLAC____Subframe__Verbatim.html + + const FLAC__int32 * + data + structFLAC____Subframe__Verbatim.html + a6abc78689650804550ac517ada884584 + + + + + FLAC::Decoder::File + classFLAC_1_1Decoder_1_1File.html + FLAC::Decoder::Stream + + virtual ::FLAC__StreamDecoderInitStatus + init + classFLAC_1_1Decoder_1_1File.html + a793d2d9c08900cbe6ef6e2739c1e091f + (FILE *file) + + + virtual ::FLAC__StreamDecoderInitStatus + init + classFLAC_1_1Decoder_1_1File.html + a4252bc6c949ec9456eea4af2a277dd6a + (const char *filename) + + + virtual ::FLAC__StreamDecoderInitStatus + init + classFLAC_1_1Decoder_1_1File.html + a104a987909937cd716d382fdef9a0245 + (const std::string &filename) + + + virtual ::FLAC__StreamDecoderInitStatus + init_ogg + classFLAC_1_1Decoder_1_1File.html + ab840fa309cb000e041f8427cd3e6354a + (FILE *file) + + + virtual ::FLAC__StreamDecoderInitStatus + init_ogg + classFLAC_1_1Decoder_1_1File.html + a1af59a2861de527e8de5697683516b6e + (const char *filename) + + + virtual ::FLAC__StreamDecoderInitStatus + init_ogg + classFLAC_1_1Decoder_1_1File.html + ac88baae2ff5a4c206a953262cd7447a9 + (const std::string &filename) + + + virtual bool + set_ogg_serial_number + classFLAC_1_1Decoder_1_1Stream.html + aa257e8156474458cd8eed2902d3c2674 + (long value) + + + virtual bool + set_md5_checking + classFLAC_1_1Decoder_1_1Stream.html + a8f46d34c10a65d9c48e990f9b3bbe4e2 + (bool value) + + + virtual bool + set_metadata_respond + classFLAC_1_1Decoder_1_1Stream.html + a9208dd09a48d7a3034119565f51f0c56 + (::FLAC__MetadataType type) + + + virtual bool + set_metadata_respond_application + classFLAC_1_1Decoder_1_1Stream.html + a95468ca8d92d1693b21203ad3e0d4545 + (const FLAC__byte id[4]) + + + virtual bool + set_metadata_respond_all + classFLAC_1_1Decoder_1_1Stream.html + a2ecec7b37f6f1d16ddcfee83a6919b5b + () + + + virtual bool + set_metadata_ignore + classFLAC_1_1Decoder_1_1Stream.html + ae239124fe0fc8fce3dcdae904bce7544 + (::FLAC__MetadataType type) + + + virtual bool + set_metadata_ignore_application + classFLAC_1_1Decoder_1_1Stream.html + ac963b9eaf8271fc47ef799901b6d3650 + (const FLAC__byte id[4]) + + + virtual bool + set_metadata_ignore_all + classFLAC_1_1Decoder_1_1Stream.html + a900ecb31410c4ce56f23477b22c1c799 + () + + + State + get_state + classFLAC_1_1Decoder_1_1Stream.html + a1ac7755d2c82a802cc97994e707b1bd2 + () const + + + virtual bool + get_md5_checking + classFLAC_1_1Decoder_1_1Stream.html + a341d3bbff336f580b59aee3adc7f9357 + () const + + + virtual FLAC__uint64 + get_total_samples + classFLAC_1_1Decoder_1_1Stream.html + a42af32a0878f9e4b5d5a052e0733a539 + () const + + + virtual unsigned + get_channels + classFLAC_1_1Decoder_1_1Stream.html + ad9361dcb0435dde6baeb98fd1e669cee + () const + + + virtual ::FLAC__ChannelAssignment + get_channel_assignment + classFLAC_1_1Decoder_1_1Stream.html + afe090e604dc45400fe64c6dd9c42ca11 + () const + + + virtual unsigned + get_bits_per_sample + classFLAC_1_1Decoder_1_1Stream.html + a9412939ab55513a7c5389a57d074f3f2 + () const + + + virtual unsigned + get_sample_rate + classFLAC_1_1Decoder_1_1Stream.html + a31b3d6b63d75d2864eb740961a0b956c + () const + + + virtual unsigned + get_blocksize + classFLAC_1_1Decoder_1_1Stream.html + a7e777db68ffea49356cc3510732ce6da + () const + + + virtual bool + get_decode_position + classFLAC_1_1Decoder_1_1Stream.html + a433252dba465178167d6a85cc1fea881 + (FLAC__uint64 *position) const + + + virtual ::FLAC__StreamDecoderInitStatus + init + classFLAC_1_1Decoder_1_1Stream.html + a33169215b21ff3582c0c1f5fef6dda47 + () + + + virtual ::FLAC__StreamDecoderInitStatus + init_ogg + classFLAC_1_1Decoder_1_1Stream.html + adb52518fda2e3e544f4c8807f4227ba7 + () + + + virtual bool + finish + classFLAC_1_1Decoder_1_1Stream.html + a0221e9ba254566331e8d0e33579ee3c0 + () + + + virtual bool + flush + classFLAC_1_1Decoder_1_1Stream.html + a9cb00ff4543d411a9b3c64b1f3f058bb + () + + + virtual bool + reset + classFLAC_1_1Decoder_1_1Stream.html + a7b6b4665e139234fa80acd0a1f16ca7c + () + + + virtual bool + process_single + classFLAC_1_1Decoder_1_1Stream.html + ab50ff5df74c47f4e0f1c91d63a59f5ac + () + + + virtual bool + process_until_end_of_metadata + classFLAC_1_1Decoder_1_1Stream.html + ab0cabe42278b18e9d3dbfee39cc720cf + () + + + virtual bool + process_until_end_of_stream + classFLAC_1_1Decoder_1_1Stream.html + afbd6ff20477cae1ace00b8c304a4795a + () + + + virtual bool + skip_single_frame + classFLAC_1_1Decoder_1_1Stream.html + a30a738e7ae11f389c58a74f7ff647fe4 + () + + + virtual bool + seek_absolute + classFLAC_1_1Decoder_1_1Stream.html + ac146128003d4ccd46bcffa82003e545c + (FLAC__uint64 sample) + + + virtual bool + is_valid + classFLAC_1_1Decoder_1_1Stream.html + a6f0b329fd6e78d5e769c769a97fcc337 + () const + + + + operator bool + classFLAC_1_1Decoder_1_1Stream.html + a82e6e8685d0b70e7686baff4377d98cd + () const + + + virtual ::FLAC__StreamDecoderReadStatus + read_callback + classFLAC_1_1Decoder_1_1File.html + a48c900fc010f14786e98908377f41195 + (FLAC__byte buffer[], size_t *bytes) + + + virtual ::FLAC__StreamDecoderSeekStatus + seek_callback + classFLAC_1_1Decoder_1_1Stream.html + af6f7e0811f34837752fbe20f3348f895 + (FLAC__uint64 absolute_byte_offset) + + + virtual ::FLAC__StreamDecoderTellStatus + tell_callback + classFLAC_1_1Decoder_1_1Stream.html + a0075cb08ab7bf5230ec0360ae3065a50 + (FLAC__uint64 *absolute_byte_offset) + + + virtual ::FLAC__StreamDecoderLengthStatus + length_callback + classFLAC_1_1Decoder_1_1Stream.html + a6a9af9305783c4af4b93698293dcdf84 + (FLAC__uint64 *stream_length) + + + virtual bool + eof_callback + classFLAC_1_1Decoder_1_1Stream.html + ac06aa682efc2e819624e78a3e6b4bd7b + () + + + virtual ::FLAC__StreamDecoderWriteStatus + write_callback + classFLAC_1_1Decoder_1_1Stream.html + af5a61e9ff720cca3eb38d1f2790f00fb + (const ::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0 + + + virtual void + metadata_callback + classFLAC_1_1Decoder_1_1Stream.html + a20d0873073d9542e08fb48becaa607c9 + (const ::FLAC__StreamMetadata *metadata) + + + virtual void + error_callback + classFLAC_1_1Decoder_1_1Stream.html + a0dbadd163ade7bc2d1858e7a435d5e52 + (::FLAC__StreamDecoderErrorStatus status)=0 + + + + FLAC::Decoder::Stream + classFLAC_1_1Decoder_1_1Stream.html + FLAC::Decoder::Stream::State + + virtual ::FLAC__StreamDecoderReadStatus + read_callback + classFLAC_1_1Decoder_1_1Stream.html + af91735b6c715ca648493e837f513ef3d + (FLAC__byte buffer[], size_t *bytes)=0 + + + + FLAC::Decoder::Stream::State + classFLAC_1_1Decoder_1_1Stream_1_1State.html + + + FLAC::Encoder::File + classFLAC_1_1Encoder_1_1File.html + FLAC::Encoder::Stream + + virtual ::FLAC__StreamEncoderInitStatus + init + classFLAC_1_1Encoder_1_1File.html + afefae0d1c92f0d63d7be69a54667ff79 + (FILE *file) + + + virtual ::FLAC__StreamEncoderInitStatus + init + classFLAC_1_1Encoder_1_1File.html + a31016dd8e1db5bb9c1c3739b94fdb3e3 + (const char *filename) + + + virtual ::FLAC__StreamEncoderInitStatus + init + classFLAC_1_1Encoder_1_1File.html + a4966ed5f77dbf5a03946ff25f60a0f8c + (const std::string &filename) + + + virtual ::FLAC__StreamEncoderInitStatus + init_ogg + classFLAC_1_1Encoder_1_1File.html + a5dfab60d9cae983899e0b0f6e1ab9377 + (FILE *file) + + + virtual ::FLAC__StreamEncoderInitStatus + init_ogg + classFLAC_1_1Encoder_1_1File.html + a0740ed07b77e49a76f8ddc0e79540eae + (const char *filename) + + + virtual ::FLAC__StreamEncoderInitStatus + init_ogg + classFLAC_1_1Encoder_1_1File.html + a202881c81ed146e9a83f7378cf1de2d6 + (const std::string &filename) + + + virtual bool + set_ogg_serial_number + classFLAC_1_1Encoder_1_1Stream.html + adf54d79eb0e6dce071f46be6f2c2d55c + (long value) + + + virtual bool + set_verify + classFLAC_1_1Encoder_1_1Stream.html + a85c2296aedf8d4cd2d9f284b1c3205f8 + (bool value) + + + virtual bool + set_streamable_subset + classFLAC_1_1Encoder_1_1Stream.html + a85d78d5333b05e8a76a1edc9462dbfbc + (bool value) + + + virtual bool + set_channels + classFLAC_1_1Encoder_1_1Stream.html + a0130baae7a1a56384ae8c5b9b2e36618 + (unsigned value) + + + virtual bool + set_bits_per_sample + classFLAC_1_1Encoder_1_1Stream.html + a37bd3f9aa78e56abde8f7119396d5698 + (unsigned value) + + + virtual bool + set_sample_rate + classFLAC_1_1Encoder_1_1Stream.html + a317337e199744ffdf5b27c9953baba2f + (unsigned value) + + + virtual bool + set_compression_level + classFLAC_1_1Encoder_1_1Stream.html + a9e274578cab80bc8f433331c46925a2a + (unsigned value) + + + virtual bool + set_blocksize + classFLAC_1_1Encoder_1_1Stream.html + acc539384c2ed09624deb1b12accfd683 + (unsigned value) + + + virtual bool + set_do_mid_side_stereo + classFLAC_1_1Encoder_1_1Stream.html + a034ab145e428444b0c6cc4d6818b1121 + (bool value) + + + virtual bool + set_loose_mid_side_stereo + classFLAC_1_1Encoder_1_1Stream.html + aa691def57681119f0cb99804db7959d0 + (bool value) + + + virtual bool + set_apodization + classFLAC_1_1Encoder_1_1Stream.html + a4b9a35fd8996be1a4c46fafd41e34e28 + (const char *specification) + + + virtual bool + set_max_lpc_order + classFLAC_1_1Encoder_1_1Stream.html + af6f402684821f1aa66e4dbb5ef8fa40f + (unsigned value) + + + virtual bool + set_qlp_coeff_precision + classFLAC_1_1Encoder_1_1Stream.html + a395d2fee212257269ad05be0c2d57b1c + (unsigned value) + + + virtual bool + set_do_qlp_coeff_prec_search + classFLAC_1_1Encoder_1_1Stream.html + a9a63c0657c6834229d67e64adaf61fde + (bool value) + + + virtual bool + set_do_escape_coding + classFLAC_1_1Encoder_1_1Stream.html + a4a5b69ec2f0a329a662519021a022266 + (bool value) + + + virtual bool + set_do_exhaustive_model_search + classFLAC_1_1Encoder_1_1Stream.html + a3832c6e375edfb304ea6dcf7afb15c83 + (bool value) + + + virtual bool + set_min_residual_partition_order + classFLAC_1_1Encoder_1_1Stream.html + a7db0bb9381b7750bb194a1fda947e5b3 + (unsigned value) + + + virtual bool + set_max_residual_partition_order + classFLAC_1_1Encoder_1_1Stream.html + a1fcb2e699261a633766e5cf3d8809e2b + (unsigned value) + + + virtual bool + set_rice_parameter_search_dist + classFLAC_1_1Encoder_1_1Stream.html + a67281b5fc39c0067e6c6fffb987c8b0a + (unsigned value) + + + virtual bool + set_total_samples_estimate + classFLAC_1_1Encoder_1_1Stream.html + a5f9de26084c378a7cd55919381465c24 + (FLAC__uint64 value) + + + virtual bool + set_metadata + classFLAC_1_1Encoder_1_1Stream.html + a79dcf32db2d8bddcabe3e871a52dd52d + (::FLAC__StreamMetadata **metadata, unsigned num_blocks) + + + virtual bool + set_metadata + classFLAC_1_1Encoder_1_1Stream.html + a06c7f5dde30c6f209e696100003c9779 + (FLAC::Metadata::Prototype **metadata, unsigned num_blocks) + + + State + get_state + classFLAC_1_1Encoder_1_1Stream.html + aeacf0b62a38ec101b07111fbb96fae4f + () const + + + virtual Decoder::Stream::State + get_verify_decoder_state + classFLAC_1_1Encoder_1_1Stream.html + ae73cb3d5e042396527a0f69343e1f9c7 + () const + + + virtual void + get_verify_decoder_error_stats + classFLAC_1_1Encoder_1_1Stream.html + a03e703883a6275ddc18e6aa85034e1b4 + (FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got) + + + virtual bool + get_verify + classFLAC_1_1Encoder_1_1Stream.html + a1b43a04f7023d15a0abde91a9a0d65b3 + () const + + + virtual bool + get_streamable_subset + classFLAC_1_1Encoder_1_1Stream.html + a84a6fe3a546ad5bed41c10c22ebe2608 + () const + + + virtual bool + get_do_mid_side_stereo + classFLAC_1_1Encoder_1_1Stream.html + abf4379816269dd5548ed29e2f803fe2b + () const + + + virtual bool + get_loose_mid_side_stereo + classFLAC_1_1Encoder_1_1Stream.html + ab7b4ffe227c2a17bee4fb001f009b446 + () const + + + virtual unsigned + get_channels + classFLAC_1_1Encoder_1_1Stream.html + a1df5ac2094960c44f698a7b6760e3035 + () const + + + virtual unsigned + get_bits_per_sample + classFLAC_1_1Encoder_1_1Stream.html + afe54ba1aad7782f5b66a423e0836761f + () const + + + virtual unsigned + get_sample_rate + classFLAC_1_1Encoder_1_1Stream.html + a98cf81c61533d745a0ed19c47d317e49 + () const + + + virtual unsigned + get_blocksize + classFLAC_1_1Encoder_1_1Stream.html + a3b257ccb31c9787e94cb0d50aea82a4e + () const + + + virtual unsigned + get_max_lpc_order + classFLAC_1_1Encoder_1_1Stream.html + a1de7f60d3124966c798d86d49e1a1e87 + () const + + + virtual unsigned + get_qlp_coeff_precision + classFLAC_1_1Encoder_1_1Stream.html + ae6c1f413bb54fbde836cc0b294b8c827 + () const + + + virtual bool + get_do_qlp_coeff_prec_search + classFLAC_1_1Encoder_1_1Stream.html + a647c407a588f29c91b49696247d52e22 + () const + + + virtual bool + get_do_escape_coding + classFLAC_1_1Encoder_1_1Stream.html + a95886dd052a3c3318a0326f1edec6a7f + () const + + + virtual bool + get_do_exhaustive_model_search + classFLAC_1_1Encoder_1_1Stream.html + ad17080caeab928a403a313f9df786ac5 + () const + + + virtual unsigned + get_min_residual_partition_order + classFLAC_1_1Encoder_1_1Stream.html + a6244b1521f2b68c5f8c41c3244f42115 + () const + + + virtual unsigned + get_max_residual_partition_order + classFLAC_1_1Encoder_1_1Stream.html + a0d95e9aa14c49956fdfbf36f7354d8d6 + () const + + + virtual unsigned + get_rice_parameter_search_dist + classFLAC_1_1Encoder_1_1Stream.html + a6a5fb52a7156c5308f2770fc2a6a1931 + () const + + + virtual FLAC__uint64 + get_total_samples_estimate + classFLAC_1_1Encoder_1_1Stream.html + a74f50f41815ec0d6bf0890ba55a52c36 + () const + + + virtual ::FLAC__StreamEncoderInitStatus + init + classFLAC_1_1Encoder_1_1Stream.html + a17bfdc6402a626db36ee23985ee959b6 + () + + + virtual ::FLAC__StreamEncoderInitStatus + init_ogg + classFLAC_1_1Encoder_1_1Stream.html + a6cd96756d387c89555b4fb36e3323f35 + () + + + virtual bool + finish + classFLAC_1_1Encoder_1_1Stream.html + ad70a30287eb9e062454ca296b9628318 + () + + + virtual bool + process + classFLAC_1_1Encoder_1_1Stream.html + ae9dad0b0bcda0b0147ee98cec93e1a7c + (const FLAC__int32 *const buffer[], unsigned samples) + + + virtual bool + process_interleaved + classFLAC_1_1Encoder_1_1Stream.html + acafa52586305e403e3a8857f91a7d62d + (const FLAC__int32 buffer[], unsigned samples) + + + virtual bool + is_valid + classFLAC_1_1Encoder_1_1Stream.html + a2032ccacef0d59384894df85d85d2378 + () const + + + + operator bool + classFLAC_1_1Encoder_1_1Stream.html + a9cc2181c5be961e2b6ad1945bf57e37b + () const + + + virtual void + progress_callback + classFLAC_1_1Encoder_1_1File.html + a9905685a62680a82d3430d9f27739870 + (FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate) + + + virtual ::FLAC__StreamEncoderWriteStatus + write_callback + classFLAC_1_1Encoder_1_1File.html + a939a333eeb145f3936d9e35c68f13db1 + (const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame) + + + virtual ::FLAC__StreamEncoderReadStatus + read_callback + classFLAC_1_1Encoder_1_1Stream.html + a483965ffe35ed652a5fca622c7791811 + (FLAC__byte buffer[], size_t *bytes) + + + virtual ::FLAC__StreamEncoderSeekStatus + seek_callback + classFLAC_1_1Encoder_1_1Stream.html + a7df3745afe10cd4dbcc3433a32fcb463 + (FLAC__uint64 absolute_byte_offset) + + + virtual ::FLAC__StreamEncoderTellStatus + tell_callback + classFLAC_1_1Encoder_1_1Stream.html + a5a4f38682e33172f53f7f374372fe1e0 + (FLAC__uint64 *absolute_byte_offset) + + + virtual void + metadata_callback + classFLAC_1_1Encoder_1_1Stream.html + ad9c6a7aa7720f215bfe3b65e032e148c + (const ::FLAC__StreamMetadata *metadata) + + + + FLAC::Encoder::Stream + classFLAC_1_1Encoder_1_1Stream.html + FLAC::Encoder::Stream::State + + virtual ::FLAC__StreamEncoderWriteStatus + write_callback + classFLAC_1_1Encoder_1_1Stream.html + afa6c90811480bb4fccb1cf3da8160c47 + (const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame)=0 + + + + FLAC::Encoder::Stream::State + classFLAC_1_1Encoder_1_1Stream_1_1State.html + + + FLAC::Metadata::Application + classFLAC_1_1Metadata_1_1Application.html + FLAC::Metadata::Prototype + + + Application + classFLAC_1_1Metadata_1_1Application.html + a354471e537af33ba0c86de4db988efd1 + (::FLAC__StreamMetadata *object, bool copy) + + + Application & + assign + classFLAC_1_1Metadata_1_1Application.html + a47f68d7001ef094a916d3b13fe589fc2 + (::FLAC__StreamMetadata *object, bool copy) + + + bool + set_data + classFLAC_1_1Metadata_1_1Application.html + acbb3f2b255a4c5cc4ad179a79b1588f1 + (const FLAC__byte *data, unsigned length) + + + bool + is_valid + group__flacpp__metadata__object.html + ga57adba3b3a548f7d9d8803762a8216d6 + () const + + + bool + get_is_last + classFLAC_1_1Metadata_1_1Prototype.html + ae9e4332c5d2b66ca39763b371420e166 + () const + + + ::FLAC__MetadataType + get_type + classFLAC_1_1Metadata_1_1Prototype.html + ae79be48d03ca0f697c60fa4f95dd856a + () const + + + unsigned + get_length + classFLAC_1_1Metadata_1_1Prototype.html + a5fd592fd29018c66d29f0940f3cf05b3 + () const + + + void + set_is_last + classFLAC_1_1Metadata_1_1Prototype.html + af40c7c078e408f7d6d0b5f521a013315 + (bool) + + + + operator const ::FLAC__StreamMetadata * + group__flacpp__metadata__object.html + gadad62834e7055e4996f3f6791553a214 + () const + + + + Application + classFLAC_1_1Metadata_1_1Application.html + ac852c4aa3be004f1ffa4895ca54354a0 + (const Application &object) + + + + Application + classFLAC_1_1Metadata_1_1Application.html + afea8e8477179395b175f5481b9a7f520 + (const ::FLAC__StreamMetadata &object) + + + + Application + classFLAC_1_1Metadata_1_1Application.html + a88fa6324b6b46d41787934774f65d423 + (const ::FLAC__StreamMetadata *object) + + + Application & + operator= + classFLAC_1_1Metadata_1_1Application.html + a3ca9dd06666b1dc7d4bdb6aef8e14d04 + (const Application &object) + + + Application & + operator= + classFLAC_1_1Metadata_1_1Application.html + aad78784867bb6c8816238a57bab91535 + (const ::FLAC__StreamMetadata &object) + + + Application & + operator= + classFLAC_1_1Metadata_1_1Application.html + afe3c7e50501b56045366d2121d084fba + (const ::FLAC__StreamMetadata *object) + + + bool + operator== + classFLAC_1_1Metadata_1_1Application.html + a8e107fdc72e0afee4ee381f375c118df + (const Application &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1Application.html + ad6beb0e98e50cdfb3b17dd3e545d54ae + (const ::FLAC__StreamMetadata &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1Application.html + a59490f6d1e1bba670bb53531df8d0f86 + (const ::FLAC__StreamMetadata *object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Application.html + a381c844b7a30a0d427495d40a04f390f + (const Application &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Application.html + af1bc45d6f584423c9cd6b59f23e7d49e + (const ::FLAC__StreamMetadata &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Application.html + a1bc922263fb36e5db3a42c13990d1563 + (const ::FLAC__StreamMetadata *object) const + + + Prototype & + assign_object + classFLAC_1_1Metadata_1_1Prototype.html + acc8ddaac1f1afe9d4fd9de33354847bd + (::FLAC__StreamMetadata *object, bool copy) + + + virtual void + clear + classFLAC_1_1Metadata_1_1Prototype.html + aa54338931745f7f1b1d8240441efedb8 + () + + + + FLAC::Metadata::Chain + classFLAC_1_1Metadata_1_1Chain.html + FLAC::Metadata::Chain::Status + + bool + is_valid + classFLAC_1_1Metadata_1_1Chain.html + a7c7799a4ed676ac334381af9e3888549 + () const + + + Status + status + classFLAC_1_1Metadata_1_1Chain.html + a02d7a4adc89e37b28eaccbccfe5da5b0 + () + + + bool + read + classFLAC_1_1Metadata_1_1Chain.html + a509bf6a75a12df65bc77947a4765d9c1 + (const char *filename, bool is_ogg=false) + + + bool + read + classFLAC_1_1Metadata_1_1Chain.html + a030c805328fc8b2da947830959dafb5b + (FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, bool is_ogg=false) + + + bool + check_if_tempfile_needed + classFLAC_1_1Metadata_1_1Chain.html + a1d54ed419365faf5429caa84b35265c3 + (bool use_padding) + + + bool + write + classFLAC_1_1Metadata_1_1Chain.html + a2341690885e2312013afc561e6fafd81 + (bool use_padding=true, bool preserve_file_stats=false) + + + bool + write + classFLAC_1_1Metadata_1_1Chain.html + a337e570e1b8fa93f7b586533bcf3eb1a + (bool use_padding,::FLAC__IOHandle handle,::FLAC__IOCallbacks callbacks) + + + bool + write + classFLAC_1_1Metadata_1_1Chain.html + a4a2826329e53dda6494b41506dd39de3 + (bool use_padding,::FLAC__IOHandle handle,::FLAC__IOCallbacks callbacks,::FLAC__IOHandle temp_handle,::FLAC__IOCallbacks temp_callbacks) + + + void + merge_padding + classFLAC_1_1Metadata_1_1Chain.html + aef51a0414284f468a2d73c07b540641d + () + + + void + sort_padding + classFLAC_1_1Metadata_1_1Chain.html + a779eaac12da7e7edac67089053e5907f + () + + + + FLAC::Metadata::Chain::Status + classFLAC_1_1Metadata_1_1Chain_1_1Status.html + + + FLAC::Metadata::CueSheet + classFLAC_1_1Metadata_1_1CueSheet.html + FLAC::Metadata::Prototype + FLAC::Metadata::CueSheet::Track + + + CueSheet + classFLAC_1_1Metadata_1_1CueSheet.html + add934e1916c2427197f8a5654f7ffae9 + (::FLAC__StreamMetadata *object, bool copy) + + + CueSheet & + assign + classFLAC_1_1Metadata_1_1CueSheet.html + ac83a472ca9852f3e2e800ae57d3e1305 + (::FLAC__StreamMetadata *object, bool copy) + + + bool + resize_indices + classFLAC_1_1Metadata_1_1CueSheet.html + a01c7fd10f7c139890aa714b8367224f4 + (unsigned track_num, unsigned new_num_indices) + + + bool + insert_index + classFLAC_1_1Metadata_1_1CueSheet.html + a5efe583c258df9c4737c27347dc69175 + (unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &index) + + + bool + insert_blank_index + classFLAC_1_1Metadata_1_1CueSheet.html + a4a046e4374c0c8fc7d3295d5cf9de023 + (unsigned track_num, unsigned index_num) + + + bool + delete_index + classFLAC_1_1Metadata_1_1CueSheet.html + aff23e60e082c00e3b70d0ff9bf8dd1d0 + (unsigned track_num, unsigned index_num) + + + bool + resize_tracks + classFLAC_1_1Metadata_1_1CueSheet.html + a402aaf611e67efdc2d67c57755162914 + (unsigned new_num_tracks) + + + bool + set_track + classFLAC_1_1Metadata_1_1CueSheet.html + a5fb53ab58aec0a980425bcfbae160a60 + (unsigned i, const Track &track) + + + bool + insert_track + classFLAC_1_1Metadata_1_1CueSheet.html + ae6ea59ff07633282504b13aa28c395dc + (unsigned i, const Track &track) + + + bool + insert_blank_track + classFLAC_1_1Metadata_1_1CueSheet.html + a97ba90f576deda6e7c40c805f9752456 + (unsigned i) + + + bool + delete_track + classFLAC_1_1Metadata_1_1CueSheet.html + a87d737e57b473b11540e98b298d21f51 + (unsigned i) + + + bool + is_legal + classFLAC_1_1Metadata_1_1CueSheet.html + a138691cddff703a729e3e295d82e7619 + (bool check_cd_da_subset=false, const char **violation=0) const + + + FLAC__uint32 + calculate_cddb_id + classFLAC_1_1Metadata_1_1CueSheet.html + a074694c791cbbaaf59f5baadb8e54e08 + () const + + + + CueSheet + classFLAC_1_1Metadata_1_1CueSheet.html + aff87fa8ab761fc12c0f37b6ff033f74e + (const CueSheet &object) + + + + CueSheet + classFLAC_1_1Metadata_1_1CueSheet.html + a70f56da621341cd05a14bafe3ddded70 + (const ::FLAC__StreamMetadata &object) + + + + CueSheet + classFLAC_1_1Metadata_1_1CueSheet.html + a0248e035cd9c13338355074d68032e90 + (const ::FLAC__StreamMetadata *object) + + + CueSheet & + operator= + classFLAC_1_1Metadata_1_1CueSheet.html + ad24bf2e19de81159d5e205ae5ef63843 + (const CueSheet &object) + + + CueSheet & + operator= + classFLAC_1_1Metadata_1_1CueSheet.html + a12ea7ba6371d328708befbc5a13b4325 + (const ::FLAC__StreamMetadata &object) + + + CueSheet & + operator= + classFLAC_1_1Metadata_1_1CueSheet.html + a70e0483a06b641a903134c7a8cd6aa9b + (const ::FLAC__StreamMetadata *object) + + + bool + operator== + classFLAC_1_1Metadata_1_1CueSheet.html + a15f7a6ef9eb4e468c785e8b592154ac4 + (const CueSheet &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1CueSheet.html + a830958ffaef36c12715546fdfd517fe8 + (const ::FLAC__StreamMetadata &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1CueSheet.html + a7d3d828165ca297de71937579153f06d + (const ::FLAC__StreamMetadata *object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1CueSheet.html + a4e9388122366f6eecd3c61eb4a142dfb + (const CueSheet &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1CueSheet.html + a89e08f4e1e11e25018ab6e1a9ab05cb2 + (const ::FLAC__StreamMetadata &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1CueSheet.html + a28a1f2f3bbb5c6735ecbec2d8d4d812a + (const ::FLAC__StreamMetadata *object) const + + + + FLAC::Metadata::CueSheet::Track + classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html + + virtual bool + is_valid + classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html + a58e1424b3cd080bfa4e9ee927086c00e + () const + + + + FLAC::Metadata::Iterator + classFLAC_1_1Metadata_1_1Iterator.html + + bool + is_valid + classFLAC_1_1Metadata_1_1Iterator.html + a9878c8330bdfb522dc2ce851b016d307 + () const + + + void + init + classFLAC_1_1Metadata_1_1Iterator.html + ab5713af7318f10a46bd8b26ce586947c + (Chain &chain) + + + bool + next + classFLAC_1_1Metadata_1_1Iterator.html + a1d2871fc1fdcc5dffee1eafd7019f4a0 + () + + + bool + prev + classFLAC_1_1Metadata_1_1Iterator.html + ade6ee6b67b22115959e2adfc65d5d3b4 + () + + + ::FLAC__MetadataType + get_block_type + classFLAC_1_1Metadata_1_1Iterator.html + ac12c815b91018dca2c3143d32bb317e9 + () const + + + Prototype * + get_block + classFLAC_1_1Metadata_1_1Iterator.html + a3693233f592b9cb333c437413c6be2a6 + () + + + bool + set_block + classFLAC_1_1Metadata_1_1Iterator.html + a3123daf89fca2a8981c9f361f466a418 + (Prototype *block) + + + bool + delete_block + classFLAC_1_1Metadata_1_1Iterator.html + a67adaa4ae39cf405ee0f4674ca8836dd + (bool replace_with_padding) + + + bool + insert_block_before + classFLAC_1_1Metadata_1_1Iterator.html + a86de6d0b21ac08b74a2ea8c1a9adce36 + (Prototype *block) + + + bool + insert_block_after + classFLAC_1_1Metadata_1_1Iterator.html + a73e7a3f7192f369cb3a19d078da504ab + (Prototype *block) + + + + FLAC::Metadata::Padding + classFLAC_1_1Metadata_1_1Padding.html + FLAC::Metadata::Prototype + + + Padding + classFLAC_1_1Metadata_1_1Padding.html + a358085e3cec897ed0b0c88c8ac04618d + (::FLAC__StreamMetadata *object, bool copy) + + + + Padding + classFLAC_1_1Metadata_1_1Padding.html + abd84a1378c3fb563fe25576f81316a48 + (unsigned length) + + + Padding & + assign + classFLAC_1_1Metadata_1_1Padding.html + a3b7508e56df71854ff1f5ad9570b5684 + (::FLAC__StreamMetadata *object, bool copy) + + + void + set_length + classFLAC_1_1Metadata_1_1Padding.html + addd51552e05e0c569dc3859431bb2840 + (unsigned length) + + + + Padding + classFLAC_1_1Metadata_1_1Padding.html + a3a5665a824530dec2906d76e665573ee + (const Padding &object) + + + + Padding + classFLAC_1_1Metadata_1_1Padding.html + a8cfa2104a846a25154ca6b431683c563 + (const ::FLAC__StreamMetadata &object) + + + + Padding + classFLAC_1_1Metadata_1_1Padding.html + a9ffc1c44b0d114998b72e2a9a4be7c0a + (const ::FLAC__StreamMetadata *object) + + + Padding & + operator= + classFLAC_1_1Metadata_1_1Padding.html + aece6ab03932bea3f0c32ff3cd88f2617 + (const Padding &object) + + + Padding & + operator= + classFLAC_1_1Metadata_1_1Padding.html + a659c9ca5fa9e53b434a1f08db2e052eb + (const ::FLAC__StreamMetadata &object) + + + Padding & + operator= + classFLAC_1_1Metadata_1_1Padding.html + a7c8adf0a827ea52ffbb51549f36dc1ac + (const ::FLAC__StreamMetadata *object) + + + bool + operator== + classFLAC_1_1Metadata_1_1Padding.html + a9e904b10ec56b516c481cb8322151471 + (const Padding &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1Padding.html + a50d554e3d3252cfcec730faf0b6c25dc + (const ::FLAC__StreamMetadata &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1Padding.html + a1afe80a4ef6a3cbeead575aa22c974f9 + (const ::FLAC__StreamMetadata *object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Padding.html + a21d2734b6dc97e537806eef07f0db5be + (const Padding &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Padding.html + ad12b6548ce88c8789a90d2c24c40f3cc + (const ::FLAC__StreamMetadata &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Padding.html + a15aadefaa426aa8b7a952f6a61c4c3b5 + (const ::FLAC__StreamMetadata *object) const + + + + FLAC::Metadata::Picture + classFLAC_1_1Metadata_1_1Picture.html + FLAC::Metadata::Prototype + + + Picture + classFLAC_1_1Metadata_1_1Picture.html + a703d5d8a88e9764714ee2dd25806e381 + (::FLAC__StreamMetadata *object, bool copy) + + + Picture & + assign + classFLAC_1_1Metadata_1_1Picture.html + aa3d7384cb724a842c3471a9ab19f81ed + (::FLAC__StreamMetadata *object, bool copy) + + + FLAC__uint32 + get_colors + classFLAC_1_1Metadata_1_1Picture.html + ab2dd65f7673b3fd167c79125ea013685 + () const + + + bool + set_mime_type + classFLAC_1_1Metadata_1_1Picture.html + afb4e53cb8ae62ea0d9ebd1afdca40c3f + (const char *string) + + + bool + set_description + classFLAC_1_1Metadata_1_1Picture.html + a1bbcd96802a16fc36ac1b6610cd7d4a3 + (const FLAC__byte *string) + + + void + set_colors + classFLAC_1_1Metadata_1_1Picture.html + a4bac0286c0fd4de4d2be8d9ba1ba50a5 + (FLAC__uint32 value) const + + + bool + set_data + classFLAC_1_1Metadata_1_1Picture.html + a301630d1c8f7647d0f192e6a2a03e6ba + (const FLAC__byte *data, FLAC__uint32 data_length) + + + bool + is_legal + classFLAC_1_1Metadata_1_1Picture.html + af11147e2041b46d679b077e6ac26bea0 + (const char **violation) + + + + Picture + classFLAC_1_1Metadata_1_1Picture.html + a368985afb060fe1024129ed808392183 + (const Picture &object) + + + + Picture + classFLAC_1_1Metadata_1_1Picture.html + a447a5837baeb1e5de9e7ae642a15e736 + (const ::FLAC__StreamMetadata &object) + + + + Picture + classFLAC_1_1Metadata_1_1Picture.html + a5403f0a99ef43e17c43a4ec21c275c83 + (const ::FLAC__StreamMetadata *object) + + + Picture & + operator= + classFLAC_1_1Metadata_1_1Picture.html + a2ab3ef473f6c70aafe5bd3229f397a93 + (const Picture &object) + + + Picture & + operator= + classFLAC_1_1Metadata_1_1Picture.html + a5681e4ee272c9f604a27c2d3b95e284b + (const ::FLAC__StreamMetadata &object) + + + Picture & + operator= + classFLAC_1_1Metadata_1_1Picture.html + a4ea95912972eee1d8c9906eae4cfe6ee + (const ::FLAC__StreamMetadata *object) + + + bool + operator== + classFLAC_1_1Metadata_1_1Picture.html + ac704e9f8a9de464b480b00e87c26eaeb + (const Picture &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1Picture.html + a0278f967eb983510a3d896e1d5e788a4 + (const ::FLAC__StreamMetadata &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1Picture.html + a7c52db6ddf65848f6b6a2f24b77b5cc9 + (const ::FLAC__StreamMetadata *object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Picture.html + afa4be54429fc22789d2251b165cb47e9 + (const Picture &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Picture.html + aa7cc7be3cde674d232192aec1242943b + (const ::FLAC__StreamMetadata &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Picture.html + a5f06bc498ad83582a601562180eb6211 + (const ::FLAC__StreamMetadata *object) const + + + + FLAC::Metadata::Prototype + classFLAC_1_1Metadata_1_1Prototype.html + + virtual + ~Prototype + classFLAC_1_1Metadata_1_1Prototype.html + a698fa1529af534ab5d1d98d0979844f6 + () + + + + Prototype + group__flacpp__metadata__level2.html + gae49fa399a6273ccad7cb0e6f787a3f5c + (const Prototype &) + + + + Prototype + classFLAC_1_1Metadata_1_1Prototype.html + a23ec8d118119578adb95de42fcbbaca2 + (::FLAC__StreamMetadata *object, bool copy) + + + Prototype & + operator= + classFLAC_1_1Metadata_1_1Prototype.html + aea76819568855c4f49f2a23d42a642f2 + (const Prototype &) + + + Prototype & + operator= + classFLAC_1_1Metadata_1_1Prototype.html + a5a50c17eaa77149842075ed3896637e7 + (const ::FLAC__StreamMetadata &) + + + Prototype & + operator= + classFLAC_1_1Metadata_1_1Prototype.html + a310d01131f3d8f4a1bf0ed31b8798685 + (const ::FLAC__StreamMetadata *) + + + + FLAC::Metadata::SeekTable + classFLAC_1_1Metadata_1_1SeekTable.html + FLAC::Metadata::Prototype + + + SeekTable + classFLAC_1_1Metadata_1_1SeekTable.html + accd82ef77dcc489280c0f46e443b16c7 + (::FLAC__StreamMetadata *object, bool copy) + + + SeekTable & + assign + classFLAC_1_1Metadata_1_1SeekTable.html + ad9d0036938d6ad1c81180cf1e156b844 + (::FLAC__StreamMetadata *object, bool copy) + + + bool + resize_points + classFLAC_1_1Metadata_1_1SeekTable.html + a8b52cd4e3d1893073d5fc299efd9f466 + (unsigned new_num_points) + + + void + set_point + classFLAC_1_1Metadata_1_1SeekTable.html + a992aa37cd6a781b3e1f64a2d1d982229 + (unsigned index, const ::FLAC__StreamMetadata_SeekPoint &point) + + + bool + insert_point + classFLAC_1_1Metadata_1_1SeekTable.html + a688ee146faf497ef96e953008adcc95a + (unsigned index, const ::FLAC__StreamMetadata_SeekPoint &point) + + + bool + delete_point + classFLAC_1_1Metadata_1_1SeekTable.html + af5962d076051a3e46379475c3f2b4fa8 + (unsigned index) + + + bool + is_legal + classFLAC_1_1Metadata_1_1SeekTable.html + aa98d82380ed3c33e1090edbf444fa280 + () const + + + bool + template_append_placeholders + classFLAC_1_1Metadata_1_1SeekTable.html + ae5be56e6dd95f27cb708206285bde4d8 + (unsigned num) + + + bool + template_append_point + classFLAC_1_1Metadata_1_1SeekTable.html + a9c05d6c010988cf2f336ab1c02c3c618 + (FLAC__uint64 sample_number) + + + bool + template_append_points + classFLAC_1_1Metadata_1_1SeekTable.html + a645edc4788158d141d67dee5d078594a + (FLAC__uint64 sample_numbers[], unsigned num) + + + bool + template_append_spaced_points + classFLAC_1_1Metadata_1_1SeekTable.html + a41393ffc88aaa59772081b2b4a211446 + (unsigned num, FLAC__uint64 total_samples) + + + bool + template_append_spaced_points_by_samples + classFLAC_1_1Metadata_1_1SeekTable.html + ab5b672df3c57703c1db965ce12ca8f45 + (unsigned samples, FLAC__uint64 total_samples) + + + bool + template_sort + classFLAC_1_1Metadata_1_1SeekTable.html + a09cc5c101fc9c26655de9ec91dcb502f + (bool compact) + + + + SeekTable + classFLAC_1_1Metadata_1_1SeekTable.html + a7f93d054937829a85108cd423a56299f + (const SeekTable &object) + + + + SeekTable + classFLAC_1_1Metadata_1_1SeekTable.html + a9a39c8eef9d57d84008eb68474c6fa6f + (const ::FLAC__StreamMetadata &object) + + + + SeekTable + classFLAC_1_1Metadata_1_1SeekTable.html + af544e2467d49d7b8610bf4ad8e14969b + (const ::FLAC__StreamMetadata *object) + + + SeekTable & + operator= + classFLAC_1_1Metadata_1_1SeekTable.html + ac1094c0536952a569e41ba619f9b4ff5 + (const SeekTable &object) + + + SeekTable & + operator= + classFLAC_1_1Metadata_1_1SeekTable.html + a72426d86f7e7f9ddc4889b2efcbcbc19 + (const ::FLAC__StreamMetadata &object) + + + SeekTable & + operator= + classFLAC_1_1Metadata_1_1SeekTable.html + a4fade1457b75e99d30a0877403ff8e76 + (const ::FLAC__StreamMetadata *object) + + + bool + operator== + classFLAC_1_1Metadata_1_1SeekTable.html + af17b7d85c8077020a69549d520b18542 + (const SeekTable &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1SeekTable.html + af6e520d60392c77e1fc59e2d86a61203 + (const ::FLAC__StreamMetadata &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1SeekTable.html + ac3b20d126863b9d4e3de695960ff3b31 + (const ::FLAC__StreamMetadata *object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1SeekTable.html + ab120ab96e99d68d607badd473b8a74eb + (const SeekTable &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1SeekTable.html + a3e264fa0e0ec795b47e8d204d27b418e + (const ::FLAC__StreamMetadata &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1SeekTable.html + a267984dede404dc9cf544aa752dbb6df + (const ::FLAC__StreamMetadata *object) const + + + + FLAC::Metadata::SimpleIterator + classFLAC_1_1Metadata_1_1SimpleIterator.html + FLAC::Metadata::SimpleIterator::Status + + bool + is_valid + classFLAC_1_1Metadata_1_1SimpleIterator.html + acd4f5f18a3b5f7c42677e6a234543366 + () const + + + bool + init + classFLAC_1_1Metadata_1_1SimpleIterator.html + a67dc75f18d282f41696467f1fbf5c3e8 + (const char *filename, bool read_only, bool preserve_file_stats) + + + Status + status + classFLAC_1_1Metadata_1_1SimpleIterator.html + a9e681b6ad35b10633002ecea5cab37c3 + () + + + bool + is_writable + classFLAC_1_1Metadata_1_1SimpleIterator.html + aef81191b644d6c0faade9da888301bcd + () const + + + bool + next + classFLAC_1_1Metadata_1_1SimpleIterator.html + ab399f6b8c5e35a1d18588279613ea63c + () + + + bool + prev + classFLAC_1_1Metadata_1_1SimpleIterator.html + a75a859af156322f451045418876eb6a3 + () + + + bool + is_last + classFLAC_1_1Metadata_1_1SimpleIterator.html + af3bd51827d4768d9ee1a244c157490b9 + () const + + + off_t + get_block_offset + classFLAC_1_1Metadata_1_1SimpleIterator.html + ae347bb1435a83a389672079833ac9ebe + () const + + + ::FLAC__MetadataType + get_block_type + classFLAC_1_1Metadata_1_1SimpleIterator.html + a6e0179859e65917dc0d0f97934f95225 + () const + + + unsigned + get_block_length + classFLAC_1_1Metadata_1_1SimpleIterator.html + a9c1c90462df4e4b67279a44769d600e2 + () const + + + bool + get_application_id + classFLAC_1_1Metadata_1_1SimpleIterator.html + a426d06a9d079f74e82eaa217f14997a5 + (FLAC__byte *id) + + + Prototype * + get_block + classFLAC_1_1Metadata_1_1SimpleIterator.html + ab206e5d7145d3726335d336cbc452598 + () + + + bool + set_block + classFLAC_1_1Metadata_1_1SimpleIterator.html + a0ebd4df55346cbcec9ace04f7d7b484d + (Prototype *block, bool use_padding=true) + + + bool + insert_block_after + classFLAC_1_1Metadata_1_1SimpleIterator.html + a1d0e512147967b7e12ac22914fbe3818 + (Prototype *block, bool use_padding=true) + + + bool + delete_block + classFLAC_1_1Metadata_1_1SimpleIterator.html + a67824deff81e2f49c2f51db6b71565e8 + (bool use_padding=true) + + + + FLAC::Metadata::SimpleIterator::Status + classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html + + + FLAC::Metadata::StreamInfo + classFLAC_1_1Metadata_1_1StreamInfo.html + FLAC::Metadata::Prototype + + + StreamInfo + classFLAC_1_1Metadata_1_1StreamInfo.html + aaf4d96124e2b323398f7edf1aaf28003 + (::FLAC__StreamMetadata *object, bool copy) + + + StreamInfo & + assign + classFLAC_1_1Metadata_1_1StreamInfo.html + ad1193a408a5735845dea17a131b7282c + (::FLAC__StreamMetadata *object, bool copy) + + + + StreamInfo + classFLAC_1_1Metadata_1_1StreamInfo.html + ab86611073f13dd3e7aea386bb6f1a7a4 + (const StreamInfo &object) + + + + StreamInfo + classFLAC_1_1Metadata_1_1StreamInfo.html + a3f23948afbcb54758d0ed20edd86515c + (const ::FLAC__StreamMetadata &object) + + + + StreamInfo + classFLAC_1_1Metadata_1_1StreamInfo.html + a24e2028916ac96e0ed0d1e53e003b150 + (const ::FLAC__StreamMetadata *object) + + + StreamInfo & + operator= + classFLAC_1_1Metadata_1_1StreamInfo.html + a353a63aa812f125fedec844142946142 + (const StreamInfo &object) + + + StreamInfo & + operator= + classFLAC_1_1Metadata_1_1StreamInfo.html + aeed95856e0b773e6634848da322d4e43 + (const ::FLAC__StreamMetadata &object) + + + StreamInfo & + operator= + classFLAC_1_1Metadata_1_1StreamInfo.html + a16b032050bc7ac632d9f48ac43b04eb2 + (const ::FLAC__StreamMetadata *object) + + + bool + operator== + classFLAC_1_1Metadata_1_1StreamInfo.html + af0d9d9b8c04978a557f31405f84bc5bc + (const StreamInfo &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1StreamInfo.html + a6c9c3933f0e860ba3341c1018aa8d311 + (const ::FLAC__StreamMetadata &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1StreamInfo.html + ab6ffc53c9a75e9e0e108148777b03c26 + (const ::FLAC__StreamMetadata *object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1StreamInfo.html + a0612e481e3e2d1885b61beb8284565df + (const StreamInfo &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1StreamInfo.html + aac1c0513b2503964bd98b14f60543f57 + (const ::FLAC__StreamMetadata &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1StreamInfo.html + a36983ed34f4bc9218ac66426983e0a3a + (const ::FLAC__StreamMetadata *object) const + + + unsigned + get_min_blocksize + classFLAC_1_1Metadata_1_1StreamInfo.html + a037f1536c4e513a83451593d81154229 + () const + + + unsigned + get_max_blocksize + classFLAC_1_1Metadata_1_1StreamInfo.html + a7914773d3467ff2d28e42f0336db6ec1 + () const + + + unsigned + get_min_framesize + classFLAC_1_1Metadata_1_1StreamInfo.html + ac3bf7cf9fece15653e65274f6edc66ba + () const + + + unsigned + get_max_framesize + classFLAC_1_1Metadata_1_1StreamInfo.html + a3f6bc12d3df2b281041d3430d1ad1358 + () const + + + unsigned + get_sample_rate + classFLAC_1_1Metadata_1_1StreamInfo.html + a647472ee26bd431dd8f54fd160ba42ac + () const + + + unsigned + get_channels + classFLAC_1_1Metadata_1_1StreamInfo.html + ae4a45951634aa55d776ca7180756c18f + () const + + + unsigned + get_bits_per_sample + classFLAC_1_1Metadata_1_1StreamInfo.html + aca391f88a484da9c26236b8234e3fe80 + () const + + + FLAC__uint64 + get_total_samples + classFLAC_1_1Metadata_1_1StreamInfo.html + ac37fd8bb9ab3b45a11d0a4787a2b0a93 + () const + + + const FLAC__byte * + get_md5sum + classFLAC_1_1Metadata_1_1StreamInfo.html + a940e28eb59a960fe12aca839ac32e5ce + () const + + + void + set_min_blocksize + classFLAC_1_1Metadata_1_1StreamInfo.html + ab6f6626737e0c42066dba690edce36de + (unsigned value) + + + void + set_max_blocksize + classFLAC_1_1Metadata_1_1StreamInfo.html + a1f61e1285252714f536f5cbc9d21a37b + (unsigned value) + + + void + set_min_framesize + classFLAC_1_1Metadata_1_1StreamInfo.html + a2bd0480bae277d2b88c55b73f6d14b23 + (unsigned value) + + + void + set_max_framesize + classFLAC_1_1Metadata_1_1StreamInfo.html + a67735d6f89d3e0387abec989dcd4fd23 + (unsigned value) + + + void + set_sample_rate + classFLAC_1_1Metadata_1_1StreamInfo.html + a08df92c03bf07fb9f3a438820eacb734 + (unsigned value) + + + void + set_channels + classFLAC_1_1Metadata_1_1StreamInfo.html + a7d813d6f3d64570126858492a786b885 + (unsigned value) + + + void + set_bits_per_sample + classFLAC_1_1Metadata_1_1StreamInfo.html + a53e22a2b6765d96552ff31a0b21fbbdd + (unsigned value) + + + void + set_total_samples + classFLAC_1_1Metadata_1_1StreamInfo.html + a57250a3a3a7a666c39ec0ac6d8432472 + (FLAC__uint64 value) + + + void + set_md5sum + classFLAC_1_1Metadata_1_1StreamInfo.html + afef84aaea3c333ad880e7843c70aed02 + (const FLAC__byte value[16]) + + + + FLAC::Metadata::Unknown + classFLAC_1_1Metadata_1_1Unknown.html + FLAC::Metadata::Prototype + + + Unknown + classFLAC_1_1Metadata_1_1Unknown.html + a2fb76f94e891c3eea7209a461cab4279 + (::FLAC__StreamMetadata *object, bool copy) + + + Unknown & + assign + classFLAC_1_1Metadata_1_1Unknown.html + a4dc5e794c8d529245888414b2bf7d404 + (::FLAC__StreamMetadata *object, bool copy) + + + bool + set_data + classFLAC_1_1Metadata_1_1Unknown.html + a8621d3eff6af5acc278297b3d2837a76 + (const FLAC__byte *data, unsigned length) + + + + Unknown + classFLAC_1_1Metadata_1_1Unknown.html + a686a799c353cf7a3dc95bb8899318a6b + (const Unknown &object) + + + + Unknown + classFLAC_1_1Metadata_1_1Unknown.html + ad3e590e4c78eeda42021fe88b85bdf91 + (const ::FLAC__StreamMetadata &object) + + + + Unknown + classFLAC_1_1Metadata_1_1Unknown.html + a320c150b6c1c9b1386390eef1c581172 + (const ::FLAC__StreamMetadata *object) + + + Unknown & + operator= + classFLAC_1_1Metadata_1_1Unknown.html + a295f824df8ed10c3386df72272fdca47 + (const Unknown &object) + + + Unknown & + operator= + classFLAC_1_1Metadata_1_1Unknown.html + a5b51e8afe12e5359386d7a85ac330d6e + (const ::FLAC__StreamMetadata &object) + + + Unknown & + operator= + classFLAC_1_1Metadata_1_1Unknown.html + ab0f5ba02518c5893fe93429292f62ef6 + (const ::FLAC__StreamMetadata *object) + + + bool + operator== + classFLAC_1_1Metadata_1_1Unknown.html + a39867d2a96585a55eac42e490704dd6b + (const Unknown &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1Unknown.html + a90b655d4ad2d09a9cd14e428f9c9444a + (const ::FLAC__StreamMetadata &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1Unknown.html + a62f32c3673818b30d585e2a4620a88a3 + (const ::FLAC__StreamMetadata *object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Unknown.html + a73017531fd845a31bb7cd731261e1aad + (const Unknown &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Unknown.html + a82f5022359870567cf2ef96c2400faf2 + (const ::FLAC__StreamMetadata &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1Unknown.html + a49d25242fa6451fb99271678764d1b2b + (const ::FLAC__StreamMetadata *object) const + + + + FLAC::Metadata::VorbisComment + classFLAC_1_1Metadata_1_1VorbisComment.html + FLAC::Metadata::Prototype + FLAC::Metadata::VorbisComment::Entry + + + VorbisComment + classFLAC_1_1Metadata_1_1VorbisComment.html + a65a73f4665db16ac7aec76e9f5e699f2 + (::FLAC__StreamMetadata *object, bool copy) + + + VorbisComment & + assign + classFLAC_1_1Metadata_1_1VorbisComment.html + a9db2171c398cd62a5907e625c3a6228d + (::FLAC__StreamMetadata *object, bool copy) + + + bool + set_vendor_string + classFLAC_1_1Metadata_1_1VorbisComment.html + ad8cffdb4c43ba01eaa9a3f7be0d5926a + (const FLAC__byte *string) + + + bool + resize_comments + classFLAC_1_1Metadata_1_1VorbisComment.html + a64795c2fc4a098e753f576e85e62c3c8 + (unsigned new_num_comments) + + + bool + set_comment + classFLAC_1_1Metadata_1_1VorbisComment.html + ac75ecd354178786318c5c3af1919d949 + (unsigned index, const Entry &entry) + + + bool + insert_comment + classFLAC_1_1Metadata_1_1VorbisComment.html + ad2aabf071235c0f00e580828e9c93f58 + (unsigned index, const Entry &entry) + + + bool + append_comment + classFLAC_1_1Metadata_1_1VorbisComment.html + a1126c7a0f25a2cf78efc8317d3a861f2 + (const Entry &entry) + + + bool + replace_comment + classFLAC_1_1Metadata_1_1VorbisComment.html + a240eb83264d05d953395e75e18e15ee2 + (const Entry &entry, bool all) + + + bool + delete_comment + classFLAC_1_1Metadata_1_1VorbisComment.html + af3c0467a369fff79f07af781c0d24c0c + (unsigned index) + + + int + find_entry_from + classFLAC_1_1Metadata_1_1VorbisComment.html + a36095a90fa9f8c6c14282be9392fd271 + (unsigned offset, const char *field_name) + + + int + remove_entry_matching + classFLAC_1_1Metadata_1_1VorbisComment.html + af0770518f35fe18fb9a0cc5c0542c4b7 + (const char *field_name) + + + int + remove_entries_matching + classFLAC_1_1Metadata_1_1VorbisComment.html + adde2dc584e31f29d67fcc6d15d2d1034 + (const char *field_name) + + + + VorbisComment + classFLAC_1_1Metadata_1_1VorbisComment.html + a436a5c6a42a83a88206376805743fe3b + (const VorbisComment &object) + + + + VorbisComment + classFLAC_1_1Metadata_1_1VorbisComment.html + a2a788c0d96b5b8b22d089663b5e53b72 + (const ::FLAC__StreamMetadata &object) + + + + VorbisComment + classFLAC_1_1Metadata_1_1VorbisComment.html + a9ca0e61561f14b1fff423b3334e14a62 + (const ::FLAC__StreamMetadata *object) + + + VorbisComment & + operator= + classFLAC_1_1Metadata_1_1VorbisComment.html + a135650367ce6c2c5ce12b534307f1cca + (const VorbisComment &object) + + + VorbisComment & + operator= + classFLAC_1_1Metadata_1_1VorbisComment.html + a6330469036affc1255e0d9528f93c191 + (const ::FLAC__StreamMetadata &object) + + + VorbisComment & + operator= + classFLAC_1_1Metadata_1_1VorbisComment.html + a4bed0b3d4a75c482dff89691be750546 + (const ::FLAC__StreamMetadata *object) + + + bool + operator== + classFLAC_1_1Metadata_1_1VorbisComment.html + a426e3fcf457530f18ca37e878e1f52db + (const VorbisComment &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1VorbisComment.html + a3df8d2b436a4bcacbfd8876ff421c391 + (const ::FLAC__StreamMetadata &object) const + + + bool + operator== + classFLAC_1_1Metadata_1_1VorbisComment.html + af011746f1404c9550e6b355c12b366fa + (const ::FLAC__StreamMetadata *object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1VorbisComment.html + a534ad61a7bf4580b786fc5ff7de1bdb7 + (const VorbisComment &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1VorbisComment.html + a511cc194f41b48922f01632e26ec40e5 + (const ::FLAC__StreamMetadata &object) const + + + bool + operator!= + classFLAC_1_1Metadata_1_1VorbisComment.html + a2774fbb6849d04439f2f7ee84c0b9723 + (const ::FLAC__StreamMetadata *object) const + + + + FLAC::Metadata::VorbisComment::Entry + classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html + + virtual bool + is_valid + classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html + affc33d6186da730409e62802e841a5f8 + () const + + + + include/FLAC + /home/erikd/Git/flac/include/FLAC/ + dir_1982b5890de532b4beef7221dae776e2.html + all.h + assert.h + callback.h + export.h + format.h + metadata.h + ordinals.h + stream_decoder.h + stream_encoder.h + + + include/FLAC++ + /home/erikd/Git/flac/include/FLAC++/ + dir_527642952c2881b3e5b36abb4a29ebef.html + all.h + decoder.h + encoder.h + export.h + metadata.h + + + include + /home/erikd/Git/flac/include/ + dir_d44c64559bbebec7f509842c48db8b23.html + include/FLAC + include/FLAC++ + + + index + + index + intro + c_api + cpp_api + getting_started + porting_guide + embedded_developers + + diff --git a/lib-src/libflac/doc/Makefile.am b/lib-src/libflac/doc/Makefile.am index ff9a27eaf..4681bf871 100644 --- a/lib-src/libflac/doc/Makefile.am +++ b/lib-src/libflac/doc/Makefile.am @@ -1,6 +1,6 @@ # flac - Command-line FLAC encoder/decoder # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -27,7 +27,6 @@ FLAC.tag: Doxyfile rm -rf doxytmp else FLAC.tag: - echo "*** Warning: Doxygen not found; documentation will not be built." touch $@ mkdir -p html/api endif diff --git a/lib-src/libflac/doc/Makefile.in b/lib-src/libflac/doc/Makefile.in index 25d33e6d7..ba6e56c99 100644 --- a/lib-src/libflac/doc/Makefile.in +++ b/lib-src/libflac/doc/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # flac - Command-line FLAC encoder/decoder # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -70,39 +97,48 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/Doxyfile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = Doxyfile CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -139,9 +175,29 @@ am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(doc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -208,7 +264,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -228,8 +283,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -330,7 +383,7 @@ EXTRA_DIST = Doxyfile.in Makefile.lite doxygen.footer.html doxygen.header.html $ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -355,9 +408,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in @@ -391,22 +444,25 @@ uninstall-docDATA: dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -421,57 +477,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -487,12 +498,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -504,15 +510,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -521,6 +523,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -686,23 +703,21 @@ ps-am: uninstall-am: uninstall-docDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am all-local check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive distclean \ - distclean-generic distclean-libtool distclean-local \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ + check check-am clean clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-generic distclean-libtool \ + distclean-local distclean-tags distdir dvi dvi-am html html-am \ + info info-am install install-am install-data install-data-am \ install-docDATA install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-docDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-docDATA @FLaC__HAS_DOXYGEN_TRUE@all-local: Doxyfile @@ -712,7 +727,6 @@ uninstall-am: uninstall-docDATA @FLaC__HAS_DOXYGEN_TRUE@ mv doxytmp/html html/api @FLaC__HAS_DOXYGEN_TRUE@ rm -rf doxytmp @FLaC__HAS_DOXYGEN_FALSE@FLAC.tag: -@FLaC__HAS_DOXYGEN_FALSE@ echo "*** Warning: Doxygen not found; documentation will not be built." @FLaC__HAS_DOXYGEN_FALSE@ touch $@ @FLaC__HAS_DOXYGEN_FALSE@ mkdir -p html/api diff --git a/lib-src/libflac/doc/Makefile.lite b/lib-src/libflac/doc/Makefile.lite index 6b8132e7c..28f98c369 100644 --- a/lib-src/libflac/doc/Makefile.lite +++ b/lib-src/libflac/doc/Makefile.lite @@ -1,6 +1,6 @@ # flac - Command-line FLAC encoder/decoder # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/doc/doxygen.footer.html b/lib-src/libflac/doc/doxygen.footer.html index c227bd0ff..d99a395db 100644 --- a/lib-src/libflac/doc/doxygen.footer.html +++ b/lib-src/libflac/doc/doxygen.footer.html @@ -6,7 +6,7 @@ Copyright (c) 2000-2009 Josh Coalson - Copyright (c) 2011-2013 Xiph.Org Foundation + Copyright (c) 2011-2014 Xiph.Org Foundation SourceForge.net Logo @@ -15,7 +15,7 @@ - + diff --git a/lib-src/libflac/doc/doxygen.header.html b/lib-src/libflac/doc/doxygen.header.html index 06a5bbf5f..ec145f115 100644 --- a/lib-src/libflac/doc/doxygen.header.html +++ b/lib-src/libflac/doc/doxygen.header.html @@ -1,5 +1,5 @@ - + diff --git a/lib-src/libflac/doc/html/Makefile.am b/lib-src/libflac/doc/html/Makefile.am index e8e5589b2..91596c409 100644 --- a/lib-src/libflac/doc/html/Makefile.am +++ b/lib-src/libflac/doc/html/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -16,43 +16,20 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. -SUBDIRS = ru images +SUBDIRS = images docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html doc_DATA = \ changelog.html \ - comparison.html \ - comparison__chopin_prelude_24.html \ - comparison__dream_theater_600.html \ - comparison__eddie_warner_titus.html \ - comparison__fanfare_de_l_eventail_de_jeanne.html \ - comparison__gloria_estefan_conga.html \ - comparison__hand_in_my_pocket.html \ - comparison__l_sub_raga_sivapriya.html \ - comparison__laetatus_sum.html \ - comparison__mummified_in_barbed_wire.html \ - comparison__prokofiev_pcon3_3.html \ - comparison__ravel_sq4_4.html \ - comparison__scarlatti_k42.html \ - comparison__tool_forty_six_and_2.html \ - comparison__white_room.html \ - comparison_all_cpudectime.html \ - comparison_all_cpuenctime.html \ - comparison_all_procdectime.html \ - comparison_all_procenctime.html \ - comparison_all_ratio.html \ developers.html \ documentation.html \ documentation_bugs.html \ documentation_example_code.html \ documentation_format_overview.html \ - documentation_tasks.html \ documentation_tools.html \ documentation_tools_flac.html \ documentation_tools_metaflac.html \ - documentation_tools_plugins.html \ - download.html \ faq.html \ favicon.ico \ features.html \ @@ -60,10 +37,7 @@ doc_DATA = \ format.html \ id.html \ index.html \ - itunes.html \ license.html \ - links.html \ - news.html \ ogg_mapping.html EXTRA_DIST = $(doc_DATA) api diff --git a/lib-src/libflac/doc/html/Makefile.in b/lib-src/libflac/doc/html/Makefile.in index 6fe99546a..a7e81db08 100644 --- a/lib-src/libflac/doc/html/Makefile.in +++ b/lib-src/libflac/doc/html/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -34,23 +33,51 @@ # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -70,38 +97,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc/html -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -138,9 +174,29 @@ am__installdirs = "$(DESTDIR)$(docdir)" DATA = $(doc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -207,7 +263,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -227,8 +282,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -321,40 +374,17 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = ru images +SUBDIRS = images doc_DATA = \ changelog.html \ - comparison.html \ - comparison__chopin_prelude_24.html \ - comparison__dream_theater_600.html \ - comparison__eddie_warner_titus.html \ - comparison__fanfare_de_l_eventail_de_jeanne.html \ - comparison__gloria_estefan_conga.html \ - comparison__hand_in_my_pocket.html \ - comparison__l_sub_raga_sivapriya.html \ - comparison__laetatus_sum.html \ - comparison__mummified_in_barbed_wire.html \ - comparison__prokofiev_pcon3_3.html \ - comparison__ravel_sq4_4.html \ - comparison__scarlatti_k42.html \ - comparison__tool_forty_six_and_2.html \ - comparison__white_room.html \ - comparison_all_cpudectime.html \ - comparison_all_cpuenctime.html \ - comparison_all_procdectime.html \ - comparison_all_procenctime.html \ - comparison_all_ratio.html \ developers.html \ documentation.html \ documentation_bugs.html \ documentation_example_code.html \ documentation_format_overview.html \ - documentation_tasks.html \ documentation_tools.html \ documentation_tools_flac.html \ documentation_tools_metaflac.html \ - documentation_tools_plugins.html \ - download.html \ faq.html \ favicon.ico \ features.html \ @@ -362,17 +392,14 @@ doc_DATA = \ format.html \ id.html \ index.html \ - itunes.html \ license.html \ - links.html \ - news.html \ ogg_mapping.html EXTRA_DIST = $(doc_DATA) api all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -397,9 +424,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -431,22 +458,25 @@ uninstall-docDATA: dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -461,57 +491,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -527,12 +512,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -544,15 +524,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -561,6 +537,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -658,9 +649,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@FLaC__HAS_DOXYGEN_FALSE@uninstall-local: @FLaC__HAS_DOXYGEN_FALSE@distclean-local: @FLaC__HAS_DOXYGEN_FALSE@install-data-local: +@FLaC__HAS_DOXYGEN_FALSE@uninstall-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -728,23 +719,22 @@ ps-am: uninstall-am: uninstall-docDATA uninstall-local -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-local distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local \ - install-docDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-docDATA uninstall-local +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-local distclean-tags distdir dvi dvi-am html html-am \ + info info-am install install-am install-data install-data-am \ + install-data-local install-docDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-docDATA \ + uninstall-local # The install targets don't copy whole directories so we have to diff --git a/lib-src/libflac/doc/html/api/_09_2all_8h_source.html b/lib-src/libflac/doc/html/api/_09_2all_8h_source.html new file mode 100644 index 000000000..8bf6a4ca2 --- /dev/null +++ b/lib-src/libflac/doc/html/api/_09_2all_8h_source.html @@ -0,0 +1,125 @@ + + + + + + +FLAC: include/FLAC++/all.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
all.h
+
+
+
1 /* libFLAC++ - Free Lossless Audio Codec library
+
2  * Copyright (C) 2002-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLACPP__ALL_H
+
34 #define FLACPP__ALL_H
+
35 
+
36 #include "export.h"
+
37 
+
38 #include "encoder.h"
+
39 #include "decoder.h"
+
40 #include "metadata.h"
+
41 
+
49 #endif
+
This module provides classes for creating and manipulating FLAC metadata blocks in memory...
+
This module contains #defines and symbols for exporting function calls, and providing version informa...
+
This module contains the classes which implement the various decoders.
+
This module contains the classes which implement the various encoders.
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/_09_2export_8h.html b/lib-src/libflac/doc/html/api/_09_2export_8h.html new file mode 100644 index 000000000..09887bd4e --- /dev/null +++ b/lib-src/libflac/doc/html/api/_09_2export_8h.html @@ -0,0 +1,102 @@ + + + + + + +FLAC: include/FLAC++/export.h File Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+ +
+
export.h File Reference
+
+
+ +

Go to the source code of this file.

+ + + + + + + + + + +

+Macros

+#define FLACPP_API
 
+#define FLACPP_API_VERSION_CURRENT   9
 
+#define FLACPP_API_VERSION_REVISION   0
 
+#define FLACPP_API_VERSION_AGE   3
 
+

Detailed Description

+

This module contains #defines and symbols for exporting function calls, and providing version information and compiled-in features.

+

See the export module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/_09_2export_8h_source.html b/lib-src/libflac/doc/html/api/_09_2export_8h_source.html new file mode 100644 index 000000000..0b1a00d26 --- /dev/null +++ b/lib-src/libflac/doc/html/api/_09_2export_8h_source.html @@ -0,0 +1,142 @@ + + + + + + +FLAC: include/FLAC++/export.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
export.h
+
+
+Go to the documentation of this file.
1 /* libFLAC++ - Free Lossless Audio Codec library
+
2  * Copyright (C) 2002-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLACPP__EXPORT_H
+
34 #define FLACPP__EXPORT_H
+
35 
+
59 #if defined(FLAC__NO_DLL)
+
60 #define FLACPP_API
+
61 
+
62 #elif defined(_MSC_VER)
+
63 #ifdef FLACPP_API_EXPORTS
+
64 #define FLACPP_API __declspec(dllexport)
+
65 #else
+
66 #define FLACPP_API __declspec(dllimport)
+
67 #endif
+
68 
+
69 #elif defined(FLAC__USE_VISIBILITY_ATTR)
+
70 #define FLACPP_API __attribute__ ((visibility ("default")))
+
71 
+
72 #else
+
73 #define FLACPP_API
+
74 
+
75 #endif
+
76 
+
77 /* These #defines will mirror the libtool-based library version number, see
+
78  * http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
+
79  */
+
80 #define FLACPP_API_VERSION_CURRENT 9
+
81 #define FLACPP_API_VERSION_REVISION 0
+
82 #define FLACPP_API_VERSION_AGE 3
+
83 
+
84 /* \} */
+
85 
+
86 #endif
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/_09_2metadata_8h.html b/lib-src/libflac/doc/html/api/_09_2metadata_8h.html new file mode 100644 index 000000000..64837db94 --- /dev/null +++ b/lib-src/libflac/doc/html/api/_09_2metadata_8h.html @@ -0,0 +1,144 @@ + + + + + + +FLAC: include/FLAC++/metadata.h File Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+ +
+
metadata.h File Reference
+
+
+
#include "export.h"
+#include "FLAC/metadata.h"
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Classes

class  FLAC::Metadata::Prototype
 
class  FLAC::Metadata::StreamInfo
 
class  FLAC::Metadata::Padding
 
class  FLAC::Metadata::Application
 
class  FLAC::Metadata::SeekTable
 
class  FLAC::Metadata::VorbisComment
 
class  FLAC::Metadata::VorbisComment::Entry
 
class  FLAC::Metadata::CueSheet
 
class  FLAC::Metadata::CueSheet::Track
 
class  FLAC::Metadata::Picture
 
class  FLAC::Metadata::Unknown
 
class  FLAC::Metadata::SimpleIterator
 
class  FLAC::Metadata::SimpleIterator::Status
 
class  FLAC::Metadata::Chain
 
class  FLAC::Metadata::Chain::Status
 
class  FLAC::Metadata::Iterator
 
+ + + + + + + + + + + + + + + + + +

+Functions

Prototype * FLAC::Metadata::clone (const Prototype *)
 
bool FLAC::Metadata::get_streaminfo (const char *filename, StreamInfo &streaminfo)
 
bool FLAC::Metadata::get_tags (const char *filename, VorbisComment *&tags)
 
bool FLAC::Metadata::get_tags (const char *filename, VorbisComment &tags)
 
bool FLAC::Metadata::get_cuesheet (const char *filename, CueSheet *&cuesheet)
 
bool FLAC::Metadata::get_cuesheet (const char *filename, CueSheet &cuesheet)
 
bool FLAC::Metadata::get_picture (const char *filename, Picture *&picture,::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors)
 
bool FLAC::Metadata::get_picture (const char *filename, Picture &picture,::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors)
 
+

Detailed Description

+

This module provides classes for creating and manipulating FLAC metadata blocks in memory, and three progressively more powerful interfaces for traversing and editing metadata in FLAC files.

+

See the detailed documentation for each interface in the metadata module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/_09_2metadata_8h_source.html b/lib-src/libflac/doc/html/api/_09_2metadata_8h_source.html new file mode 100644 index 000000000..ae1d3becd --- /dev/null +++ b/lib-src/libflac/doc/html/api/_09_2metadata_8h_source.html @@ -0,0 +1,1010 @@ + + + + + + +FLAC: include/FLAC++/metadata.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
metadata.h
+
+
+Go to the documentation of this file.
1 /* libFLAC++ - Free Lossless Audio Codec library
+
2  * Copyright (C) 2002-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLACPP__METADATA_H
+
34 #define FLACPP__METADATA_H
+
35 
+
36 #include "export.h"
+
37 
+
38 #include "FLAC/metadata.h"
+
39 
+
40 // ===============================================================
+
41 //
+
42 // Full documentation for the metadata interface can be found
+
43 // in the C layer in include/FLAC/metadata.h
+
44 //
+
45 // ===============================================================
+
46 
+
75 namespace FLAC {
+
76  namespace Metadata {
+
77 
+
78  // ============================================================
+
79  //
+
80  // Metadata objects
+
81  //
+
82  // ============================================================
+
83 
+
109  class FLACPP_API Prototype {
+
110  protected:
+
112 
+
115  Prototype(const Prototype &);
+
116  Prototype(const ::FLAC__StreamMetadata &);
+
117  Prototype(const ::FLAC__StreamMetadata *);
+
119 
+
130  Prototype(::FLAC__StreamMetadata *object, bool copy);
+
131 
+
133 
+
134  Prototype &operator=(const Prototype &);
+
135  Prototype &operator=(const ::FLAC__StreamMetadata &);
+
136  Prototype &operator=(const ::FLAC__StreamMetadata *);
+
138 
+
142  Prototype &assign_object(::FLAC__StreamMetadata *object, bool copy);
+
143 
+
146  virtual void clear();
+
147 
+
148  ::FLAC__StreamMetadata *object_;
+
149  public:
+
152  virtual ~Prototype();
+
153 
+
155 
+
157  inline bool operator==(const Prototype &) const;
+
158  inline bool operator==(const ::FLAC__StreamMetadata &) const;
+
159  inline bool operator==(const ::FLAC__StreamMetadata *) const;
+
161 
+
163 
+
164  inline bool operator!=(const Prototype &) const;
+
165  inline bool operator!=(const ::FLAC__StreamMetadata &) const;
+
166  inline bool operator!=(const ::FLAC__StreamMetadata *) const;
+
168 
+
169  friend class SimpleIterator;
+
170  friend class Iterator;
+
171 
+
176  inline bool is_valid() const;
+
177 
+
184  bool get_is_last() const;
+
185 
+
191  ::FLAC__MetadataType get_type() const;
+
192 
+
202  unsigned get_length() const;
+
203 
+
210  void set_is_last(bool);
+
211 
+
219  inline operator const ::FLAC__StreamMetadata *() const;
+
220  private:
+
222  Prototype();
+
223 
+
224  // These are used only by Iterator
+
225  bool is_reference_;
+
226  inline void set_reference(bool x) { is_reference_ = x; }
+
227  };
+
228 
+
229 #ifdef _MSC_VER
+
230 // warning C4800: 'int' : forcing to bool 'true' or 'false' (performance warning)
+
231 #pragma warning ( disable : 4800 )
+
232 #endif
+
233 
+
234  inline bool Prototype::operator==(const Prototype &object) const
+
235  { return (bool)::FLAC__metadata_object_is_equal(object_, object.object_); }
+
236 
+
237  inline bool Prototype::operator==(const ::FLAC__StreamMetadata &object) const
+
238  { return (bool)::FLAC__metadata_object_is_equal(object_, &object); }
+
239 
+
240  inline bool Prototype::operator==(const ::FLAC__StreamMetadata *object) const
+
241  { return (bool)::FLAC__metadata_object_is_equal(object_, object); }
+
242 
+
243 #ifdef _MSC_VER
+
244 #pragma warning ( default : 4800 )
+
245 #endif
+
246 
+
247  inline bool Prototype::operator!=(const Prototype &object) const
+
248  { return !operator==(object); }
+
249 
+
250  inline bool Prototype::operator!=(const ::FLAC__StreamMetadata &object) const
+
251  { return !operator==(object); }
+
252 
+
253  inline bool Prototype::operator!=(const ::FLAC__StreamMetadata *object) const
+
254  { return !operator==(object); }
+
255 
+
256  inline bool Prototype::is_valid() const
+
257  { return 0 != object_; }
+
258 
+
259  inline Prototype::operator const ::FLAC__StreamMetadata *() const
+
260  { return object_; }
+
261 
+
263  FLACPP_API Prototype *clone(const Prototype *);
+
264 
+
265 
+
270  class FLACPP_API StreamInfo : public Prototype {
+
271  public:
+
272  StreamInfo();
+
273 
+
275 
+
278  inline StreamInfo(const StreamInfo &object): Prototype(object) { }
+
279  inline StreamInfo(const ::FLAC__StreamMetadata &object): Prototype(object) { }
+
280  inline StreamInfo(const ::FLAC__StreamMetadata *object): Prototype(object) { }
+
282 
+
286  inline StreamInfo(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
+
287 
+
288  ~StreamInfo();
+
289 
+
291 
+
292  inline StreamInfo &operator=(const StreamInfo &object) { Prototype::operator=(object); return *this; }
+
293  inline StreamInfo &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+
294  inline StreamInfo &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
+
296 
+
300  inline StreamInfo &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
301 
+
303 
+
304  inline bool operator==(const StreamInfo &object) const { return Prototype::operator==(object); }
+
305  inline bool operator==(const ::FLAC__StreamMetadata &object) const { return Prototype::operator==(object); }
+
306  inline bool operator==(const ::FLAC__StreamMetadata *object) const { return Prototype::operator==(object); }
+
308 
+
310 
+
311  inline bool operator!=(const StreamInfo &object) const { return Prototype::operator!=(object); }
+
312  inline bool operator!=(const ::FLAC__StreamMetadata &object) const { return Prototype::operator!=(object); }
+
313  inline bool operator!=(const ::FLAC__StreamMetadata *object) const { return Prototype::operator!=(object); }
+
315 
+
317 
+
318  unsigned get_min_blocksize() const;
+
319  unsigned get_max_blocksize() const;
+
320  unsigned get_min_framesize() const;
+
321  unsigned get_max_framesize() const;
+
322  unsigned get_sample_rate() const;
+
323  unsigned get_channels() const;
+
324  unsigned get_bits_per_sample() const;
+
325  FLAC__uint64 get_total_samples() const;
+
326  const FLAC__byte *get_md5sum() const;
+
327 
+
328  void set_min_blocksize(unsigned value);
+
329  void set_max_blocksize(unsigned value);
+
330  void set_min_framesize(unsigned value);
+
331  void set_max_framesize(unsigned value);
+
332  void set_sample_rate(unsigned value);
+
333  void set_channels(unsigned value);
+
334  void set_bits_per_sample(unsigned value);
+
335  void set_total_samples(FLAC__uint64 value);
+
336  void set_md5sum(const FLAC__byte value[16]);
+
338  };
+
339 
+
344  class FLACPP_API Padding : public Prototype {
+
345  public:
+
346  Padding();
+
347 
+
349 
+
352  inline Padding(const Padding &object): Prototype(object) { }
+
353  inline Padding(const ::FLAC__StreamMetadata &object): Prototype(object) { }
+
354  inline Padding(const ::FLAC__StreamMetadata *object): Prototype(object) { }
+
356 
+
360  inline Padding(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
+
361 
+
364  Padding(unsigned length);
+
365 
+
366  ~Padding();
+
367 
+
369 
+
370  inline Padding &operator=(const Padding &object) { Prototype::operator=(object); return *this; }
+
371  inline Padding &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+
372  inline Padding &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
+
374 
+
378  inline Padding &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
379 
+
381 
+
382  inline bool operator==(const Padding &object) const { return Prototype::operator==(object); }
+
383  inline bool operator==(const ::FLAC__StreamMetadata &object) const { return Prototype::operator==(object); }
+
384  inline bool operator==(const ::FLAC__StreamMetadata *object) const { return Prototype::operator==(object); }
+
386 
+
388 
+
389  inline bool operator!=(const Padding &object) const { return Prototype::operator!=(object); }
+
390  inline bool operator!=(const ::FLAC__StreamMetadata &object) const { return Prototype::operator!=(object); }
+
391  inline bool operator!=(const ::FLAC__StreamMetadata *object) const { return Prototype::operator!=(object); }
+
393 
+
396  void set_length(unsigned length);
+
397  };
+
398 
+
403  class FLACPP_API Application : public Prototype {
+
404  public:
+
405  Application();
+
406  //
+
408 
+
411  inline Application(const Application &object): Prototype(object) { }
+
412  inline Application(const ::FLAC__StreamMetadata &object): Prototype(object) { }
+
413  inline Application(const ::FLAC__StreamMetadata *object): Prototype(object) { }
+
415 
+
419  inline Application(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
+
420 
+
421  ~Application();
+
422 
+
424 
+
425  inline Application &operator=(const Application &object) { Prototype::operator=(object); return *this; }
+
426  inline Application &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+
427  inline Application &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
+
429 
+
433  inline Application &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
434 
+
436 
+
437  inline bool operator==(const Application &object) const { return Prototype::operator==(object); }
+
438  inline bool operator==(const ::FLAC__StreamMetadata &object) const { return Prototype::operator==(object); }
+
439  inline bool operator==(const ::FLAC__StreamMetadata *object) const { return Prototype::operator==(object); }
+
441 
+
443 
+
444  inline bool operator!=(const Application &object) const { return Prototype::operator!=(object); }
+
445  inline bool operator!=(const ::FLAC__StreamMetadata &object) const { return Prototype::operator!=(object); }
+
446  inline bool operator!=(const ::FLAC__StreamMetadata *object) const { return Prototype::operator!=(object); }
+
448 
+
449  const FLAC__byte *get_id() const;
+
450  const FLAC__byte *get_data() const;
+
451 
+
452  void set_id(const FLAC__byte value[4]);
+
454  bool set_data(const FLAC__byte *data, unsigned length);
+
455  bool set_data(FLAC__byte *data, unsigned length, bool copy);
+
456  };
+
457 
+
462  class FLACPP_API SeekTable : public Prototype {
+
463  public:
+
464  SeekTable();
+
465 
+
467 
+
470  inline SeekTable(const SeekTable &object): Prototype(object) { }
+
471  inline SeekTable(const ::FLAC__StreamMetadata &object): Prototype(object) { }
+
472  inline SeekTable(const ::FLAC__StreamMetadata *object): Prototype(object) { }
+
474 
+
478  inline SeekTable(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
+
479 
+
480  ~SeekTable();
+
481 
+
483 
+
484  inline SeekTable &operator=(const SeekTable &object) { Prototype::operator=(object); return *this; }
+
485  inline SeekTable &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+
486  inline SeekTable &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
+
488 
+
492  inline SeekTable &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
493 
+
495 
+
496  inline bool operator==(const SeekTable &object) const { return Prototype::operator==(object); }
+
497  inline bool operator==(const ::FLAC__StreamMetadata &object) const { return Prototype::operator==(object); }
+
498  inline bool operator==(const ::FLAC__StreamMetadata *object) const { return Prototype::operator==(object); }
+
500 
+
502 
+
503  inline bool operator!=(const SeekTable &object) const { return Prototype::operator!=(object); }
+
504  inline bool operator!=(const ::FLAC__StreamMetadata &object) const { return Prototype::operator!=(object); }
+
505  inline bool operator!=(const ::FLAC__StreamMetadata *object) const { return Prototype::operator!=(object); }
+
507 
+
508  unsigned get_num_points() const;
+
509  ::FLAC__StreamMetadata_SeekPoint get_point(unsigned index) const;
+
510 
+
512  bool resize_points(unsigned new_num_points);
+
513 
+
515  void set_point(unsigned index, const ::FLAC__StreamMetadata_SeekPoint &point);
+
516 
+
518  bool insert_point(unsigned index, const ::FLAC__StreamMetadata_SeekPoint &point);
+
519 
+
521  bool delete_point(unsigned index);
+
522 
+
524  bool is_legal() const;
+
525 
+
527  bool template_append_placeholders(unsigned num);
+
528 
+
530  bool template_append_point(FLAC__uint64 sample_number);
+
531 
+
533  bool template_append_points(FLAC__uint64 sample_numbers[], unsigned num);
+
534 
+
536  bool template_append_spaced_points(unsigned num, FLAC__uint64 total_samples);
+
537 
+
539  bool template_append_spaced_points_by_samples(unsigned samples, FLAC__uint64 total_samples);
+
540 
+
542  bool template_sort(bool compact);
+
543  };
+
544 
+
549  class FLACPP_API VorbisComment : public Prototype {
+
550  public:
+
580  class FLACPP_API Entry {
+
581  public:
+
582  Entry();
+
583 
+
584  Entry(const char *field, unsigned field_length);
+
585  Entry(const char *field); // assumes \a field is NUL-terminated
+
586 
+
587  Entry(const char *field_name, const char *field_value, unsigned field_value_length);
+
588  Entry(const char *field_name, const char *field_value); // assumes \a field_value is NUL-terminated
+
589 
+
590  Entry(const Entry &entry);
+
591 
+
592  Entry &operator=(const Entry &entry);
+
593 
+
594  virtual ~Entry();
+
595 
+
596  virtual bool is_valid() const;
+
597 
+
598  unsigned get_field_length() const;
+
599  unsigned get_field_name_length() const;
+
600  unsigned get_field_value_length() const;
+
601 
+ +
603  const char *get_field() const;
+
604  const char *get_field_name() const;
+
605  const char *get_field_value() const;
+
606 
+
607  bool set_field(const char *field, unsigned field_length);
+
608  bool set_field(const char *field); // assumes \a field is NUL-terminated
+
609  bool set_field_name(const char *field_name);
+
610  bool set_field_value(const char *field_value, unsigned field_value_length);
+
611  bool set_field_value(const char *field_value); // assumes \a field_value is NUL-terminated
+
612  protected:
+
613  bool is_valid_;
+ +
615  char *field_name_;
+
616  unsigned field_name_length_;
+
617  char *field_value_;
+
618  unsigned field_value_length_;
+
619  private:
+
620  void zero();
+
621  void clear();
+
622  void clear_entry();
+
623  void clear_field_name();
+
624  void clear_field_value();
+
625  void construct(const char *field, unsigned field_length);
+
626  void construct(const char *field); // assumes \a field is NUL-terminated
+
627  void construct(const char *field_name, const char *field_value, unsigned field_value_length);
+
628  void construct(const char *field_name, const char *field_value); // assumes \a field_value is NUL-terminated
+
629  void compose_field();
+
630  void parse_field();
+
631  };
+
632 
+
633  VorbisComment();
+
634 
+
636 
+
639  inline VorbisComment(const VorbisComment &object): Prototype(object) { }
+
640  inline VorbisComment(const ::FLAC__StreamMetadata &object): Prototype(object) { }
+
641  inline VorbisComment(const ::FLAC__StreamMetadata *object): Prototype(object) { }
+
643 
+
647  inline VorbisComment(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
+
648 
+
649  ~VorbisComment();
+
650 
+
652 
+
653  inline VorbisComment &operator=(const VorbisComment &object) { Prototype::operator=(object); return *this; }
+
654  inline VorbisComment &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+
655  inline VorbisComment &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
+
657 
+
661  inline VorbisComment &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
662 
+
664 
+
665  inline bool operator==(const VorbisComment &object) const { return Prototype::operator==(object); }
+
666  inline bool operator==(const ::FLAC__StreamMetadata &object) const { return Prototype::operator==(object); }
+
667  inline bool operator==(const ::FLAC__StreamMetadata *object) const { return Prototype::operator==(object); }
+
669 
+
671 
+
672  inline bool operator!=(const VorbisComment &object) const { return Prototype::operator!=(object); }
+
673  inline bool operator!=(const ::FLAC__StreamMetadata &object) const { return Prototype::operator!=(object); }
+
674  inline bool operator!=(const ::FLAC__StreamMetadata *object) const { return Prototype::operator!=(object); }
+
676 
+
677  unsigned get_num_comments() const;
+
678  const FLAC__byte *get_vendor_string() const; // NUL-terminated UTF-8 string
+
679  Entry get_comment(unsigned index) const;
+
680 
+
682  bool set_vendor_string(const FLAC__byte *string); // NUL-terminated UTF-8 string
+
683 
+
685  bool resize_comments(unsigned new_num_comments);
+
686 
+
688  bool set_comment(unsigned index, const Entry &entry);
+
689 
+
691  bool insert_comment(unsigned index, const Entry &entry);
+
692 
+
694  bool append_comment(const Entry &entry);
+
695 
+
697  bool replace_comment(const Entry &entry, bool all);
+
698 
+
700  bool delete_comment(unsigned index);
+
701 
+
703  int find_entry_from(unsigned offset, const char *field_name);
+
704 
+
706  int remove_entry_matching(const char *field_name);
+
707 
+
709  int remove_entries_matching(const char *field_name);
+
710  };
+
711 
+
716  class FLACPP_API CueSheet : public Prototype {
+
717  public:
+
724  class FLACPP_API Track {
+
725  protected:
+ +
727  public:
+
728  Track();
+
729  Track(const ::FLAC__StreamMetadata_CueSheet_Track *track);
+
730  Track(const Track &track);
+
731  Track &operator=(const Track &track);
+
732 
+
733  virtual ~Track();
+
734 
+
735  virtual bool is_valid() const;
+
736 
+
737 
+
738  inline FLAC__uint64 get_offset() const { return object_->offset; }
+
739  inline FLAC__byte get_number() const { return object_->number; }
+
740  inline const char *get_isrc() const { return object_->isrc; }
+
741  inline unsigned get_type() const { return object_->type; }
+
742  inline bool get_pre_emphasis() const { return object_->pre_emphasis; }
+
743 
+
744  inline FLAC__byte get_num_indices() const { return object_->num_indices; }
+
745  ::FLAC__StreamMetadata_CueSheet_Index get_index(unsigned i) const;
+
746 
+
747  inline const ::FLAC__StreamMetadata_CueSheet_Track *get_track() const { return object_; }
+
748 
+
749  inline void set_offset(FLAC__uint64 value) { object_->offset = value; }
+
750  inline void set_number(FLAC__byte value) { object_->number = value; }
+
751  void set_isrc(const char value[12]);
+
752  void set_type(unsigned value);
+
753  inline void set_pre_emphasis(bool value) { object_->pre_emphasis = value? 1 : 0; }
+
754 
+
755  void set_index(unsigned i, const ::FLAC__StreamMetadata_CueSheet_Index &index);
+
756  //@@@ It's awkward but to insert/delete index points
+
757  //@@@ you must use the routines in the CueSheet class.
+
758  };
+
759 
+
760  CueSheet();
+
761 
+
763 
+
766  inline CueSheet(const CueSheet &object): Prototype(object) { }
+
767  inline CueSheet(const ::FLAC__StreamMetadata &object): Prototype(object) { }
+
768  inline CueSheet(const ::FLAC__StreamMetadata *object): Prototype(object) { }
+
770 
+
774  inline CueSheet(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
+
775 
+
776  ~CueSheet();
+
777 
+
779 
+
780  inline CueSheet &operator=(const CueSheet &object) { Prototype::operator=(object); return *this; }
+
781  inline CueSheet &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+
782  inline CueSheet &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
+
784 
+
788  inline CueSheet &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
789 
+
791 
+
792  inline bool operator==(const CueSheet &object) const { return Prototype::operator==(object); }
+
793  inline bool operator==(const ::FLAC__StreamMetadata &object) const { return Prototype::operator==(object); }
+
794  inline bool operator==(const ::FLAC__StreamMetadata *object) const { return Prototype::operator==(object); }
+
796 
+
798 
+
799  inline bool operator!=(const CueSheet &object) const { return Prototype::operator!=(object); }
+
800  inline bool operator!=(const ::FLAC__StreamMetadata &object) const { return Prototype::operator!=(object); }
+
801  inline bool operator!=(const ::FLAC__StreamMetadata *object) const { return Prototype::operator!=(object); }
+
803 
+
804  const char *get_media_catalog_number() const;
+
805  FLAC__uint64 get_lead_in() const;
+
806  bool get_is_cd() const;
+
807 
+
808  unsigned get_num_tracks() const;
+
809  Track get_track(unsigned i) const;
+
810 
+
811  void set_media_catalog_number(const char value[128]);
+
812  void set_lead_in(FLAC__uint64 value);
+
813  void set_is_cd(bool value);
+
814 
+
815  void set_index(unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &index);
+
816 
+
818  bool resize_indices(unsigned track_num, unsigned new_num_indices);
+
819 
+
821  bool insert_index(unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &index);
+
822 
+
824  bool insert_blank_index(unsigned track_num, unsigned index_num);
+
825 
+
827  bool delete_index(unsigned track_num, unsigned index_num);
+
828 
+
830  bool resize_tracks(unsigned new_num_tracks);
+
831 
+
833  bool set_track(unsigned i, const Track &track);
+
834 
+
836  bool insert_track(unsigned i, const Track &track);
+
837 
+
839  bool insert_blank_track(unsigned i);
+
840 
+
842  bool delete_track(unsigned i);
+
843 
+
845  bool is_legal(bool check_cd_da_subset = false, const char **violation = 0) const;
+
846 
+
848  FLAC__uint32 calculate_cddb_id() const;
+
849  };
+
850 
+
855  class FLACPP_API Picture : public Prototype {
+
856  public:
+
857  Picture();
+
858 
+
860 
+
863  inline Picture(const Picture &object): Prototype(object) { }
+
864  inline Picture(const ::FLAC__StreamMetadata &object): Prototype(object) { }
+
865  inline Picture(const ::FLAC__StreamMetadata *object): Prototype(object) { }
+
867 
+
871  inline Picture(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
+
872 
+
873  ~Picture();
+
874 
+
876 
+
877  inline Picture &operator=(const Picture &object) { Prototype::operator=(object); return *this; }
+
878  inline Picture &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+
879  inline Picture &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
+
881 
+
885  inline Picture &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
886 
+
888 
+
889  inline bool operator==(const Picture &object) const { return Prototype::operator==(object); }
+
890  inline bool operator==(const ::FLAC__StreamMetadata &object) const { return Prototype::operator==(object); }
+
891  inline bool operator==(const ::FLAC__StreamMetadata *object) const { return Prototype::operator==(object); }
+
893 
+
895 
+
896  inline bool operator!=(const Picture &object) const { return Prototype::operator!=(object); }
+
897  inline bool operator!=(const ::FLAC__StreamMetadata &object) const { return Prototype::operator!=(object); }
+
898  inline bool operator!=(const ::FLAC__StreamMetadata *object) const { return Prototype::operator!=(object); }
+
900 
+
901  ::FLAC__StreamMetadata_Picture_Type get_type() const;
+
902  const char *get_mime_type() const; // NUL-terminated printable ASCII string
+
903  const FLAC__byte *get_description() const; // NUL-terminated UTF-8 string
+
904  FLAC__uint32 get_width() const;
+
905  FLAC__uint32 get_height() const;
+
906  FLAC__uint32 get_depth() const;
+
907  FLAC__uint32 get_colors() const;
+
908  FLAC__uint32 get_data_length() const;
+
909  const FLAC__byte *get_data() const;
+
910 
+
911  void set_type(::FLAC__StreamMetadata_Picture_Type type);
+
912 
+
914  bool set_mime_type(const char *string); // NUL-terminated printable ASCII string
+
915 
+
917  bool set_description(const FLAC__byte *string); // NUL-terminated UTF-8 string
+
918 
+
919  void set_width(FLAC__uint32 value) const;
+
920  void set_height(FLAC__uint32 value) const;
+
921  void set_depth(FLAC__uint32 value) const;
+
922  void set_colors(FLAC__uint32 value) const;
+
923 
+
925  bool set_data(const FLAC__byte *data, FLAC__uint32 data_length);
+
926 
+
928  bool is_legal(const char **violation);
+
929  };
+
930 
+
937  class FLACPP_API Unknown : public Prototype {
+
938  public:
+
939  Unknown();
+
940  //
+
942 
+
945  inline Unknown(const Unknown &object): Prototype(object) { }
+
946  inline Unknown(const ::FLAC__StreamMetadata &object): Prototype(object) { }
+
947  inline Unknown(const ::FLAC__StreamMetadata *object): Prototype(object) { }
+
949 
+
953  inline Unknown(::FLAC__StreamMetadata *object, bool copy): Prototype(object, copy) { }
+
954 
+
955  ~Unknown();
+
956 
+
958 
+
959  inline Unknown &operator=(const Unknown &object) { Prototype::operator=(object); return *this; }
+
960  inline Unknown &operator=(const ::FLAC__StreamMetadata &object) { Prototype::operator=(object); return *this; }
+
961  inline Unknown &operator=(const ::FLAC__StreamMetadata *object) { Prototype::operator=(object); return *this; }
+
963 
+
967  inline Unknown &assign(::FLAC__StreamMetadata *object, bool copy) { Prototype::assign_object(object, copy); return *this; }
+
968 
+
970 
+
971  inline bool operator==(const Unknown &object) const { return Prototype::operator==(object); }
+
972  inline bool operator==(const ::FLAC__StreamMetadata &object) const { return Prototype::operator==(object); }
+
973  inline bool operator==(const ::FLAC__StreamMetadata *object) const { return Prototype::operator==(object); }
+
975 
+
977 
+
978  inline bool operator!=(const Unknown &object) const { return Prototype::operator!=(object); }
+
979  inline bool operator!=(const ::FLAC__StreamMetadata &object) const { return Prototype::operator!=(object); }
+
980  inline bool operator!=(const ::FLAC__StreamMetadata *object) const { return Prototype::operator!=(object); }
+
982 
+
983  const FLAC__byte *get_data() const;
+
984 
+
986  bool set_data(const FLAC__byte *data, unsigned length);
+
987  bool set_data(FLAC__byte *data, unsigned length, bool copy);
+
988  };
+
989 
+
990  /* \} */
+
991 
+
992 
+
1005  FLACPP_API bool get_streaminfo(const char *filename, StreamInfo &streaminfo);
+
1006 
+
1007  FLACPP_API bool get_tags(const char *filename, VorbisComment *&tags);
+
1008  FLACPP_API bool get_tags(const char *filename, VorbisComment &tags);
+
1009 
+
1010  FLACPP_API bool get_cuesheet(const char *filename, CueSheet *&cuesheet);
+
1011  FLACPP_API bool get_cuesheet(const char *filename, CueSheet &cuesheet);
+
1012 
+
1013  FLACPP_API bool get_picture(const char *filename, Picture *&picture, ::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors);
+
1014  FLACPP_API bool get_picture(const char *filename, Picture &picture, ::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors);
+
1015 
+
1016  /* \} */
+
1017 
+
1018 
+
1053  class FLACPP_API SimpleIterator {
+
1054  public:
+
1057  class FLACPP_API Status {
+
1058  public:
+
1059  inline Status(::FLAC__Metadata_SimpleIteratorStatus status): status_(status) { }
+
1060  inline operator ::FLAC__Metadata_SimpleIteratorStatus() const { return status_; }
+
1061  inline const char *as_cstring() const { return ::FLAC__Metadata_SimpleIteratorStatusString[status_]; }
+
1062  protected:
+ +
1064  };
+
1065 
+
1066  SimpleIterator();
+
1067  virtual ~SimpleIterator();
+
1068 
+
1069  bool is_valid() const;
+
1070 
+
1071  bool init(const char *filename, bool read_only, bool preserve_file_stats);
+
1072 
+
1073  Status status();
+
1074  bool is_writable() const;
+
1075 
+
1076  bool next();
+
1077  bool prev();
+
1078  bool is_last() const;
+
1079 
+
1080  off_t get_block_offset() const;
+
1081  ::FLAC__MetadataType get_block_type() const;
+
1082  unsigned get_block_length() const;
+
1083  bool get_application_id(FLAC__byte *id);
+
1084  Prototype *get_block();
+
1085  bool set_block(Prototype *block, bool use_padding = true);
+
1086  bool insert_block_after(Prototype *block, bool use_padding = true);
+
1087  bool delete_block(bool use_padding = true);
+
1088 
+
1089  protected:
+ +
1091  void clear();
+
1092 
+
1093  private: // Do not use.
+ +
1095  SimpleIterator&operator=(const SimpleIterator&);
+
1096  };
+
1097 
+
1098  /* \} */
+
1099 
+
1100 
+
1143  class FLACPP_API Chain {
+
1144  public:
+
1147  class FLACPP_API Status {
+
1148  public:
+
1149  inline Status(::FLAC__Metadata_ChainStatus status): status_(status) { }
+
1150  inline operator ::FLAC__Metadata_ChainStatus() const { return status_; }
+
1151  inline const char *as_cstring() const { return ::FLAC__Metadata_ChainStatusString[status_]; }
+
1152  protected:
+ +
1154  };
+
1155 
+
1156  Chain();
+
1157  virtual ~Chain();
+
1158 
+
1159  friend class Iterator;
+
1160 
+
1161  bool is_valid() const;
+
1162 
+
1163  Status status();
+
1164 
+
1165  bool read(const char *filename, bool is_ogg = false);
+
1166  bool read(FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, bool is_ogg = false);
+
1167 
+
1168  bool check_if_tempfile_needed(bool use_padding);
+
1169 
+
1170  bool write(bool use_padding = true, bool preserve_file_stats = false);
+
1171  bool write(bool use_padding, ::FLAC__IOHandle handle, ::FLAC__IOCallbacks callbacks);
+
1172  bool write(bool use_padding, ::FLAC__IOHandle handle, ::FLAC__IOCallbacks callbacks, ::FLAC__IOHandle temp_handle, ::FLAC__IOCallbacks temp_callbacks);
+
1173 
+
1174  void merge_padding();
+
1175  void sort_padding();
+
1176 
+
1177  protected:
+
1178  ::FLAC__Metadata_Chain *chain_;
+
1179  virtual void clear();
+
1180 
+
1181  private: // Do not use.
+
1182  Chain(const Chain&);
+
1183  Chain&operator=(const Chain&);
+
1184  };
+
1185 
+
1191  class FLACPP_API Iterator {
+
1192  public:
+
1193  Iterator();
+
1194  virtual ~Iterator();
+
1195 
+
1196  bool is_valid() const;
+
1197 
+
1198 
+
1199  void init(Chain &chain);
+
1200 
+
1201  bool next();
+
1202  bool prev();
+
1203 
+
1204  ::FLAC__MetadataType get_block_type() const;
+
1205  Prototype *get_block();
+
1206  bool set_block(Prototype *block);
+
1207  bool delete_block(bool replace_with_padding);
+
1208  bool insert_block_before(Prototype *block);
+
1209  bool insert_block_after(Prototype *block);
+
1210 
+
1211  protected:
+
1212  ::FLAC__Metadata_Iterator *iterator_;
+
1213  virtual void clear();
+
1214 
+
1215  private: // Do not use.
+
1216  Iterator(const Iterator&);
+
1217  Iterator&operator=(const Iterator&);
+
1218  };
+
1219 
+
1220  /* \} */
+
1221 
+
1222  }
+
1223 }
+
1224 
+
1225 #endif
+
FLAC__byte number
Definition: format.h:670
+
bool operator!=(const Application &object) const
Definition: metadata.h:444
+
bool operator==(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:973
+
Application & assign(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:433
+
CueSheet(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:768
+
StreamInfo(const StreamInfo &object)
Definition: metadata.h:278
+
unsigned pre_emphasis
Definition: format.h:679
+
bool operator!=(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:445
+
bool operator==(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:439
+
Definition: metadata.h:855
+
VorbisComment(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:640
+
Prototype & operator=(const Prototype &)
+
bool operator==(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:890
+
Application(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:412
+
Definition: metadata.h:1053
+
CueSheet & assign(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:788
+
bool get_cuesheet(const char *filename, CueSheet &cuesheet)
See FLAC__metadata_get_cuesheet().
+
StreamInfo & assign(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:300
+
bool operator!=(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:801
+
bool operator!=(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:504
+
bool operator!=(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:898
+
Padding & operator=(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:371
+
bool get_tags(const char *filename, VorbisComment &tags)
See FLAC__metadata_get_tags().
+
Definition: decoder.h:78
+
bool operator!=(const CueSheet &object) const
Definition: metadata.h:799
+
bool operator!=(const VorbisComment &object) const
Definition: metadata.h:672
+
This module provides functions for creating and manipulating FLAC metadata blocks in memory...
+
CueSheet & operator=(const CueSheet &object)
Definition: metadata.h:780
+
bool operator!=(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:446
+
Unknown & operator=(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:961
+
Definition: callback.h:170
+
Picture(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:871
+
Definition: metadata.h:344
+
const char *const FLAC__Metadata_SimpleIteratorStatusString[]
+
Unknown(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:947
+
Padding & operator=(const Padding &object)
Definition: metadata.h:370
+
VorbisComment(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:647
+
StreamInfo & operator=(const StreamInfo &object)
Definition: metadata.h:292
+
bool operator==(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:794
+
Picture & operator=(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:878
+
StreamInfo(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:286
+
VorbisComment(const VorbisComment &object)
Definition: metadata.h:639
+
bool operator!=(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:391
+
bool operator!=(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:673
+
bool operator!=(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:979
+
Unknown(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:953
+
bool operator!=(const Unknown &object) const
Definition: metadata.h:978
+
bool operator==(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:438
+
Application & operator=(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:426
+
SeekTable & operator=(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:485
+
unsigned type
Definition: format.h:676
+
bool operator!=(const SeekTable &object) const
Definition: metadata.h:503
+
StreamInfo(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:279
+
Definition: format.h:666
+
Padding & assign(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:378
+
Padding & operator=(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:372
+
StreamInfo & operator=(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:294
+
Picture & assign(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:885
+
bool operator==(const Unknown &object) const
Definition: metadata.h:971
+
Prototype * clone(const Prototype *)
+
Definition: format.h:647
+
Unknown(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:946
+
bool operator!=(const StreamInfo &object) const
Definition: metadata.h:311
+
Picture & operator=(const Picture &object)
Definition: metadata.h:877
+
FLAC__bool FLAC__metadata_object_is_equal(const FLAC__StreamMetadata *block1, const FLAC__StreamMetadata *block2)
+
Unknown & assign(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:967
+
CueSheet & operator=(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:782
+
Definition: metadata.h:549
+
Prototype & assign_object(::FLAC__StreamMetadata *object, bool copy)
+
bool operator==(const CueSheet &object) const
Definition: metadata.h:792
+
Definition: metadata.h:1143
+
SeekTable & assign(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:492
+
bool operator!=(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:390
+
CueSheet(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:767
+
FLAC__byte num_indices
Definition: format.h:682
+
Padding(const Padding &object)
Definition: metadata.h:352
+
Picture & operator=(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:879
+
bool operator!=(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:980
+
StreamInfo & operator=(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:293
+
This module contains #defines and symbols for exporting function calls, and providing version informa...
+
bool operator!=(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:312
+
Unknown(const Unknown &object)
Definition: metadata.h:945
+
struct FLAC__Metadata_Chain FLAC__Metadata_Chain
Definition: metadata.h:714
+
Definition: format.h:834
+
Application & operator=(const Application &object)
Definition: metadata.h:425
+
bool get_streaminfo(const char *filename, StreamInfo &streaminfo)
See FLAC__metadata_get_streaminfo().
+
Padding(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:353
+
Definition: metadata.h:580
+
SeekTable(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:471
+
bool operator==(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:972
+
Definition: metadata.h:1147
+
const char *const FLAC__Metadata_ChainStatusString[]
+
bool operator==(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:667
+
VorbisComment(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:641
+
Application(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:419
+
Definition: metadata.h:1057
+
bool operator==(const Padding &object) const
Definition: metadata.h:382
+
bool operator==(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:306
+
bool operator==(const Picture &object) const
Definition: metadata.h:889
+
CueSheet(const CueSheet &object)
Definition: metadata.h:766
+
Application(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:413
+
bool is_valid() const
Definition: metadata.h:256
+
Definition: metadata.h:270
+
StreamInfo(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:280
+
FLAC__MetadataType
Definition: format.h:489
+
struct FLAC__Metadata_Iterator FLAC__Metadata_Iterator
Definition: metadata.h:719
+
bool operator==(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:498
+
Picture(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:865
+
Definition: format.h:624
+
VorbisComment & assign(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:661
+
bool operator==(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:497
+
Picture(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:864
+
SeekTable(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:472
+
Picture(const Picture &object)
Definition: metadata.h:863
+
Definition: metadata.h:724
+
bool operator!=(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:313
+
void * FLAC__IOHandle
Definition: callback.h:89
+
CueSheet(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:774
+
char isrc[13]
Definition: format.h:673
+
SeekTable(const SeekTable &object)
Definition: metadata.h:470
+
FLAC__StreamMetadata_Picture_Type
Definition: format.h:732
+
struct FLAC__Metadata_SimpleIterator FLAC__Metadata_SimpleIterator
Definition: metadata.h:303
+
bool operator!=(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:674
+
bool operator==(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:384
+
VorbisComment & operator=(const VorbisComment &object)
Definition: metadata.h:653
+
bool operator==(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:891
+
bool operator==(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:793
+
bool operator!=(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:800
+
Definition: metadata.h:716
+
bool operator!=(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:897
+
bool operator!=(const Prototype &) const
Definition: metadata.h:247
+
FLAC__uint64 offset
Definition: format.h:667
+
Definition: metadata.h:1191
+
bool operator==(const VorbisComment &object) const
Definition: metadata.h:665
+
Definition: metadata.h:109
+
bool operator==(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:305
+
Padding(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:360
+
Unknown & operator=(const Unknown &object)
Definition: metadata.h:959
+
VorbisComment & operator=(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:655
+
Padding(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:354
+
Application(const Application &object)
Definition: metadata.h:411
+
SeekTable & operator=(const SeekTable &object)
Definition: metadata.h:484
+
CueSheet & operator=(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:781
+
FLAC__Metadata_SimpleIteratorStatus
Definition: metadata.h:309
+
Definition: metadata.h:462
+
bool operator==(const Application &object) const
Definition: metadata.h:437
+
Unknown & operator=(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:960
+
bool operator==(const StreamInfo &object) const
Definition: metadata.h:304
+
bool operator==(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:383
+
Definition: metadata.h:937
+
Application & operator=(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:427
+
Definition: format.h:574
+
bool operator!=(const Picture &object) const
Definition: metadata.h:896
+
VorbisComment & operator=(const ::FLAC__StreamMetadata &object)
Definition: metadata.h:654
+
FLAC__Metadata_ChainStatus
Definition: metadata.h:721
+
Definition: metadata.h:403
+
bool operator!=(const Padding &object) const
Definition: metadata.h:389
+
SeekTable & operator=(const ::FLAC__StreamMetadata *object)
Definition: metadata.h:486
+
bool operator!=(const ::FLAC__StreamMetadata *object) const
Definition: metadata.h:505
+
bool operator==(const Prototype &) const
Definition: metadata.h:234
+
bool get_picture(const char *filename, Picture &picture,::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors)
See FLAC__metadata_get_picture().
+
SeekTable(::FLAC__StreamMetadata *object, bool copy)
Definition: metadata.h:478
+
bool operator==(const SeekTable &object) const
Definition: metadata.h:496
+
bool operator==(const ::FLAC__StreamMetadata &object) const
Definition: metadata.h:666
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/all_8h_source.html b/lib-src/libflac/doc/html/api/all_8h_source.html new file mode 100644 index 000000000..23aed428a --- /dev/null +++ b/lib-src/libflac/doc/html/api/all_8h_source.html @@ -0,0 +1,131 @@ + + + + + + +FLAC: include/FLAC/all.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
all.h
+
+
+
1 /* libFLAC - Free Lossless Audio Codec library
+
2  * Copyright (C) 2000-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLAC__ALL_H
+
34 #define FLAC__ALL_H
+
35 
+
36 #include "export.h"
+
37 
+
38 #include "assert.h"
+
39 #include "callback.h"
+
40 #include "format.h"
+
41 #include "metadata.h"
+
42 #include "ordinals.h"
+
43 #include "stream_decoder.h"
+
44 #include "stream_encoder.h"
+
45 
+
371 #endif
+
This module contains the functions which implement the stream encoder.
+
This module contains #defines and symbols for exporting function calls, and providing version informa...
+
This module provides functions for creating and manipulating FLAC metadata blocks in memory...
+
This module defines the structures for describing I/O callbacks to the other FLAC interfaces...
+
This module contains structure definitions for the representation of FLAC format components in memory...
+
This module contains the functions which implement the stream decoder.
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/annotated.html b/lib-src/libflac/doc/html/api/annotated.html new file mode 100644 index 000000000..00a067cef --- /dev/null +++ b/lib-src/libflac/doc/html/api/annotated.html @@ -0,0 +1,134 @@ + + + + + + +FLAC: Class List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
Class List
+
+
+
Here are the classes, structs, unions and interfaces with brief descriptions:
+
[detail level 1234]
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 NFLAC
 NDecoder
 CFileThis class wraps the FLAC__StreamDecoder. If you are not decoding from a file, you may need to use FLAC::Decoder::Stream
 CStreamThis class wraps the FLAC__StreamDecoder. If you are decoding from a file, FLAC::Decoder::File may be more convenient
 CState
 NEncoder
 CFileThis class wraps the FLAC__StreamEncoder. If you are not encoding to a file, you may need to use FLAC::Encoder::Stream
 CStreamThis class wraps the FLAC__StreamEncoder. If you are encoding to a file, FLAC::Encoder::File may be more convenient
 CState
 NMetadata
 CApplication
 CChain
 CStatus
 CCueSheet
 CTrack
 CIterator
 CPadding
 CPicture
 CPrototype
 CSeekTable
 CSimpleIterator
 CStatus
 CStreamInfo
 CUnknown
 CVorbisComment
 CEntry
 CFLAC__EntropyCodingMethod
 CFLAC__EntropyCodingMethod_PartitionedRice
 CFLAC__EntropyCodingMethod_PartitionedRiceContents
 CFLAC__Frame
 CFLAC__FrameFooter
 CFLAC__FrameHeader
 CFLAC__IOCallbacks
 CFLAC__StreamDecoder
 CFLAC__StreamEncoder
 CFLAC__StreamMetadata
 CFLAC__StreamMetadata_Application
 CFLAC__StreamMetadata_CueSheet
 CFLAC__StreamMetadata_CueSheet_Index
 CFLAC__StreamMetadata_CueSheet_Track
 CFLAC__StreamMetadata_Padding
 CFLAC__StreamMetadata_Picture
 CFLAC__StreamMetadata_SeekPoint
 CFLAC__StreamMetadata_SeekTable
 CFLAC__StreamMetadata_StreamInfo
 CFLAC__StreamMetadata_Unknown
 CFLAC__StreamMetadata_VorbisComment
 CFLAC__StreamMetadata_VorbisComment_Entry
 CFLAC__Subframe
 CFLAC__Subframe_Constant
 CFLAC__Subframe_Fixed
 CFLAC__Subframe_LPC
 CFLAC__Subframe_Verbatim
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/assert_8h_source.html b/lib-src/libflac/doc/html/api/assert_8h_source.html new file mode 100644 index 000000000..d007280b8 --- /dev/null +++ b/lib-src/libflac/doc/html/api/assert_8h_source.html @@ -0,0 +1,125 @@ + + + + + + +FLAC: include/FLAC/assert.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
assert.h
+
+
+
1 /* libFLAC - Free Lossless Audio Codec library
+
2  * Copyright (C) 2001-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLAC__ASSERT_H
+
34 #define FLAC__ASSERT_H
+
35 
+
36 /* we need this since some compilers (like MSVC) leave assert()s on release code (and we don't want to use their ASSERT) */
+
37 #ifdef DEBUG
+
38 #include <assert.h>
+
39 #define FLAC__ASSERT(x) assert(x)
+
40 #define FLAC__ASSERT_DECLARATION(x) x
+
41 #else
+
42 #define FLAC__ASSERT(x)
+
43 #define FLAC__ASSERT_DECLARATION(x)
+
44 #endif
+
45 
+
46 #endif
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/bc_s.png b/lib-src/libflac/doc/html/api/bc_s.png new file mode 100644 index 000000000..224b29aa9 Binary files /dev/null and b/lib-src/libflac/doc/html/api/bc_s.png differ diff --git a/lib-src/libflac/doc/html/api/bdwn.png b/lib-src/libflac/doc/html/api/bdwn.png new file mode 100644 index 000000000..940a0b950 Binary files /dev/null and b/lib-src/libflac/doc/html/api/bdwn.png differ diff --git a/lib-src/libflac/doc/html/api/callback_8h.html b/lib-src/libflac/doc/html/api/callback_8h.html new file mode 100644 index 000000000..0655c878a --- /dev/null +++ b/lib-src/libflac/doc/html/api/callback_8h.html @@ -0,0 +1,112 @@ + + + + + + +FLAC: include/FLAC/callback.h File Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+ +
+
callback.h File Reference
+
+
+
#include "ordinals.h"
+#include <stdlib.h>
+
+

Go to the source code of this file.

+ + + + +

+Classes

struct  FLAC__IOCallbacks
 
+ + + + + + + + + + + + + + + +

+Typedefs

typedef void * FLAC__IOHandle
 
typedef size_t(* FLAC__IOCallback_Read )(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
 
typedef size_t(* FLAC__IOCallback_Write )(const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
 
typedef int(* FLAC__IOCallback_Seek )(FLAC__IOHandle handle, FLAC__int64 offset, int whence)
 
typedef FLAC__int64(* FLAC__IOCallback_Tell )(FLAC__IOHandle handle)
 
typedef int(* FLAC__IOCallback_Eof )(FLAC__IOHandle handle)
 
typedef int(* FLAC__IOCallback_Close )(FLAC__IOHandle handle)
 
+

Detailed Description

+

This module defines the structures for describing I/O callbacks to the other FLAC interfaces.

+

See the detailed documentation for callbacks in the callbacks module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/callback_8h_source.html b/lib-src/libflac/doc/html/api/callback_8h_source.html new file mode 100644 index 000000000..dbd0e949f --- /dev/null +++ b/lib-src/libflac/doc/html/api/callback_8h_source.html @@ -0,0 +1,159 @@ + + + + + + +FLAC: include/FLAC/callback.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
callback.h
+
+
+Go to the documentation of this file.
1 /* libFLAC - Free Lossless Audio Codec library
+
2  * Copyright (C) 2004-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLAC__CALLBACK_H
+
34 #define FLAC__CALLBACK_H
+
35 
+
36 #include "ordinals.h"
+
37 #include <stdlib.h> /* for size_t */
+
38 
+
82 #ifdef __cplusplus
+
83 extern "C" {
+
84 #endif
+
85 
+
89 typedef void* FLAC__IOHandle;
+
90 
+
102 typedef size_t (*FLAC__IOCallback_Read) (void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle);
+
103 
+
115 typedef size_t (*FLAC__IOCallback_Write) (const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle);
+
116 
+
128 typedef int (*FLAC__IOCallback_Seek) (FLAC__IOHandle handle, FLAC__int64 offset, int whence);
+
129 
+
139 typedef FLAC__int64 (*FLAC__IOCallback_Tell) (FLAC__IOHandle handle);
+
140 
+
150 typedef int (*FLAC__IOCallback_Eof) (FLAC__IOHandle handle);
+
151 
+
160 typedef int (*FLAC__IOCallback_Close) (FLAC__IOHandle handle);
+
161 
+
170 typedef struct {
+ + + + + + + +
178 
+
179 /* \} */
+
180 
+
181 #ifdef __cplusplus
+
182 }
+
183 #endif
+
184 
+
185 #endif
+
FLAC__int64(* FLAC__IOCallback_Tell)(FLAC__IOHandle handle)
Definition: callback.h:139
+
int(* FLAC__IOCallback_Seek)(FLAC__IOHandle handle, FLAC__int64 offset, int whence)
Definition: callback.h:128
+
Definition: callback.h:170
+
size_t(* FLAC__IOCallback_Read)(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
Definition: callback.h:102
+
size_t(* FLAC__IOCallback_Write)(const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
Definition: callback.h:115
+
int(* FLAC__IOCallback_Close)(FLAC__IOHandle handle)
Definition: callback.h:160
+
int(* FLAC__IOCallback_Eof)(FLAC__IOHandle handle)
Definition: callback.h:150
+
void * FLAC__IOHandle
Definition: callback.h:89
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File-members.html new file mode 100644 index 000000000..5ec0b4f20 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File-members.html @@ -0,0 +1,140 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Decoder::File Member List
+
+
+ +

This is the complete list of members for FLAC::Decoder::File, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
decoder_ (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotected
eof_callback()FLAC::Decoder::Streamprotectedvirtual
eof_callback_(const ::FLAC__StreamDecoder *decoder, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
error_callback(::FLAC__StreamDecoderErrorStatus status)=0FLAC::Decoder::Streamprotectedpure virtual
error_callback_(const ::FLAC__StreamDecoder *decoder,::FLAC__StreamDecoderErrorStatus status, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
File() (defined in FLAC::Decoder::File)FLAC::Decoder::File
finish()FLAC::Decoder::Streamvirtual
flush()FLAC::Decoder::Streamvirtual
get_bits_per_sample() const FLAC::Decoder::Streamvirtual
get_blocksize() const FLAC::Decoder::Streamvirtual
get_channel_assignment() const FLAC::Decoder::Stream
get_channels() const FLAC::Decoder::Streamvirtual
get_decode_position(FLAC__uint64 *position) const FLAC::Decoder::Streamvirtual
get_md5_checking() const FLAC::Decoder::Streamvirtual
get_sample_rate() const FLAC::Decoder::Streamvirtual
get_state() const FLAC::Decoder::Stream
get_total_samples() const FLAC::Decoder::Streamvirtual
init(FILE *file)FLAC::Decoder::File
init(const char *filename)FLAC::Decoder::File
init(const std::string &filename)FLAC::Decoder::File
FLAC::Decoder::Stream::init()FLAC::Decoder::Stream
init_ogg(FILE *file)FLAC::Decoder::File
init_ogg(const char *filename)FLAC::Decoder::File
init_ogg(const std::string &filename)FLAC::Decoder::File
FLAC::Decoder::Stream::init_ogg()FLAC::Decoder::Stream
is_valid() const FLAC::Decoder::Streamvirtual
length_callback(FLAC__uint64 *stream_length)FLAC::Decoder::Streamprotected
length_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
metadata_callback(const ::FLAC__StreamMetadata *metadata)FLAC::Decoder::Streamprotectedvirtual
metadata_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
operator bool() const FLAC::Decoder::Streaminline
process_single()FLAC::Decoder::Streamvirtual
process_until_end_of_metadata()FLAC::Decoder::Streamvirtual
process_until_end_of_stream()FLAC::Decoder::Streamvirtual
read_callback(FLAC__byte buffer[], size_t *bytes)FLAC::Decoder::Fileprotectedvirtual
read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
reset()FLAC::Decoder::Streamvirtual
seek_absolute(FLAC__uint64 sample)FLAC::Decoder::Streamvirtual
seek_callback(FLAC__uint64 absolute_byte_offset)FLAC::Decoder::Streamprotected
seek_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
set_md5_checking(bool value)FLAC::Decoder::Streamvirtual
set_metadata_ignore(::FLAC__MetadataType type)FLAC::Decoder::Streamvirtual
set_metadata_ignore_all()FLAC::Decoder::Streamvirtual
set_metadata_ignore_application(const FLAC__byte id[4])FLAC::Decoder::Streamvirtual
set_metadata_respond(::FLAC__MetadataType type)FLAC::Decoder::Streamvirtual
set_metadata_respond_all()FLAC::Decoder::Streamvirtual
set_metadata_respond_application(const FLAC__byte id[4])FLAC::Decoder::Streamvirtual
set_ogg_serial_number(long value)FLAC::Decoder::Streamvirtual
skip_single_frame()FLAC::Decoder::Streamvirtual
Stream() (defined in FLAC::Decoder::Stream)FLAC::Decoder::Stream
tell_callback(FLAC__uint64 *absolute_byte_offset)FLAC::Decoder::Streamprotected
tell_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
write_callback(const ::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0FLAC::Decoder::Streamprotectedpure virtual
write_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
~File() (defined in FLAC::Decoder::File)FLAC::Decoder::Filevirtual
~Stream() (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamvirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File.html new file mode 100644 index 000000000..8681b7412 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File.html @@ -0,0 +1,1315 @@ + + + + + + +FLAC: FLAC::Decoder::File Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <decoder.h>

+
+Inheritance diagram for FLAC::Decoder::File:
+
+
+ + +FLAC::Decoder::Stream + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

virtual
+::FLAC__StreamDecoderInitStatus 
init (FILE *file)
 
virtual
+::FLAC__StreamDecoderInitStatus 
init (const char *filename)
 
virtual
+::FLAC__StreamDecoderInitStatus 
init (const std::string &filename)
 
virtual
+::FLAC__StreamDecoderInitStatus 
init_ogg (FILE *file)
 
virtual
+::FLAC__StreamDecoderInitStatus 
init_ogg (const char *filename)
 
virtual
+::FLAC__StreamDecoderInitStatus 
init_ogg (const std::string &filename)
 
virtual bool set_ogg_serial_number (long value)
 
virtual bool set_md5_checking (bool value)
 
virtual bool set_metadata_respond (::FLAC__MetadataType type)
 
virtual bool set_metadata_respond_application (const FLAC__byte id[4])
 
virtual bool set_metadata_respond_all ()
 
virtual bool set_metadata_ignore (::FLAC__MetadataType type)
 
virtual bool set_metadata_ignore_application (const FLAC__byte id[4])
 
virtual bool set_metadata_ignore_all ()
 
State get_state () const
 
virtual bool get_md5_checking () const
 
virtual FLAC__uint64 get_total_samples () const
 
virtual unsigned get_channels () const
 
virtual ::FLAC__ChannelAssignment get_channel_assignment () const
 
virtual unsigned get_bits_per_sample () const
 
virtual unsigned get_sample_rate () const
 
virtual unsigned get_blocksize () const
 
virtual bool get_decode_position (FLAC__uint64 *position) const
 
virtual
+::FLAC__StreamDecoderInitStatus 
init ()
 
virtual
+::FLAC__StreamDecoderInitStatus 
init_ogg ()
 
virtual bool finish ()
 
virtual bool flush ()
 
virtual bool reset ()
 
virtual bool process_single ()
 
virtual bool process_until_end_of_metadata ()
 
virtual bool process_until_end_of_stream ()
 
virtual bool skip_single_frame ()
 
virtual bool seek_absolute (FLAC__uint64 sample)
 
virtual bool is_valid () const
 
 operator bool () const
 
+ + + + + + + + + + + + + + + + + +

+Protected Member Functions

virtual
+::FLAC__StreamDecoderReadStatus 
read_callback (FLAC__byte buffer[], size_t *bytes)
 
virtual
+::FLAC__StreamDecoderSeekStatus 
seek_callback (FLAC__uint64 absolute_byte_offset)
 
virtual
+::FLAC__StreamDecoderTellStatus 
tell_callback (FLAC__uint64 *absolute_byte_offset)
 
virtual
+::FLAC__StreamDecoderLengthStatus 
length_callback (FLAC__uint64 *stream_length)
 
virtual bool eof_callback ()
 
virtual
+::FLAC__StreamDecoderWriteStatus 
write_callback (const ::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0
 
virtual void metadata_callback (const ::FLAC__StreamMetadata *metadata)
 
virtual void error_callback (::FLAC__StreamDecoderErrorStatus status)=0
 
+ + + + + + + + + + + + + + + + + +

+Static Protected Member Functions

+::FLAC__StreamDecoderReadStatus read_callback_ (const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
 
+::FLAC__StreamDecoderSeekStatus seek_callback_ (const ::FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
 
+::FLAC__StreamDecoderTellStatus tell_callback_ (const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
 
+::FLAC__StreamDecoderLengthStatus length_callback_ (const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
 
+static FLAC__bool eof_callback_ (const ::FLAC__StreamDecoder *decoder, void *client_data)
 
+::FLAC__StreamDecoderWriteStatus write_callback_ (const ::FLAC__StreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data)
 
+static void metadata_callback_ (const ::FLAC__StreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data)
 
+static void error_callback_ (const ::FLAC__StreamDecoder *decoder,::FLAC__StreamDecoderErrorStatus status, void *client_data)
 
+ + + +

+Protected Attributes

+::FLAC__StreamDecoderdecoder_
 
+

Detailed Description

+

This class wraps the FLAC__StreamDecoder. If you are not decoding from a file, you may need to use FLAC::Decoder::Stream.

+

The usage of this class is similar to FLAC__StreamDecoder, except instead of providing callbacks to FLAC__stream_decoder_init*_FILE() or FLAC__stream_decoder_init*_file(), you will inherit from this class and override the virtual callback functions with your own implementations, then call init() or init_off(). The rest of the calls work the same as in the C layer.

+

Only the write, and error callbacks from FLAC::Decoder::Stream are mandatory. The others are optional; this class provides full working implementations for all other callbacks and supports seeking.

+

Member Function Documentation

+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamDecoderInitStatus FLAC::Decoder::File::init (FILE * file)
+
+
+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamDecoderInitStatus FLAC::Decoder::File::init (const char * filename)
+
+
+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamDecoderInitStatus FLAC::Decoder::File::init (const std::string & filename)
+
+
+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamDecoderInitStatus FLAC::Decoder::File::init_ogg (FILE * file)
+
+
+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamDecoderInitStatus FLAC::Decoder::File::init_ogg (const char * filename)
+
+
+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamDecoderInitStatus FLAC::Decoder::File::init_ogg (const std::string & filename)
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual ::FLAC__StreamDecoderReadStatus FLAC::Decoder::File::read_callback (FLAC__byte buffer[],
size_t * bytes 
)
+
+protectedvirtual
+
+ +

see FLAC__StreamDecoderReadCallback

+ +

Implements FLAC::Decoder::Stream.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::is_valid () const
+
+virtualinherited
+
+

Call after construction to check the that the object was created successfully. If not, use get_state() to find out why not.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
FLAC::Decoder::Stream::operator bool () const
+
+inlineinherited
+
+ +

See is_valid()

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_ogg_serial_number (long value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_md5_checking (bool value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_respond (::FLAC__MetadataType type)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_respond_application (const FLAC__byte id[4])
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_respond_all ()
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_ignore (::FLAC__MetadataType type)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_ignore_application (const FLAC__byte id[4])
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_ignore_all ()
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
State FLAC::Decoder::Stream::get_state () const
+
+inherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::get_md5_checking () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual FLAC__uint64 FLAC::Decoder::Stream::get_total_samples () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Decoder::Stream::get_channels () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual ::FLAC__ChannelAssignment FLAC::Decoder::Stream::get_channel_assignment () const
+
+inherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Decoder::Stream::get_bits_per_sample () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Decoder::Stream::get_sample_rate () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Decoder::Stream::get_blocksize () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::get_decode_position (FLAC__uint64 * position) const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual ::FLAC__StreamDecoderInitStatus FLAC::Decoder::Stream::init ()
+
+inherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual ::FLAC__StreamDecoderInitStatus FLAC::Decoder::Stream::init_ogg ()
+
+inherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::finish ()
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::flush ()
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::reset ()
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::process_single ()
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::process_until_end_of_metadata ()
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::process_until_end_of_stream ()
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::skip_single_frame ()
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::seek_absolute (FLAC__uint64 sample)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual ::FLAC__StreamDecoderSeekStatus FLAC::Decoder::Stream::seek_callback (FLAC__uint64 absolute_byte_offset)
+
+protectedinherited
+
+ +

see FLAC__StreamDecoderSeekCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual ::FLAC__StreamDecoderTellStatus FLAC::Decoder::Stream::tell_callback (FLAC__uint64 * absolute_byte_offset)
+
+protectedinherited
+
+ +

see FLAC__StreamDecoderTellCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual ::FLAC__StreamDecoderLengthStatus FLAC::Decoder::Stream::length_callback (FLAC__uint64 * stream_length)
+
+protectedinherited
+
+ +

see FLAC__StreamDecoderLengthCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::eof_callback ()
+
+protectedvirtualinherited
+
+ +

see FLAC__StreamDecoderEofCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual ::FLAC__StreamDecoderWriteStatus FLAC::Decoder::Stream::write_callback (const ::FLAC__Frameframe,
const FLAC__int32 *const buffer[] 
)
+
+protectedpure virtualinherited
+
+ +

see FLAC__StreamDecoderWriteCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual void FLAC::Decoder::Stream::metadata_callback (const ::FLAC__StreamMetadatametadata)
+
+protectedvirtualinherited
+
+ +

see FLAC__StreamDecoderMetadataCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual void FLAC::Decoder::Stream::error_callback (::FLAC__StreamDecoderErrorStatus status)
+
+protectedpure virtualinherited
+
+ +

see FLAC__StreamDecoderErrorCallback

+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File.png new file mode 100644 index 000000000..9001f7cda Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1File.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream-members.html new file mode 100644 index 000000000..483604d23 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream-members.html @@ -0,0 +1,132 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Decoder::Stream Member List
+
+
+ +

This is the complete list of members for FLAC::Decoder::Stream, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
decoder_ (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotected
eof_callback()FLAC::Decoder::Streamprotectedvirtual
eof_callback_(const ::FLAC__StreamDecoder *decoder, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
error_callback(::FLAC__StreamDecoderErrorStatus status)=0FLAC::Decoder::Streamprotectedpure virtual
error_callback_(const ::FLAC__StreamDecoder *decoder,::FLAC__StreamDecoderErrorStatus status, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
finish()FLAC::Decoder::Streamvirtual
flush()FLAC::Decoder::Streamvirtual
get_bits_per_sample() const FLAC::Decoder::Streamvirtual
get_blocksize() const FLAC::Decoder::Streamvirtual
get_channel_assignment() const FLAC::Decoder::Stream
get_channels() const FLAC::Decoder::Streamvirtual
get_decode_position(FLAC__uint64 *position) const FLAC::Decoder::Streamvirtual
get_md5_checking() const FLAC::Decoder::Streamvirtual
get_sample_rate() const FLAC::Decoder::Streamvirtual
get_state() const FLAC::Decoder::Stream
get_total_samples() const FLAC::Decoder::Streamvirtual
init()FLAC::Decoder::Stream
init_ogg()FLAC::Decoder::Stream
is_valid() const FLAC::Decoder::Streamvirtual
length_callback(FLAC__uint64 *stream_length)FLAC::Decoder::Streamprotected
length_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
metadata_callback(const ::FLAC__StreamMetadata *metadata)FLAC::Decoder::Streamprotectedvirtual
metadata_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
operator bool() const FLAC::Decoder::Streaminline
process_single()FLAC::Decoder::Streamvirtual
process_until_end_of_metadata()FLAC::Decoder::Streamvirtual
process_until_end_of_stream()FLAC::Decoder::Streamvirtual
read_callback(FLAC__byte buffer[], size_t *bytes)=0FLAC::Decoder::Streamprotectedpure virtual
read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
reset()FLAC::Decoder::Streamvirtual
seek_absolute(FLAC__uint64 sample)FLAC::Decoder::Streamvirtual
seek_callback(FLAC__uint64 absolute_byte_offset)FLAC::Decoder::Streamprotected
seek_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
set_md5_checking(bool value)FLAC::Decoder::Streamvirtual
set_metadata_ignore(::FLAC__MetadataType type)FLAC::Decoder::Streamvirtual
set_metadata_ignore_all()FLAC::Decoder::Streamvirtual
set_metadata_ignore_application(const FLAC__byte id[4])FLAC::Decoder::Streamvirtual
set_metadata_respond(::FLAC__MetadataType type)FLAC::Decoder::Streamvirtual
set_metadata_respond_all()FLAC::Decoder::Streamvirtual
set_metadata_respond_application(const FLAC__byte id[4])FLAC::Decoder::Streamvirtual
set_ogg_serial_number(long value)FLAC::Decoder::Streamvirtual
skip_single_frame()FLAC::Decoder::Streamvirtual
Stream() (defined in FLAC::Decoder::Stream)FLAC::Decoder::Stream
tell_callback(FLAC__uint64 *absolute_byte_offset)FLAC::Decoder::Streamprotected
tell_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
write_callback(const ::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0FLAC::Decoder::Streamprotectedpure virtual
write_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data) (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamprotectedstatic
~Stream() (defined in FLAC::Decoder::Stream)FLAC::Decoder::Streamvirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream.html new file mode 100644 index 000000000..735ac3966 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream.html @@ -0,0 +1,1163 @@ + + + + + + +FLAC: FLAC::Decoder::Stream Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <decoder.h>

+
+Inheritance diagram for FLAC::Decoder::Stream:
+
+
+ + +FLAC::Decoder::File + +
+ + + + +

+Classes

class  State
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

virtual bool set_ogg_serial_number (long value)
 
virtual bool set_md5_checking (bool value)
 
virtual bool set_metadata_respond (::FLAC__MetadataType type)
 
virtual bool set_metadata_respond_application (const FLAC__byte id[4])
 
virtual bool set_metadata_respond_all ()
 
virtual bool set_metadata_ignore (::FLAC__MetadataType type)
 
virtual bool set_metadata_ignore_application (const FLAC__byte id[4])
 
virtual bool set_metadata_ignore_all ()
 
State get_state () const
 
virtual bool get_md5_checking () const
 
virtual FLAC__uint64 get_total_samples () const
 
virtual unsigned get_channels () const
 
virtual ::FLAC__ChannelAssignment get_channel_assignment () const
 
virtual unsigned get_bits_per_sample () const
 
virtual unsigned get_sample_rate () const
 
virtual unsigned get_blocksize () const
 
virtual bool get_decode_position (FLAC__uint64 *position) const
 
virtual
+::FLAC__StreamDecoderInitStatus 
init ()
 
virtual
+::FLAC__StreamDecoderInitStatus 
init_ogg ()
 
virtual bool finish ()
 
virtual bool flush ()
 
virtual bool reset ()
 
virtual bool process_single ()
 
virtual bool process_until_end_of_metadata ()
 
virtual bool process_until_end_of_stream ()
 
virtual bool skip_single_frame ()
 
virtual bool seek_absolute (FLAC__uint64 sample)
 
virtual bool is_valid () const
 
 operator bool () const
 
+ + + + + + + + + + + + + + + + + +

+Protected Member Functions

virtual
+::FLAC__StreamDecoderReadStatus 
read_callback (FLAC__byte buffer[], size_t *bytes)=0
 
virtual
+::FLAC__StreamDecoderSeekStatus 
seek_callback (FLAC__uint64 absolute_byte_offset)
 
virtual
+::FLAC__StreamDecoderTellStatus 
tell_callback (FLAC__uint64 *absolute_byte_offset)
 
virtual
+::FLAC__StreamDecoderLengthStatus 
length_callback (FLAC__uint64 *stream_length)
 
virtual bool eof_callback ()
 
virtual
+::FLAC__StreamDecoderWriteStatus 
write_callback (const ::FLAC__Frame *frame, const FLAC__int32 *const buffer[])=0
 
virtual void metadata_callback (const ::FLAC__StreamMetadata *metadata)
 
virtual void error_callback (::FLAC__StreamDecoderErrorStatus status)=0
 
+ + + + + + + + + + + + + + + + + +

+Static Protected Member Functions

+::FLAC__StreamDecoderReadStatus read_callback_ (const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
 
+::FLAC__StreamDecoderSeekStatus seek_callback_ (const ::FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
 
+::FLAC__StreamDecoderTellStatus tell_callback_ (const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
 
+::FLAC__StreamDecoderLengthStatus length_callback_ (const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
 
+static FLAC__bool eof_callback_ (const ::FLAC__StreamDecoder *decoder, void *client_data)
 
+::FLAC__StreamDecoderWriteStatus write_callback_ (const ::FLAC__StreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data)
 
+static void metadata_callback_ (const ::FLAC__StreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data)
 
+static void error_callback_ (const ::FLAC__StreamDecoder *decoder,::FLAC__StreamDecoderErrorStatus status, void *client_data)
 
+ + + +

+Protected Attributes

+::FLAC__StreamDecoderdecoder_
 
+

Detailed Description

+

This class wraps the FLAC__StreamDecoder. If you are decoding from a file, FLAC::Decoder::File may be more convenient.

+

The usage of this class is similar to FLAC__StreamDecoder, except instead of providing callbacks to FLAC__stream_decoder_init*_stream(), you will inherit from this class and override the virtual callback functions with your own implementations, then call init() or init_ogg(). The rest of the calls work the same as in the C layer.

+

Only the read, write, and error callbacks are mandatory. The others are optional; this class provides default implementations that do nothing. In order for seeking to work you must overide seek_callback(), tell_callback(), length_callback(), and eof_callback().

+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::is_valid () const
+
+virtual
+
+

Call after construction to check the that the object was created successfully. If not, use get_state() to find out why not.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
FLAC::Decoder::Stream::operator bool () const
+
+inline
+
+ +

See is_valid()

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_ogg_serial_number (long value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_md5_checking (bool value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_respond (::FLAC__MetadataType type)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_respond_application (const FLAC__byte id[4])
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_respond_all ()
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_ignore (::FLAC__MetadataType type)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_ignore_application (const FLAC__byte id[4])
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::set_metadata_ignore_all ()
+
+virtual
+
+
+ +
+
+ + + + + + + +
State FLAC::Decoder::Stream::get_state () const
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::get_md5_checking () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual FLAC__uint64 FLAC::Decoder::Stream::get_total_samples () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Decoder::Stream::get_channels () const
+
+virtual
+
+
+ +
+
+ + + + + + + +
virtual ::FLAC__ChannelAssignment FLAC::Decoder::Stream::get_channel_assignment () const
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Decoder::Stream::get_bits_per_sample () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Decoder::Stream::get_sample_rate () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Decoder::Stream::get_blocksize () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::get_decode_position (FLAC__uint64 * position) const
+
+virtual
+
+
+ +
+
+ + + + + + + +
virtual ::FLAC__StreamDecoderInitStatus FLAC::Decoder::Stream::init ()
+
+
+ +
+
+ + + + + + + +
virtual ::FLAC__StreamDecoderInitStatus FLAC::Decoder::Stream::init_ogg ()
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::finish ()
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::flush ()
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::reset ()
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::process_single ()
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::process_until_end_of_metadata ()
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::process_until_end_of_stream ()
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::skip_single_frame ()
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Decoder::Stream::seek_absolute (FLAC__uint64 sample)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual ::FLAC__StreamDecoderReadStatus FLAC::Decoder::Stream::read_callback (FLAC__byte buffer[],
size_t * bytes 
)
+
+protectedpure virtual
+
+ +

see FLAC__StreamDecoderReadCallback

+ +

Implemented in FLAC::Decoder::File.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual ::FLAC__StreamDecoderSeekStatus FLAC::Decoder::Stream::seek_callback (FLAC__uint64 absolute_byte_offset)
+
+protected
+
+ +

see FLAC__StreamDecoderSeekCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual ::FLAC__StreamDecoderTellStatus FLAC::Decoder::Stream::tell_callback (FLAC__uint64 * absolute_byte_offset)
+
+protected
+
+ +

see FLAC__StreamDecoderTellCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual ::FLAC__StreamDecoderLengthStatus FLAC::Decoder::Stream::length_callback (FLAC__uint64 * stream_length)
+
+protected
+
+ +

see FLAC__StreamDecoderLengthCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Decoder::Stream::eof_callback ()
+
+protectedvirtual
+
+ +

see FLAC__StreamDecoderEofCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual ::FLAC__StreamDecoderWriteStatus FLAC::Decoder::Stream::write_callback (const ::FLAC__Frameframe,
const FLAC__int32 *const buffer[] 
)
+
+protectedpure virtual
+
+ +

see FLAC__StreamDecoderWriteCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual void FLAC::Decoder::Stream::metadata_callback (const ::FLAC__StreamMetadatametadata)
+
+protectedvirtual
+
+ +

see FLAC__StreamDecoderMetadataCallback

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual void FLAC::Decoder::Stream::error_callback (::FLAC__StreamDecoderErrorStatus status)
+
+protectedpure virtual
+
+ +

see FLAC__StreamDecoderErrorCallback

+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream.png new file mode 100644 index 000000000..5dd5cba4f Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html new file mode 100644 index 000000000..2d0eaf1fb --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html @@ -0,0 +1,89 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Decoder::Stream::State Member List
+
+
+ +

This is the complete list of members for FLAC::Decoder::Stream::State, including all inherited members.

+ + + + + + +
as_cstring() const (defined in FLAC::Decoder::Stream::State)FLAC::Decoder::Stream::Stateinline
operator::FLAC__StreamDecoderState() const (defined in FLAC::Decoder::Stream::State)FLAC::Decoder::Stream::Stateinline
resolved_as_cstring(const Stream &decoder) const (defined in FLAC::Decoder::Stream::State)FLAC::Decoder::Stream::Stateinline
State(::FLAC__StreamDecoderState state) (defined in FLAC::Decoder::Stream::State)FLAC::Decoder::Stream::Stateinline
state_ (defined in FLAC::Decoder::Stream::State)FLAC::Decoder::Stream::Stateprotected
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html new file mode 100644 index 000000000..04e15f847 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html @@ -0,0 +1,114 @@ + + + + + + +FLAC: FLAC::Decoder::Stream::State Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <decoder.h>

+ + + + + + + + + + +

+Public Member Functions

State (::FLAC__StreamDecoderState state)
 
operator::FLAC__StreamDecoderState () const
 
+const char * as_cstring () const
 
+const char * resolved_as_cstring (const Stream &decoder) const
 
+ + + +

+Protected Attributes

+::FLAC__StreamDecoderState state_
 
+

Detailed Description

+

This class is a wrapper around FLAC__StreamDecoderState.

+

The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File-members.html new file mode 100644 index 000000000..e08933d92 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File-members.html @@ -0,0 +1,155 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Encoder::File Member List
+
+
+ +

This is the complete list of members for FLAC::Encoder::File, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
encoder_ (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotected
File() (defined in FLAC::Encoder::File)FLAC::Encoder::File
finish()FLAC::Encoder::Streamvirtual
get_bits_per_sample() const FLAC::Encoder::Streamvirtual
get_blocksize() const FLAC::Encoder::Streamvirtual
get_channels() const FLAC::Encoder::Streamvirtual
get_do_escape_coding() const FLAC::Encoder::Streamvirtual
get_do_exhaustive_model_search() const FLAC::Encoder::Streamvirtual
get_do_mid_side_stereo() const FLAC::Encoder::Streamvirtual
get_do_qlp_coeff_prec_search() const FLAC::Encoder::Streamvirtual
get_loose_mid_side_stereo() const FLAC::Encoder::Streamvirtual
get_max_lpc_order() const FLAC::Encoder::Streamvirtual
get_max_residual_partition_order() const FLAC::Encoder::Streamvirtual
get_min_residual_partition_order() const FLAC::Encoder::Streamvirtual
get_qlp_coeff_precision() const FLAC::Encoder::Streamvirtual
get_rice_parameter_search_dist() const FLAC::Encoder::Streamvirtual
get_sample_rate() const FLAC::Encoder::Streamvirtual
get_state() const FLAC::Encoder::Stream
get_streamable_subset() const FLAC::Encoder::Streamvirtual
get_total_samples_estimate() const FLAC::Encoder::Streamvirtual
get_verify() const FLAC::Encoder::Streamvirtual
get_verify_decoder_error_stats(FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got)FLAC::Encoder::Streamvirtual
get_verify_decoder_state() const FLAC::Encoder::Streamvirtual
init(FILE *file)FLAC::Encoder::File
init(const char *filename)FLAC::Encoder::File
init(const std::string &filename)FLAC::Encoder::File
FLAC::Encoder::Stream::init()FLAC::Encoder::Stream
init_ogg(FILE *file)FLAC::Encoder::File
init_ogg(const char *filename)FLAC::Encoder::File
init_ogg(const std::string &filename)FLAC::Encoder::File
FLAC::Encoder::Stream::init_ogg()FLAC::Encoder::Stream
is_valid() const FLAC::Encoder::Streamvirtual
metadata_callback(const ::FLAC__StreamMetadata *metadata)FLAC::Encoder::Streamprotectedvirtual
metadata_callback_(const ::FLAC__StreamEncoder *encoder, const ::FLAC__StreamMetadata *metadata, void *client_data) (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotectedstatic
operator bool() const FLAC::Encoder::Streaminline
process(const FLAC__int32 *const buffer[], unsigned samples)FLAC::Encoder::Streamvirtual
process_interleaved(const FLAC__int32 buffer[], unsigned samples)FLAC::Encoder::Streamvirtual
progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate)FLAC::Encoder::Fileprotectedvirtual
read_callback(FLAC__byte buffer[], size_t *bytes)FLAC::Encoder::Streamprotected
read_callback_(const ::FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data) (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotectedstatic
seek_callback(FLAC__uint64 absolute_byte_offset)FLAC::Encoder::Streamprotected
seek_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotectedstatic
set_apodization(const char *specification)FLAC::Encoder::Streamvirtual
set_bits_per_sample(unsigned value)FLAC::Encoder::Streamvirtual
set_blocksize(unsigned value)FLAC::Encoder::Streamvirtual
set_channels(unsigned value)FLAC::Encoder::Streamvirtual
set_compression_level(unsigned value)FLAC::Encoder::Streamvirtual
set_do_escape_coding(bool value)FLAC::Encoder::Streamvirtual
set_do_exhaustive_model_search(bool value)FLAC::Encoder::Streamvirtual
set_do_mid_side_stereo(bool value)FLAC::Encoder::Streamvirtual
set_do_qlp_coeff_prec_search(bool value)FLAC::Encoder::Streamvirtual
set_loose_mid_side_stereo(bool value)FLAC::Encoder::Streamvirtual
set_max_lpc_order(unsigned value)FLAC::Encoder::Streamvirtual
set_max_residual_partition_order(unsigned value)FLAC::Encoder::Streamvirtual
set_metadata(::FLAC__StreamMetadata **metadata, unsigned num_blocks)FLAC::Encoder::Streamvirtual
set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks)FLAC::Encoder::Streamvirtual
set_min_residual_partition_order(unsigned value)FLAC::Encoder::Streamvirtual
set_ogg_serial_number(long value)FLAC::Encoder::Streamvirtual
set_qlp_coeff_precision(unsigned value)FLAC::Encoder::Streamvirtual
set_rice_parameter_search_dist(unsigned value)FLAC::Encoder::Streamvirtual
set_sample_rate(unsigned value)FLAC::Encoder::Streamvirtual
set_streamable_subset(bool value)FLAC::Encoder::Streamvirtual
set_total_samples_estimate(FLAC__uint64 value)FLAC::Encoder::Streamvirtual
set_verify(bool value)FLAC::Encoder::Streamvirtual
Stream() (defined in FLAC::Encoder::Stream)FLAC::Encoder::Stream
tell_callback(FLAC__uint64 *absolute_byte_offset)FLAC::Encoder::Streamprotected
tell_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotectedstatic
write_callback(const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame)FLAC::Encoder::Fileprotectedvirtual
write_callback_(const ::FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotectedstatic
~File() (defined in FLAC::Encoder::File)FLAC::Encoder::Filevirtual
~Stream() (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamvirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File.html new file mode 100644 index 000000000..5fb01c7fe --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File.html @@ -0,0 +1,1915 @@ + + + + + + +FLAC: FLAC::Encoder::File Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <encoder.h>

+
+Inheritance diagram for FLAC::Encoder::File:
+
+
+ + +FLAC::Encoder::Stream + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

virtual
+::FLAC__StreamEncoderInitStatus 
init (FILE *file)
 
virtual
+::FLAC__StreamEncoderInitStatus 
init (const char *filename)
 
virtual
+::FLAC__StreamEncoderInitStatus 
init (const std::string &filename)
 
virtual
+::FLAC__StreamEncoderInitStatus 
init_ogg (FILE *file)
 
virtual
+::FLAC__StreamEncoderInitStatus 
init_ogg (const char *filename)
 
virtual
+::FLAC__StreamEncoderInitStatus 
init_ogg (const std::string &filename)
 
virtual bool set_ogg_serial_number (long value)
 
virtual bool set_verify (bool value)
 
virtual bool set_streamable_subset (bool value)
 
virtual bool set_channels (unsigned value)
 
virtual bool set_bits_per_sample (unsigned value)
 
virtual bool set_sample_rate (unsigned value)
 
virtual bool set_compression_level (unsigned value)
 
virtual bool set_blocksize (unsigned value)
 
virtual bool set_do_mid_side_stereo (bool value)
 
virtual bool set_loose_mid_side_stereo (bool value)
 
virtual bool set_apodization (const char *specification)
 
virtual bool set_max_lpc_order (unsigned value)
 
virtual bool set_qlp_coeff_precision (unsigned value)
 
virtual bool set_do_qlp_coeff_prec_search (bool value)
 
virtual bool set_do_escape_coding (bool value)
 
virtual bool set_do_exhaustive_model_search (bool value)
 
virtual bool set_min_residual_partition_order (unsigned value)
 
virtual bool set_max_residual_partition_order (unsigned value)
 
virtual bool set_rice_parameter_search_dist (unsigned value)
 
virtual bool set_total_samples_estimate (FLAC__uint64 value)
 
virtual bool set_metadata (::FLAC__StreamMetadata **metadata, unsigned num_blocks)
 
virtual bool set_metadata (FLAC::Metadata::Prototype **metadata, unsigned num_blocks)
 
State get_state () const
 
virtual Decoder::Stream::State get_verify_decoder_state () const
 
virtual void get_verify_decoder_error_stats (FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got)
 
virtual bool get_verify () const
 
virtual bool get_streamable_subset () const
 
virtual bool get_do_mid_side_stereo () const
 
virtual bool get_loose_mid_side_stereo () const
 
virtual unsigned get_channels () const
 
virtual unsigned get_bits_per_sample () const
 
virtual unsigned get_sample_rate () const
 
virtual unsigned get_blocksize () const
 
virtual unsigned get_max_lpc_order () const
 
virtual unsigned get_qlp_coeff_precision () const
 
virtual bool get_do_qlp_coeff_prec_search () const
 
virtual bool get_do_escape_coding () const
 
virtual bool get_do_exhaustive_model_search () const
 
virtual unsigned get_min_residual_partition_order () const
 
virtual unsigned get_max_residual_partition_order () const
 
virtual unsigned get_rice_parameter_search_dist () const
 
virtual FLAC__uint64 get_total_samples_estimate () const
 
virtual
+::FLAC__StreamEncoderInitStatus 
init ()
 
virtual
+::FLAC__StreamEncoderInitStatus 
init_ogg ()
 
virtual bool finish ()
 
virtual bool process (const FLAC__int32 *const buffer[], unsigned samples)
 
virtual bool process_interleaved (const FLAC__int32 buffer[], unsigned samples)
 
virtual bool is_valid () const
 
 operator bool () const
 
+ + + + + + + + + + + + + +

+Protected Member Functions

virtual void progress_callback (FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate)
 
virtual
+::FLAC__StreamEncoderWriteStatus 
write_callback (const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame)
 
virtual
+::FLAC__StreamEncoderReadStatus 
read_callback (FLAC__byte buffer[], size_t *bytes)
 
virtual
+::FLAC__StreamEncoderSeekStatus 
seek_callback (FLAC__uint64 absolute_byte_offset)
 
virtual
+::FLAC__StreamEncoderTellStatus 
tell_callback (FLAC__uint64 *absolute_byte_offset)
 
virtual void metadata_callback (const ::FLAC__StreamMetadata *metadata)
 
+ + + + + + + + + + + +

+Static Protected Member Functions

+::FLAC__StreamEncoderReadStatus read_callback_ (const ::FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
 
+::FLAC__StreamEncoderWriteStatus write_callback_ (const ::FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
 
+::FLAC__StreamEncoderSeekStatus seek_callback_ (const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
 
+::FLAC__StreamEncoderTellStatus tell_callback_ (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
 
+static void metadata_callback_ (const ::FLAC__StreamEncoder *encoder, const ::FLAC__StreamMetadata *metadata, void *client_data)
 
+ + + +

+Protected Attributes

+::FLAC__StreamEncoderencoder_
 
+

Detailed Description

+

This class wraps the FLAC__StreamEncoder. If you are not encoding to a file, you may need to use FLAC::Encoder::Stream.

+

The usage of this class is similar to FLAC__StreamEncoder, except instead of providing callbacks to FLAC__stream_encoder_init*_FILE() or FLAC__stream_encoder_init*_file(), you will inherit from this class and override the virtual callback functions with your own implementations, then call init() or init_ogg(). The rest of the calls work the same as in the C layer.

+

There are no mandatory callbacks; all the callbacks from FLAC::Encoder::Stream are implemented here fully and support full post-encode STREAMINFO and SEEKTABLE updating. There is only an optional progress callback which you may override to get periodic reports on the progress of the encode.

+

Member Function Documentation

+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamEncoderInitStatus FLAC::Encoder::File::init (FILE * file)
+
+
+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamEncoderInitStatus FLAC::Encoder::File::init (const char * filename)
+
+
+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamEncoderInitStatus FLAC::Encoder::File::init (const std::string & filename)
+
+
+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamEncoderInitStatus FLAC::Encoder::File::init_ogg (FILE * file)
+
+
+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamEncoderInitStatus FLAC::Encoder::File::init_ogg (const char * filename)
+
+
+ +
+
+ + + + + + + + +
virtual ::FLAC__StreamEncoderInitStatus FLAC::Encoder::File::init_ogg (const std::string & filename)
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
virtual void FLAC::Encoder::File::progress_callback (FLAC__uint64 bytes_written,
FLAC__uint64 samples_written,
unsigned frames_written,
unsigned total_frames_estimate 
)
+
+protectedvirtual
+
+ +

See FLAC__StreamEncoderProgressCallback.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
virtual ::FLAC__StreamEncoderWriteStatus FLAC::Encoder::File::write_callback (const FLAC__byte buffer[],
size_t bytes,
unsigned samples,
unsigned current_frame 
)
+
+protectedvirtual
+
+ +

This is a dummy implementation to satisfy the pure virtual in Stream that is actually supplied internally by the C layer.

+ +

Implements FLAC::Encoder::Stream.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::is_valid () const
+
+virtualinherited
+
+

Call after construction to check the that the object was created successfully. If not, use get_state() to find out why not.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
FLAC::Encoder::Stream::operator bool () const
+
+inlineinherited
+
+ +

See is_valid()

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_ogg_serial_number (long value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_verify (bool value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_streamable_subset (bool value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_channels (unsigned value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_bits_per_sample (unsigned value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_sample_rate (unsigned value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_compression_level (unsigned value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_blocksize (unsigned value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_do_mid_side_stereo (bool value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_loose_mid_side_stereo (bool value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_apodization (const char * specification)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_max_lpc_order (unsigned value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_qlp_coeff_precision (unsigned value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_do_qlp_coeff_prec_search (bool value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_do_escape_coding (bool value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_do_exhaustive_model_search (bool value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_min_residual_partition_order (unsigned value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_max_residual_partition_order (unsigned value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_rice_parameter_search_dist (unsigned value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_total_samples_estimate (FLAC__uint64 value)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_metadata (::FLAC__StreamMetadata ** metadata,
unsigned num_blocks 
)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_metadata (FLAC::Metadata::Prototype ** metadata,
unsigned num_blocks 
)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
State FLAC::Encoder::Stream::get_state () const
+
+inherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual Decoder::Stream::State FLAC::Encoder::Stream::get_verify_decoder_state () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
virtual void FLAC::Encoder::Stream::get_verify_decoder_error_stats (FLAC__uint64 * absolute_sample,
unsigned * frame_number,
unsigned * channel,
unsigned * sample,
FLAC__int32 * expected,
FLAC__int32 * got 
)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_verify () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_streamable_subset () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_do_mid_side_stereo () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_loose_mid_side_stereo () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_channels () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_bits_per_sample () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_sample_rate () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_blocksize () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_max_lpc_order () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_qlp_coeff_precision () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_do_qlp_coeff_prec_search () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_do_escape_coding () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_do_exhaustive_model_search () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_min_residual_partition_order () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_max_residual_partition_order () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_rice_parameter_search_dist () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual FLAC__uint64 FLAC::Encoder::Stream::get_total_samples_estimate () const
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual ::FLAC__StreamEncoderInitStatus FLAC::Encoder::Stream::init ()
+
+inherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual ::FLAC__StreamEncoderInitStatus FLAC::Encoder::Stream::init_ogg ()
+
+inherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::finish ()
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual bool FLAC::Encoder::Stream::process (const FLAC__int32 *const buffer[],
unsigned samples 
)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual bool FLAC::Encoder::Stream::process_interleaved (const FLAC__int32 buffer[],
unsigned samples 
)
+
+virtualinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual ::FLAC__StreamEncoderReadStatus FLAC::Encoder::Stream::read_callback (FLAC__byte buffer[],
size_t * bytes 
)
+
+protectedinherited
+
+ +

See FLAC__StreamEncoderReadCallback.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual ::FLAC__StreamEncoderSeekStatus FLAC::Encoder::Stream::seek_callback (FLAC__uint64 absolute_byte_offset)
+
+protectedinherited
+
+ +

See FLAC__StreamEncoderSeekCallback.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual ::FLAC__StreamEncoderTellStatus FLAC::Encoder::Stream::tell_callback (FLAC__uint64 * absolute_byte_offset)
+
+protectedinherited
+
+ +

See FLAC__StreamEncoderTellCallback.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual void FLAC::Encoder::Stream::metadata_callback (const ::FLAC__StreamMetadatametadata)
+
+protectedvirtualinherited
+
+ +

See FLAC__StreamEncoderMetadataCallback.

+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File.png new file mode 100644 index 000000000..7ec1aa13a Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1File.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream-members.html new file mode 100644 index 000000000..a210658f1 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream-members.html @@ -0,0 +1,146 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Encoder::Stream Member List
+
+
+ +

This is the complete list of members for FLAC::Encoder::Stream, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
encoder_ (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotected
finish()FLAC::Encoder::Streamvirtual
get_bits_per_sample() const FLAC::Encoder::Streamvirtual
get_blocksize() const FLAC::Encoder::Streamvirtual
get_channels() const FLAC::Encoder::Streamvirtual
get_do_escape_coding() const FLAC::Encoder::Streamvirtual
get_do_exhaustive_model_search() const FLAC::Encoder::Streamvirtual
get_do_mid_side_stereo() const FLAC::Encoder::Streamvirtual
get_do_qlp_coeff_prec_search() const FLAC::Encoder::Streamvirtual
get_loose_mid_side_stereo() const FLAC::Encoder::Streamvirtual
get_max_lpc_order() const FLAC::Encoder::Streamvirtual
get_max_residual_partition_order() const FLAC::Encoder::Streamvirtual
get_min_residual_partition_order() const FLAC::Encoder::Streamvirtual
get_qlp_coeff_precision() const FLAC::Encoder::Streamvirtual
get_rice_parameter_search_dist() const FLAC::Encoder::Streamvirtual
get_sample_rate() const FLAC::Encoder::Streamvirtual
get_state() const FLAC::Encoder::Stream
get_streamable_subset() const FLAC::Encoder::Streamvirtual
get_total_samples_estimate() const FLAC::Encoder::Streamvirtual
get_verify() const FLAC::Encoder::Streamvirtual
get_verify_decoder_error_stats(FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got)FLAC::Encoder::Streamvirtual
get_verify_decoder_state() const FLAC::Encoder::Streamvirtual
init()FLAC::Encoder::Stream
init_ogg()FLAC::Encoder::Stream
is_valid() const FLAC::Encoder::Streamvirtual
metadata_callback(const ::FLAC__StreamMetadata *metadata)FLAC::Encoder::Streamprotectedvirtual
metadata_callback_(const ::FLAC__StreamEncoder *encoder, const ::FLAC__StreamMetadata *metadata, void *client_data) (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotectedstatic
operator bool() const FLAC::Encoder::Streaminline
process(const FLAC__int32 *const buffer[], unsigned samples)FLAC::Encoder::Streamvirtual
process_interleaved(const FLAC__int32 buffer[], unsigned samples)FLAC::Encoder::Streamvirtual
read_callback(FLAC__byte buffer[], size_t *bytes)FLAC::Encoder::Streamprotected
read_callback_(const ::FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data) (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotectedstatic
seek_callback(FLAC__uint64 absolute_byte_offset)FLAC::Encoder::Streamprotected
seek_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data) (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotectedstatic
set_apodization(const char *specification)FLAC::Encoder::Streamvirtual
set_bits_per_sample(unsigned value)FLAC::Encoder::Streamvirtual
set_blocksize(unsigned value)FLAC::Encoder::Streamvirtual
set_channels(unsigned value)FLAC::Encoder::Streamvirtual
set_compression_level(unsigned value)FLAC::Encoder::Streamvirtual
set_do_escape_coding(bool value)FLAC::Encoder::Streamvirtual
set_do_exhaustive_model_search(bool value)FLAC::Encoder::Streamvirtual
set_do_mid_side_stereo(bool value)FLAC::Encoder::Streamvirtual
set_do_qlp_coeff_prec_search(bool value)FLAC::Encoder::Streamvirtual
set_loose_mid_side_stereo(bool value)FLAC::Encoder::Streamvirtual
set_max_lpc_order(unsigned value)FLAC::Encoder::Streamvirtual
set_max_residual_partition_order(unsigned value)FLAC::Encoder::Streamvirtual
set_metadata(::FLAC__StreamMetadata **metadata, unsigned num_blocks)FLAC::Encoder::Streamvirtual
set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks)FLAC::Encoder::Streamvirtual
set_min_residual_partition_order(unsigned value)FLAC::Encoder::Streamvirtual
set_ogg_serial_number(long value)FLAC::Encoder::Streamvirtual
set_qlp_coeff_precision(unsigned value)FLAC::Encoder::Streamvirtual
set_rice_parameter_search_dist(unsigned value)FLAC::Encoder::Streamvirtual
set_sample_rate(unsigned value)FLAC::Encoder::Streamvirtual
set_streamable_subset(bool value)FLAC::Encoder::Streamvirtual
set_total_samples_estimate(FLAC__uint64 value)FLAC::Encoder::Streamvirtual
set_verify(bool value)FLAC::Encoder::Streamvirtual
Stream() (defined in FLAC::Encoder::Stream)FLAC::Encoder::Stream
tell_callback(FLAC__uint64 *absolute_byte_offset)FLAC::Encoder::Streamprotected
tell_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data) (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotectedstatic
write_callback(const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame)=0FLAC::Encoder::Streamprotectedpure virtual
write_callback_(const ::FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data) (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamprotectedstatic
~Stream() (defined in FLAC::Encoder::Stream)FLAC::Encoder::Streamvirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream.html new file mode 100644 index 000000000..9226f599d --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream.html @@ -0,0 +1,1721 @@ + + + + + + +FLAC: FLAC::Encoder::Stream Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <encoder.h>

+
+Inheritance diagram for FLAC::Encoder::Stream:
+
+
+ + +FLAC::Encoder::File + +
+ + + + +

+Classes

class  State
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

virtual bool set_ogg_serial_number (long value)
 
virtual bool set_verify (bool value)
 
virtual bool set_streamable_subset (bool value)
 
virtual bool set_channels (unsigned value)
 
virtual bool set_bits_per_sample (unsigned value)
 
virtual bool set_sample_rate (unsigned value)
 
virtual bool set_compression_level (unsigned value)
 
virtual bool set_blocksize (unsigned value)
 
virtual bool set_do_mid_side_stereo (bool value)
 
virtual bool set_loose_mid_side_stereo (bool value)
 
virtual bool set_apodization (const char *specification)
 
virtual bool set_max_lpc_order (unsigned value)
 
virtual bool set_qlp_coeff_precision (unsigned value)
 
virtual bool set_do_qlp_coeff_prec_search (bool value)
 
virtual bool set_do_escape_coding (bool value)
 
virtual bool set_do_exhaustive_model_search (bool value)
 
virtual bool set_min_residual_partition_order (unsigned value)
 
virtual bool set_max_residual_partition_order (unsigned value)
 
virtual bool set_rice_parameter_search_dist (unsigned value)
 
virtual bool set_total_samples_estimate (FLAC__uint64 value)
 
virtual bool set_metadata (::FLAC__StreamMetadata **metadata, unsigned num_blocks)
 
virtual bool set_metadata (FLAC::Metadata::Prototype **metadata, unsigned num_blocks)
 
State get_state () const
 
virtual Decoder::Stream::State get_verify_decoder_state () const
 
virtual void get_verify_decoder_error_stats (FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got)
 
virtual bool get_verify () const
 
virtual bool get_streamable_subset () const
 
virtual bool get_do_mid_side_stereo () const
 
virtual bool get_loose_mid_side_stereo () const
 
virtual unsigned get_channels () const
 
virtual unsigned get_bits_per_sample () const
 
virtual unsigned get_sample_rate () const
 
virtual unsigned get_blocksize () const
 
virtual unsigned get_max_lpc_order () const
 
virtual unsigned get_qlp_coeff_precision () const
 
virtual bool get_do_qlp_coeff_prec_search () const
 
virtual bool get_do_escape_coding () const
 
virtual bool get_do_exhaustive_model_search () const
 
virtual unsigned get_min_residual_partition_order () const
 
virtual unsigned get_max_residual_partition_order () const
 
virtual unsigned get_rice_parameter_search_dist () const
 
virtual FLAC__uint64 get_total_samples_estimate () const
 
virtual
+::FLAC__StreamEncoderInitStatus 
init ()
 
virtual
+::FLAC__StreamEncoderInitStatus 
init_ogg ()
 
virtual bool finish ()
 
virtual bool process (const FLAC__int32 *const buffer[], unsigned samples)
 
virtual bool process_interleaved (const FLAC__int32 buffer[], unsigned samples)
 
virtual bool is_valid () const
 
 operator bool () const
 
+ + + + + + + + + + + +

+Protected Member Functions

virtual
+::FLAC__StreamEncoderReadStatus 
read_callback (FLAC__byte buffer[], size_t *bytes)
 
virtual
+::FLAC__StreamEncoderWriteStatus 
write_callback (const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame)=0
 
virtual
+::FLAC__StreamEncoderSeekStatus 
seek_callback (FLAC__uint64 absolute_byte_offset)
 
virtual
+::FLAC__StreamEncoderTellStatus 
tell_callback (FLAC__uint64 *absolute_byte_offset)
 
virtual void metadata_callback (const ::FLAC__StreamMetadata *metadata)
 
+ + + + + + + + + + + +

+Static Protected Member Functions

+::FLAC__StreamEncoderReadStatus read_callback_ (const ::FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
 
+::FLAC__StreamEncoderWriteStatus write_callback_ (const ::FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
 
+::FLAC__StreamEncoderSeekStatus seek_callback_ (const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
 
+::FLAC__StreamEncoderTellStatus tell_callback_ (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
 
+static void metadata_callback_ (const ::FLAC__StreamEncoder *encoder, const ::FLAC__StreamMetadata *metadata, void *client_data)
 
+ + + +

+Protected Attributes

+::FLAC__StreamEncoderencoder_
 
+

Detailed Description

+

This class wraps the FLAC__StreamEncoder. If you are encoding to a file, FLAC::Encoder::File may be more convenient.

+

The usage of this class is similar to FLAC__StreamEncoder, except instead of providing callbacks to FLAC__stream_encoder_init*_stream(), you will inherit from this class and override the virtual callback functions with your own implementations, then call init() or init_ogg(). The rest of the calls work the same as in the C layer.

+

Only the write callback is mandatory. The others are optional; this class provides default implementations that do nothing. In order for some STREAMINFO and SEEKTABLE data to be written properly, you must overide seek_callback() and tell_callback(); see FLAC__stream_encoder_init_stream() as to why.

+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::is_valid () const
+
+virtual
+
+

Call after construction to check the that the object was created successfully. If not, use get_state() to find out why not.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
FLAC::Encoder::Stream::operator bool () const
+
+inline
+
+ +

See is_valid()

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_ogg_serial_number (long value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_verify (bool value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_streamable_subset (bool value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_channels (unsigned value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_bits_per_sample (unsigned value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_sample_rate (unsigned value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_compression_level (unsigned value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_blocksize (unsigned value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_do_mid_side_stereo (bool value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_loose_mid_side_stereo (bool value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_apodization (const char * specification)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_max_lpc_order (unsigned value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_qlp_coeff_precision (unsigned value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_do_qlp_coeff_prec_search (bool value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_do_escape_coding (bool value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_do_exhaustive_model_search (bool value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_min_residual_partition_order (unsigned value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_max_residual_partition_order (unsigned value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_rice_parameter_search_dist (unsigned value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_total_samples_estimate (FLAC__uint64 value)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_metadata (::FLAC__StreamMetadata ** metadata,
unsigned num_blocks 
)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual bool FLAC::Encoder::Stream::set_metadata (FLAC::Metadata::Prototype ** metadata,
unsigned num_blocks 
)
+
+virtual
+
+
+ +
+
+ + + + + + + +
State FLAC::Encoder::Stream::get_state () const
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual Decoder::Stream::State FLAC::Encoder::Stream::get_verify_decoder_state () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
virtual void FLAC::Encoder::Stream::get_verify_decoder_error_stats (FLAC__uint64 * absolute_sample,
unsigned * frame_number,
unsigned * channel,
unsigned * sample,
FLAC__int32 * expected,
FLAC__int32 * got 
)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_verify () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_streamable_subset () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_do_mid_side_stereo () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_loose_mid_side_stereo () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_channels () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_bits_per_sample () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_sample_rate () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_blocksize () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_max_lpc_order () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_qlp_coeff_precision () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_do_qlp_coeff_prec_search () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_do_escape_coding () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::get_do_exhaustive_model_search () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_min_residual_partition_order () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_max_residual_partition_order () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual unsigned FLAC::Encoder::Stream::get_rice_parameter_search_dist () const
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual FLAC__uint64 FLAC::Encoder::Stream::get_total_samples_estimate () const
+
+virtual
+
+
+ +
+
+ + + + + + + +
virtual ::FLAC__StreamEncoderInitStatus FLAC::Encoder::Stream::init ()
+
+
+ +
+
+ + + + + + + +
virtual ::FLAC__StreamEncoderInitStatus FLAC::Encoder::Stream::init_ogg ()
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Encoder::Stream::finish ()
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual bool FLAC::Encoder::Stream::process (const FLAC__int32 *const buffer[],
unsigned samples 
)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual bool FLAC::Encoder::Stream::process_interleaved (const FLAC__int32 buffer[],
unsigned samples 
)
+
+virtual
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
virtual ::FLAC__StreamEncoderReadStatus FLAC::Encoder::Stream::read_callback (FLAC__byte buffer[],
size_t * bytes 
)
+
+protected
+
+ +

See FLAC__StreamEncoderReadCallback.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
virtual ::FLAC__StreamEncoderWriteStatus FLAC::Encoder::Stream::write_callback (const FLAC__byte buffer[],
size_t bytes,
unsigned samples,
unsigned current_frame 
)
+
+protectedpure virtual
+
+ +

See FLAC__StreamEncoderWriteCallback.

+ +

Implemented in FLAC::Encoder::File.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual ::FLAC__StreamEncoderSeekStatus FLAC::Encoder::Stream::seek_callback (FLAC__uint64 absolute_byte_offset)
+
+protected
+
+ +

See FLAC__StreamEncoderSeekCallback.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual ::FLAC__StreamEncoderTellStatus FLAC::Encoder::Stream::tell_callback (FLAC__uint64 * absolute_byte_offset)
+
+protected
+
+ +

See FLAC__StreamEncoderTellCallback.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
virtual void FLAC::Encoder::Stream::metadata_callback (const ::FLAC__StreamMetadatametadata)
+
+protectedvirtual
+
+ +

See FLAC__StreamEncoderMetadataCallback.

+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream.png new file mode 100644 index 000000000..b705446ea Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html new file mode 100644 index 000000000..8bdab9ef5 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html @@ -0,0 +1,89 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Encoder::Stream::State Member List
+
+
+ +

This is the complete list of members for FLAC::Encoder::Stream::State, including all inherited members.

+ + + + + + +
as_cstring() const (defined in FLAC::Encoder::Stream::State)FLAC::Encoder::Stream::Stateinline
operator::FLAC__StreamEncoderState() const (defined in FLAC::Encoder::Stream::State)FLAC::Encoder::Stream::Stateinline
resolved_as_cstring(const Stream &encoder) const (defined in FLAC::Encoder::Stream::State)FLAC::Encoder::Stream::Stateinline
State(::FLAC__StreamEncoderState state) (defined in FLAC::Encoder::Stream::State)FLAC::Encoder::Stream::Stateinline
state_ (defined in FLAC::Encoder::Stream::State)FLAC::Encoder::Stream::Stateprotected
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html new file mode 100644 index 000000000..7c84c4a10 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html @@ -0,0 +1,114 @@ + + + + + + +FLAC: FLAC::Encoder::Stream::State Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <encoder.h>

+ + + + + + + + + + +

+Public Member Functions

State (::FLAC__StreamEncoderState state)
 
operator::FLAC__StreamEncoderState () const
 
+const char * as_cstring () const
 
+const char * resolved_as_cstring (const Stream &encoder) const
 
+ + + +

+Protected Attributes

+::FLAC__StreamEncoderState state_
 
+

Detailed Description

+

This class is a wrapper around FLAC__StreamEncoderState.

+

The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application-members.html new file mode 100644 index 000000000..26379d916 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application-members.html @@ -0,0 +1,122 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::Application Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::Application, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Application() (defined in FLAC::Metadata::Application)FLAC::Metadata::Application
Application(const Application &object)FLAC::Metadata::Applicationinline
Application(const ::FLAC__StreamMetadata &object)FLAC::Metadata::Applicationinline
Application(const ::FLAC__StreamMetadata *object)FLAC::Metadata::Applicationinline
Application(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Applicationinline
assign(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Applicationinline
assign_object(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
clear()FLAC::Metadata::Prototypeprotectedvirtual
get_data() const (defined in FLAC::Metadata::Application)FLAC::Metadata::Application
get_id() const (defined in FLAC::Metadata::Application)FLAC::Metadata::Application
get_is_last() const FLAC::Metadata::Prototype
get_length() const FLAC::Metadata::Prototype
get_type() const FLAC::Metadata::Prototype
is_valid() const FLAC::Metadata::Prototypeinline
object_ (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
operator const ::FLAC__StreamMetadata *() const FLAC::Metadata::Prototypeinline
operator!=(const Application &object) const FLAC::Metadata::Applicationinline
operator!=(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::Applicationinline
operator!=(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::Applicationinline
FLAC::Metadata::Prototype::operator!=(const Prototype &) const FLAC::Metadata::Prototypeinline
operator=(const Application &object)FLAC::Metadata::Applicationinline
operator=(const ::FLAC__StreamMetadata &object)FLAC::Metadata::Applicationinline
operator=(const ::FLAC__StreamMetadata *object)FLAC::Metadata::Applicationinline
FLAC::Metadata::Prototype::operator=(const Prototype &)FLAC::Metadata::Prototypeprotected
operator==(const Application &object) const FLAC::Metadata::Applicationinline
operator==(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::Applicationinline
operator==(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::Applicationinline
FLAC::Metadata::Prototype::operator==(const Prototype &) const FLAC::Metadata::Prototypeinline
Prototype(const Prototype &)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata &) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata *) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
set_data(const FLAC__byte *data, unsigned length)FLAC::Metadata::Application
set_data(FLAC__byte *data, unsigned length, bool copy) (defined in FLAC::Metadata::Application)FLAC::Metadata::Application
set_id(const FLAC__byte value[4]) (defined in FLAC::Metadata::Application)FLAC::Metadata::Application
set_is_last(bool)FLAC::Metadata::Prototype
~Application() (defined in FLAC::Metadata::Application)FLAC::Metadata::Application
~Prototype()FLAC::Metadata::Prototypevirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application.html new file mode 100644 index 000000000..b9da1c0e4 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application.html @@ -0,0 +1,770 @@ + + + + + + +FLAC: FLAC::Metadata::Application Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+
+Inheritance diagram for FLAC::Metadata::Application:
+
+
+ + +FLAC::Metadata::Prototype + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

 Application (::FLAC__StreamMetadata *object, bool copy)
 
Applicationassign (::FLAC__StreamMetadata *object, bool copy)
 
+const FLAC__byte * get_id () const
 
+const FLAC__byte * get_data () const
 
+void set_id (const FLAC__byte value[4])
 
bool set_data (const FLAC__byte *data, unsigned length)
 
+bool set_data (FLAC__byte *data, unsigned length, bool copy)
 
bool is_valid () const
 
bool get_is_last () const
 
::FLAC__MetadataType get_type () const
 
unsigned get_length () const
 
void set_is_last (bool)
 
 operator const ::FLAC__StreamMetadata * () const
 
 Application (const Application &object)
 
 Application (const ::FLAC__StreamMetadata &object)
 
 Application (const ::FLAC__StreamMetadata *object)
 
Applicationoperator= (const Application &object)
 
Applicationoperator= (const ::FLAC__StreamMetadata &object)
 
Applicationoperator= (const ::FLAC__StreamMetadata *object)
 
bool operator== (const Application &object) const
 
bool operator== (const ::FLAC__StreamMetadata &object) const
 
bool operator== (const ::FLAC__StreamMetadata *object) const
 
bool operator!= (const Application &object) const
 
bool operator!= (const ::FLAC__StreamMetadata &object) const
 
bool operator!= (const ::FLAC__StreamMetadata *object) const
 
bool operator== (const Prototype &) const
 
bool operator!= (const Prototype &) const
 
+ + + + + +

+Protected Member Functions

Prototypeassign_object (::FLAC__StreamMetadata *object, bool copy)
 
virtual void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__StreamMetadataobject_
 
+

Detailed Description

+

APPLICATION metadata block. See the overview for more, and the format specification.

+

Constructor & Destructor Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Application::Application (const Applicationobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Application::Application (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Application::Application (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
FLAC::Metadata::Application::Application (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+

Constructs an object with copy control. See Prototype(::FLAC__StreamMetadata *object, bool copy).

+ +
+
+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
Application& FLAC::Metadata::Application::operator= (const Applicationobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
Application& FLAC::Metadata::Application::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
Application& FLAC::Metadata::Application::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Application& FLAC::Metadata::Application::assign (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Application::operator== (const Applicationobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Application::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Application::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Application::operator!= (const Applicationobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Application::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Application::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::Application::set_data (const FLAC__byte * data,
unsigned length 
)
+
+ +

This form always copies data.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Prototype& FLAC::Metadata::Prototype::assign_object (::FLAC__StreamMetadataobject,
bool copy 
)
+
+protectedinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual void FLAC::Metadata::Prototype::clear ()
+
+protectedvirtualinherited
+
+

Deletes the underlying FLAC__StreamMetadata object.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
bool FLAC::Metadata::Prototype::get_is_last () const
+
+inherited
+
+

Returns true if this block is the last block in a stream, else false.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
::FLAC__MetadataType FLAC::Metadata::Prototype::get_type () const
+
+inherited
+
+

Returns the type of the block.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
unsigned FLAC::Metadata::Prototype::get_length () const
+
+inherited
+
+

Returns the stream length of the metadata block.

+
Note
The length does not include the metadata block header, per spec.
+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
void FLAC::Metadata::Prototype::set_is_last (bool )
+
+inherited
+
+

Sets the "is_last" flag for the block. When using the iterators it is not necessary to set this flag; they will do it for you.

+
Assertions:
+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application.png new file mode 100644 index 000000000..ccff7fff7 Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Application.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain-members.html new file mode 100644 index 000000000..24a2db186 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain-members.html @@ -0,0 +1,99 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::Chain Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::Chain, including all inherited members.

+ + + + + + + + + + + + + + + + +
Chain() (defined in FLAC::Metadata::Chain)FLAC::Metadata::Chain
chain_ (defined in FLAC::Metadata::Chain)FLAC::Metadata::Chainprotected
check_if_tempfile_needed(bool use_padding)FLAC::Metadata::Chain
clear() (defined in FLAC::Metadata::Chain)FLAC::Metadata::Chainprotectedvirtual
is_valid() const FLAC::Metadata::Chain
Iterator (defined in FLAC::Metadata::Chain)FLAC::Metadata::Chainfriend
merge_padding()FLAC::Metadata::Chain
read(const char *filename, bool is_ogg=false)FLAC::Metadata::Chain
read(FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, bool is_ogg=false)FLAC::Metadata::Chain
sort_padding()FLAC::Metadata::Chain
status()FLAC::Metadata::Chain
write(bool use_padding=true, bool preserve_file_stats=false)FLAC::Metadata::Chain
write(bool use_padding,::FLAC__IOHandle handle,::FLAC__IOCallbacks callbacks)FLAC::Metadata::Chain
write(bool use_padding,::FLAC__IOHandle handle,::FLAC__IOCallbacks callbacks,::FLAC__IOHandle temp_handle,::FLAC__IOCallbacks temp_callbacks)FLAC::Metadata::Chain
~Chain() (defined in FLAC::Metadata::Chain)FLAC::Metadata::Chainvirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain.html new file mode 100644 index 000000000..7ea198b4c --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain.html @@ -0,0 +1,399 @@ + + + + + + +FLAC: FLAC::Metadata::Chain Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+ + + + +

+Classes

class  Status
 
+ + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

bool is_valid () const
 
Status status ()
 
bool read (const char *filename, bool is_ogg=false)
 
bool read (FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, bool is_ogg=false)
 
bool check_if_tempfile_needed (bool use_padding)
 
bool write (bool use_padding=true, bool preserve_file_stats=false)
 
bool write (bool use_padding,::FLAC__IOHandle handle,::FLAC__IOCallbacks callbacks)
 
bool write (bool use_padding,::FLAC__IOHandle handle,::FLAC__IOCallbacks callbacks,::FLAC__IOHandle temp_handle,::FLAC__IOCallbacks temp_callbacks)
 
void merge_padding ()
 
void sort_padding ()
 
+ + + +

+Protected Member Functions

+virtual void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__Metadata_Chainchain_
 
+ + + +

+Friends

+class Iterator
 
+

Detailed Description

+

This class is a wrapper around the FLAC__metadata_chain structures and methods; see the usage guide and FLAC__Metadata_Chain.

+

Member Function Documentation

+ +
+
+ + + + + + + +
bool FLAC::Metadata::Chain::is_valid () const
+
+ +

Returns true iff object was properly constructed.

+ +
+
+ +
+
+ + + + + + + +
Status FLAC::Metadata::Chain::status ()
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::Chain::read (const char * filename,
bool is_ogg = false 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::Chain::read (FLAC__IOHandle handle,
FLAC__IOCallbacks callbacks,
bool is_ogg = false 
)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::Chain::check_if_tempfile_needed (bool use_padding)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::Chain::write (bool use_padding = true,
bool preserve_file_stats = false 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::Chain::write (bool use_padding,
::FLAC__IOHandle handle,
::FLAC__IOCallbacks callbacks 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::Chain::write (bool use_padding,
::FLAC__IOHandle handle,
::FLAC__IOCallbacks callbacks,
::FLAC__IOHandle temp_handle,
::FLAC__IOCallbacks temp_callbacks 
)
+
+
+ +
+
+ + + + + + + +
void FLAC::Metadata::Chain::merge_padding ()
+
+
+ +
+
+ + + + + + + +
void FLAC::Metadata::Chain::sort_padding ()
+
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html new file mode 100644 index 000000000..416f7556a --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html @@ -0,0 +1,88 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::Chain::Status Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::Chain::Status, including all inherited members.

+ + + + + +
as_cstring() const (defined in FLAC::Metadata::Chain::Status)FLAC::Metadata::Chain::Statusinline
operator::FLAC__Metadata_ChainStatus() const (defined in FLAC::Metadata::Chain::Status)FLAC::Metadata::Chain::Statusinline
Status(::FLAC__Metadata_ChainStatus status) (defined in FLAC::Metadata::Chain::Status)FLAC::Metadata::Chain::Statusinline
status_ (defined in FLAC::Metadata::Chain::Status)FLAC::Metadata::Chain::Statusprotected
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html new file mode 100644 index 000000000..3cb526049 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html @@ -0,0 +1,111 @@ + + + + + + +FLAC: FLAC::Metadata::Chain::Status Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+ + + + + + + + +

+Public Member Functions

Status (::FLAC__Metadata_ChainStatus status)
 
operator::FLAC__Metadata_ChainStatus () const
 
+const char * as_cstring () const
 
+ + + +

+Protected Attributes

+::FLAC__Metadata_ChainStatus status_
 
+

Detailed Description

+

This class is a wrapper around FLAC__Metadata_ChainStatus.

+

The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html new file mode 100644 index 000000000..9bf394294 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html @@ -0,0 +1,137 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::CueSheet Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::CueSheet, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
assign(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::CueSheetinline
assign_object(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
calculate_cddb_id() const FLAC::Metadata::CueSheet
clear()FLAC::Metadata::Prototypeprotectedvirtual
CueSheet() (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
CueSheet(const CueSheet &object)FLAC::Metadata::CueSheetinline
CueSheet(const ::FLAC__StreamMetadata &object)FLAC::Metadata::CueSheetinline
CueSheet(const ::FLAC__StreamMetadata *object)FLAC::Metadata::CueSheetinline
CueSheet(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::CueSheetinline
delete_index(unsigned track_num, unsigned index_num)FLAC::Metadata::CueSheet
delete_track(unsigned i)FLAC::Metadata::CueSheet
get_is_cd() const (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
get_is_last() const FLAC::Metadata::Prototype
get_lead_in() const (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
get_length() const FLAC::Metadata::Prototype
get_media_catalog_number() const (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
get_num_tracks() const (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
get_track(unsigned i) const (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
get_type() const FLAC::Metadata::Prototype
insert_blank_index(unsigned track_num, unsigned index_num)FLAC::Metadata::CueSheet
insert_blank_track(unsigned i)FLAC::Metadata::CueSheet
insert_index(unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &index)FLAC::Metadata::CueSheet
insert_track(unsigned i, const Track &track)FLAC::Metadata::CueSheet
is_legal(bool check_cd_da_subset=false, const char **violation=0) const FLAC::Metadata::CueSheet
is_valid() const FLAC::Metadata::Prototypeinline
object_ (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
operator const ::FLAC__StreamMetadata *() const FLAC::Metadata::Prototypeinline
operator!=(const CueSheet &object) const FLAC::Metadata::CueSheetinline
operator!=(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::CueSheetinline
operator!=(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::CueSheetinline
FLAC::Metadata::Prototype::operator!=(const Prototype &) const FLAC::Metadata::Prototypeinline
operator=(const CueSheet &object)FLAC::Metadata::CueSheetinline
operator=(const ::FLAC__StreamMetadata &object)FLAC::Metadata::CueSheetinline
operator=(const ::FLAC__StreamMetadata *object)FLAC::Metadata::CueSheetinline
FLAC::Metadata::Prototype::operator=(const Prototype &)FLAC::Metadata::Prototypeprotected
operator==(const CueSheet &object) const FLAC::Metadata::CueSheetinline
operator==(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::CueSheetinline
operator==(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::CueSheetinline
FLAC::Metadata::Prototype::operator==(const Prototype &) const FLAC::Metadata::Prototypeinline
Prototype(const Prototype &)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata &) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata *) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
resize_indices(unsigned track_num, unsigned new_num_indices)FLAC::Metadata::CueSheet
resize_tracks(unsigned new_num_tracks)FLAC::Metadata::CueSheet
set_index(unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &index) (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
set_is_cd(bool value) (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
set_is_last(bool)FLAC::Metadata::Prototype
set_lead_in(FLAC__uint64 value) (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
set_media_catalog_number(const char value[128]) (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
set_track(unsigned i, const Track &track)FLAC::Metadata::CueSheet
~CueSheet() (defined in FLAC::Metadata::CueSheet)FLAC::Metadata::CueSheet
~Prototype()FLAC::Metadata::Prototypevirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet.html new file mode 100644 index 000000000..7ad42e485 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet.html @@ -0,0 +1,1056 @@ + + + + + + +FLAC: FLAC::Metadata::CueSheet Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+
+Inheritance diagram for FLAC::Metadata::CueSheet:
+
+
+ + +FLAC::Metadata::Prototype + +
+ + + + +

+Classes

class  Track
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

 CueSheet (::FLAC__StreamMetadata *object, bool copy)
 
CueSheetassign (::FLAC__StreamMetadata *object, bool copy)
 
+const char * get_media_catalog_number () const
 
+FLAC__uint64 get_lead_in () const
 
+bool get_is_cd () const
 
+unsigned get_num_tracks () const
 
+Track get_track (unsigned i) const
 
+void set_media_catalog_number (const char value[128])
 
+void set_lead_in (FLAC__uint64 value)
 
+void set_is_cd (bool value)
 
+void set_index (unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &index)
 
bool resize_indices (unsigned track_num, unsigned new_num_indices)
 
bool insert_index (unsigned track_num, unsigned index_num, const ::FLAC__StreamMetadata_CueSheet_Index &index)
 
bool insert_blank_index (unsigned track_num, unsigned index_num)
 
bool delete_index (unsigned track_num, unsigned index_num)
 
bool resize_tracks (unsigned new_num_tracks)
 
bool set_track (unsigned i, const Track &track)
 
bool insert_track (unsigned i, const Track &track)
 
bool insert_blank_track (unsigned i)
 
bool delete_track (unsigned i)
 
bool is_legal (bool check_cd_da_subset=false, const char **violation=0) const
 
FLAC__uint32 calculate_cddb_id () const
 
bool is_valid () const
 
bool get_is_last () const
 
::FLAC__MetadataType get_type () const
 
unsigned get_length () const
 
void set_is_last (bool)
 
 operator const ::FLAC__StreamMetadata * () const
 
 CueSheet (const CueSheet &object)
 
 CueSheet (const ::FLAC__StreamMetadata &object)
 
 CueSheet (const ::FLAC__StreamMetadata *object)
 
CueSheetoperator= (const CueSheet &object)
 
CueSheetoperator= (const ::FLAC__StreamMetadata &object)
 
CueSheetoperator= (const ::FLAC__StreamMetadata *object)
 
bool operator== (const CueSheet &object) const
 
bool operator== (const ::FLAC__StreamMetadata &object) const
 
bool operator== (const ::FLAC__StreamMetadata *object) const
 
bool operator!= (const CueSheet &object) const
 
bool operator!= (const ::FLAC__StreamMetadata &object) const
 
bool operator!= (const ::FLAC__StreamMetadata *object) const
 
bool operator== (const Prototype &) const
 
bool operator!= (const Prototype &) const
 
+ + + + + +

+Protected Member Functions

Prototypeassign_object (::FLAC__StreamMetadata *object, bool copy)
 
virtual void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__StreamMetadataobject_
 
+

Detailed Description

+

CUESHEET metadata block. See the overview for more, and the format specification.

+

Constructor & Destructor Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::CueSheet::CueSheet (const CueSheetobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::CueSheet::CueSheet (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::CueSheet::CueSheet (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
FLAC::Metadata::CueSheet::CueSheet (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+

Constructs an object with copy control. See Prototype(::FLAC__StreamMetadata *object, bool copy).

+ +
+
+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
CueSheet& FLAC::Metadata::CueSheet::operator= (const CueSheetobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
CueSheet& FLAC::Metadata::CueSheet::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
CueSheet& FLAC::Metadata::CueSheet::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
CueSheet& FLAC::Metadata::CueSheet::assign (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::CueSheet::operator== (const CueSheetobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::CueSheet::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::CueSheet::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::CueSheet::operator!= (const CueSheetobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::CueSheet::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::CueSheet::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::CueSheet::resize_indices (unsigned track_num,
unsigned new_num_indices 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::CueSheet::insert_index (unsigned track_num,
unsigned index_num,
const ::FLAC__StreamMetadata_CueSheet_Indexindex 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::CueSheet::insert_blank_index (unsigned track_num,
unsigned index_num 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::CueSheet::delete_index (unsigned track_num,
unsigned index_num 
)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::CueSheet::resize_tracks (unsigned new_num_tracks)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::CueSheet::set_track (unsigned i,
const Tracktrack 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::CueSheet::insert_track (unsigned i,
const Tracktrack 
)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::CueSheet::insert_blank_track (unsigned i)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::CueSheet::delete_track (unsigned i)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::CueSheet::is_legal (bool check_cd_da_subset = false,
const char ** violation = 0 
) const
+
+
+ +
+
+ + + + + + + +
FLAC__uint32 FLAC::Metadata::CueSheet::calculate_cddb_id () const
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Prototype& FLAC::Metadata::Prototype::assign_object (::FLAC__StreamMetadataobject,
bool copy 
)
+
+protectedinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual void FLAC::Metadata::Prototype::clear ()
+
+protectedvirtualinherited
+
+

Deletes the underlying FLAC__StreamMetadata object.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
bool FLAC::Metadata::Prototype::get_is_last () const
+
+inherited
+
+

Returns true if this block is the last block in a stream, else false.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
::FLAC__MetadataType FLAC::Metadata::Prototype::get_type () const
+
+inherited
+
+

Returns the type of the block.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
unsigned FLAC::Metadata::Prototype::get_length () const
+
+inherited
+
+

Returns the stream length of the metadata block.

+
Note
The length does not include the metadata block header, per spec.
+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
void FLAC::Metadata::Prototype::set_is_last (bool )
+
+inherited
+
+

Sets the "is_last" flag for the block. When using the iterators it is not necessary to set this flag; they will do it for you.

+
Assertions:
+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet.png new file mode 100644 index 000000000..171bfa61e Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html new file mode 100644 index 000000000..f843e342d --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html @@ -0,0 +1,105 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::CueSheet::Track Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::CueSheet::Track, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + +
get_index(unsigned i) const (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Track
get_isrc() const (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackinline
get_num_indices() const (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackinline
get_number() const (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackinline
get_offset() const (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackinline
get_pre_emphasis() const (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackinline
get_track() const (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackinline
get_type() const (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackinline
is_valid() const FLAC::Metadata::CueSheet::Trackvirtual
object_ (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackprotected
operator=(const Track &track) (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Track
set_index(unsigned i, const ::FLAC__StreamMetadata_CueSheet_Index &index) (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Track
set_isrc(const char value[12]) (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Track
set_number(FLAC__byte value) (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackinline
set_offset(FLAC__uint64 value) (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackinline
set_pre_emphasis(bool value) (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackinline
set_type(unsigned value) (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Track
Track() (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Track
Track(const ::FLAC__StreamMetadata_CueSheet_Track *track) (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Track
Track(const Track &track) (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Track
~Track() (defined in FLAC::Metadata::CueSheet::Track)FLAC::Metadata::CueSheet::Trackvirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html new file mode 100644 index 000000000..445946eb0 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html @@ -0,0 +1,183 @@ + + + + + + +FLAC: FLAC::Metadata::CueSheet::Track Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

Track (const ::FLAC__StreamMetadata_CueSheet_Track *track)
 
Track (const Track &track)
 
+Trackoperator= (const Track &track)
 
virtual bool is_valid () const
 
+FLAC__uint64 get_offset () const
 
+FLAC__byte get_number () const
 
+const char * get_isrc () const
 
+unsigned get_type () const
 
+bool get_pre_emphasis () const
 
+FLAC__byte get_num_indices () const
 
+::FLAC__StreamMetadata_CueSheet_Index get_index (unsigned i) const
 
+const
+::FLAC__StreamMetadata_CueSheet_Track
get_track () const
 
+void set_offset (FLAC__uint64 value)
 
+void set_number (FLAC__byte value)
 
+void set_isrc (const char value[12])
 
+void set_type (unsigned value)
 
+void set_pre_emphasis (bool value)
 
+void set_index (unsigned i, const ::FLAC__StreamMetadata_CueSheet_Index &index)
 
+ + + +

+Protected Attributes

+::FLAC__StreamMetadata_CueSheet_Trackobject_
 
+

Detailed Description

+

Convenience class for encapsulating a cue sheet track.

+

Always check is_valid() after the constructor or operator= to make sure memory was properly allocated.

+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Metadata::CueSheet::Track::is_valid () const
+
+virtual
+
+ +

Returns true iff object was properly constructed.

+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html new file mode 100644 index 000000000..e10a65137 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html @@ -0,0 +1,98 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::Iterator Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator.html new file mode 100644 index 000000000..adc3967c8 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Iterator.html @@ -0,0 +1,305 @@ + + + + + + +FLAC: FLAC::Metadata::Iterator Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+ + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

bool is_valid () const
 
void init (Chain &chain)
 
bool next ()
 
bool prev ()
 
::FLAC__MetadataType get_block_type () const
 
Prototypeget_block ()
 
bool set_block (Prototype *block)
 
bool delete_block (bool replace_with_padding)
 
bool insert_block_before (Prototype *block)
 
bool insert_block_after (Prototype *block)
 
+ + + +

+Protected Member Functions

+virtual void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__Metadata_Iteratoriterator_
 
+

Detailed Description

+

This class is a wrapper around the FLAC__metadata_iterator structures and methods; see the usage guide and FLAC__Metadata_Iterator.

+

Member Function Documentation

+ +
+
+ + + + + + + +
bool FLAC::Metadata::Iterator::is_valid () const
+
+ +

Returns true iff object was properly constructed.

+ +
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::Iterator::init (Chainchain)
+
+
+ +
+
+ + + + + + + +
bool FLAC::Metadata::Iterator::next ()
+
+
+ +
+
+ + + + + + + +
bool FLAC::Metadata::Iterator::prev ()
+
+
+ +
+
+ + + + + + + +
::FLAC__MetadataType FLAC::Metadata::Iterator::get_block_type () const
+
+
+ +
+
+ + + + + + + +
Prototype* FLAC::Metadata::Iterator::get_block ()
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::Iterator::set_block (Prototypeblock)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::Iterator::delete_block (bool replace_with_padding)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::Iterator::insert_block_before (Prototypeblock)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::Iterator::insert_block_after (Prototypeblock)
+
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding-members.html new file mode 100644 index 000000000..87d6a53ac --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding-members.html @@ -0,0 +1,119 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::Padding Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::Padding, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
assign(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Paddinginline
assign_object(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
clear()FLAC::Metadata::Prototypeprotectedvirtual
get_is_last() const FLAC::Metadata::Prototype
get_length() const FLAC::Metadata::Prototype
get_type() const FLAC::Metadata::Prototype
is_valid() const FLAC::Metadata::Prototypeinline
object_ (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
operator const ::FLAC__StreamMetadata *() const FLAC::Metadata::Prototypeinline
operator!=(const Padding &object) const FLAC::Metadata::Paddinginline
operator!=(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::Paddinginline
operator!=(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::Paddinginline
FLAC::Metadata::Prototype::operator!=(const Prototype &) const FLAC::Metadata::Prototypeinline
operator=(const Padding &object)FLAC::Metadata::Paddinginline
operator=(const ::FLAC__StreamMetadata &object)FLAC::Metadata::Paddinginline
operator=(const ::FLAC__StreamMetadata *object)FLAC::Metadata::Paddinginline
FLAC::Metadata::Prototype::operator=(const Prototype &)FLAC::Metadata::Prototypeprotected
operator==(const Padding &object) const FLAC::Metadata::Paddinginline
operator==(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::Paddinginline
operator==(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::Paddinginline
FLAC::Metadata::Prototype::operator==(const Prototype &) const FLAC::Metadata::Prototypeinline
Padding() (defined in FLAC::Metadata::Padding)FLAC::Metadata::Padding
Padding(const Padding &object)FLAC::Metadata::Paddinginline
Padding(const ::FLAC__StreamMetadata &object)FLAC::Metadata::Paddinginline
Padding(const ::FLAC__StreamMetadata *object)FLAC::Metadata::Paddinginline
Padding(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Paddinginline
Padding(unsigned length)FLAC::Metadata::Padding
Prototype(const Prototype &)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata &) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata *) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
set_is_last(bool)FLAC::Metadata::Prototype
set_length(unsigned length)FLAC::Metadata::Padding
~Padding() (defined in FLAC::Metadata::Padding)FLAC::Metadata::Padding
~Prototype()FLAC::Metadata::Prototypevirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding.html new file mode 100644 index 000000000..8ae1edeee --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding.html @@ -0,0 +1,766 @@ + + + + + + +FLAC: FLAC::Metadata::Padding Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+
+Inheritance diagram for FLAC::Metadata::Padding:
+
+
+ + +FLAC::Metadata::Prototype + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

 Padding (::FLAC__StreamMetadata *object, bool copy)
 
 Padding (unsigned length)
 
Paddingassign (::FLAC__StreamMetadata *object, bool copy)
 
void set_length (unsigned length)
 
bool is_valid () const
 
bool get_is_last () const
 
::FLAC__MetadataType get_type () const
 
unsigned get_length () const
 
void set_is_last (bool)
 
 operator const ::FLAC__StreamMetadata * () const
 
 Padding (const Padding &object)
 
 Padding (const ::FLAC__StreamMetadata &object)
 
 Padding (const ::FLAC__StreamMetadata *object)
 
Paddingoperator= (const Padding &object)
 
Paddingoperator= (const ::FLAC__StreamMetadata &object)
 
Paddingoperator= (const ::FLAC__StreamMetadata *object)
 
bool operator== (const Padding &object) const
 
bool operator== (const ::FLAC__StreamMetadata &object) const
 
bool operator== (const ::FLAC__StreamMetadata *object) const
 
bool operator!= (const Padding &object) const
 
bool operator!= (const ::FLAC__StreamMetadata &object) const
 
bool operator!= (const ::FLAC__StreamMetadata *object) const
 
bool operator== (const Prototype &) const
 
bool operator!= (const Prototype &) const
 
+ + + + + +

+Protected Member Functions

Prototypeassign_object (::FLAC__StreamMetadata *object, bool copy)
 
virtual void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__StreamMetadataobject_
 
+

Detailed Description

+

PADDING metadata block. See the overview for more, and the format specification.

+

Constructor & Destructor Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Padding::Padding (const Paddingobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Padding::Padding (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Padding::Padding (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
FLAC::Metadata::Padding::Padding (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+

Constructs an object with copy control. See Prototype(::FLAC__StreamMetadata *object, bool copy).

+ +
+
+ +
+
+ + + + + + + + +
FLAC::Metadata::Padding::Padding (unsigned length)
+
+

Constructs an object with the given length.

+ +
+
+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
Padding& FLAC::Metadata::Padding::operator= (const Paddingobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
Padding& FLAC::Metadata::Padding::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
Padding& FLAC::Metadata::Padding::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Padding& FLAC::Metadata::Padding::assign (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Padding::operator== (const Paddingobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Padding::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Padding::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Padding::operator!= (const Paddingobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Padding::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Padding::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::Padding::set_length (unsigned length)
+
+

Sets the length in bytes of the padding block.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Prototype& FLAC::Metadata::Prototype::assign_object (::FLAC__StreamMetadataobject,
bool copy 
)
+
+protectedinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual void FLAC::Metadata::Prototype::clear ()
+
+protectedvirtualinherited
+
+

Deletes the underlying FLAC__StreamMetadata object.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
bool FLAC::Metadata::Prototype::get_is_last () const
+
+inherited
+
+

Returns true if this block is the last block in a stream, else false.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
::FLAC__MetadataType FLAC::Metadata::Prototype::get_type () const
+
+inherited
+
+

Returns the type of the block.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
unsigned FLAC::Metadata::Prototype::get_length () const
+
+inherited
+
+

Returns the stream length of the metadata block.

+
Note
The length does not include the metadata block header, per spec.
+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
void FLAC::Metadata::Prototype::set_is_last (bool )
+
+inherited
+
+

Sets the "is_last" flag for the block. When using the iterators it is not necessary to set this flag; they will do it for you.

+
Assertions:
+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding.png new file mode 100644 index 000000000..1a4476bc9 Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Padding.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Picture-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Picture-members.html new file mode 100644 index 000000000..647b21240 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Picture-members.html @@ -0,0 +1,134 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::Picture Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::Picture, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
assign(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Pictureinline
assign_object(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
clear()FLAC::Metadata::Prototypeprotectedvirtual
get_colors() const FLAC::Metadata::Picture
get_data() const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
get_data_length() const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
get_depth() const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
get_description() const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
get_height() const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
get_is_last() const FLAC::Metadata::Prototype
get_length() const FLAC::Metadata::Prototype
get_mime_type() const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
get_type() const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
get_width() const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
is_legal(const char **violation)FLAC::Metadata::Picture
is_valid() const FLAC::Metadata::Prototypeinline
object_ (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
operator const ::FLAC__StreamMetadata *() const FLAC::Metadata::Prototypeinline
operator!=(const Picture &object) const FLAC::Metadata::Pictureinline
operator!=(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::Pictureinline
operator!=(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::Pictureinline
FLAC::Metadata::Prototype::operator!=(const Prototype &) const FLAC::Metadata::Prototypeinline
operator=(const Picture &object)FLAC::Metadata::Pictureinline
operator=(const ::FLAC__StreamMetadata &object)FLAC::Metadata::Pictureinline
operator=(const ::FLAC__StreamMetadata *object)FLAC::Metadata::Pictureinline
FLAC::Metadata::Prototype::operator=(const Prototype &)FLAC::Metadata::Prototypeprotected
operator==(const Picture &object) const FLAC::Metadata::Pictureinline
operator==(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::Pictureinline
operator==(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::Pictureinline
FLAC::Metadata::Prototype::operator==(const Prototype &) const FLAC::Metadata::Prototypeinline
Picture() (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
Picture(const Picture &object)FLAC::Metadata::Pictureinline
Picture(const ::FLAC__StreamMetadata &object)FLAC::Metadata::Pictureinline
Picture(const ::FLAC__StreamMetadata *object)FLAC::Metadata::Pictureinline
Picture(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Pictureinline
Prototype(const Prototype &)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata &) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata *) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
set_colors(FLAC__uint32 value) const FLAC::Metadata::Picture
set_data(const FLAC__byte *data, FLAC__uint32 data_length)FLAC::Metadata::Picture
set_depth(FLAC__uint32 value) const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
set_description(const FLAC__byte *string)FLAC::Metadata::Picture
set_height(FLAC__uint32 value) const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
set_is_last(bool)FLAC::Metadata::Prototype
set_mime_type(const char *string)FLAC::Metadata::Picture
set_type(::FLAC__StreamMetadata_Picture_Type type) (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
set_width(FLAC__uint32 value) const (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
~Picture() (defined in FLAC::Metadata::Picture)FLAC::Metadata::Picture
~Prototype()FLAC::Metadata::Prototypevirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Picture.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Picture.html new file mode 100644 index 000000000..e24e4a6ff --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Picture.html @@ -0,0 +1,865 @@ + + + + + + +FLAC: FLAC::Metadata::Picture Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+
+Inheritance diagram for FLAC::Metadata::Picture:
+
+
+ + +FLAC::Metadata::Prototype + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

 Picture (::FLAC__StreamMetadata *object, bool copy)
 
Pictureassign (::FLAC__StreamMetadata *object, bool copy)
 
+::FLAC__StreamMetadata_Picture_Type get_type () const
 
+const char * get_mime_type () const
 
+const FLAC__byte * get_description () const
 
+FLAC__uint32 get_width () const
 
+FLAC__uint32 get_height () const
 
+FLAC__uint32 get_depth () const
 
FLAC__uint32 get_colors () const
 
+FLAC__uint32 get_data_length () const
 
+const FLAC__byte * get_data () const
 
+void set_type (::FLAC__StreamMetadata_Picture_Type type)
 
bool set_mime_type (const char *string)
 
bool set_description (const FLAC__byte *string)
 
+void set_width (FLAC__uint32 value) const
 
+void set_height (FLAC__uint32 value) const
 
+void set_depth (FLAC__uint32 value) const
 
void set_colors (FLAC__uint32 value) const
 
bool set_data (const FLAC__byte *data, FLAC__uint32 data_length)
 
bool is_legal (const char **violation)
 
bool is_valid () const
 
bool get_is_last () const
 
unsigned get_length () const
 
void set_is_last (bool)
 
 operator const ::FLAC__StreamMetadata * () const
 
 Picture (const Picture &object)
 
 Picture (const ::FLAC__StreamMetadata &object)
 
 Picture (const ::FLAC__StreamMetadata *object)
 
Pictureoperator= (const Picture &object)
 
Pictureoperator= (const ::FLAC__StreamMetadata &object)
 
Pictureoperator= (const ::FLAC__StreamMetadata *object)
 
bool operator== (const Picture &object) const
 
bool operator== (const ::FLAC__StreamMetadata &object) const
 
bool operator== (const ::FLAC__StreamMetadata *object) const
 
bool operator!= (const Picture &object) const
 
bool operator!= (const ::FLAC__StreamMetadata &object) const
 
bool operator!= (const ::FLAC__StreamMetadata *object) const
 
bool operator== (const Prototype &) const
 
bool operator!= (const Prototype &) const
 
+ + + + + +

+Protected Member Functions

Prototypeassign_object (::FLAC__StreamMetadata *object, bool copy)
 
virtual void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__StreamMetadataobject_
 
+

Detailed Description

+

PICTURE metadata block. See the overview for more, and the format specification.

+

Constructor & Destructor Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Picture::Picture (const Pictureobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Picture::Picture (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Picture::Picture (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
FLAC::Metadata::Picture::Picture (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+

Constructs an object with copy control. See Prototype(::FLAC__StreamMetadata *object, bool copy).

+ +
+
+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
Picture& FLAC::Metadata::Picture::operator= (const Pictureobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
Picture& FLAC::Metadata::Picture::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
Picture& FLAC::Metadata::Picture::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Picture& FLAC::Metadata::Picture::assign (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Picture::operator== (const Pictureobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Picture::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Picture::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Picture::operator!= (const Pictureobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Picture::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Picture::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + + + +
FLAC__uint32 FLAC::Metadata::Picture::get_colors () const
+
+ +

a return value of 0 means true-color, i.e. 2^depth colors

+ +
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::Picture::set_mime_type (const char * string)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::Picture::set_description (const FLAC__byte * string)
+
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::Picture::set_colors (FLAC__uint32 value) const
+
+ +

a value of 0 means true-color, i.e. 2^depth colors

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::Picture::set_data (const FLAC__byte * data,
FLAC__uint32 data_length 
)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::Picture::is_legal (const char ** violation)
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Prototype& FLAC::Metadata::Prototype::assign_object (::FLAC__StreamMetadataobject,
bool copy 
)
+
+protectedinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual void FLAC::Metadata::Prototype::clear ()
+
+protectedvirtualinherited
+
+

Deletes the underlying FLAC__StreamMetadata object.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
bool FLAC::Metadata::Prototype::get_is_last () const
+
+inherited
+
+

Returns true if this block is the last block in a stream, else false.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
unsigned FLAC::Metadata::Prototype::get_length () const
+
+inherited
+
+

Returns the stream length of the metadata block.

+
Note
The length does not include the metadata block header, per spec.
+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
void FLAC::Metadata::Prototype::set_is_last (bool )
+
+inherited
+
+

Sets the "is_last" flag for the block. When using the iterators it is not necessary to set this flag; they will do it for you.

+
Assertions:
+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Picture.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Picture.png new file mode 100644 index 000000000..e2470cc16 Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Picture.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html new file mode 100644 index 000000000..f66138ee9 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html @@ -0,0 +1,109 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::Prototype Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::Prototype, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
assign_object(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
clear()FLAC::Metadata::Prototypeprotectedvirtual
get_is_last() const FLAC::Metadata::Prototype
get_length() const FLAC::Metadata::Prototype
get_type() const FLAC::Metadata::Prototype
is_valid() const FLAC::Metadata::Prototypeinline
Iterator (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypefriend
object_ (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
operator const ::FLAC__StreamMetadata *() const FLAC::Metadata::Prototypeinline
operator!=(const Prototype &) const FLAC::Metadata::Prototypeinline
operator!=(const ::FLAC__StreamMetadata &) const FLAC::Metadata::Prototypeinline
operator!=(const ::FLAC__StreamMetadata *) const FLAC::Metadata::Prototypeinline
operator=(const Prototype &)FLAC::Metadata::Prototypeprotected
operator=(const ::FLAC__StreamMetadata &)FLAC::Metadata::Prototypeprotected
operator=(const ::FLAC__StreamMetadata *)FLAC::Metadata::Prototypeprotected
operator==(const Prototype &) const FLAC::Metadata::Prototypeinline
operator==(const ::FLAC__StreamMetadata &) const FLAC::Metadata::Prototypeinline
operator==(const ::FLAC__StreamMetadata *) const FLAC::Metadata::Prototypeinline
Prototype(const Prototype &)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata &) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata *) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
set_is_last(bool)FLAC::Metadata::Prototype
SimpleIterator (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypefriend
~Prototype()FLAC::Metadata::Prototypevirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype.html new file mode 100644 index 000000000..7cd65255e --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype.html @@ -0,0 +1,456 @@ + + + + + + +FLAC: FLAC::Metadata::Prototype Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+
+Inheritance diagram for FLAC::Metadata::Prototype:
+
+
+ + +FLAC::Metadata::Application +FLAC::Metadata::CueSheet +FLAC::Metadata::Padding +FLAC::Metadata::Picture +FLAC::Metadata::SeekTable +FLAC::Metadata::StreamInfo +FLAC::Metadata::Unknown +FLAC::Metadata::VorbisComment + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

virtual ~Prototype ()
 
bool is_valid () const
 
bool get_is_last () const
 
::FLAC__MetadataType get_type () const
 
unsigned get_length () const
 
void set_is_last (bool)
 
 operator const ::FLAC__StreamMetadata * () const
 
bool operator== (const Prototype &) const
 
bool operator== (const ::FLAC__StreamMetadata &) const
 
bool operator== (const ::FLAC__StreamMetadata *) const
 
bool operator!= (const Prototype &) const
 
bool operator!= (const ::FLAC__StreamMetadata &) const
 
bool operator!= (const ::FLAC__StreamMetadata *) const
 
+ + + + + + + + + + + + + + + + + + + + +

+Protected Member Functions

 Prototype (const Prototype &)
 
Prototype (const ::FLAC__StreamMetadata &)
 
Prototype (const ::FLAC__StreamMetadata *)
 
 Prototype (::FLAC__StreamMetadata *object, bool copy)
 
Prototypeassign_object (::FLAC__StreamMetadata *object, bool copy)
 
virtual void clear ()
 
Prototypeoperator= (const Prototype &)
 
Prototypeoperator= (const ::FLAC__StreamMetadata &)
 
Prototypeoperator= (const ::FLAC__StreamMetadata *)
 
+ + + +

+Protected Attributes

+::FLAC__StreamMetadataobject_
 
+ + + + + +

+Friends

+class SimpleIterator
 
+class Iterator
 
+

Detailed Description

+

Base class for all metadata block types. See the overview for more.

+

Constructor & Destructor Documentation

+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
FLAC::Metadata::Prototype::Prototype (::FLAC__StreamMetadataobject,
bool copy 
)
+
+protected
+
+

Constructs an object with copy control. When copy is true, behaves identically to FLAC::Metadata::Prototype::Prototype(const ::FLAC__StreamMetadata *object). When copy is false, the instance takes ownership of the pointer and the FLAC__StreamMetadata object will be freed by the destructor.

+
Assertions:
object != NULL
+
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual FLAC::Metadata::Prototype::~Prototype ()
+
+virtual
+
+

Deletes the underlying FLAC__StreamMetadata object.

+ +
+
+

Member Function Documentation

+ + + +
+
+ + + + + +
+ + + + + + + + +
Prototype& FLAC::Metadata::Prototype::operator= (const ::FLAC__StreamMetadata)
+
+protected
+
+

Assign from another object. Always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
Prototype& FLAC::Metadata::Prototype::operator= (const ::FLAC__StreamMetadata)
+
+protected
+
+

Assign from another object. Always performs a deep copy.

+ +
+
+ + + +
+
+ + + + + +
+ + + + + + + +
virtual void FLAC::Metadata::Prototype::clear ()
+
+protectedvirtual
+
+

Deletes the underlying FLAC__StreamMetadata object.

+ +
+
+ +
+
+ + + + + + + +
bool FLAC::Metadata::Prototype::get_is_last () const
+
+

Returns true if this block is the last block in a stream, else false.

+
Assertions:
+ +
+
+ +
+
+ + + + + + + +
::FLAC__MetadataType FLAC::Metadata::Prototype::get_type () const
+
+

Returns the type of the block.

+
Assertions:
+ +
+
+ +
+
+ + + + + + + +
unsigned FLAC::Metadata::Prototype::get_length () const
+
+

Returns the stream length of the metadata block.

+
Note
The length does not include the metadata block header, per spec.
+
Assertions:
+ +
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::Prototype::set_is_last (bool )
+
+

Sets the "is_last" flag for the block. When using the iterators it is not necessary to set this flag; they will do it for you.

+
Assertions:
+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype.png new file mode 100644 index 000000000..7e42ee51d Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Prototype.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html new file mode 100644 index 000000000..89e5163bf --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html @@ -0,0 +1,130 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::SeekTable Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::SeekTable, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
assign(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::SeekTableinline
assign_object(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
clear()FLAC::Metadata::Prototypeprotectedvirtual
delete_point(unsigned index)FLAC::Metadata::SeekTable
get_is_last() const FLAC::Metadata::Prototype
get_length() const FLAC::Metadata::Prototype
get_num_points() const (defined in FLAC::Metadata::SeekTable)FLAC::Metadata::SeekTable
get_point(unsigned index) const (defined in FLAC::Metadata::SeekTable)FLAC::Metadata::SeekTable
get_type() const FLAC::Metadata::Prototype
insert_point(unsigned index, const ::FLAC__StreamMetadata_SeekPoint &point)FLAC::Metadata::SeekTable
is_legal() const FLAC::Metadata::SeekTable
is_valid() const FLAC::Metadata::Prototypeinline
object_ (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
operator const ::FLAC__StreamMetadata *() const FLAC::Metadata::Prototypeinline
operator!=(const SeekTable &object) const FLAC::Metadata::SeekTableinline
operator!=(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::SeekTableinline
operator!=(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::SeekTableinline
FLAC::Metadata::Prototype::operator!=(const Prototype &) const FLAC::Metadata::Prototypeinline
operator=(const SeekTable &object)FLAC::Metadata::SeekTableinline
operator=(const ::FLAC__StreamMetadata &object)FLAC::Metadata::SeekTableinline
operator=(const ::FLAC__StreamMetadata *object)FLAC::Metadata::SeekTableinline
FLAC::Metadata::Prototype::operator=(const Prototype &)FLAC::Metadata::Prototypeprotected
operator==(const SeekTable &object) const FLAC::Metadata::SeekTableinline
operator==(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::SeekTableinline
operator==(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::SeekTableinline
FLAC::Metadata::Prototype::operator==(const Prototype &) const FLAC::Metadata::Prototypeinline
Prototype(const Prototype &)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata &) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata *) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
resize_points(unsigned new_num_points)FLAC::Metadata::SeekTable
SeekTable() (defined in FLAC::Metadata::SeekTable)FLAC::Metadata::SeekTable
SeekTable(const SeekTable &object)FLAC::Metadata::SeekTableinline
SeekTable(const ::FLAC__StreamMetadata &object)FLAC::Metadata::SeekTableinline
SeekTable(const ::FLAC__StreamMetadata *object)FLAC::Metadata::SeekTableinline
SeekTable(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::SeekTableinline
set_is_last(bool)FLAC::Metadata::Prototype
set_point(unsigned index, const ::FLAC__StreamMetadata_SeekPoint &point)FLAC::Metadata::SeekTable
template_append_placeholders(unsigned num)FLAC::Metadata::SeekTable
template_append_point(FLAC__uint64 sample_number)FLAC::Metadata::SeekTable
template_append_points(FLAC__uint64 sample_numbers[], unsigned num)FLAC::Metadata::SeekTable
template_append_spaced_points(unsigned num, FLAC__uint64 total_samples)FLAC::Metadata::SeekTable
template_append_spaced_points_by_samples(unsigned samples, FLAC__uint64 total_samples)FLAC::Metadata::SeekTable
template_sort(bool compact)FLAC::Metadata::SeekTable
~Prototype()FLAC::Metadata::Prototypevirtual
~SeekTable() (defined in FLAC::Metadata::SeekTable)FLAC::Metadata::SeekTable
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable.html new file mode 100644 index 000000000..c90f4f72e --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable.html @@ -0,0 +1,1003 @@ + + + + + + +FLAC: FLAC::Metadata::SeekTable Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+
+Inheritance diagram for FLAC::Metadata::SeekTable:
+
+
+ + +FLAC::Metadata::Prototype + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

 SeekTable (::FLAC__StreamMetadata *object, bool copy)
 
SeekTableassign (::FLAC__StreamMetadata *object, bool copy)
 
+unsigned get_num_points () const
 
+::FLAC__StreamMetadata_SeekPoint get_point (unsigned index) const
 
bool resize_points (unsigned new_num_points)
 
void set_point (unsigned index, const ::FLAC__StreamMetadata_SeekPoint &point)
 
bool insert_point (unsigned index, const ::FLAC__StreamMetadata_SeekPoint &point)
 
bool delete_point (unsigned index)
 
bool is_legal () const
 
bool template_append_placeholders (unsigned num)
 
bool template_append_point (FLAC__uint64 sample_number)
 
bool template_append_points (FLAC__uint64 sample_numbers[], unsigned num)
 
bool template_append_spaced_points (unsigned num, FLAC__uint64 total_samples)
 
bool template_append_spaced_points_by_samples (unsigned samples, FLAC__uint64 total_samples)
 
bool template_sort (bool compact)
 
bool is_valid () const
 
bool get_is_last () const
 
::FLAC__MetadataType get_type () const
 
unsigned get_length () const
 
void set_is_last (bool)
 
 operator const ::FLAC__StreamMetadata * () const
 
 SeekTable (const SeekTable &object)
 
 SeekTable (const ::FLAC__StreamMetadata &object)
 
 SeekTable (const ::FLAC__StreamMetadata *object)
 
SeekTableoperator= (const SeekTable &object)
 
SeekTableoperator= (const ::FLAC__StreamMetadata &object)
 
SeekTableoperator= (const ::FLAC__StreamMetadata *object)
 
bool operator== (const SeekTable &object) const
 
bool operator== (const ::FLAC__StreamMetadata &object) const
 
bool operator== (const ::FLAC__StreamMetadata *object) const
 
bool operator!= (const SeekTable &object) const
 
bool operator!= (const ::FLAC__StreamMetadata &object) const
 
bool operator!= (const ::FLAC__StreamMetadata *object) const
 
bool operator== (const Prototype &) const
 
bool operator!= (const Prototype &) const
 
+ + + + + +

+Protected Member Functions

Prototypeassign_object (::FLAC__StreamMetadata *object, bool copy)
 
virtual void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__StreamMetadataobject_
 
+

Detailed Description

+

SEEKTABLE metadata block. See the overview for more, and the format specification.

+

Constructor & Destructor Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::SeekTable::SeekTable (const SeekTableobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::SeekTable::SeekTable (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::SeekTable::SeekTable (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
FLAC::Metadata::SeekTable::SeekTable (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+

Constructs an object with copy control. See Prototype(::FLAC__StreamMetadata *object, bool copy).

+ +
+
+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
SeekTable& FLAC::Metadata::SeekTable::operator= (const SeekTableobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
SeekTable& FLAC::Metadata::SeekTable::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
SeekTable& FLAC::Metadata::SeekTable::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
SeekTable& FLAC::Metadata::SeekTable::assign (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::operator== (const SeekTableobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::operator!= (const SeekTableobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::resize_points (unsigned new_num_points)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void FLAC::Metadata::SeekTable::set_point (unsigned index,
const ::FLAC__StreamMetadata_SeekPointpoint 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::SeekTable::insert_point (unsigned index,
const ::FLAC__StreamMetadata_SeekPointpoint 
)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::delete_point (unsigned index)
+
+
+ +
+
+ + + + + + + +
bool FLAC::Metadata::SeekTable::is_legal () const
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::template_append_placeholders (unsigned num)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::template_append_point (FLAC__uint64 sample_number)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::SeekTable::template_append_points (FLAC__uint64 sample_numbers[],
unsigned num 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::SeekTable::template_append_spaced_points (unsigned num,
FLAC__uint64 total_samples 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::SeekTable::template_append_spaced_points_by_samples (unsigned samples,
FLAC__uint64 total_samples 
)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::SeekTable::template_sort (bool compact)
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Prototype& FLAC::Metadata::Prototype::assign_object (::FLAC__StreamMetadataobject,
bool copy 
)
+
+protectedinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual void FLAC::Metadata::Prototype::clear ()
+
+protectedvirtualinherited
+
+

Deletes the underlying FLAC__StreamMetadata object.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
bool FLAC::Metadata::Prototype::get_is_last () const
+
+inherited
+
+

Returns true if this block is the last block in a stream, else false.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
::FLAC__MetadataType FLAC::Metadata::Prototype::get_type () const
+
+inherited
+
+

Returns the type of the block.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
unsigned FLAC::Metadata::Prototype::get_length () const
+
+inherited
+
+

Returns the stream length of the metadata block.

+
Note
The length does not include the metadata block header, per spec.
+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
void FLAC::Metadata::Prototype::set_is_last (bool )
+
+inherited
+
+

Sets the "is_last" flag for the block. When using the iterators it is not necessary to set this flag; they will do it for you.

+
Assertions:
+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable.png new file mode 100644 index 000000000..b70131d54 Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SeekTable.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html new file mode 100644 index 000000000..93c17df1c --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html @@ -0,0 +1,103 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::SimpleIterator Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html new file mode 100644 index 000000000..6b2d6cf62 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html @@ -0,0 +1,442 @@ + + + + + + +FLAC: FLAC::Metadata::SimpleIterator Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+ + + + +

+Classes

class  Status
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

bool is_valid () const
 
bool init (const char *filename, bool read_only, bool preserve_file_stats)
 
Status status ()
 
bool is_writable () const
 
bool next ()
 
bool prev ()
 
bool is_last () const
 
off_t get_block_offset () const
 
::FLAC__MetadataType get_block_type () const
 
unsigned get_block_length () const
 
bool get_application_id (FLAC__byte *id)
 
Prototypeget_block ()
 
bool set_block (Prototype *block, bool use_padding=true)
 
bool insert_block_after (Prototype *block, bool use_padding=true)
 
bool delete_block (bool use_padding=true)
 
+ + + +

+Protected Member Functions

+void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__Metadata_SimpleIteratoriterator_
 
+

Detailed Description

+

This class is a wrapper around the FLAC__metadata_simple_iterator structures and methods; see the usage guide and FLAC__Metadata_SimpleIterator.

+

Member Function Documentation

+ +
+
+ + + + + + + +
bool FLAC::Metadata::SimpleIterator::is_valid () const
+
+ +

Returns true iff object was properly constructed.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::SimpleIterator::init (const char * filename,
bool read_only,
bool preserve_file_stats 
)
+
+
+ +
+
+ + + + + + + +
Status FLAC::Metadata::SimpleIterator::status ()
+
+
+ +
+
+ + + + + + + +
bool FLAC::Metadata::SimpleIterator::is_writable () const
+
+
+ +
+
+ + + + + + + +
bool FLAC::Metadata::SimpleIterator::next ()
+
+
+ +
+
+ + + + + + + +
bool FLAC::Metadata::SimpleIterator::prev ()
+
+
+ +
+
+ + + + + + + +
bool FLAC::Metadata::SimpleIterator::is_last () const
+
+
+ +
+
+ + + + + + + +
off_t FLAC::Metadata::SimpleIterator::get_block_offset () const
+
+
+ +
+
+ + + + + + + +
::FLAC__MetadataType FLAC::Metadata::SimpleIterator::get_block_type () const
+
+
+ +
+
+ + + + + + + +
unsigned FLAC::Metadata::SimpleIterator::get_block_length () const
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::SimpleIterator::get_application_id (FLAC__byte * id)
+
+
+ +
+
+ + + + + + + +
Prototype* FLAC::Metadata::SimpleIterator::get_block ()
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::SimpleIterator::set_block (Prototypeblock,
bool use_padding = true 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::SimpleIterator::insert_block_after (Prototypeblock,
bool use_padding = true 
)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::SimpleIterator::delete_block (bool use_padding = true)
+
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html new file mode 100644 index 000000000..2d6d80aba --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html @@ -0,0 +1,88 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::SimpleIterator::Status Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::SimpleIterator::Status, including all inherited members.

+ + + + + +
as_cstring() const (defined in FLAC::Metadata::SimpleIterator::Status)FLAC::Metadata::SimpleIterator::Statusinline
operator::FLAC__Metadata_SimpleIteratorStatus() const (defined in FLAC::Metadata::SimpleIterator::Status)FLAC::Metadata::SimpleIterator::Statusinline
Status(::FLAC__Metadata_SimpleIteratorStatus status) (defined in FLAC::Metadata::SimpleIterator::Status)FLAC::Metadata::SimpleIterator::Statusinline
status_ (defined in FLAC::Metadata::SimpleIterator::Status)FLAC::Metadata::SimpleIterator::Statusprotected
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html new file mode 100644 index 000000000..a8f94f598 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html @@ -0,0 +1,111 @@ + + + + + + +FLAC: FLAC::Metadata::SimpleIterator::Status Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+ + + + + + + + +

+Public Member Functions

Status (::FLAC__Metadata_SimpleIteratorStatus status)
 
operator::FLAC__Metadata_SimpleIteratorStatus () const
 
+const char * as_cstring () const
 
+ + + +

+Protected Attributes

+::FLAC__Metadata_SimpleIteratorStatus status_
 
+

Detailed Description

+

This class is a wrapper around FLAC__Metadata_SimpleIteratorStatus.

+

The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html new file mode 100644 index 000000000..28be9f96c --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html @@ -0,0 +1,135 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::StreamInfo Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::StreamInfo, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
assign(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::StreamInfoinline
assign_object(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
clear()FLAC::Metadata::Prototypeprotectedvirtual
get_bits_per_sample() const FLAC::Metadata::StreamInfo
get_channels() const FLAC::Metadata::StreamInfo
get_is_last() const FLAC::Metadata::Prototype
get_length() const FLAC::Metadata::Prototype
get_max_blocksize() const FLAC::Metadata::StreamInfo
get_max_framesize() const FLAC::Metadata::StreamInfo
get_md5sum() const FLAC::Metadata::StreamInfo
get_min_blocksize() const FLAC::Metadata::StreamInfo
get_min_framesize() const FLAC::Metadata::StreamInfo
get_sample_rate() const FLAC::Metadata::StreamInfo
get_total_samples() const FLAC::Metadata::StreamInfo
get_type() const FLAC::Metadata::Prototype
is_valid() const FLAC::Metadata::Prototypeinline
object_ (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
operator const ::FLAC__StreamMetadata *() const FLAC::Metadata::Prototypeinline
operator!=(const StreamInfo &object) const FLAC::Metadata::StreamInfoinline
operator!=(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::StreamInfoinline
operator!=(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::StreamInfoinline
FLAC::Metadata::Prototype::operator!=(const Prototype &) const FLAC::Metadata::Prototypeinline
operator=(const StreamInfo &object)FLAC::Metadata::StreamInfoinline
operator=(const ::FLAC__StreamMetadata &object)FLAC::Metadata::StreamInfoinline
operator=(const ::FLAC__StreamMetadata *object)FLAC::Metadata::StreamInfoinline
FLAC::Metadata::Prototype::operator=(const Prototype &)FLAC::Metadata::Prototypeprotected
operator==(const StreamInfo &object) const FLAC::Metadata::StreamInfoinline
operator==(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::StreamInfoinline
operator==(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::StreamInfoinline
FLAC::Metadata::Prototype::operator==(const Prototype &) const FLAC::Metadata::Prototypeinline
Prototype(const Prototype &)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata &) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata *) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
set_bits_per_sample(unsigned value)FLAC::Metadata::StreamInfo
set_channels(unsigned value)FLAC::Metadata::StreamInfo
set_is_last(bool)FLAC::Metadata::Prototype
set_max_blocksize(unsigned value)FLAC::Metadata::StreamInfo
set_max_framesize(unsigned value)FLAC::Metadata::StreamInfo
set_md5sum(const FLAC__byte value[16])FLAC::Metadata::StreamInfo
set_min_blocksize(unsigned value)FLAC::Metadata::StreamInfo
set_min_framesize(unsigned value)FLAC::Metadata::StreamInfo
set_sample_rate(unsigned value)FLAC::Metadata::StreamInfo
set_total_samples(FLAC__uint64 value)FLAC::Metadata::StreamInfo
StreamInfo() (defined in FLAC::Metadata::StreamInfo)FLAC::Metadata::StreamInfo
StreamInfo(const StreamInfo &object)FLAC::Metadata::StreamInfoinline
StreamInfo(const ::FLAC__StreamMetadata &object)FLAC::Metadata::StreamInfoinline
StreamInfo(const ::FLAC__StreamMetadata *object)FLAC::Metadata::StreamInfoinline
StreamInfo(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::StreamInfoinline
~Prototype()FLAC::Metadata::Prototypevirtual
~StreamInfo() (defined in FLAC::Metadata::StreamInfo)FLAC::Metadata::StreamInfo
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html new file mode 100644 index 000000000..d1029bb64 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html @@ -0,0 +1,1062 @@ + + + + + + +FLAC: FLAC::Metadata::StreamInfo Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+
+Inheritance diagram for FLAC::Metadata::StreamInfo:
+
+
+ + +FLAC::Metadata::Prototype + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

 StreamInfo (::FLAC__StreamMetadata *object, bool copy)
 
StreamInfoassign (::FLAC__StreamMetadata *object, bool copy)
 
bool is_valid () const
 
bool get_is_last () const
 
::FLAC__MetadataType get_type () const
 
unsigned get_length () const
 
void set_is_last (bool)
 
 operator const ::FLAC__StreamMetadata * () const
 
 StreamInfo (const StreamInfo &object)
 
 StreamInfo (const ::FLAC__StreamMetadata &object)
 
 StreamInfo (const ::FLAC__StreamMetadata *object)
 
StreamInfooperator= (const StreamInfo &object)
 
StreamInfooperator= (const ::FLAC__StreamMetadata &object)
 
StreamInfooperator= (const ::FLAC__StreamMetadata *object)
 
bool operator== (const StreamInfo &object) const
 
bool operator== (const ::FLAC__StreamMetadata &object) const
 
bool operator== (const ::FLAC__StreamMetadata *object) const
 
bool operator!= (const StreamInfo &object) const
 
bool operator!= (const ::FLAC__StreamMetadata &object) const
 
bool operator!= (const ::FLAC__StreamMetadata *object) const
 
unsigned get_min_blocksize () const
 
unsigned get_max_blocksize () const
 
unsigned get_min_framesize () const
 
unsigned get_max_framesize () const
 
unsigned get_sample_rate () const
 
unsigned get_channels () const
 
unsigned get_bits_per_sample () const
 
FLAC__uint64 get_total_samples () const
 
const FLAC__byte * get_md5sum () const
 
void set_min_blocksize (unsigned value)
 
void set_max_blocksize (unsigned value)
 
void set_min_framesize (unsigned value)
 
void set_max_framesize (unsigned value)
 
void set_sample_rate (unsigned value)
 
void set_channels (unsigned value)
 
void set_bits_per_sample (unsigned value)
 
void set_total_samples (FLAC__uint64 value)
 
void set_md5sum (const FLAC__byte value[16])
 
bool operator== (const Prototype &) const
 
bool operator!= (const Prototype &) const
 
+ + + + + +

+Protected Member Functions

Prototypeassign_object (::FLAC__StreamMetadata *object, bool copy)
 
virtual void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__StreamMetadataobject_
 
+

Detailed Description

+

STREAMINFO metadata block. See the overview for more, and the format specification.

+

Constructor & Destructor Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::StreamInfo::StreamInfo (const StreamInfoobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::StreamInfo::StreamInfo (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::StreamInfo::StreamInfo (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
FLAC::Metadata::StreamInfo::StreamInfo (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+

Constructs an object with copy control. See Prototype(::FLAC__StreamMetadata *object, bool copy).

+ +
+
+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
StreamInfo& FLAC::Metadata::StreamInfo::operator= (const StreamInfoobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
StreamInfo& FLAC::Metadata::StreamInfo::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
StreamInfo& FLAC::Metadata::StreamInfo::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
StreamInfo& FLAC::Metadata::StreamInfo::assign (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::StreamInfo::operator== (const StreamInfoobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::StreamInfo::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::StreamInfo::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::StreamInfo::operator!= (const StreamInfoobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::StreamInfo::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::StreamInfo::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + + + +
unsigned FLAC::Metadata::StreamInfo::get_min_blocksize () const
+
+
+ +
+
+ + + + + + + +
unsigned FLAC::Metadata::StreamInfo::get_max_blocksize () const
+
+
+ +
+
+ + + + + + + +
unsigned FLAC::Metadata::StreamInfo::get_min_framesize () const
+
+
+ +
+
+ + + + + + + +
unsigned FLAC::Metadata::StreamInfo::get_max_framesize () const
+
+
+ +
+
+ + + + + + + +
unsigned FLAC::Metadata::StreamInfo::get_sample_rate () const
+
+
+ +
+
+ + + + + + + +
unsigned FLAC::Metadata::StreamInfo::get_channels () const
+
+
+ +
+
+ + + + + + + +
unsigned FLAC::Metadata::StreamInfo::get_bits_per_sample () const
+
+
+ +
+
+ + + + + + + +
FLAC__uint64 FLAC::Metadata::StreamInfo::get_total_samples () const
+
+
+ +
+
+ + + + + + + +
const FLAC__byte* FLAC::Metadata::StreamInfo::get_md5sum () const
+
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::StreamInfo::set_min_blocksize (unsigned value)
+
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::StreamInfo::set_max_blocksize (unsigned value)
+
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::StreamInfo::set_min_framesize (unsigned value)
+
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::StreamInfo::set_max_framesize (unsigned value)
+
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::StreamInfo::set_sample_rate (unsigned value)
+
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::StreamInfo::set_channels (unsigned value)
+
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::StreamInfo::set_bits_per_sample (unsigned value)
+
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::StreamInfo::set_total_samples (FLAC__uint64 value)
+
+
+ +
+
+ + + + + + + + +
void FLAC::Metadata::StreamInfo::set_md5sum (const FLAC__byte value[16])
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Prototype& FLAC::Metadata::Prototype::assign_object (::FLAC__StreamMetadataobject,
bool copy 
)
+
+protectedinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual void FLAC::Metadata::Prototype::clear ()
+
+protectedvirtualinherited
+
+

Deletes the underlying FLAC__StreamMetadata object.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
bool FLAC::Metadata::Prototype::get_is_last () const
+
+inherited
+
+

Returns true if this block is the last block in a stream, else false.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
::FLAC__MetadataType FLAC::Metadata::Prototype::get_type () const
+
+inherited
+
+

Returns the type of the block.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
unsigned FLAC::Metadata::Prototype::get_length () const
+
+inherited
+
+

Returns the stream length of the metadata block.

+
Note
The length does not include the metadata block header, per spec.
+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
void FLAC::Metadata::Prototype::set_is_last (bool )
+
+inherited
+
+

Sets the "is_last" flag for the block. When using the iterators it is not necessary to set this flag; they will do it for you.

+
Assertions:
+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png new file mode 100644 index 000000000..a60891989 Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html new file mode 100644 index 000000000..a92fd0bde --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html @@ -0,0 +1,120 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::Unknown Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::Unknown, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
assign(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Unknowninline
assign_object(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
clear()FLAC::Metadata::Prototypeprotectedvirtual
get_data() const (defined in FLAC::Metadata::Unknown)FLAC::Metadata::Unknown
get_is_last() const FLAC::Metadata::Prototype
get_length() const FLAC::Metadata::Prototype
get_type() const FLAC::Metadata::Prototype
is_valid() const FLAC::Metadata::Prototypeinline
object_ (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
operator const ::FLAC__StreamMetadata *() const FLAC::Metadata::Prototypeinline
operator!=(const Unknown &object) const FLAC::Metadata::Unknowninline
operator!=(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::Unknowninline
operator!=(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::Unknowninline
FLAC::Metadata::Prototype::operator!=(const Prototype &) const FLAC::Metadata::Prototypeinline
operator=(const Unknown &object)FLAC::Metadata::Unknowninline
operator=(const ::FLAC__StreamMetadata &object)FLAC::Metadata::Unknowninline
operator=(const ::FLAC__StreamMetadata *object)FLAC::Metadata::Unknowninline
FLAC::Metadata::Prototype::operator=(const Prototype &)FLAC::Metadata::Prototypeprotected
operator==(const Unknown &object) const FLAC::Metadata::Unknowninline
operator==(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::Unknowninline
operator==(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::Unknowninline
FLAC::Metadata::Prototype::operator==(const Prototype &) const FLAC::Metadata::Prototypeinline
Prototype(const Prototype &)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata &) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata *) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
set_data(const FLAC__byte *data, unsigned length)FLAC::Metadata::Unknown
set_data(FLAC__byte *data, unsigned length, bool copy) (defined in FLAC::Metadata::Unknown)FLAC::Metadata::Unknown
set_is_last(bool)FLAC::Metadata::Prototype
Unknown() (defined in FLAC::Metadata::Unknown)FLAC::Metadata::Unknown
Unknown(const Unknown &object)FLAC::Metadata::Unknowninline
Unknown(const ::FLAC__StreamMetadata &object)FLAC::Metadata::Unknowninline
Unknown(const ::FLAC__StreamMetadata *object)FLAC::Metadata::Unknowninline
Unknown(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Unknowninline
~Prototype()FLAC::Metadata::Prototypevirtual
~Unknown() (defined in FLAC::Metadata::Unknown)FLAC::Metadata::Unknown
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown.html new file mode 100644 index 000000000..e6876e501 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown.html @@ -0,0 +1,764 @@ + + + + + + +FLAC: FLAC::Metadata::Unknown Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+
+Inheritance diagram for FLAC::Metadata::Unknown:
+
+
+ + +FLAC::Metadata::Prototype + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

 Unknown (::FLAC__StreamMetadata *object, bool copy)
 
Unknownassign (::FLAC__StreamMetadata *object, bool copy)
 
+const FLAC__byte * get_data () const
 
bool set_data (const FLAC__byte *data, unsigned length)
 
+bool set_data (FLAC__byte *data, unsigned length, bool copy)
 
bool is_valid () const
 
bool get_is_last () const
 
::FLAC__MetadataType get_type () const
 
unsigned get_length () const
 
void set_is_last (bool)
 
 operator const ::FLAC__StreamMetadata * () const
 
 Unknown (const Unknown &object)
 
 Unknown (const ::FLAC__StreamMetadata &object)
 
 Unknown (const ::FLAC__StreamMetadata *object)
 
Unknownoperator= (const Unknown &object)
 
Unknownoperator= (const ::FLAC__StreamMetadata &object)
 
Unknownoperator= (const ::FLAC__StreamMetadata *object)
 
bool operator== (const Unknown &object) const
 
bool operator== (const ::FLAC__StreamMetadata &object) const
 
bool operator== (const ::FLAC__StreamMetadata *object) const
 
bool operator!= (const Unknown &object) const
 
bool operator!= (const ::FLAC__StreamMetadata &object) const
 
bool operator!= (const ::FLAC__StreamMetadata *object) const
 
bool operator== (const Prototype &) const
 
bool operator!= (const Prototype &) const
 
+ + + + + +

+Protected Member Functions

Prototypeassign_object (::FLAC__StreamMetadata *object, bool copy)
 
virtual void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__StreamMetadataobject_
 
+

Detailed Description

+

Opaque metadata block for storing unknown types. This should not be used unless you know what you are doing; it is currently used only internally to support forward compatibility of metadata blocks. See the overview for more,

+

Constructor & Destructor Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Unknown::Unknown (const Unknownobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Unknown::Unknown (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Unknown::Unknown (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
FLAC::Metadata::Unknown::Unknown (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+

Constructs an object with copy control. See Prototype(::FLAC__StreamMetadata *object, bool copy).

+ +
+
+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
Unknown& FLAC::Metadata::Unknown::operator= (const Unknownobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
Unknown& FLAC::Metadata::Unknown::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
Unknown& FLAC::Metadata::Unknown::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Unknown& FLAC::Metadata::Unknown::assign (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Unknown::operator== (const Unknownobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Unknown::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Unknown::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Unknown::operator!= (const Unknownobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Unknown::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Unknown::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::Unknown::set_data (const FLAC__byte * data,
unsigned length 
)
+
+ +

This form always copies data.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Prototype& FLAC::Metadata::Prototype::assign_object (::FLAC__StreamMetadataobject,
bool copy 
)
+
+protectedinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual void FLAC::Metadata::Prototype::clear ()
+
+protectedvirtualinherited
+
+

Deletes the underlying FLAC__StreamMetadata object.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
bool FLAC::Metadata::Prototype::get_is_last () const
+
+inherited
+
+

Returns true if this block is the last block in a stream, else false.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
::FLAC__MetadataType FLAC::Metadata::Prototype::get_type () const
+
+inherited
+
+

Returns the type of the block.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
unsigned FLAC::Metadata::Prototype::get_length () const
+
+inherited
+
+

Returns the stream length of the metadata block.

+
Note
The length does not include the metadata block header, per spec.
+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
void FLAC::Metadata::Prototype::set_is_last (bool )
+
+inherited
+
+

Sets the "is_last" flag for the block. When using the iterators it is not necessary to set this flag; they will do it for you.

+
Assertions:
+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown.png new file mode 100644 index 000000000..fe2edd733 Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1Unknown.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html new file mode 100644 index 000000000..41c7bdedf --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html @@ -0,0 +1,130 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::VorbisComment Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::VorbisComment, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
append_comment(const Entry &entry)FLAC::Metadata::VorbisComment
assign(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::VorbisCommentinline
assign_object(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
clear()FLAC::Metadata::Prototypeprotectedvirtual
delete_comment(unsigned index)FLAC::Metadata::VorbisComment
find_entry_from(unsigned offset, const char *field_name)FLAC::Metadata::VorbisComment
get_comment(unsigned index) const (defined in FLAC::Metadata::VorbisComment)FLAC::Metadata::VorbisComment
get_is_last() const FLAC::Metadata::Prototype
get_length() const FLAC::Metadata::Prototype
get_num_comments() const (defined in FLAC::Metadata::VorbisComment)FLAC::Metadata::VorbisComment
get_type() const FLAC::Metadata::Prototype
get_vendor_string() const (defined in FLAC::Metadata::VorbisComment)FLAC::Metadata::VorbisComment
insert_comment(unsigned index, const Entry &entry)FLAC::Metadata::VorbisComment
is_valid() const FLAC::Metadata::Prototypeinline
object_ (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
operator const ::FLAC__StreamMetadata *() const FLAC::Metadata::Prototypeinline
operator!=(const VorbisComment &object) const FLAC::Metadata::VorbisCommentinline
operator!=(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::VorbisCommentinline
operator!=(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::VorbisCommentinline
FLAC::Metadata::Prototype::operator!=(const Prototype &) const FLAC::Metadata::Prototypeinline
operator=(const VorbisComment &object)FLAC::Metadata::VorbisCommentinline
operator=(const ::FLAC__StreamMetadata &object)FLAC::Metadata::VorbisCommentinline
operator=(const ::FLAC__StreamMetadata *object)FLAC::Metadata::VorbisCommentinline
FLAC::Metadata::Prototype::operator=(const Prototype &)FLAC::Metadata::Prototypeprotected
operator==(const VorbisComment &object) const FLAC::Metadata::VorbisCommentinline
operator==(const ::FLAC__StreamMetadata &object) const FLAC::Metadata::VorbisCommentinline
operator==(const ::FLAC__StreamMetadata *object) const FLAC::Metadata::VorbisCommentinline
FLAC::Metadata::Prototype::operator==(const Prototype &) const FLAC::Metadata::Prototypeinline
Prototype(const Prototype &)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata &) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(const ::FLAC__StreamMetadata *) (defined in FLAC::Metadata::Prototype)FLAC::Metadata::Prototypeprotected
Prototype(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::Prototypeprotected
remove_entries_matching(const char *field_name)FLAC::Metadata::VorbisComment
remove_entry_matching(const char *field_name)FLAC::Metadata::VorbisComment
replace_comment(const Entry &entry, bool all)FLAC::Metadata::VorbisComment
resize_comments(unsigned new_num_comments)FLAC::Metadata::VorbisComment
set_comment(unsigned index, const Entry &entry)FLAC::Metadata::VorbisComment
set_is_last(bool)FLAC::Metadata::Prototype
set_vendor_string(const FLAC__byte *string)FLAC::Metadata::VorbisComment
VorbisComment() (defined in FLAC::Metadata::VorbisComment)FLAC::Metadata::VorbisComment
VorbisComment(const VorbisComment &object)FLAC::Metadata::VorbisCommentinline
VorbisComment(const ::FLAC__StreamMetadata &object)FLAC::Metadata::VorbisCommentinline
VorbisComment(const ::FLAC__StreamMetadata *object)FLAC::Metadata::VorbisCommentinline
VorbisComment(::FLAC__StreamMetadata *object, bool copy)FLAC::Metadata::VorbisCommentinline
~Prototype()FLAC::Metadata::Prototypevirtual
~VorbisComment() (defined in FLAC::Metadata::VorbisComment)FLAC::Metadata::VorbisComment
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html new file mode 100644 index 000000000..9a965c14e --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html @@ -0,0 +1,983 @@ + + + + + + +FLAC: FLAC::Metadata::VorbisComment Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+
+Inheritance diagram for FLAC::Metadata::VorbisComment:
+
+
+ + +FLAC::Metadata::Prototype + +
+ + + + +

+Classes

class  Entry
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

 VorbisComment (::FLAC__StreamMetadata *object, bool copy)
 
VorbisCommentassign (::FLAC__StreamMetadata *object, bool copy)
 
+unsigned get_num_comments () const
 
+const FLAC__byte * get_vendor_string () const
 
+Entry get_comment (unsigned index) const
 
bool set_vendor_string (const FLAC__byte *string)
 
bool resize_comments (unsigned new_num_comments)
 
bool set_comment (unsigned index, const Entry &entry)
 
bool insert_comment (unsigned index, const Entry &entry)
 
bool append_comment (const Entry &entry)
 
bool replace_comment (const Entry &entry, bool all)
 
bool delete_comment (unsigned index)
 
int find_entry_from (unsigned offset, const char *field_name)
 
int remove_entry_matching (const char *field_name)
 
int remove_entries_matching (const char *field_name)
 
bool is_valid () const
 
bool get_is_last () const
 
::FLAC__MetadataType get_type () const
 
unsigned get_length () const
 
void set_is_last (bool)
 
 operator const ::FLAC__StreamMetadata * () const
 
 VorbisComment (const VorbisComment &object)
 
 VorbisComment (const ::FLAC__StreamMetadata &object)
 
 VorbisComment (const ::FLAC__StreamMetadata *object)
 
VorbisCommentoperator= (const VorbisComment &object)
 
VorbisCommentoperator= (const ::FLAC__StreamMetadata &object)
 
VorbisCommentoperator= (const ::FLAC__StreamMetadata *object)
 
bool operator== (const VorbisComment &object) const
 
bool operator== (const ::FLAC__StreamMetadata &object) const
 
bool operator== (const ::FLAC__StreamMetadata *object) const
 
bool operator!= (const VorbisComment &object) const
 
bool operator!= (const ::FLAC__StreamMetadata &object) const
 
bool operator!= (const ::FLAC__StreamMetadata *object) const
 
bool operator== (const Prototype &) const
 
bool operator!= (const Prototype &) const
 
+ + + + + +

+Protected Member Functions

Prototypeassign_object (::FLAC__StreamMetadata *object, bool copy)
 
virtual void clear ()
 
+ + + +

+Protected Attributes

+::FLAC__StreamMetadataobject_
 
+

Detailed Description

+

VORBIS_COMMENT metadata block. See the overview for more, and the format specification.

+

Constructor & Destructor Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::VorbisComment::VorbisComment (const VorbisCommentobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::VorbisComment::VorbisComment (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::VorbisComment::VorbisComment (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
FLAC::Metadata::VorbisComment::VorbisComment (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+

Constructs an object with copy control. See Prototype(::FLAC__StreamMetadata *object, bool copy).

+ +
+
+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
VorbisComment& FLAC::Metadata::VorbisComment::operator= (const VorbisCommentobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
VorbisComment& FLAC::Metadata::VorbisComment::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
VorbisComment& FLAC::Metadata::VorbisComment::operator= (const ::FLAC__StreamMetadataobject)
+
+inline
+
+

Assign from another object. Always performs a deep copy.

+ +

References FLAC::Metadata::Prototype::operator=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
VorbisComment& FLAC::Metadata::VorbisComment::assign (::FLAC__StreamMetadataobject,
bool copy 
)
+
+inline
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::VorbisComment::operator== (const VorbisCommentobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::VorbisComment::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::VorbisComment::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::VorbisComment::operator!= (const VorbisCommentobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::VorbisComment::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::VorbisComment::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator!=().

+ +
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::VorbisComment::set_vendor_string (const FLAC__byte * string)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::VorbisComment::resize_comments (unsigned new_num_comments)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::VorbisComment::set_comment (unsigned index,
const Entryentry 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::VorbisComment::insert_comment (unsigned index,
const Entryentry 
)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::VorbisComment::append_comment (const Entryentry)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::VorbisComment::replace_comment (const Entryentry,
bool all 
)
+
+
+ +
+
+ + + + + + + + +
bool FLAC::Metadata::VorbisComment::delete_comment (unsigned index)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
int FLAC::Metadata::VorbisComment::find_entry_from (unsigned offset,
const char * field_name 
)
+
+
+ +
+
+ + + + + + + + +
int FLAC::Metadata::VorbisComment::remove_entry_matching (const char * field_name)
+
+
+ +
+
+ + + + + + + + +
int FLAC::Metadata::VorbisComment::remove_entries_matching (const char * field_name)
+
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
Prototype& FLAC::Metadata::Prototype::assign_object (::FLAC__StreamMetadataobject,
bool copy 
)
+
+protectedinherited
+
+
+ +
+
+ + + + + +
+ + + + + + + +
virtual void FLAC::Metadata::Prototype::clear ()
+
+protectedvirtualinherited
+
+

Deletes the underlying FLAC__StreamMetadata object.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
bool FLAC::Metadata::Prototype::get_is_last () const
+
+inherited
+
+

Returns true if this block is the last block in a stream, else false.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
::FLAC__MetadataType FLAC::Metadata::Prototype::get_type () const
+
+inherited
+
+

Returns the type of the block.

+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
unsigned FLAC::Metadata::Prototype::get_length () const
+
+inherited
+
+

Returns the stream length of the metadata block.

+
Note
The length does not include the metadata block header, per spec.
+
Assertions:
+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
void FLAC::Metadata::Prototype::set_is_last (bool )
+
+inherited
+
+

Sets the "is_last" flag for the block. When using the iterators it is not necessary to set this flag; they will do it for you.

+
Assertions:
+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png new file mode 100644 index 000000000..58b91eab1 Binary files /dev/null and b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png differ diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html new file mode 100644 index 000000000..b2553cd73 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html @@ -0,0 +1,111 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
FLAC::Metadata::VorbisComment::Entry Member List
+
+
+ +

This is the complete list of members for FLAC::Metadata::VorbisComment::Entry, including all inherited members.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Entry() (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
Entry(const char *field, unsigned field_length) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
Entry(const char *field) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
Entry(const char *field_name, const char *field_value, unsigned field_value_length) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
Entry(const char *field_name, const char *field_value) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
Entry(const Entry &entry) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
entry_ (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entryprotected
field_name_ (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entryprotected
field_name_length_ (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entryprotected
field_value_ (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entryprotected
field_value_length_ (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entryprotected
get_entry() const (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
get_field() const (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
get_field_length() const (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
get_field_name() const (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
get_field_name_length() const (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
get_field_value() const (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
get_field_value_length() const (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
is_valid() const FLAC::Metadata::VorbisComment::Entryvirtual
is_valid_ (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entryprotected
operator=(const Entry &entry) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
set_field(const char *field, unsigned field_length) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
set_field(const char *field) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
set_field_name(const char *field_name) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
set_field_value(const char *field_value, unsigned field_value_length) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
set_field_value(const char *field_value) (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entry
~Entry() (defined in FLAC::Metadata::VorbisComment::Entry)FLAC::Metadata::VorbisComment::Entryvirtual
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html new file mode 100644 index 000000000..e4ebcede2 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html @@ -0,0 +1,203 @@ + + + + + + +FLAC: FLAC::Metadata::VorbisComment::Entry Class Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+ +
+ +

#include <metadata.h>

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Member Functions

Entry (const char *field, unsigned field_length)
 
Entry (const char *field)
 
Entry (const char *field_name, const char *field_value, unsigned field_value_length)
 
Entry (const char *field_name, const char *field_value)
 
Entry (const Entry &entry)
 
+Entryoperator= (const Entry &entry)
 
virtual bool is_valid () const
 
+unsigned get_field_length () const
 
+unsigned get_field_name_length () const
 
+unsigned get_field_value_length () const
 
+::FLAC__StreamMetadata_VorbisComment_Entry get_entry () const
 
+const char * get_field () const
 
+const char * get_field_name () const
 
+const char * get_field_value () const
 
+bool set_field (const char *field, unsigned field_length)
 
+bool set_field (const char *field)
 
+bool set_field_name (const char *field_name)
 
+bool set_field_value (const char *field_value, unsigned field_value_length)
 
+bool set_field_value (const char *field_value)
 
+ + + + + + + + + + + + + +

+Protected Attributes

+bool is_valid_
 
+::FLAC__StreamMetadata_VorbisComment_Entry entry_
 
+char * field_name_
 
+unsigned field_name_length_
 
+char * field_value_
 
+unsigned field_value_length_
 
+

Detailed Description

+

Convenience class for encapsulating Vorbis comment entries. An entry is a vendor string or a comment field. In the case of a vendor string, the field name is undefined; only the field value is relevant.

+

A field as used in the methods refers to an entire 'NAME=VALUE' string; for convenience the string is NUL-terminated. A length field is required in the unlikely event that the value contains contain embedded NULs.

+

A field_name is what is on the left side of the first '=' in the field. By definition it is ASCII and so is NUL-terminated and does not require a length to describe it. field_name is undefined for a vendor string entry.

+

A field_value is what is on the right side of the first '=' in the field. By definition, this may contain embedded NULs and so a field_value_length is required to describe it. However in practice, embedded NULs are not known to be used, so it is generally safe to treat field values as NUL- terminated UTF-8 strings.

+

Always check is_valid() after the constructor or operator= to make sure memory was properly allocated and that the Entry conforms to the Vorbis comment specification.

+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + +
virtual bool FLAC::Metadata::VorbisComment::Entry::is_valid () const
+
+virtual
+
+ +

Returns true iff object was properly constructed.

+ +
+
+
The documentation for this class was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/classes.html b/lib-src/libflac/doc/html/api/classes.html new file mode 100644 index 000000000..0af74e428 --- /dev/null +++ b/lib-src/libflac/doc/html/api/classes.html @@ -0,0 +1,108 @@ + + + + + + +FLAC: Class Index + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
Class Index
+
+
+
A | C | E | F | I | P | S | T | U | V
+ + + + + + + + + + + + + + + + + + +
  A  
+
FLAC__EntropyCodingMethod   FLAC__StreamMetadata_Padding   
  P  
+
SimpleIterator::Status (FLAC::Metadata)   
FLAC__EntropyCodingMethod_PartitionedRice   FLAC__StreamMetadata_Picture   StreamInfo (FLAC::Metadata)   
Application (FLAC::Metadata)   FLAC__EntropyCodingMethod_PartitionedRiceContents   FLAC__StreamMetadata_SeekPoint   Padding (FLAC::Metadata)   
  T  
+
  C  
+
FLAC__Frame   FLAC__StreamMetadata_SeekTable   Picture (FLAC::Metadata)   
FLAC__FrameFooter   FLAC__StreamMetadata_StreamInfo   Prototype (FLAC::Metadata)   CueSheet::Track (FLAC::Metadata)   
Chain (FLAC::Metadata)   FLAC__FrameHeader   FLAC__StreamMetadata_Unknown   
  S  
+
  U  
+
CueSheet (FLAC::Metadata)   FLAC__IOCallbacks   FLAC__StreamMetadata_VorbisComment   
  E  
+
FLAC__StreamDecoder   FLAC__StreamMetadata_VorbisComment_Entry   Stream (FLAC::Decoder)   Unknown (FLAC::Metadata)   
FLAC__StreamEncoder   FLAC__Subframe   Stream::State (FLAC::Decoder)   
  V  
+
VorbisComment::Entry (FLAC::Metadata)   FLAC__StreamMetadata   FLAC__Subframe_Constant   Stream (FLAC::Encoder)   
  F  
+
FLAC__StreamMetadata_Application   FLAC__Subframe_Fixed   Stream::State (FLAC::Encoder)   VorbisComment (FLAC::Metadata)   
FLAC__StreamMetadata_CueSheet   FLAC__Subframe_LPC   Chain::Status (FLAC::Metadata)   
File (FLAC::Decoder)   FLAC__StreamMetadata_CueSheet_Index   FLAC__Subframe_Verbatim   SeekTable (FLAC::Metadata)   
File (FLAC::Encoder)   FLAC__StreamMetadata_CueSheet_Track   
  I  
+
SimpleIterator (FLAC::Metadata)   
Iterator (FLAC::Metadata)   
+
A | C | E | F | I | P | S | T | U | V
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/closed.png b/lib-src/libflac/doc/html/api/closed.png new file mode 100644 index 000000000..98cc2c909 Binary files /dev/null and b/lib-src/libflac/doc/html/api/closed.png differ diff --git a/lib-src/libflac/doc/html/api/decoder_8h.html b/lib-src/libflac/doc/html/api/decoder_8h.html new file mode 100644 index 000000000..faa68c391 --- /dev/null +++ b/lib-src/libflac/doc/html/api/decoder_8h.html @@ -0,0 +1,99 @@ + + + + + + +FLAC: include/FLAC++/decoder.h File Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+ +
+
decoder.h File Reference
+
+
+
#include "export.h"
+#include <string>
+#include "FLAC/stream_decoder.h"
+
+

Go to the source code of this file.

+ + + + + + + + +

+Classes

class  FLAC::Decoder::Stream
 
class  FLAC::Decoder::Stream::State
 
class  FLAC::Decoder::File
 
+

Detailed Description

+

This module contains the classes which implement the various decoders.

+

See the detailed documentation in the decoder module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/decoder_8h_source.html b/lib-src/libflac/doc/html/api/decoder_8h_source.html new file mode 100644 index 000000000..c9b8ffb53 --- /dev/null +++ b/lib-src/libflac/doc/html/api/decoder_8h_source.html @@ -0,0 +1,257 @@ + + + + + + +FLAC: include/FLAC++/decoder.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
decoder.h
+
+
+Go to the documentation of this file.
1 /* libFLAC++ - Free Lossless Audio Codec library
+
2  * Copyright (C) 2002-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLACPP__DECODER_H
+
34 #define FLACPP__DECODER_H
+
35 
+
36 #include "export.h"
+
37 
+
38 #include <string>
+
39 #include "FLAC/stream_decoder.h"
+
40 
+
41 
+
78 namespace FLAC {
+
79  namespace Decoder {
+
80 
+
100  class FLACPP_API Stream {
+
101  public:
+
104  class FLACPP_API State {
+
105  public:
+
106  inline State(::FLAC__StreamDecoderState state): state_(state) { }
+
107  inline operator ::FLAC__StreamDecoderState() const { return state_; }
+
108  inline const char *as_cstring() const { return ::FLAC__StreamDecoderStateString[state_]; }
+
109  inline const char *resolved_as_cstring(const Stream &decoder) const { return ::FLAC__stream_decoder_get_resolved_state_string(decoder.decoder_); }
+
110  protected:
+ +
112  };
+
113 
+
114  Stream();
+
115  virtual ~Stream();
+
116 
+
118 
+
121  virtual bool is_valid() const;
+
122  inline operator bool() const { return is_valid(); }
+
123 
+
124 
+
125  virtual bool set_ogg_serial_number(long value);
+
126  virtual bool set_md5_checking(bool value);
+
127  virtual bool set_metadata_respond(::FLAC__MetadataType type);
+
128  virtual bool set_metadata_respond_application(const FLAC__byte id[4]);
+
129  virtual bool set_metadata_respond_all();
+
130  virtual bool set_metadata_ignore(::FLAC__MetadataType type);
+
131  virtual bool set_metadata_ignore_application(const FLAC__byte id[4]);
+
132  virtual bool set_metadata_ignore_all();
+
133 
+
134  /* get_state() is not virtual since we want subclasses to be able to return their own state */
+
135  State get_state() const;
+
136  virtual bool get_md5_checking() const;
+
137  virtual FLAC__uint64 get_total_samples() const;
+
138  virtual unsigned get_channels() const;
+
139  virtual ::FLAC__ChannelAssignment get_channel_assignment() const;
+
140  virtual unsigned get_bits_per_sample() const;
+
141  virtual unsigned get_sample_rate() const;
+
142  virtual unsigned get_blocksize() const;
+
143  virtual bool get_decode_position(FLAC__uint64 *position) const;
+
144 
+ + +
147 
+
148  virtual bool finish();
+
149 
+
150  virtual bool flush();
+
151  virtual bool reset();
+
152 
+
153  virtual bool process_single();
+
154  virtual bool process_until_end_of_metadata();
+
155  virtual bool process_until_end_of_stream();
+
156  virtual bool skip_single_frame();
+
157 
+
158  virtual bool seek_absolute(FLAC__uint64 sample);
+
159  protected:
+
161  virtual ::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], size_t *bytes) = 0;
+
162 
+
164  virtual ::FLAC__StreamDecoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset);
+
165 
+
167  virtual ::FLAC__StreamDecoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset);
+
168 
+
170  virtual ::FLAC__StreamDecoderLengthStatus length_callback(FLAC__uint64 *stream_length);
+
171 
+
173  virtual bool eof_callback();
+
174 
+
176  virtual ::FLAC__StreamDecoderWriteStatus write_callback(const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]) = 0;
+
177 
+
179  virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata);
+
180 
+
182  virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
+
183 
+
184 #if (defined _MSC_VER) || (defined __BORLANDC__) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+
185  // lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
+
186  friend State;
+
187 #endif
+
188  ::FLAC__StreamDecoder *decoder_;
+
189 
+
190  static ::FLAC__StreamDecoderReadStatus read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
+
191  static ::FLAC__StreamDecoderSeekStatus seek_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data);
+
192  static ::FLAC__StreamDecoderTellStatus tell_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
+
193  static ::FLAC__StreamDecoderLengthStatus length_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data);
+
194  static FLAC__bool eof_callback_(const ::FLAC__StreamDecoder *decoder, void *client_data);
+
195  static ::FLAC__StreamDecoderWriteStatus write_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+
196  static void metadata_callback_(const ::FLAC__StreamDecoder *decoder, const ::FLAC__StreamMetadata *metadata, void *client_data);
+
197  static void error_callback_(const ::FLAC__StreamDecoder *decoder, ::FLAC__StreamDecoderErrorStatus status, void *client_data);
+
198  private:
+
199  // Private and undefined so you can't use them:
+
200  Stream(const Stream &);
+
201  void operator=(const Stream &);
+
202  };
+
203 
+
223  class FLACPP_API File: public Stream {
+
224  public:
+
225  File();
+
226  virtual ~File();
+
227 
+
228  virtual ::FLAC__StreamDecoderInitStatus init(FILE *file);
+
229  virtual ::FLAC__StreamDecoderInitStatus init(const char *filename);
+
230  virtual ::FLAC__StreamDecoderInitStatus init(const std::string &filename);
+
231  virtual ::FLAC__StreamDecoderInitStatus init_ogg(FILE *file);
+
232  virtual ::FLAC__StreamDecoderInitStatus init_ogg(const char *filename);
+
233  virtual ::FLAC__StreamDecoderInitStatus init_ogg(const std::string &filename);
+
234  protected:
+
235  // this is a dummy implementation to satisfy the pure virtual in Stream that is actually supplied internally by the C layer
+
236  virtual ::FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], size_t *bytes);
+
237  private:
+
238  // Private and undefined so you can't use them:
+
239  File(const File &);
+
240  void operator=(const File &);
+
241  };
+
242 
+
243  }
+
244 }
+
245 
+
246 #endif
+
const char * FLAC__stream_decoder_get_resolved_state_string(const FLAC__StreamDecoder *decoder)
+
Definition: decoder.h:78
+
This class wraps the FLAC__StreamDecoder. If you are decoding from a file, FLAC::Decoder::File may be...
Definition: decoder.h:100
+
FLAC__StreamDecoderTellStatus
Definition: stream_decoder.h:348
+
const char *const FLAC__StreamDecoderStateString[]
+
FLAC__StreamDecoderErrorStatus
Definition: stream_decoder.h:427
+
Definition: stream_decoder.h:463
+
This class wraps the FLAC__StreamDecoder. If you are not decoding from a file, you may need to use FL...
Definition: decoder.h:223
+
FLAC__StreamDecoderInitStatus
Definition: stream_decoder.h:256
+
FLAC__StreamDecoderWriteStatus
Definition: stream_decoder.h:394
+
This module contains #defines and symbols for exporting function calls, and providing version informa...
+
FLAC__MetadataType
Definition: format.h:489
+
FLAC__StreamDecoderReadStatus
Definition: stream_decoder.h:294
+
FLAC__StreamDecoderState
Definition: stream_decoder.h:202
+
FLAC__StreamDecoderLengthStatus
Definition: stream_decoder.h:371
+
FLAC__ChannelAssignment
Definition: format.h:381
+
Definition: decoder.h:104
+
FLAC__StreamDecoderSeekStatus
Definition: stream_decoder.h:325
+
This module contains the functions which implement the stream decoder.
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/dir_1982b5890de532b4beef7221dae776e2.html b/lib-src/libflac/doc/html/api/dir_1982b5890de532b4beef7221dae776e2.html new file mode 100644 index 000000000..81042fa58 --- /dev/null +++ b/lib-src/libflac/doc/html/api/dir_1982b5890de532b4beef7221dae776e2.html @@ -0,0 +1,95 @@ + + + + + + +FLAC: include/FLAC Directory Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC Directory Reference
+
+
+ + + + + + + + + + + + + + + + + + + + +

+Files

file  all.h [code]
 
file  assert.h [code]
 
file  callback.h [code]
 
file  export.h [code]
 
file  format.h [code]
 
 
file  ordinals.h [code]
 
file  stream_decoder.h [code]
 
file  stream_encoder.h [code]
 
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/dir_527642952c2881b3e5b36abb4a29ebef.html b/lib-src/libflac/doc/html/api/dir_527642952c2881b3e5b36abb4a29ebef.html new file mode 100644 index 000000000..94bb45c95 --- /dev/null +++ b/lib-src/libflac/doc/html/api/dir_527642952c2881b3e5b36abb4a29ebef.html @@ -0,0 +1,87 @@ + + + + + + +FLAC: include/FLAC++ Directory Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC++ Directory Reference
+
+
+ + + + + + + + + + + + +

+Files

file  all.h [code]
 
file  decoder.h [code]
 
file  encoder.h [code]
 
file  export.h [code]
 
 
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/dir_d44c64559bbebec7f509842c48db8b23.html b/lib-src/libflac/doc/html/api/dir_d44c64559bbebec7f509842c48db8b23.html new file mode 100644 index 000000000..26eda4e43 --- /dev/null +++ b/lib-src/libflac/doc/html/api/dir_d44c64559bbebec7f509842c48db8b23.html @@ -0,0 +1,81 @@ + + + + + + +FLAC: include Directory Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
include Directory Reference
+
+
+ + + + + + +

+Directories

directory  FLAC
 
directory  FLAC++
 
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/doxygen.css b/lib-src/libflac/doc/html/api/doxygen.css new file mode 100644 index 000000000..02e8b0152 --- /dev/null +++ b/lib-src/libflac/doc/html/api/doxygen.css @@ -0,0 +1,1440 @@ +/* The standard CSS for doxygen 1.8.8 */ + +body, table, div, p, dl { + font: 400 14px/22px Roboto,sans-serif; +} + +/* @group Heading Levels */ + +h1.groupheader { + font-size: 150%; +} + +.title { + font: 400 14px/28px Roboto,sans-serif; + font-size: 150%; + font-weight: bold; + margin: 10px 2px; +} + +h2.groupheader { + border-bottom: 1px solid #879ECB; + color: #354C7B; + font-size: 150%; + font-weight: normal; + margin-top: 1.75em; + padding-top: 8px; + padding-bottom: 4px; + width: 100%; +} + +h3.groupheader { + font-size: 100%; +} + +h1, h2, h3, h4, h5, h6 { + -webkit-transition: text-shadow 0.5s linear; + -moz-transition: text-shadow 0.5s linear; + -ms-transition: text-shadow 0.5s linear; + -o-transition: text-shadow 0.5s linear; + transition: text-shadow 0.5s linear; + margin-right: 15px; +} + +h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow { + text-shadow: 0 0 15px cyan; +} + +dt { + font-weight: bold; +} + +div.multicol { + -moz-column-gap: 1em; + -webkit-column-gap: 1em; + -moz-column-count: 3; + -webkit-column-count: 3; +} + +p.startli, p.startdd { + margin-top: 2px; +} + +p.starttd { + margin-top: 0px; +} + +p.endli { + margin-bottom: 0px; +} + +p.enddd { + margin-bottom: 4px; +} + +p.endtd { + margin-bottom: 2px; +} + +/* @end */ + +caption { + font-weight: bold; +} + +span.legend { + font-size: 70%; + text-align: center; +} + +h3.version { + font-size: 90%; + text-align: center; +} + +div.qindex, div.navtab{ + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; +} + +div.qindex, div.navpath { + width: 100%; + line-height: 140%; +} + +div.navtab { + margin-right: 15px; +} + +/* @group Link Styling */ + +a { + color: #3D578C; + font-weight: normal; + text-decoration: none; +} + +.contents a:visited { + color: #4665A2; +} + +a:hover { + text-decoration: underline; +} + +a.qindex { + font-weight: bold; +} + +a.qindexHL { + font-weight: bold; + background-color: #9CAFD4; + color: #ffffff; + border: 1px double #869DCA; +} + +.contents a.qindexHL:visited { + color: #ffffff; +} + +a.el { + font-weight: bold; +} + +a.elRef { +} + +a.code, a.code:visited, a.line, a.line:visited { + color: #4665A2; +} + +a.codeRef, a.codeRef:visited, a.lineRef, a.lineRef:visited { + color: #4665A2; +} + +/* @end */ + +dl.el { + margin-left: -1cm; +} + +pre.fragment { + border: 1px solid #C4CFE5; + background-color: #FBFCFD; + padding: 4px 6px; + margin: 4px 8px 4px 2px; + overflow: auto; + word-wrap: break-word; + font-size: 9pt; + line-height: 125%; + font-family: monospace, fixed; + font-size: 105%; +} + +div.fragment { + padding: 4px 6px; + margin: 4px 8px 4px 2px; + background-color: #FBFCFD; + border: 1px solid #C4CFE5; +} + +div.line { + font-family: monospace, fixed; + font-size: 13px; + min-height: 13px; + line-height: 1.0; + text-wrap: unrestricted; + white-space: -moz-pre-wrap; /* Moz */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + white-space: pre-wrap; /* CSS3 */ + word-wrap: break-word; /* IE 5.5+ */ + text-indent: -53px; + padding-left: 53px; + padding-bottom: 0px; + margin: 0px; + -webkit-transition-property: background-color, box-shadow; + -webkit-transition-duration: 0.5s; + -moz-transition-property: background-color, box-shadow; + -moz-transition-duration: 0.5s; + -ms-transition-property: background-color, box-shadow; + -ms-transition-duration: 0.5s; + -o-transition-property: background-color, box-shadow; + -o-transition-duration: 0.5s; + transition-property: background-color, box-shadow; + transition-duration: 0.5s; +} + +div.line.glow { + background-color: cyan; + box-shadow: 0 0 10px cyan; +} + + +span.lineno { + padding-right: 4px; + text-align: right; + border-right: 2px solid #0F0; + background-color: #E8E8E8; + white-space: pre; +} +span.lineno a { + background-color: #D8D8D8; +} + +span.lineno a:hover { + background-color: #C8C8C8; +} + +div.ah { + background-color: black; + font-weight: bold; + color: #ffffff; + margin-bottom: 3px; + margin-top: 3px; + padding: 0.2em; + border: solid thin #333; + border-radius: 0.5em; + -webkit-border-radius: .5em; + -moz-border-radius: .5em; + box-shadow: 2px 2px 3px #999; + -webkit-box-shadow: 2px 2px 3px #999; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444)); + background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000); +} + +div.groupHeader { + margin-left: 16px; + margin-top: 12px; + font-weight: bold; +} + +div.groupText { + margin-left: 16px; + font-style: italic; +} + +body { + background-color: white; + color: black; + margin: 0; +} + +div.contents { + margin-top: 10px; + margin-left: 12px; + margin-right: 8px; +} + +td.indexkey { + background-color: #EBEFF6; + font-weight: bold; + border: 1px solid #C4CFE5; + margin: 2px 0px 2px 0; + padding: 2px 10px; + white-space: nowrap; + vertical-align: top; +} + +td.indexvalue { + background-color: #EBEFF6; + border: 1px solid #C4CFE5; + padding: 2px 10px; + margin: 2px 0px; +} + +tr.memlist { + background-color: #EEF1F7; +} + +p.formulaDsp { + text-align: center; +} + +img.formulaDsp { + +} + +img.formulaInl { + vertical-align: middle; +} + +div.center { + text-align: center; + margin-top: 0px; + margin-bottom: 0px; + padding: 0px; +} + +div.center img { + border: 0px; +} + +address.footer { + text-align: right; + padding-right: 12px; +} + +img.footer { + border: 0px; + vertical-align: middle; +} + +/* @group Code Colorization */ + +span.keyword { + color: #008000 +} + +span.keywordtype { + color: #604020 +} + +span.keywordflow { + color: #e08000 +} + +span.comment { + color: #800000 +} + +span.preprocessor { + color: #806020 +} + +span.stringliteral { + color: #002080 +} + +span.charliteral { + color: #008080 +} + +span.vhdldigit { + color: #ff00ff +} + +span.vhdlchar { + color: #000000 +} + +span.vhdlkeyword { + color: #700070 +} + +span.vhdllogic { + color: #ff0000 +} + +blockquote { + background-color: #F7F8FB; + border-left: 2px solid #9CAFD4; + margin: 0 24px 0 4px; + padding: 0 12px 0 16px; +} + +/* @end */ + +/* +.search { + color: #003399; + font-weight: bold; +} + +form.search { + margin-bottom: 0px; + margin-top: 0px; +} + +input.search { + font-size: 75%; + color: #000080; + font-weight: normal; + background-color: #e8eef2; +} +*/ + +td.tiny { + font-size: 75%; +} + +.dirtab { + padding: 4px; + border-collapse: collapse; + border: 1px solid #A3B4D7; +} + +th.dirtab { + background: #EBEFF6; + font-weight: bold; +} + +hr { + height: 0px; + border: none; + border-top: 1px solid #4A6AAA; +} + +hr.footer { + height: 1px; +} + +/* @group Member Descriptions */ + +table.memberdecls { + border-spacing: 0px; + padding: 0px; +} + +.memberdecls td, .fieldtable tr { + -webkit-transition-property: background-color, box-shadow; + -webkit-transition-duration: 0.5s; + -moz-transition-property: background-color, box-shadow; + -moz-transition-duration: 0.5s; + -ms-transition-property: background-color, box-shadow; + -ms-transition-duration: 0.5s; + -o-transition-property: background-color, box-shadow; + -o-transition-duration: 0.5s; + transition-property: background-color, box-shadow; + transition-duration: 0.5s; +} + +.memberdecls td.glow, .fieldtable tr.glow { + background-color: cyan; + box-shadow: 0 0 15px cyan; +} + +.mdescLeft, .mdescRight, +.memItemLeft, .memItemRight, +.memTemplItemLeft, .memTemplItemRight, .memTemplParams { + background-color: #F9FAFC; + border: none; + margin: 4px; + padding: 1px 0 0 8px; +} + +.mdescLeft, .mdescRight { + padding: 0px 8px 4px 8px; + color: #555; +} + +.memSeparator { + border-bottom: 1px solid #DEE4F0; + line-height: 1px; + margin: 0px; + padding: 0px; +} + +.memItemLeft, .memTemplItemLeft { + white-space: nowrap; +} + +.memItemRight { + width: 100%; +} + +.memTemplParams { + color: #4665A2; + white-space: nowrap; + font-size: 80%; +} + +/* @end */ + +/* @group Member Details */ + +/* Styles for detailed member documentation */ + +.memtemplate { + font-size: 80%; + color: #4665A2; + font-weight: normal; + margin-left: 9px; +} + +.memnav { + background-color: #EBEFF6; + border: 1px solid #A3B4D7; + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; +} + +.mempage { + width: 100%; +} + +.memitem { + padding: 0; + margin-bottom: 10px; + margin-right: 5px; + -webkit-transition: box-shadow 0.5s linear; + -moz-transition: box-shadow 0.5s linear; + -ms-transition: box-shadow 0.5s linear; + -o-transition: box-shadow 0.5s linear; + transition: box-shadow 0.5s linear; + display: table !important; + width: 100%; +} + +.memitem.glow { + box-shadow: 0 0 15px cyan; +} + +.memname { + font-weight: bold; + margin-left: 6px; +} + +.memname td { + vertical-align: bottom; +} + +.memproto, dl.reflist dt { + border-top: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 6px 0px 6px 0px; + color: #253555; + font-weight: bold; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + background-image:url('nav_f.png'); + background-repeat:repeat-x; + background-color: #E2E8F2; + /* opera specific markup */ + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + border-top-right-radius: 4px; + border-top-left-radius: 4px; + /* firefox specific markup */ + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + -moz-border-radius-topright: 4px; + -moz-border-radius-topleft: 4px; + /* webkit specific markup */ + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + -webkit-border-top-right-radius: 4px; + -webkit-border-top-left-radius: 4px; + +} + +.memdoc, dl.reflist dd { + border-bottom: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; + padding: 6px 10px 2px 10px; + background-color: #FBFCFD; + border-top-width: 0; + background-image:url('nav_g.png'); + background-repeat:repeat-x; + background-color: #FFFFFF; + /* opera specific markup */ + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); + /* firefox specific markup */ + -moz-border-radius-bottomleft: 4px; + -moz-border-radius-bottomright: 4px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; + /* webkit specific markup */ + -webkit-border-bottom-left-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15); +} + +dl.reflist dt { + padding: 5px; +} + +dl.reflist dd { + margin: 0px 0px 10px 0px; + padding: 5px; +} + +.paramkey { + text-align: right; +} + +.paramtype { + white-space: nowrap; +} + +.paramname { + color: #602020; + white-space: nowrap; +} +.paramname em { + font-style: normal; +} +.paramname code { + line-height: 14px; +} + +.params, .retval, .exception, .tparams { + margin-left: 0px; + padding-left: 0px; +} + +.params .paramname, .retval .paramname { + font-weight: bold; + vertical-align: top; +} + +.params .paramtype { + font-style: italic; + vertical-align: top; +} + +.params .paramdir { + font-family: "courier new",courier,monospace; + vertical-align: top; +} + +table.mlabels { + border-spacing: 0px; +} + +td.mlabels-left { + width: 100%; + padding: 0px; +} + +td.mlabels-right { + vertical-align: bottom; + padding: 0px; + white-space: nowrap; +} + +span.mlabels { + margin-left: 8px; +} + +span.mlabel { + background-color: #728DC1; + border-top:1px solid #5373B4; + border-left:1px solid #5373B4; + border-right:1px solid #C4CFE5; + border-bottom:1px solid #C4CFE5; + text-shadow: none; + color: white; + margin-right: 4px; + padding: 2px 3px; + border-radius: 3px; + font-size: 7pt; + white-space: nowrap; + vertical-align: middle; +} + + + +/* @end */ + +/* these are for tree view inside a (index) page */ + +div.directory { + margin: 10px 0px; + border-top: 1px solid #9CAFD4; + border-bottom: 1px solid #9CAFD4; + width: 100%; +} + +.directory table { + border-collapse:collapse; +} + +.directory td { + margin: 0px; + padding: 0px; + vertical-align: top; +} + +.directory td.entry { + white-space: nowrap; + padding-right: 6px; + padding-top: 3px; +} + +.directory td.entry a { + outline:none; +} + +.directory td.entry a img { + border: none; +} + +.directory td.desc { + width: 100%; + padding-left: 6px; + padding-right: 6px; + padding-top: 3px; + border-left: 1px solid rgba(0,0,0,0.05); +} + +.directory tr.even { + padding-left: 6px; + background-color: #F7F8FB; +} + +.directory img { + vertical-align: -30%; +} + +.directory .levels { + white-space: nowrap; + width: 100%; + text-align: right; + font-size: 9pt; +} + +.directory .levels span { + cursor: pointer; + padding-left: 2px; + padding-right: 2px; + color: #3D578C; +} + +.arrow { + color: #9CAFD4; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + cursor: pointer; + font-size: 80%; + display: inline-block; + width: 16px; + height: 22px; +} + +.icon { + font-family: Arial, Helvetica; + font-weight: bold; + font-size: 12px; + height: 14px; + width: 16px; + display: inline-block; + background-color: #728DC1; + color: white; + text-align: center; + border-radius: 4px; + margin-left: 2px; + margin-right: 2px; +} + +.icona { + width: 24px; + height: 22px; + display: inline-block; +} + +.iconfopen { + width: 24px; + height: 18px; + margin-bottom: 4px; + background-image:url('ftv2folderopen.png'); + background-position: 0px -4px; + background-repeat: repeat-y; + vertical-align:top; + display: inline-block; +} + +.iconfclosed { + width: 24px; + height: 18px; + margin-bottom: 4px; + background-image:url('ftv2folderclosed.png'); + background-position: 0px -4px; + background-repeat: repeat-y; + vertical-align:top; + display: inline-block; +} + +.icondoc { + width: 24px; + height: 18px; + margin-bottom: 4px; + background-image:url('ftv2doc.png'); + background-position: 0px -4px; + background-repeat: repeat-y; + vertical-align:top; + display: inline-block; +} + +table.directory { + font: 400 14px Roboto,sans-serif; +} + +/* @end */ + +div.dynheader { + margin-top: 8px; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +address { + font-style: normal; + color: #2A3D61; +} + +table.doxtable { + border-collapse:collapse; + margin-top: 4px; + margin-bottom: 4px; +} + +table.doxtable td, table.doxtable th { + border: 1px solid #2D4068; + padding: 3px 7px 2px; +} + +table.doxtable th { + background-color: #374F7F; + color: #FFFFFF; + font-size: 110%; + padding-bottom: 4px; + padding-top: 5px; +} + +table.fieldtable { + /*width: 100%;*/ + margin-bottom: 10px; + border: 1px solid #A8B8D9; + border-spacing: 0px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px; + -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15); + box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15); +} + +.fieldtable td, .fieldtable th { + padding: 3px 7px 2px; +} + +.fieldtable td.fieldtype, .fieldtable td.fieldname { + white-space: nowrap; + border-right: 1px solid #A8B8D9; + border-bottom: 1px solid #A8B8D9; + vertical-align: top; +} + +.fieldtable td.fieldname { + padding-top: 3px; +} + +.fieldtable td.fielddoc { + border-bottom: 1px solid #A8B8D9; + /*width: 100%;*/ +} + +.fieldtable td.fielddoc p:first-child { + margin-top: 0px; +} + +.fieldtable td.fielddoc p:last-child { + margin-bottom: 2px; +} + +.fieldtable tr:last-child td { + border-bottom: none; +} + +.fieldtable th { + background-image:url('nav_f.png'); + background-repeat:repeat-x; + background-color: #E2E8F2; + font-size: 90%; + color: #253555; + padding-bottom: 4px; + padding-top: 5px; + text-align:left; + -moz-border-radius-topleft: 4px; + -moz-border-radius-topright: 4px; + -webkit-border-top-left-radius: 4px; + -webkit-border-top-right-radius: 4px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom: 1px solid #A8B8D9; +} + + +.tabsearch { + top: 0px; + left: 10px; + height: 36px; + background-image: url('tab_b.png'); + z-index: 101; + overflow: hidden; + font-size: 13px; +} + +.navpath ul +{ + font-size: 11px; + background-image:url('tab_b.png'); + background-repeat:repeat-x; + background-position: 0 -5px; + height:30px; + line-height:30px; + color:#8AA0CC; + border:solid 1px #C2CDE4; + overflow:hidden; + margin:0px; + padding:0px; +} + +.navpath li +{ + list-style-type:none; + float:left; + padding-left:10px; + padding-right:15px; + background-image:url('bc_s.png'); + background-repeat:no-repeat; + background-position:right; + color:#364D7C; +} + +.navpath li.navelem a +{ + height:32px; + display:block; + text-decoration: none; + outline: none; + color: #283A5D; + font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + text-decoration: none; +} + +.navpath li.navelem a:hover +{ + color:#6884BD; +} + +.navpath li.footer +{ + list-style-type:none; + float:right; + padding-left:10px; + padding-right:15px; + background-image:none; + background-repeat:no-repeat; + background-position:right; + color:#364D7C; + font-size: 8pt; +} + + +div.summary +{ + float: right; + font-size: 8pt; + padding-right: 5px; + width: 50%; + text-align: right; +} + +div.summary a +{ + white-space: nowrap; +} + +div.ingroups +{ + font-size: 8pt; + width: 50%; + text-align: left; +} + +div.ingroups a +{ + white-space: nowrap; +} + +div.header +{ + background-image:url('nav_h.png'); + background-repeat:repeat-x; + background-color: #F9FAFC; + margin: 0px; + border-bottom: 1px solid #C4CFE5; +} + +div.headertitle +{ + padding: 5px 5px 5px 10px; +} + +dl +{ + padding: 0 0 0 10px; +} + +/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */ +dl.section +{ + margin-left: 0px; + padding-left: 0px; +} + +dl.note +{ + margin-left:-7px; + padding-left: 3px; + border-left:4px solid; + border-color: #D0C000; +} + +dl.warning, dl.attention +{ + margin-left:-7px; + padding-left: 3px; + border-left:4px solid; + border-color: #FF0000; +} + +dl.pre, dl.post, dl.invariant +{ + margin-left:-7px; + padding-left: 3px; + border-left:4px solid; + border-color: #00D000; +} + +dl.deprecated +{ + margin-left:-7px; + padding-left: 3px; + border-left:4px solid; + border-color: #505050; +} + +dl.todo +{ + margin-left:-7px; + padding-left: 3px; + border-left:4px solid; + border-color: #00C0E0; +} + +dl.test +{ + margin-left:-7px; + padding-left: 3px; + border-left:4px solid; + border-color: #3030E0; +} + +dl.bug +{ + margin-left:-7px; + padding-left: 3px; + border-left:4px solid; + border-color: #C08050; +} + +dl.section dd { + margin-bottom: 6px; +} + + +#projectlogo +{ + text-align: center; + vertical-align: bottom; + border-collapse: separate; +} + +#projectlogo img +{ + border: 0px none; +} + +#projectname +{ + font: 300% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 2px 0px; +} + +#projectbrief +{ + font: 120% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 0px; +} + +#projectnumber +{ + font: 50% Tahoma, Arial,sans-serif; + margin: 0px; + padding: 0px; +} + +#titlearea +{ + padding: 0px; + margin: 0px; + width: 100%; + border-bottom: 1px solid #5373B4; +} + +.image +{ + text-align: center; +} + +.dotgraph +{ + text-align: center; +} + +.mscgraph +{ + text-align: center; +} + +.diagraph +{ + text-align: center; +} + +.caption +{ + font-weight: bold; +} + +div.zoom +{ + border: 1px solid #90A5CE; +} + +dl.citelist { + margin-bottom:50px; +} + +dl.citelist dt { + color:#334975; + float:left; + font-weight:bold; + margin-right:10px; + padding:5px; +} + +dl.citelist dd { + margin:2px 0; + padding:5px 0; +} + +div.toc { + padding: 14px 25px; + background-color: #F4F6FA; + border: 1px solid #D8DFEE; + border-radius: 7px 7px 7px 7px; + float: right; + height: auto; + margin: 0 20px 10px 10px; + width: 200px; +} + +div.toc li { + background: url("bdwn.png") no-repeat scroll 0 5px transparent; + font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif; + margin-top: 5px; + padding-left: 10px; + padding-top: 2px; +} + +div.toc h3 { + font: bold 12px/1.2 Arial,FreeSans,sans-serif; + color: #4665A2; + border-bottom: 0 none; + margin: 0; +} + +div.toc ul { + list-style: none outside none; + border: medium none; + padding: 0px; +} + +div.toc li.level1 { + margin-left: 0px; +} + +div.toc li.level2 { + margin-left: 15px; +} + +div.toc li.level3 { + margin-left: 30px; +} + +div.toc li.level4 { + margin-left: 45px; +} + +.inherit_header { + font-weight: bold; + color: gray; + cursor: pointer; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.inherit_header td { + padding: 6px 0px 2px 5px; +} + +.inherit { + display: none; +} + +tr.heading h2 { + margin-top: 12px; + margin-bottom: 4px; +} + +/* tooltip related style info */ + +.ttc { + position: absolute; + display: none; +} + +#powerTip { + cursor: default; + white-space: nowrap; + background-color: white; + border: 1px solid gray; + border-radius: 4px 4px 4px 4px; + box-shadow: 1px 1px 7px gray; + display: none; + font-size: smaller; + max-width: 80%; + opacity: 0.9; + padding: 1ex 1em 1em; + position: absolute; + z-index: 2147483647; +} + +#powerTip div.ttdoc { + color: grey; + font-style: italic; +} + +#powerTip div.ttname a { + font-weight: bold; +} + +#powerTip div.ttname { + font-weight: bold; +} + +#powerTip div.ttdeci { + color: #006318; +} + +#powerTip div { + margin: 0px; + padding: 0px; + font: 12px/16px Roboto,sans-serif; +} + +#powerTip:before, #powerTip:after { + content: ""; + position: absolute; + margin: 0px; +} + +#powerTip.n:after, #powerTip.n:before, +#powerTip.s:after, #powerTip.s:before, +#powerTip.w:after, #powerTip.w:before, +#powerTip.e:after, #powerTip.e:before, +#powerTip.ne:after, #powerTip.ne:before, +#powerTip.se:after, #powerTip.se:before, +#powerTip.nw:after, #powerTip.nw:before, +#powerTip.sw:after, #powerTip.sw:before { + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; +} + +#powerTip.n:after, #powerTip.s:after, +#powerTip.w:after, #powerTip.e:after, +#powerTip.nw:after, #powerTip.ne:after, +#powerTip.sw:after, #powerTip.se:after { + border-color: rgba(255, 255, 255, 0); +} + +#powerTip.n:before, #powerTip.s:before, +#powerTip.w:before, #powerTip.e:before, +#powerTip.nw:before, #powerTip.ne:before, +#powerTip.sw:before, #powerTip.se:before { + border-color: rgba(128, 128, 128, 0); +} + +#powerTip.n:after, #powerTip.n:before, +#powerTip.ne:after, #powerTip.ne:before, +#powerTip.nw:after, #powerTip.nw:before { + top: 100%; +} + +#powerTip.n:after, #powerTip.ne:after, #powerTip.nw:after { + border-top-color: #ffffff; + border-width: 10px; + margin: 0px -10px; +} +#powerTip.n:before { + border-top-color: #808080; + border-width: 11px; + margin: 0px -11px; +} +#powerTip.n:after, #powerTip.n:before { + left: 50%; +} + +#powerTip.nw:after, #powerTip.nw:before { + right: 14px; +} + +#powerTip.ne:after, #powerTip.ne:before { + left: 14px; +} + +#powerTip.s:after, #powerTip.s:before, +#powerTip.se:after, #powerTip.se:before, +#powerTip.sw:after, #powerTip.sw:before { + bottom: 100%; +} + +#powerTip.s:after, #powerTip.se:after, #powerTip.sw:after { + border-bottom-color: #ffffff; + border-width: 10px; + margin: 0px -10px; +} + +#powerTip.s:before, #powerTip.se:before, #powerTip.sw:before { + border-bottom-color: #808080; + border-width: 11px; + margin: 0px -11px; +} + +#powerTip.s:after, #powerTip.s:before { + left: 50%; +} + +#powerTip.sw:after, #powerTip.sw:before { + right: 14px; +} + +#powerTip.se:after, #powerTip.se:before { + left: 14px; +} + +#powerTip.e:after, #powerTip.e:before { + left: 100%; +} +#powerTip.e:after { + border-left-color: #ffffff; + border-width: 10px; + top: 50%; + margin-top: -10px; +} +#powerTip.e:before { + border-left-color: #808080; + border-width: 11px; + top: 50%; + margin-top: -11px; +} + +#powerTip.w:after, #powerTip.w:before { + right: 100%; +} +#powerTip.w:after { + border-right-color: #ffffff; + border-width: 10px; + top: 50%; + margin-top: -10px; +} +#powerTip.w:before { + border-right-color: #808080; + border-width: 11px; + top: 50%; + margin-top: -11px; +} + +@media print +{ + #top { display: none; } + #side-nav { display: none; } + #nav-path { display: none; } + body { overflow:visible; } + h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } + .summary { display: none; } + .memitem { page-break-inside: avoid; } + #doc-content + { + margin-left:0 !important; + height:auto !important; + width:auto !important; + overflow:inherit; + display:inline; + } +} + diff --git a/lib-src/libflac/doc/html/api/doxygen.png b/lib-src/libflac/doc/html/api/doxygen.png new file mode 100644 index 000000000..3ff17d807 Binary files /dev/null and b/lib-src/libflac/doc/html/api/doxygen.png differ diff --git a/lib-src/libflac/doc/html/api/dynsections.js b/lib-src/libflac/doc/html/api/dynsections.js new file mode 100644 index 000000000..85e183690 --- /dev/null +++ b/lib-src/libflac/doc/html/api/dynsections.js @@ -0,0 +1,97 @@ +function toggleVisibility(linkObj) +{ + var base = $(linkObj).attr('id'); + var summary = $('#'+base+'-summary'); + var content = $('#'+base+'-content'); + var trigger = $('#'+base+'-trigger'); + var src=$(trigger).attr('src'); + if (content.is(':visible')===true) { + content.hide(); + summary.show(); + $(linkObj).addClass('closed').removeClass('opened'); + $(trigger).attr('src',src.substring(0,src.length-8)+'closed.png'); + } else { + content.show(); + summary.hide(); + $(linkObj).removeClass('closed').addClass('opened'); + $(trigger).attr('src',src.substring(0,src.length-10)+'open.png'); + } + return false; +} + +function updateStripes() +{ + $('table.directory tr'). + removeClass('even').filter(':visible:even').addClass('even'); +} + +function toggleLevel(level) +{ + $('table.directory tr').each(function() { + var l = this.id.split('_').length-1; + var i = $('#img'+this.id.substring(3)); + var a = $('#arr'+this.id.substring(3)); + if (l + + + + + +FLAC: include/FLAC++/encoder.h File Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+ +
+
encoder.h File Reference
+
+
+
#include "export.h"
+#include "FLAC/stream_encoder.h"
+#include "decoder.h"
+#include "metadata.h"
+
+

Go to the source code of this file.

+ + + + + + + + +

+Classes

class  FLAC::Encoder::Stream
 
class  FLAC::Encoder::Stream::State
 
class  FLAC::Encoder::File
 
+

Detailed Description

+

This module contains the classes which implement the various encoders.

+

See the detailed documentation in the encoder module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/encoder_8h_source.html b/lib-src/libflac/doc/html/api/encoder_8h_source.html new file mode 100644 index 000000000..09fc3a689 --- /dev/null +++ b/lib-src/libflac/doc/html/api/encoder_8h_source.html @@ -0,0 +1,271 @@ + + + + + + +FLAC: include/FLAC++/encoder.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
encoder.h
+
+
+Go to the documentation of this file.
1 /* libFLAC++ - Free Lossless Audio Codec library
+
2  * Copyright (C) 2002-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLACPP__ENCODER_H
+
34 #define FLACPP__ENCODER_H
+
35 
+
36 #include "export.h"
+
37 
+
38 #include "FLAC/stream_encoder.h"
+
39 #include "decoder.h"
+
40 #include "metadata.h"
+
41 
+
42 
+
79 namespace FLAC {
+
80  namespace Encoder {
+
81 
+
102  class FLACPP_API Stream {
+
103  public:
+
106  class FLACPP_API State {
+
107  public:
+
108  inline State(::FLAC__StreamEncoderState state): state_(state) { }
+
109  inline operator ::FLAC__StreamEncoderState() const { return state_; }
+
110  inline const char *as_cstring() const { return ::FLAC__StreamEncoderStateString[state_]; }
+
111  inline const char *resolved_as_cstring(const Stream &encoder) const { return ::FLAC__stream_encoder_get_resolved_state_string(encoder.encoder_); }
+
112  protected:
+ +
114  };
+
115 
+
116  Stream();
+
117  virtual ~Stream();
+
118 
+
120 
+
124  virtual bool is_valid() const;
+
125  inline operator bool() const { return is_valid(); }
+
126 
+
127 
+
128  virtual bool set_ogg_serial_number(long value);
+
129  virtual bool set_verify(bool value);
+
130  virtual bool set_streamable_subset(bool value);
+
131  virtual bool set_channels(unsigned value);
+
132  virtual bool set_bits_per_sample(unsigned value);
+
133  virtual bool set_sample_rate(unsigned value);
+
134  virtual bool set_compression_level(unsigned value);
+
135  virtual bool set_blocksize(unsigned value);
+
136  virtual bool set_do_mid_side_stereo(bool value);
+
137  virtual bool set_loose_mid_side_stereo(bool value);
+
138  virtual bool set_apodization(const char *specification);
+
139  virtual bool set_max_lpc_order(unsigned value);
+
140  virtual bool set_qlp_coeff_precision(unsigned value);
+
141  virtual bool set_do_qlp_coeff_prec_search(bool value);
+
142  virtual bool set_do_escape_coding(bool value);
+
143  virtual bool set_do_exhaustive_model_search(bool value);
+
144  virtual bool set_min_residual_partition_order(unsigned value);
+
145  virtual bool set_max_residual_partition_order(unsigned value);
+
146  virtual bool set_rice_parameter_search_dist(unsigned value);
+
147  virtual bool set_total_samples_estimate(FLAC__uint64 value);
+
148  virtual bool set_metadata(::FLAC__StreamMetadata **metadata, unsigned num_blocks);
+
149  virtual bool set_metadata(FLAC::Metadata::Prototype **metadata, unsigned num_blocks);
+
150 
+
151  /* get_state() is not virtual since we want subclasses to be able to return their own state */
+
152  State get_state() const;
+
153  virtual Decoder::Stream::State get_verify_decoder_state() const;
+
154  virtual void get_verify_decoder_error_stats(FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got);
+
155  virtual bool get_verify() const;
+
156  virtual bool get_streamable_subset() const;
+
157  virtual bool get_do_mid_side_stereo() const;
+
158  virtual bool get_loose_mid_side_stereo() const;
+
159  virtual unsigned get_channels() const;
+
160  virtual unsigned get_bits_per_sample() const;
+
161  virtual unsigned get_sample_rate() const;
+
162  virtual unsigned get_blocksize() const;
+
163  virtual unsigned get_max_lpc_order() const;
+
164  virtual unsigned get_qlp_coeff_precision() const;
+
165  virtual bool get_do_qlp_coeff_prec_search() const;
+
166  virtual bool get_do_escape_coding() const;
+
167  virtual bool get_do_exhaustive_model_search() const;
+
168  virtual unsigned get_min_residual_partition_order() const;
+
169  virtual unsigned get_max_residual_partition_order() const;
+
170  virtual unsigned get_rice_parameter_search_dist() const;
+
171  virtual FLAC__uint64 get_total_samples_estimate() const;
+
172 
+ + +
175 
+
176  virtual bool finish();
+
177 
+
178  virtual bool process(const FLAC__int32 * const buffer[], unsigned samples);
+
179  virtual bool process_interleaved(const FLAC__int32 buffer[], unsigned samples);
+
180  protected:
+
182  virtual ::FLAC__StreamEncoderReadStatus read_callback(FLAC__byte buffer[], size_t *bytes);
+
183 
+
185  virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame) = 0;
+
186 
+
188  virtual ::FLAC__StreamEncoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset);
+
189 
+
191  virtual ::FLAC__StreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset);
+
192 
+
194  virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata);
+
195 
+
196 #if (defined _MSC_VER) || (defined __BORLANDC__) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC)
+
197  // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
+
198  friend State;
+
199 #endif
+
200  ::FLAC__StreamEncoder *encoder_;
+
201 
+
202  static ::FLAC__StreamEncoderReadStatus read_callback_(const ::FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
+
203  static ::FLAC__StreamEncoderWriteStatus write_callback_(const ::FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data);
+
204  static ::FLAC__StreamEncoderSeekStatus seek_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data);
+
205  static ::FLAC__StreamEncoderTellStatus tell_callback_(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
+
206  static void metadata_callback_(const ::FLAC__StreamEncoder *encoder, const ::FLAC__StreamMetadata *metadata, void *client_data);
+
207  private:
+
208  // Private and undefined so you can't use them:
+
209  Stream(const Stream &);
+
210  void operator=(const Stream &);
+
211  };
+
212 
+
233  class FLACPP_API File: public Stream {
+
234  public:
+
235  File();
+
236  virtual ~File();
+
237 
+
238  virtual ::FLAC__StreamEncoderInitStatus init(FILE *file);
+
239  virtual ::FLAC__StreamEncoderInitStatus init(const char *filename);
+
240  virtual ::FLAC__StreamEncoderInitStatus init(const std::string &filename);
+
241  virtual ::FLAC__StreamEncoderInitStatus init_ogg(FILE *file);
+
242  virtual ::FLAC__StreamEncoderInitStatus init_ogg(const char *filename);
+
243  virtual ::FLAC__StreamEncoderInitStatus init_ogg(const std::string &filename);
+
244  protected:
+
246  virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
+
247 
+
249  virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame);
+
250  private:
+
251  static void progress_callback_(const ::FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data);
+
252 
+
253  // Private and undefined so you can't use them:
+
254  File(const Stream &);
+
255  void operator=(const Stream &);
+
256  };
+
257 
+
258  }
+
259 }
+
260 
+
261 #endif
+
This module contains the functions which implement the stream encoder.
+
Definition: encoder.h:106
+
This class wraps the FLAC__StreamEncoder. If you are encoding to a file, FLAC::Encoder::File may be m...
Definition: encoder.h:102
+
FLAC__StreamEncoderTellStatus
Definition: stream_encoder.h:432
+
Definition: decoder.h:78
+
FLAC__StreamEncoderSeekStatus
Definition: stream_encoder.h:409
+
This module provides classes for creating and manipulating FLAC metadata blocks in memory...
+
FLAC__StreamEncoderReadStatus
Definition: stream_encoder.h:363
+
FLAC__StreamEncoderState
Definition: stream_encoder.h:241
+
const char * FLAC__stream_encoder_get_resolved_state_string(const FLAC__StreamEncoder *encoder)
+
This module contains #defines and symbols for exporting function calls, and providing version informa...
+
Definition: format.h:834
+
This class wraps the FLAC__StreamEncoder. If you are not encoding to a file, you may need to use FLAC...
Definition: encoder.h:233
+
This module contains the classes which implement the various decoders.
+
FLAC__StreamEncoderInitStatus
Definition: stream_encoder.h:293
+
FLAC__StreamEncoderWriteStatus
Definition: stream_encoder.h:389
+
Definition: metadata.h:109
+
Definition: decoder.h:104
+
Definition: stream_encoder.h:465
+
const char *const FLAC__StreamEncoderStateString[]
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/export_8h.html b/lib-src/libflac/doc/html/api/export_8h.html new file mode 100644 index 000000000..431fe07c0 --- /dev/null +++ b/lib-src/libflac/doc/html/api/export_8h.html @@ -0,0 +1,105 @@ + + + + + + +FLAC: include/FLAC/export.h File Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+ +
+
export.h File Reference
+
+
+ +

Go to the source code of this file.

+ + + + + + + + + + +

+Macros

+#define FLAC_API
 
#define FLAC_API_VERSION_CURRENT   11
 
#define FLAC_API_VERSION_REVISION   0
 
#define FLAC_API_VERSION_AGE   3
 
+ + + +

+Variables

int FLAC_API_SUPPORTS_OGG_FLAC
 
+

Detailed Description

+

This module contains #defines and symbols for exporting function calls, and providing version information and compiled-in features.

+

See the export module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/export_8h_source.html b/lib-src/libflac/doc/html/api/export_8h_source.html new file mode 100644 index 000000000..1c86c85f4 --- /dev/null +++ b/lib-src/libflac/doc/html/api/export_8h_source.html @@ -0,0 +1,149 @@ + + + + + + +FLAC: include/FLAC/export.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
export.h
+
+
+Go to the documentation of this file.
1 /* libFLAC - Free Lossless Audio Codec library
+
2  * Copyright (C) 2000-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLAC__EXPORT_H
+
34 #define FLAC__EXPORT_H
+
35 
+
59 #if defined(FLAC__NO_DLL)
+
60 #define FLAC_API
+
61 
+
62 #elif defined(_MSC_VER)
+
63 #ifdef FLAC_API_EXPORTS
+
64 #define FLAC_API __declspec(dllexport)
+
65 #else
+
66 #define FLAC_API __declspec(dllimport)
+
67 #endif
+
68 
+
69 #elif defined(FLAC__USE_VISIBILITY_ATTR)
+
70 #define FLAC_API __attribute__ ((visibility ("default")))
+
71 
+
72 #else
+
73 #define FLAC_API
+
74 
+
75 #endif
+
76 
+
80 #define FLAC_API_VERSION_CURRENT 11
+
81 #define FLAC_API_VERSION_REVISION 0
+
82 #define FLAC_API_VERSION_AGE 3
+
84 #ifdef __cplusplus
+
85 extern "C" {
+
86 #endif
+
87 
+
89 extern FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC;
+
90 
+
91 #ifdef __cplusplus
+
92 }
+
93 #endif
+
94 
+
95 /* \} */
+
96 
+
97 #endif
+
int FLAC_API_SUPPORTS_OGG_FLAC
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/files.html b/lib-src/libflac/doc/html/api/files.html new file mode 100644 index 000000000..2b3128d39 --- /dev/null +++ b/lib-src/libflac/doc/html/api/files.html @@ -0,0 +1,96 @@ + + + + + + +FLAC: File List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
File List
+
+
+
Here is a list of all documented files with brief descriptions:
+
[detail level 123]
+ + + + + + + + + + + + + + + + + +
  include
  FLAC
 all.h
 assert.h
 callback.hThis module defines the structures for describing I/O callbacks to the other FLAC interfaces
 export.hThis module contains #defines and symbols for exporting function calls, and providing version information and compiled-in features
 format.hThis module contains structure definitions for the representation of FLAC format components in memory. These are the basic structures used by the rest of the interfaces
 metadata.hThis module provides functions for creating and manipulating FLAC metadata blocks in memory, and three progressively more powerful interfaces for traversing and editing metadata in FLAC files
 ordinals.h
 stream_decoder.hThis module contains the functions which implement the stream decoder
 stream_encoder.hThis module contains the functions which implement the stream encoder
  FLAC++
 all.h
 decoder.hThis module contains the classes which implement the various decoders
 encoder.hThis module contains the classes which implement the various encoders
 export.hThis module contains #defines and symbols for exporting function calls, and providing version information and compiled-in features
 metadata.hThis module provides classes for creating and manipulating FLAC metadata blocks in memory, and three progressively more powerful interfaces for traversing and editing metadata in FLAC files
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/format_8h.html b/lib-src/libflac/doc/html/api/format_8h.html new file mode 100644 index 000000000..0d779650c --- /dev/null +++ b/lib-src/libflac/doc/html/api/format_8h.html @@ -0,0 +1,442 @@ + + + + + + +FLAC: include/FLAC/format.h File Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+ +
+
format.h File Reference
+
+
+
#include "export.h"
+#include "ordinals.h"
+
+

Go to the source code of this file.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Classes

struct  FLAC__EntropyCodingMethod_PartitionedRiceContents
 
struct  FLAC__EntropyCodingMethod_PartitionedRice
 
struct  FLAC__EntropyCodingMethod
 
struct  FLAC__Subframe_Constant
 
struct  FLAC__Subframe_Verbatim
 
struct  FLAC__Subframe_Fixed
 
struct  FLAC__Subframe_LPC
 
struct  FLAC__Subframe
 
struct  FLAC__FrameHeader
 
struct  FLAC__FrameFooter
 
struct  FLAC__Frame
 
struct  FLAC__StreamMetadata_StreamInfo
 
struct  FLAC__StreamMetadata_Padding
 
struct  FLAC__StreamMetadata_Application
 
struct  FLAC__StreamMetadata_SeekPoint
 
struct  FLAC__StreamMetadata_SeekTable
 
struct  FLAC__StreamMetadata_VorbisComment_Entry
 
struct  FLAC__StreamMetadata_VorbisComment
 
struct  FLAC__StreamMetadata_CueSheet_Index
 
struct  FLAC__StreamMetadata_CueSheet_Track
 
struct  FLAC__StreamMetadata_CueSheet
 
struct  FLAC__StreamMetadata_Picture
 
struct  FLAC__StreamMetadata_Unknown
 
struct  FLAC__StreamMetadata
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Macros

#define FLAC__MAX_METADATA_TYPE_CODE   (126u)
 
#define FLAC__MIN_BLOCK_SIZE   (16u)
 
#define FLAC__MAX_BLOCK_SIZE   (65535u)
 
#define FLAC__SUBSET_MAX_BLOCK_SIZE_48000HZ   (4608u)
 
#define FLAC__MAX_CHANNELS   (8u)
 
#define FLAC__MIN_BITS_PER_SAMPLE   (4u)
 
#define FLAC__MAX_BITS_PER_SAMPLE   (32u)
 
#define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE   (24u)
 
#define FLAC__MAX_SAMPLE_RATE   (655350u)
 
#define FLAC__MAX_LPC_ORDER   (32u)
 
#define FLAC__SUBSET_MAX_LPC_ORDER_48000HZ   (12u)
 
#define FLAC__MIN_QLP_COEFF_PRECISION   (5u)
 
#define FLAC__MAX_QLP_COEFF_PRECISION   (15u)
 
#define FLAC__MAX_FIXED_ORDER   (4u)
 
#define FLAC__MAX_RICE_PARTITION_ORDER   (15u)
 
#define FLAC__SUBSET_MAX_RICE_PARTITION_ORDER   (8u)
 
#define FLAC__STREAM_SYNC_LENGTH   (4u)
 
#define FLAC__STREAM_METADATA_STREAMINFO_LENGTH   (34u)
 
#define FLAC__STREAM_METADATA_SEEKPOINT_LENGTH   (18u)
 
#define FLAC__STREAM_METADATA_HEADER_LENGTH   (4u)
 
+ + + + + + + + + + + + + +

+Enumerations

enum  FLAC__EntropyCodingMethodType { FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE = 0, +FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2 = 1 + }
 
enum  FLAC__SubframeType { FLAC__SUBFRAME_TYPE_CONSTANT = 0, +FLAC__SUBFRAME_TYPE_VERBATIM = 1, +FLAC__SUBFRAME_TYPE_FIXED = 2, +FLAC__SUBFRAME_TYPE_LPC = 3 + }
 
enum  FLAC__ChannelAssignment { FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT = 0, +FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE = 1, +FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE = 2, +FLAC__CHANNEL_ASSIGNMENT_MID_SIDE = 3 + }
 
enum  FLAC__FrameNumberType { FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER, +FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER + }
 
enum  FLAC__MetadataType {
+  FLAC__METADATA_TYPE_STREAMINFO = 0, +FLAC__METADATA_TYPE_PADDING = 1, +FLAC__METADATA_TYPE_APPLICATION = 2, +FLAC__METADATA_TYPE_SEEKTABLE = 3, +
+  FLAC__METADATA_TYPE_VORBIS_COMMENT = 4, +FLAC__METADATA_TYPE_CUESHEET = 5, +FLAC__METADATA_TYPE_PICTURE = 6, +FLAC__METADATA_TYPE_UNDEFINED = 7, +
+  FLAC__MAX_METADATA_TYPE = FLAC__MAX_METADATA_TYPE_CODE +
+ }
 
enum  FLAC__StreamMetadata_Picture_Type {
+  FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER = 0, +FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD = 1, +FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON = 2, +FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER = 3, +
+  FLAC__STREAM_METADATA_PICTURE_TYPE_BACK_COVER = 4, +FLAC__STREAM_METADATA_PICTURE_TYPE_LEAFLET_PAGE = 5, +FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA = 6, +FLAC__STREAM_METADATA_PICTURE_TYPE_LEAD_ARTIST = 7, +
+  FLAC__STREAM_METADATA_PICTURE_TYPE_ARTIST = 8, +FLAC__STREAM_METADATA_PICTURE_TYPE_CONDUCTOR = 9, +FLAC__STREAM_METADATA_PICTURE_TYPE_BAND = 10, +FLAC__STREAM_METADATA_PICTURE_TYPE_COMPOSER = 11, +
+  FLAC__STREAM_METADATA_PICTURE_TYPE_LYRICIST = 12, +FLAC__STREAM_METADATA_PICTURE_TYPE_RECORDING_LOCATION = 13, +FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_RECORDING = 14, +FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_PERFORMANCE = 15, +
+  FLAC__STREAM_METADATA_PICTURE_TYPE_VIDEO_SCREEN_CAPTURE = 16, +FLAC__STREAM_METADATA_PICTURE_TYPE_FISH = 17, +FLAC__STREAM_METADATA_PICTURE_TYPE_ILLUSTRATION = 18, +FLAC__STREAM_METADATA_PICTURE_TYPE_BAND_LOGOTYPE = 19, +
+  FLAC__STREAM_METADATA_PICTURE_TYPE_PUBLISHER_LOGOTYPE = 20, +FLAC__STREAM_METADATA_PICTURE_TYPE_UNDEFINED +
+ }
 
+ + + + + + + + + + + + + + + + + + + + + +

+Functions

FLAC__bool FLAC__format_sample_rate_is_valid (unsigned sample_rate)
 
FLAC__bool FLAC__format_blocksize_is_subset (unsigned blocksize, unsigned sample_rate)
 
FLAC__bool FLAC__format_sample_rate_is_subset (unsigned sample_rate)
 
FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal (const char *name)
 
FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal (const FLAC__byte *value, unsigned length)
 
FLAC__bool FLAC__format_vorbiscomment_entry_is_legal (const FLAC__byte *entry, unsigned length)
 
FLAC__bool FLAC__format_seektable_is_legal (const FLAC__StreamMetadata_SeekTable *seek_table)
 
unsigned FLAC__format_seektable_sort (FLAC__StreamMetadata_SeekTable *seek_table)
 
FLAC__bool FLAC__format_cuesheet_is_legal (const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation)
 
FLAC__bool FLAC__format_picture_is_legal (const FLAC__StreamMetadata_Picture *picture, const char **violation)
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Variables

const char * FLAC__VERSION_STRING
 
const char * FLAC__VENDOR_STRING
 
const FLAC__byte FLAC__STREAM_SYNC_STRING [4]
 
const unsigned FLAC__STREAM_SYNC
 
const unsigned FLAC__STREAM_SYNC_LEN
 
const char *const FLAC__EntropyCodingMethodTypeString []
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER
 
const unsigned FLAC__ENTROPY_CODING_METHOD_TYPE_LEN
 
const char *const FLAC__SubframeTypeString []
 
const unsigned FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN
 
const unsigned FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN
 
const unsigned FLAC__SUBFRAME_ZERO_PAD_LEN
 
const unsigned FLAC__SUBFRAME_TYPE_LEN
 
const unsigned FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN
 
const unsigned FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK
 
const unsigned FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK
 
const unsigned FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK
 
const unsigned FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK
 
const char *const FLAC__ChannelAssignmentString []
 
const char *const FLAC__FrameNumberTypeString []
 
const unsigned FLAC__FRAME_HEADER_SYNC
 
const unsigned FLAC__FRAME_HEADER_SYNC_LEN
 
const unsigned FLAC__FRAME_HEADER_RESERVED_LEN
 
const unsigned FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN
 
const unsigned FLAC__FRAME_HEADER_BLOCK_SIZE_LEN
 
const unsigned FLAC__FRAME_HEADER_SAMPLE_RATE_LEN
 
const unsigned FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN
 
const unsigned FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN
 
const unsigned FLAC__FRAME_HEADER_ZERO_PAD_LEN
 
const unsigned FLAC__FRAME_HEADER_CRC_LEN
 
const unsigned FLAC__FRAME_FOOTER_CRC_LEN
 
const char *const FLAC__MetadataTypeString []
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN
 
const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN
 
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN
 
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN
 
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN
 
const FLAC__uint64 FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER
 
const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN
 
const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN
 
const char *const FLAC__StreamMetadata_Picture_TypeString []
 
const unsigned FLAC__STREAM_METADATA_PICTURE_TYPE_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_COLORS_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN
 
const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN
 
const unsigned FLAC__STREAM_METADATA_TYPE_LEN
 
const unsigned FLAC__STREAM_METADATA_LENGTH_LEN
 
+

Detailed Description

+

This module contains structure definitions for the representation of FLAC format components in memory. These are the basic structures used by the rest of the interfaces.

+

See the detailed documentation in the format module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/format_8h_source.html b/lib-src/libflac/doc/html/api/format_8h_source.html new file mode 100644 index 000000000..7f6b7fd8d --- /dev/null +++ b/lib-src/libflac/doc/html/api/format_8h_source.html @@ -0,0 +1,788 @@ + + + + + + +FLAC: include/FLAC/format.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
format.h
+
+
+Go to the documentation of this file.
1 /* libFLAC - Free Lossless Audio Codec library
+
2  * Copyright (C) 2000-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLAC__FORMAT_H
+
34 #define FLAC__FORMAT_H
+
35 
+
36 #include "export.h"
+
37 #include "ordinals.h"
+
38 
+
39 #ifdef __cplusplus
+
40 extern "C" {
+
41 #endif
+
42 
+
87 /*
+
88  Most of the values described in this file are defined by the FLAC
+
89  format specification. There is nothing to tune here.
+
90 */
+
91 
+
93 #define FLAC__MAX_METADATA_TYPE_CODE (126u)
+
94 
+
96 #define FLAC__MIN_BLOCK_SIZE (16u)
+
97 
+
99 #define FLAC__MAX_BLOCK_SIZE (65535u)
+
100 
+
103 #define FLAC__SUBSET_MAX_BLOCK_SIZE_48000HZ (4608u)
+
104 
+
106 #define FLAC__MAX_CHANNELS (8u)
+
107 
+
109 #define FLAC__MIN_BITS_PER_SAMPLE (4u)
+
110 
+
112 #define FLAC__MAX_BITS_PER_SAMPLE (32u)
+
113 
+
122 #define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE (24u)
+
123 
+
128 #define FLAC__MAX_SAMPLE_RATE (655350u)
+
129 
+
131 #define FLAC__MAX_LPC_ORDER (32u)
+
132 
+
135 #define FLAC__SUBSET_MAX_LPC_ORDER_48000HZ (12u)
+
136 
+
140 #define FLAC__MIN_QLP_COEFF_PRECISION (5u)
+
141 
+
145 #define FLAC__MAX_QLP_COEFF_PRECISION (15u)
+
146 
+
148 #define FLAC__MAX_FIXED_ORDER (4u)
+
149 
+
151 #define FLAC__MAX_RICE_PARTITION_ORDER (15u)
+
152 
+
154 #define FLAC__SUBSET_MAX_RICE_PARTITION_ORDER (8u)
+
155 
+
162 extern FLAC_API const char *FLAC__VERSION_STRING;
+
163 
+
168 extern FLAC_API const char *FLAC__VENDOR_STRING;
+
169 
+
171 extern FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4]; /* = "fLaC" */
+
172 
+
176 extern FLAC_API const unsigned FLAC__STREAM_SYNC; /* = 0x664C6143 */
+
177 
+
179 extern FLAC_API const unsigned FLAC__STREAM_SYNC_LEN; /* = 32 bits */
+
180 
+
182 #define FLAC__STREAM_SYNC_LENGTH (4u)
+
183 
+
184 
+
185 /*****************************************************************************
+
186  *
+
187  * Subframe structures
+
188  *
+
189  *****************************************************************************/
+
190 
+
191 /*****************************************************************************/
+
192 
+
194 typedef enum {
+ + + +
203 
+
209 extern FLAC_API const char * const FLAC__EntropyCodingMethodTypeString[];
+
210 
+
211 
+
214 typedef struct {
+
215 
+
216  unsigned *parameters;
+
219  unsigned *raw_bits;
+ + +
230 
+
233 typedef struct {
+
234 
+
235  unsigned order;
+ + +
242 
+
243 extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN;
+
244 extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN;
+ +
246 extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN;
+ + +
255 typedef struct {
+ +
257  union {
+ +
259  } data;
+ +
261 
+
262 extern FLAC_API const unsigned FLAC__ENTROPY_CODING_METHOD_TYPE_LEN;
+
264 /*****************************************************************************/
+
265 
+
267 typedef enum {
+ + + + + +
273 
+
279 extern FLAC_API const char * const FLAC__SubframeTypeString[];
+
280 
+
281 
+
284 typedef struct {
+
285  FLAC__int32 value;
+ +
287 
+
288 
+
291 typedef struct {
+
292  const FLAC__int32 *data;
+ +
294 
+
295 
+
298 typedef struct {
+ +
302  unsigned order;
+
305  FLAC__int32 warmup[FLAC__MAX_FIXED_ORDER];
+
308  const FLAC__int32 *residual;
+ +
311 
+
312 
+
315 typedef struct {
+ +
319  unsigned order;
+ + +
328  FLAC__int32 qlp_coeff[FLAC__MAX_LPC_ORDER];
+
331  FLAC__int32 warmup[FLAC__MAX_LPC_ORDER];
+
334  const FLAC__int32 *residual;
+ +
337 
+
338 extern FLAC_API const unsigned FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN;
+
339 extern FLAC_API const unsigned FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN;
+
344 typedef struct {
+
345  FLAC__SubframeType type;
+
346  union {
+
347  FLAC__Subframe_Constant constant;
+
348  FLAC__Subframe_Fixed fixed;
+
349  FLAC__Subframe_LPC lpc;
+
350  FLAC__Subframe_Verbatim verbatim;
+
351  } data;
+
352  unsigned wasted_bits;
+ +
354 
+
362 extern FLAC_API const unsigned FLAC__SUBFRAME_ZERO_PAD_LEN;
+
363 extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_LEN;
+
364 extern FLAC_API const unsigned FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN;
+
366 extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK;
+
367 extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK;
+
368 extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK;
+
369 extern FLAC_API const unsigned FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK;
+
371 /*****************************************************************************/
+
372 
+
373 
+
374 /*****************************************************************************
+
375  *
+
376  * Frame structures
+
377  *
+
378  *****************************************************************************/
+
379 
+
381 typedef enum {
+ + + + + +
387 
+
393 extern FLAC_API const char * const FLAC__ChannelAssignmentString[];
+
394 
+
396 typedef enum {
+ + + +
400 
+
406 extern FLAC_API const char * const FLAC__FrameNumberTypeString[];
+
407 
+
408 
+
411 typedef struct {
+
412  unsigned blocksize;
+
415  unsigned sample_rate;
+
418  unsigned channels;
+ +
424  unsigned bits_per_sample;
+ +
432  union {
+
433  FLAC__uint32 frame_number;
+
434  FLAC__uint64 sample_number;
+
435  } number;
+
439  FLAC__uint8 crc;
+ +
445 
+
446 extern FLAC_API const unsigned FLAC__FRAME_HEADER_SYNC;
+
447 extern FLAC_API const unsigned FLAC__FRAME_HEADER_SYNC_LEN;
+
448 extern FLAC_API const unsigned FLAC__FRAME_HEADER_RESERVED_LEN;
+
449 extern FLAC_API const unsigned FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN;
+
450 extern FLAC_API const unsigned FLAC__FRAME_HEADER_BLOCK_SIZE_LEN;
+
451 extern FLAC_API const unsigned FLAC__FRAME_HEADER_SAMPLE_RATE_LEN;
+
452 extern FLAC_API const unsigned FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN;
+
453 extern FLAC_API const unsigned FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN;
+
454 extern FLAC_API const unsigned FLAC__FRAME_HEADER_ZERO_PAD_LEN;
+
455 extern FLAC_API const unsigned FLAC__FRAME_HEADER_CRC_LEN;
+
460 typedef struct {
+
461  FLAC__uint16 crc;
+ +
467 
+
468 extern FLAC_API const unsigned FLAC__FRAME_FOOTER_CRC_LEN;
+
473 typedef struct {
+
474  FLAC__FrameHeader header;
+ +
476  FLAC__FrameFooter footer;
+
477 } FLAC__Frame;
+
478 
+
479 /*****************************************************************************/
+
480 
+
481 
+
482 /*****************************************************************************
+
483  *
+
484  * Meta-data structures
+
485  *
+
486  *****************************************************************************/
+
487 
+
489 typedef enum {
+
490 
+ + + + + + + + + + +
518 
+
524 extern FLAC_API const char * const FLAC__MetadataTypeString[];
+
525 
+
526 
+
529 typedef struct {
+
530  unsigned min_blocksize, max_blocksize;
+
531  unsigned min_framesize, max_framesize;
+
532  unsigned sample_rate;
+
533  unsigned channels;
+
534  unsigned bits_per_sample;
+
535  FLAC__uint64 total_samples;
+
536  FLAC__byte md5sum[16];
+ +
538 
+
539 extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN;
+
540 extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN;
+
541 extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN;
+
542 extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN;
+
543 extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN;
+
544 extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN;
+
545 extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN;
+
546 extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN;
+
547 extern FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN;
+
550 #define FLAC__STREAM_METADATA_STREAMINFO_LENGTH (34u)
+
551 
+
554 typedef struct {
+
555  int dummy;
+ +
561 
+
562 
+
565 typedef struct {
+
566  FLAC__byte id[4];
+
567  FLAC__byte *data;
+ +
569 
+
570 extern FLAC_API const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN;
+
574 typedef struct {
+
575  FLAC__uint64 sample_number;
+
578  FLAC__uint64 stream_offset;
+
582  unsigned frame_samples;
+ +
585 
+
586 extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN;
+
587 extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN;
+
588 extern FLAC_API const unsigned FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN;
+
591 #define FLAC__STREAM_METADATA_SEEKPOINT_LENGTH (18u)
+
592 
+
597 extern FLAC_API const FLAC__uint64 FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER;
+
598 
+
599 
+
612 typedef struct {
+
613  unsigned num_points;
+ + +
616 
+
617 
+
624 typedef struct {
+
625  FLAC__uint32 length;
+
626  FLAC__byte *entry;
+ +
628 
+
629 extern FLAC_API const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN;
+
634 typedef struct {
+ +
636  FLAC__uint32 num_comments;
+ + +
639 
+
640 extern FLAC_API const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN;
+
647 typedef struct {
+
648  FLAC__uint64 offset;
+
653  FLAC__byte number;
+ +
656 
+
657 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN;
+
658 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN;
+
659 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN;
+
666 typedef struct {
+
667  FLAC__uint64 offset;
+
670  FLAC__byte number;
+
673  char isrc[13];
+
676  unsigned type:1;
+
679  unsigned pre_emphasis:1;
+
682  FLAC__byte num_indices;
+ + +
689 
+
690 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN;
+
691 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN;
+
692 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN;
+
693 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN;
+
694 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN;
+
695 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN;
+
696 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN;
+
703 typedef struct {
+
704  char media_catalog_number[129];
+
710  FLAC__uint64 lead_in;
+
713  FLAC__bool is_cd;
+
716  unsigned num_tracks;
+ + +
723 
+
724 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN;
+
725 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN;
+
726 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN;
+
727 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN;
+
728 extern FLAC_API const unsigned FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN;
+
732 typedef enum {
+ + + + + + + + + + + + + + + + + + + + + +
754  FLAC__STREAM_METADATA_PICTURE_TYPE_UNDEFINED
+ +
756 
+
763 extern FLAC_API const char * const FLAC__StreamMetadata_Picture_TypeString[];
+
764 
+
769 typedef struct {
+ +
773  char *mime_type;
+
784  FLAC__byte *description;
+
791  FLAC__uint32 width;
+
794  FLAC__uint32 height;
+
797  FLAC__uint32 depth;
+
800  FLAC__uint32 colors;
+
805  FLAC__uint32 data_length;
+
808  FLAC__byte *data;
+ +
812 
+
813 extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_TYPE_LEN;
+
814 extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN;
+
815 extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN;
+
816 extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN;
+
817 extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN;
+
818 extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN;
+
819 extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_COLORS_LEN;
+
820 extern FLAC_API const unsigned FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN;
+
827 typedef struct {
+
828  FLAC__byte *data;
+ +
830 
+
831 
+
834 typedef struct {
+ +
840  FLAC__bool is_last;
+
843  unsigned length;
+
846  union {
+ + + + +
851  FLAC__StreamMetadata_VorbisComment vorbis_comment;
+ + + +
855  } data;
+ +
859 
+
860 extern FLAC_API const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN;
+
861 extern FLAC_API const unsigned FLAC__STREAM_METADATA_TYPE_LEN;
+
862 extern FLAC_API const unsigned FLAC__STREAM_METADATA_LENGTH_LEN;
+
865 #define FLAC__STREAM_METADATA_HEADER_LENGTH (4u)
+
866 
+
867 /*****************************************************************************/
+
868 
+
869 
+
870 /*****************************************************************************
+
871  *
+
872  * Utility functions
+
873  *
+
874  *****************************************************************************/
+
875 
+
883 FLAC_API FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate);
+
884 
+
895 FLAC_API FLAC__bool FLAC__format_blocksize_is_subset(unsigned blocksize, unsigned sample_rate);
+
896 
+
906 FLAC_API FLAC__bool FLAC__format_sample_rate_is_subset(unsigned sample_rate);
+
907 
+
920 FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal(const char *name);
+
921 
+
936 FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal(const FLAC__byte *value, unsigned length);
+
937 
+
953 FLAC_API FLAC__bool FLAC__format_vorbiscomment_entry_is_legal(const FLAC__byte *entry, unsigned length);
+
954 
+
965 FLAC_API FLAC__bool FLAC__format_seektable_is_legal(const FLAC__StreamMetadata_SeekTable *seek_table);
+
966 
+
979 FLAC_API unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *seek_table);
+
980 
+
999 FLAC_API FLAC__bool FLAC__format_cuesheet_is_legal(const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation);
+
1000 
+
1017 FLAC_API FLAC__bool FLAC__format_picture_is_legal(const FLAC__StreamMetadata_Picture *picture, const char **violation);
+
1018 
+
1019 /* \} */
+
1020 
+
1021 #ifdef __cplusplus
+
1022 }
+
1023 #endif
+
1024 
+
1025 #endif
+
FLAC__byte number
Definition: format.h:670
+
const unsigned FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN
+
const FLAC__EntropyCodingMethod_PartitionedRiceContents * contents
Definition: format.h:238
+
const unsigned FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN
+
const char *const FLAC__ChannelAssignmentString[]
+
unsigned order
Definition: format.h:319
+
const unsigned FLAC__STREAM_METADATA_PICTURE_TYPE_LEN
+
Definition: format.h:512
+
FLAC__uint8 crc
Definition: format.h:439
+
FLAC__uint16 crc
Definition: format.h:461
+ +
unsigned bits_per_sample
Definition: format.h:424
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN
+
Definition: format.h:506
+ + +
FLAC__byte * description
Definition: format.h:784
+
unsigned capacity_by_order
Definition: format.h:224
+
unsigned FLAC__format_seektable_sort(FLAC__StreamMetadata_SeekTable *seek_table)
+
FLAC__uint32 height
Definition: format.h:794
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN
+
FLAC__bool FLAC__format_seektable_is_legal(const FLAC__StreamMetadata_SeekTable *seek_table)
+ +
FLAC__uint32 width
Definition: format.h:791
+
Definition: format.h:284
+
const FLAC__uint64 FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER
+
FLAC__bool FLAC__format_blocksize_is_subset(unsigned blocksize, unsigned sample_rate)
+ + +
This module contains #defines and symbols for exporting function calls, and providing version informa...
+
unsigned length
Definition: format.h:843
+
const char *const FLAC__StreamMetadata_Picture_TypeString[]
+
FLAC__StreamMetadata_CueSheet_Track * tracks
Definition: format.h:719
+
FLAC__uint32 colors
Definition: format.h:800
+ +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN
+ +
const unsigned FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK
+ + +
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN
+
FLAC__ChannelAssignment channel_assignment
Definition: format.h:421
+
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN
+
const unsigned FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN
+
Definition: format.h:503
+
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN
+
const unsigned FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK
+
unsigned frame_samples
Definition: format.h:582
+
char * mime_type
Definition: format.h:773
+
Definition: format.h:612
+ +
Definition: format.h:397
+
const unsigned FLAC__FRAME_HEADER_ZERO_PAD_LEN
+
const unsigned FLAC__STREAM_METADATA_LENGTH_LEN
+
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN
+
unsigned * raw_bits
Definition: format.h:219
+
FLAC__bool is_cd
Definition: format.h:713
+
const unsigned FLAC__FRAME_HEADER_CRC_LEN
+
Definition: format.h:385
+
unsigned channels
Definition: format.h:418
+
Definition: format.h:666
+ +
FLAC__bool FLAC__format_sample_rate_is_subset(unsigned sample_rate)
+
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN
+
const unsigned FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK
+
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN
+
#define FLAC__MAX_CHANNELS
Definition: format.h:106
+
FLAC__bool FLAC__format_cuesheet_is_legal(const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation)
+
Definition: format.h:554
+
const unsigned FLAC__SUBFRAME_ZERO_PAD_LEN
+
int quantization_level
Definition: format.h:325
+
Definition: format.h:647
+
const unsigned FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN
+
const FLAC__int32 * residual
Definition: format.h:334
+
unsigned qlp_coeff_precision
Definition: format.h:322
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN
+
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN
+
const unsigned FLAC__SUBFRAME_TYPE_LEN
+
Definition: format.h:344
+
Definition: format.h:271
+
const unsigned FLAC__FRAME_FOOTER_CRC_LEN
+
Definition: format.h:411
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN
+
FLAC__uint64 sample_number
Definition: format.h:575
+ +
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN
+
unsigned blocksize
Definition: format.h:412
+
const unsigned FLAC__STREAM_SYNC_LEN
+
FLAC__byte num_indices
Definition: format.h:682
+
Definition: format.h:491
+
Definition: format.h:473
+
Definition: format.h:634
+ +
const unsigned FLAC__FRAME_HEADER_RESERVED_LEN
+ +
const unsigned FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN
+
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN
+
FLAC__SubframeType
Definition: format.h:267
+
const char *const FLAC__MetadataTypeString[]
+
FLAC__uint64 offset
Definition: format.h:648
+
#define FLAC__MAX_FIXED_ORDER
Definition: format.h:148
+
const FLAC__int32 * data
Definition: format.h:292
+
FLAC__bool is_last
Definition: format.h:840
+
const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN
+
const unsigned FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN
+
Definition: format.h:315
+
FLAC__StreamMetadata_Picture_Type type
Definition: format.h:770
+ +
const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN
+
const char *const FLAC__FrameNumberTypeString[]
+
Definition: format.h:834
+
Definition: format.h:383
+
FLAC__uint64 stream_offset
Definition: format.h:578
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN
+ +
Definition: format.h:509
+
const unsigned FLAC__STREAM_METADATA_PICTURE_COLORS_LEN
+
Definition: format.h:827
+
const unsigned FLAC__FRAME_HEADER_SAMPLE_RATE_LEN
+
FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal(const char *name)
+
const char * FLAC__VERSION_STRING
+
FLAC__StreamMetadata_CueSheet_Index * indices
Definition: format.h:685
+
const unsigned FLAC__STREAM_METADATA_TYPE_LEN
+
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN
+
FLAC__EntropyCodingMethodType
Definition: format.h:194
+
const unsigned FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN
+
const unsigned FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN
+
const unsigned FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN
+ +
FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal(const FLAC__byte *value, unsigned length)
+
Definition: format.h:268
+
FLAC__MetadataType
Definition: format.h:489
+
Definition: format.h:500
+ +
Definition: format.h:497
+ +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN
+
Definition: format.h:624
+
const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN
+
Definition: format.h:270
+
Definition: format.h:529
+
FLAC__uint32 data_length
Definition: format.h:805
+
#define FLAC__MAX_METADATA_TYPE_CODE
Definition: format.h:93
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN
+
Definition: format.h:565
+
const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN
+
Definition: format.h:384
+
FLAC__StreamMetadata_Picture_Type
Definition: format.h:732
+
FLAC__ChannelAssignment
Definition: format.h:381
+
Definition: format.h:382
+
FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate)
+
#define FLAC__MAX_LPC_ORDER
Definition: format.h:131
+
const unsigned FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN
+
Definition: format.h:494
+
const char * FLAC__VENDOR_STRING
+
int dummy
Definition: format.h:555
+
FLAC__uint64 lead_in
Definition: format.h:710
+
Definition: format.h:703
+
const unsigned FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN
+
FLAC__FrameNumberType number_type
Definition: format.h:427
+
unsigned num_tracks
Definition: format.h:716
+
FLAC__uint64 offset
Definition: format.h:667
+
const unsigned FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN
+
FLAC__MetadataType type
Definition: format.h:835
+
FLAC__bool FLAC__format_picture_is_legal(const FLAC__StreamMetadata_Picture *picture, const char **violation)
+
unsigned sample_rate
Definition: format.h:415
+
FLAC__EntropyCodingMethod entropy_coding_method
Definition: format.h:316
+
Definition: format.h:269
+
Definition: format.h:460
+
const unsigned FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN
+
Definition: format.h:515
+
const unsigned FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN
+
FLAC__byte number
Definition: format.h:653
+ +
const unsigned FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK
+
Definition: format.h:255
+ + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN
+
unsigned * parameters
Definition: format.h:216
+
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN
+
const FLAC__byte FLAC__STREAM_SYNC_STRING[4]
+
const char *const FLAC__EntropyCodingMethodTypeString[]
+
const char *const FLAC__SubframeTypeString[]
+ +
const FLAC__int32 * residual
Definition: format.h:308
+
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN
+
FLAC__FrameNumberType
Definition: format.h:396
+ +
const unsigned FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN
+
const unsigned FLAC__FRAME_HEADER_SYNC
+
Definition: format.h:574
+
FLAC__byte * data
Definition: format.h:808
+ +
FLAC__int32 value
Definition: format.h:285
+
unsigned order
Definition: format.h:302
+
const unsigned FLAC__STREAM_SYNC
+
Definition: format.h:769
+
const unsigned FLAC__ENTROPY_CODING_METHOD_TYPE_LEN
+
Definition: format.h:291
+
FLAC__EntropyCodingMethod entropy_coding_method
Definition: format.h:299
+
const unsigned FLAC__FRAME_HEADER_SYNC_LEN
+
FLAC__bool FLAC__format_vorbiscomment_entry_is_legal(const FLAC__byte *entry, unsigned length)
+
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN
+
unsigned order
Definition: format.h:235
+
const unsigned FLAC__FRAME_HEADER_BLOCK_SIZE_LEN
+
Definition: format.h:298
+
FLAC__uint32 depth
Definition: format.h:797
+
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER
+
const unsigned FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/ftv2blank.png b/lib-src/libflac/doc/html/api/ftv2blank.png new file mode 100644 index 000000000..63c605bb4 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2blank.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2doc.png b/lib-src/libflac/doc/html/api/ftv2doc.png new file mode 100644 index 000000000..17edabff9 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2doc.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2folderclosed.png b/lib-src/libflac/doc/html/api/ftv2folderclosed.png new file mode 100644 index 000000000..bb8ab35ed Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2folderclosed.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2folderopen.png b/lib-src/libflac/doc/html/api/ftv2folderopen.png new file mode 100644 index 000000000..d6c7f676a Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2folderopen.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2lastnode.png b/lib-src/libflac/doc/html/api/ftv2lastnode.png new file mode 100644 index 000000000..63c605bb4 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2lastnode.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2link.png b/lib-src/libflac/doc/html/api/ftv2link.png new file mode 100644 index 000000000..17edabff9 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2link.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2mlastnode.png b/lib-src/libflac/doc/html/api/ftv2mlastnode.png new file mode 100644 index 000000000..0b63f6d38 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2mlastnode.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2mnode.png b/lib-src/libflac/doc/html/api/ftv2mnode.png new file mode 100644 index 000000000..0b63f6d38 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2mnode.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2node.png b/lib-src/libflac/doc/html/api/ftv2node.png new file mode 100644 index 000000000..63c605bb4 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2node.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2plastnode.png b/lib-src/libflac/doc/html/api/ftv2plastnode.png new file mode 100644 index 000000000..c6ee22f93 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2plastnode.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2pnode.png b/lib-src/libflac/doc/html/api/ftv2pnode.png new file mode 100644 index 000000000..c6ee22f93 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2pnode.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2splitbar.png b/lib-src/libflac/doc/html/api/ftv2splitbar.png new file mode 100644 index 000000000..fe895f2c5 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2splitbar.png differ diff --git a/lib-src/libflac/doc/html/api/ftv2vertline.png b/lib-src/libflac/doc/html/api/ftv2vertline.png new file mode 100644 index 000000000..63c605bb4 Binary files /dev/null and b/lib-src/libflac/doc/html/api/ftv2vertline.png differ diff --git a/lib-src/libflac/doc/html/api/functions.html b/lib-src/libflac/doc/html/api/functions.html new file mode 100644 index 000000000..8827d8644 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions.html @@ -0,0 +1,129 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- a -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_b.html b/lib-src/libflac/doc/html/api/functions_b.html new file mode 100644 index 000000000..9ad59d248 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_b.html @@ -0,0 +1,116 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- b -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_c.html b/lib-src/libflac/doc/html/api/functions_c.html new file mode 100644 index 000000000..a3ecefe21 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_c.html @@ -0,0 +1,141 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- c -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_d.html b/lib-src/libflac/doc/html/api/functions_d.html new file mode 100644 index 000000000..0f30f1d0e --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_d.html @@ -0,0 +1,143 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- d -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_e.html b/lib-src/libflac/doc/html/api/functions_e.html new file mode 100644 index 000000000..4856e44f5 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_e.html @@ -0,0 +1,120 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- e -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_f.html b/lib-src/libflac/doc/html/api/functions_f.html new file mode 100644 index 000000000..85206fc27 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_f.html @@ -0,0 +1,123 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- f -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func.html b/lib-src/libflac/doc/html/api/functions_func.html new file mode 100644 index 000000000..ac06658a7 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func.html @@ -0,0 +1,126 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_c.html b/lib-src/libflac/doc/html/api/functions_func_c.html new file mode 100644 index 000000000..283edd701 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_c.html @@ -0,0 +1,119 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- c -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_d.html b/lib-src/libflac/doc/html/api/functions_func_d.html new file mode 100644 index 000000000..099aa1ba3 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_d.html @@ -0,0 +1,123 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- d -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_e.html b/lib-src/libflac/doc/html/api/functions_func_e.html new file mode 100644 index 000000000..81bd9f5b8 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_e.html @@ -0,0 +1,113 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- e -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_f.html b/lib-src/libflac/doc/html/api/functions_func_f.html new file mode 100644 index 000000000..e86bd6a06 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_f.html @@ -0,0 +1,117 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- f -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_g.html b/lib-src/libflac/doc/html/api/functions_func_g.html new file mode 100644 index 000000000..979231fa8 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_g.html @@ -0,0 +1,232 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- g -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_i.html b/lib-src/libflac/doc/html/api/functions_func_i.html new file mode 100644 index 000000000..4fbe4a801 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_i.html @@ -0,0 +1,167 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_l.html b/lib-src/libflac/doc/html/api/functions_func_l.html new file mode 100644 index 000000000..73ec3a53f --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_l.html @@ -0,0 +1,110 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- l -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_m.html b/lib-src/libflac/doc/html/api/functions_func_m.html new file mode 100644 index 000000000..d5202e5a9 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_m.html @@ -0,0 +1,114 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- m -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_n.html b/lib-src/libflac/doc/html/api/functions_func_n.html new file mode 100644 index 000000000..dbaa4dcbf --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_n.html @@ -0,0 +1,111 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_o.html b/lib-src/libflac/doc/html/api/functions_func_o.html new file mode 100644 index 000000000..7ebfd6579 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_o.html @@ -0,0 +1,147 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_p.html b/lib-src/libflac/doc/html/api/functions_func_p.html new file mode 100644 index 000000000..0c257bb2a --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_p.html @@ -0,0 +1,138 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- p -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_r.html b/lib-src/libflac/doc/html/api/functions_func_r.html new file mode 100644 index 000000000..2e774dbf5 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_r.html @@ -0,0 +1,139 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- r -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_s.html b/lib-src/libflac/doc/html/api/functions_func_s.html new file mode 100644 index 000000000..a3d4a55bb --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_s.html @@ -0,0 +1,272 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- s -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_t.html b/lib-src/libflac/doc/html/api/functions_func_t.html new file mode 100644 index 000000000..b99b135e9 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_t.html @@ -0,0 +1,129 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- t -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_u.html b/lib-src/libflac/doc/html/api/functions_func_u.html new file mode 100644 index 000000000..5f67438bc --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_u.html @@ -0,0 +1,110 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- u -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_v.html b/lib-src/libflac/doc/html/api/functions_func_v.html new file mode 100644 index 000000000..64df08b07 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_v.html @@ -0,0 +1,110 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- v -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_w.html b/lib-src/libflac/doc/html/api/functions_func_w.html new file mode 100644 index 000000000..e315bb957 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_w.html @@ -0,0 +1,115 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- w -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_func_~.html b/lib-src/libflac/doc/html/api/functions_func_~.html new file mode 100644 index 000000000..5769b7f95 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_func_~.html @@ -0,0 +1,110 @@ + + + + + + +FLAC: Class Members - Functions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- ~ -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_g.html b/lib-src/libflac/doc/html/api/functions_g.html new file mode 100644 index 000000000..42cf87ba2 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_g.html @@ -0,0 +1,235 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- g -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_h.html b/lib-src/libflac/doc/html/api/functions_h.html new file mode 100644 index 000000000..d2c4a06ac --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_h.html @@ -0,0 +1,113 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- h -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_i.html b/lib-src/libflac/doc/html/api/functions_i.html new file mode 100644 index 000000000..cdcb54acb --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_i.html @@ -0,0 +1,180 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_l.html b/lib-src/libflac/doc/html/api/functions_l.html new file mode 100644 index 000000000..f9333badf --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_l.html @@ -0,0 +1,119 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- l -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_m.html b/lib-src/libflac/doc/html/api/functions_m.html new file mode 100644 index 000000000..4689f6ce7 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_m.html @@ -0,0 +1,123 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- m -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_n.html b/lib-src/libflac/doc/html/api/functions_n.html new file mode 100644 index 000000000..d42a65b4d --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_n.html @@ -0,0 +1,128 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- n -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_o.html b/lib-src/libflac/doc/html/api/functions_o.html new file mode 100644 index 000000000..b890f3fd0 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_o.html @@ -0,0 +1,159 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_p.html b/lib-src/libflac/doc/html/api/functions_p.html new file mode 100644 index 000000000..836bcfe73 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_p.html @@ -0,0 +1,147 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- p -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_q.html b/lib-src/libflac/doc/html/api/functions_q.html new file mode 100644 index 000000000..30433b9ba --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_q.html @@ -0,0 +1,119 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- q -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_r.html b/lib-src/libflac/doc/html/api/functions_r.html new file mode 100644 index 000000000..7b525f6cf --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_r.html @@ -0,0 +1,149 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- r -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_s.html b/lib-src/libflac/doc/html/api/functions_s.html new file mode 100644 index 000000000..69ed43b93 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_s.html @@ -0,0 +1,284 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- s -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_t.html b/lib-src/libflac/doc/html/api/functions_t.html new file mode 100644 index 000000000..35e90eed4 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_t.html @@ -0,0 +1,140 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- t -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_u.html b/lib-src/libflac/doc/html/api/functions_u.html new file mode 100644 index 000000000..a44c58098 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_u.html @@ -0,0 +1,113 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- u -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_v.html b/lib-src/libflac/doc/html/api/functions_v.html new file mode 100644 index 000000000..c7007f8c6 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_v.html @@ -0,0 +1,116 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- v -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_vars.html b/lib-src/libflac/doc/html/api/functions_vars.html new file mode 100644 index 000000000..b88244576 --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_vars.html @@ -0,0 +1,322 @@ + + + + + + +FLAC: Class Members - Variables + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- b -

+ + +

- c -

+ + +

- d -

+ + +

- e -

+ + +

- f -

+ + +

- h -

+ + +

- i -

+ + +

- l -

+ + +

- m -

+ + +

- n -

+ + +

- o -

+ + +

- p -

+ + +

- q -

+ + +

- r -

+ + +

- s -

+ + +

- t -

+ + +

- v -

+ + +

- w -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_w.html b/lib-src/libflac/doc/html/api/functions_w.html new file mode 100644 index 000000000..6d11fecca --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_w.html @@ -0,0 +1,125 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- w -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/functions_~.html b/lib-src/libflac/doc/html/api/functions_~.html new file mode 100644 index 000000000..06d54c4fe --- /dev/null +++ b/lib-src/libflac/doc/html/api/functions_~.html @@ -0,0 +1,113 @@ + + + + + + +FLAC: Class Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented class members with links to the class documentation for each member:
+ +

- ~ -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/globals.html b/lib-src/libflac/doc/html/api/globals.html new file mode 100644 index 000000000..23b60a36d --- /dev/null +++ b/lib-src/libflac/doc/html/api/globals.html @@ -0,0 +1,1573 @@ + + + + + + +FLAC: File Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+
Here is a list of all documented file members with links to the documentation:
+ +

- f -

    +
  • FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT +: format.h +
  • +
  • FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE +: format.h +
  • +
  • FLAC__CHANNEL_ASSIGNMENT_MID_SIDE +: format.h +
  • +
  • FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE +: format.h +
  • +
  • FLAC__ChannelAssignment +: format.h +
  • +
  • FLAC__ChannelAssignmentString +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2 +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_TYPE_LEN +: format.h +
  • +
  • FLAC__EntropyCodingMethodType +: format.h +
  • +
  • FLAC__EntropyCodingMethodTypeString +: format.h +
  • +
  • FLAC__format_blocksize_is_subset() +: format.h +
  • +
  • FLAC__format_cuesheet_is_legal() +: format.h +
  • +
  • FLAC__format_picture_is_legal() +: format.h +
  • +
  • FLAC__format_sample_rate_is_subset() +: format.h +
  • +
  • FLAC__format_sample_rate_is_valid() +: format.h +
  • +
  • FLAC__format_seektable_is_legal() +: format.h +
  • +
  • FLAC__format_seektable_sort() +: format.h +
  • +
  • FLAC__format_vorbiscomment_entry_is_legal() +: format.h +
  • +
  • FLAC__format_vorbiscomment_entry_name_is_legal() +: format.h +
  • +
  • FLAC__format_vorbiscomment_entry_value_is_legal() +: format.h +
  • +
  • FLAC__FRAME_FOOTER_CRC_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_BLOCK_SIZE_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_CRC_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_RESERVED_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_SAMPLE_RATE_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_SYNC +: format.h +
  • +
  • FLAC__FRAME_HEADER_SYNC_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_ZERO_PAD_LEN +: format.h +
  • +
  • FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER +: format.h +
  • +
  • FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER +: format.h +
  • +
  • FLAC__FrameNumberType +: format.h +
  • +
  • FLAC__FrameNumberTypeString +: format.h +
  • +
  • FLAC__IOCallback_Close +: callback.h +
  • +
  • FLAC__IOCallback_Eof +: callback.h +
  • +
  • FLAC__IOCallback_Read +: callback.h +
  • +
  • FLAC__IOCallback_Seek +: callback.h +
  • +
  • FLAC__IOCallback_Tell +: callback.h +
  • +
  • FLAC__IOCallback_Write +: callback.h +
  • +
  • FLAC__IOHandle +: callback.h +
  • +
  • FLAC__MAX_BITS_PER_SAMPLE +: format.h +
  • +
  • FLAC__MAX_BLOCK_SIZE +: format.h +
  • +
  • FLAC__MAX_CHANNELS +: format.h +
  • +
  • FLAC__MAX_FIXED_ORDER +: format.h +
  • +
  • FLAC__MAX_LPC_ORDER +: format.h +
  • +
  • FLAC__MAX_METADATA_TYPE +: format.h +
  • +
  • FLAC__MAX_METADATA_TYPE_CODE +: format.h +
  • +
  • FLAC__MAX_QLP_COEFF_PRECISION +: format.h +
  • +
  • FLAC__MAX_RICE_PARTITION_ORDER +: format.h +
  • +
  • FLAC__MAX_SAMPLE_RATE +: format.h +
  • +
  • FLAC__Metadata_Chain +: metadata.h +
  • +
  • FLAC__metadata_chain_check_if_tempfile_needed() +: metadata.h +
  • +
  • FLAC__metadata_chain_delete() +: metadata.h +
  • +
  • FLAC__metadata_chain_merge_padding() +: metadata.h +
  • +
  • FLAC__metadata_chain_new() +: metadata.h +
  • +
  • FLAC__metadata_chain_read() +: metadata.h +
  • +
  • FLAC__metadata_chain_read_ogg() +: metadata.h +
  • +
  • FLAC__metadata_chain_read_ogg_with_callbacks() +: metadata.h +
  • +
  • FLAC__metadata_chain_read_with_callbacks() +: metadata.h +
  • +
  • FLAC__metadata_chain_sort_padding() +: metadata.h +
  • +
  • FLAC__metadata_chain_status() +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_BAD_METADATA +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_ERROR_OPENING_FILE +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_ILLEGAL_INPUT +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_INVALID_CALLBACKS +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_NOT_A_FLAC_FILE +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_NOT_WRITABLE +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_OK +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_READ_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_RENAME_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_UNLINK_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_WRITE_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL +: metadata.h +
  • +
  • FLAC__metadata_chain_write() +: metadata.h +
  • +
  • FLAC__metadata_chain_write_with_callbacks() +: metadata.h +
  • +
  • FLAC__metadata_chain_write_with_callbacks_and_tempfile() +: metadata.h +
  • +
  • FLAC__Metadata_ChainStatus +: metadata.h +
  • +
  • FLAC__Metadata_ChainStatusString +: metadata.h +
  • +
  • FLAC__metadata_get_cuesheet() +: metadata.h +
  • +
  • FLAC__metadata_get_picture() +: metadata.h +
  • +
  • FLAC__metadata_get_streaminfo() +: metadata.h +
  • +
  • FLAC__metadata_get_tags() +: metadata.h +
  • +
  • FLAC__Metadata_Iterator +: metadata.h +
  • +
  • FLAC__metadata_iterator_delete() +: metadata.h +
  • +
  • FLAC__metadata_iterator_delete_block() +: metadata.h +
  • +
  • FLAC__metadata_iterator_get_block() +: metadata.h +
  • +
  • FLAC__metadata_iterator_get_block_type() +: metadata.h +
  • +
  • FLAC__metadata_iterator_init() +: metadata.h +
  • +
  • FLAC__metadata_iterator_insert_block_after() +: metadata.h +
  • +
  • FLAC__metadata_iterator_insert_block_before() +: metadata.h +
  • +
  • FLAC__metadata_iterator_new() +: metadata.h +
  • +
  • FLAC__metadata_iterator_next() +: metadata.h +
  • +
  • FLAC__metadata_iterator_prev() +: metadata.h +
  • +
  • FLAC__metadata_iterator_set_block() +: metadata.h +
  • +
  • FLAC__metadata_object_application_set_data() +: metadata.h +
  • +
  • FLAC__metadata_object_clone() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_calculate_cddb_id() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_delete_track() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_insert_blank_track() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_insert_track() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_is_legal() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_resize_tracks() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_set_track() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_track_clone() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_track_delete() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_track_delete_index() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_track_insert_blank_index() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_track_insert_index() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_track_new() +: metadata.h +
  • +
  • FLAC__metadata_object_cuesheet_track_resize_indices() +: metadata.h +
  • +
  • FLAC__metadata_object_delete() +: metadata.h +
  • +
  • FLAC__metadata_object_is_equal() +: metadata.h +
  • +
  • FLAC__metadata_object_new() +: metadata.h +
  • +
  • FLAC__metadata_object_picture_is_legal() +: metadata.h +
  • +
  • FLAC__metadata_object_picture_set_data() +: metadata.h +
  • +
  • FLAC__metadata_object_picture_set_description() +: metadata.h +
  • +
  • FLAC__metadata_object_picture_set_mime_type() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_delete_point() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_insert_point() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_is_legal() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_resize_points() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_set_point() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_template_append_placeholders() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_template_append_point() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_template_append_points() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_template_append_spaced_points() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_template_append_spaced_points_by_samples() +: metadata.h +
  • +
  • FLAC__metadata_object_seektable_template_sort() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_append_comment() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_delete_comment() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_entry_matches() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_find_entry_from() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_insert_comment() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_remove_entries_matching() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_remove_entry_matching() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_replace_comment() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_resize_comments() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_set_comment() +: metadata.h +
  • +
  • FLAC__metadata_object_vorbiscomment_set_vendor_string() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_delete() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_delete_block() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_get_application_id() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_get_block() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_get_block_length() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_get_block_offset() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_get_block_type() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_init() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_insert_block_after() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_is_last() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_is_writable() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_new() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_next() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_prev() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_set_block() +: metadata.h +
  • +
  • FLAC__metadata_simple_iterator_status() +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_INTERNAL_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR +: metadata.h +
  • +
  • FLAC__Metadata_SimpleIterator +: metadata.h +
  • +
  • FLAC__Metadata_SimpleIteratorStatus +: metadata.h +
  • +
  • FLAC__Metadata_SimpleIteratorStatusString +: metadata.h +
  • +
  • FLAC__METADATA_TYPE_APPLICATION +: format.h +
  • +
  • FLAC__METADATA_TYPE_CUESHEET +: format.h +
  • +
  • FLAC__METADATA_TYPE_PADDING +: format.h +
  • +
  • FLAC__METADATA_TYPE_PICTURE +: format.h +
  • +
  • FLAC__METADATA_TYPE_SEEKTABLE +: format.h +
  • +
  • FLAC__METADATA_TYPE_STREAMINFO +: format.h +
  • +
  • FLAC__METADATA_TYPE_UNDEFINED +: format.h +
  • +
  • FLAC__METADATA_TYPE_VORBIS_COMMENT +: format.h +
  • +
  • FLAC__MetadataType +: format.h +
  • +
  • FLAC__MetadataTypeString +: format.h +
  • +
  • FLAC__MIN_BITS_PER_SAMPLE +: format.h +
  • +
  • FLAC__MIN_BLOCK_SIZE +: format.h +
  • +
  • FLAC__MIN_QLP_COEFF_PRECISION +: format.h +
  • +
  • FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE +: format.h +
  • +
  • FLAC__STREAM_DECODER_ABORTED +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_delete() +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_END_OF_STREAM +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_finish() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_flush() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_get_bits_per_sample() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_get_blocksize() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_get_channel_assignment() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_get_channels() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_get_decode_position() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_get_md5_checking() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_get_resolved_state_string() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_get_sample_rate() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_get_state() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_get_total_samples() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_init_FILE() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_init_file() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_init_ogg_file() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_init_ogg_FILE() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_init_ogg_stream() +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_OK +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_init_stream() +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_LENGTH_STATUS_OK +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_new() +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_OGG_ERROR +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_process_single() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_process_until_end_of_metadata() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_process_until_end_of_stream() +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_READ_FRAME +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_READ_METADATA +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_READ_STATUS_ABORT +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_READ_STATUS_CONTINUE +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_reset() +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEARCH_FOR_METADATA +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_seek_absolute() +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEEK_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEEK_STATUS_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEEK_STATUS_OK +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_set_md5_checking() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_set_metadata_ignore() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_set_metadata_ignore_all() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_set_metadata_ignore_application() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_set_metadata_respond() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_set_metadata_respond_all() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_set_metadata_respond_application() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_set_ogg_serial_number() +: stream_decoder.h +
  • +
  • FLAC__stream_decoder_skip_single_frame() +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_TELL_STATUS_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_TELL_STATUS_OK +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_UNINITIALIZED +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_WRITE_STATUS_ABORT +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE +: stream_decoder.h +
  • +
  • FLAC__STREAM_ENCODER_CLIENT_ERROR +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_delete() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_finish() +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_FRAMING_ERROR +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_bits_per_sample() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_blocksize() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_channels() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_do_escape_coding() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_do_exhaustive_model_search() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_do_mid_side_stereo() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_do_qlp_coeff_prec_search() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_loose_mid_side_stereo() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_max_lpc_order() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_max_residual_partition_order() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_min_residual_partition_order() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_qlp_coeff_precision() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_resolved_state_string() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_rice_parameter_search_dist() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_sample_rate() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_state() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_streamable_subset() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_total_samples_estimate() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_verify() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_verify_decoder_error_stats() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_get_verify_decoder_state() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_init_file() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_init_FILE() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_init_ogg_file() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_init_ogg_FILE() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_init_ogg_stream() +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BLOCK_SIZE +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_NUMBER_OF_CHANNELS +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_OK +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_init_stream() +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_IO_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_new() +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_OGG_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_OK +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_process() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_process_interleaved() +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_READ_STATUS_ABORT +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_SEEK_STATUS_OK +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_apodization() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_bits_per_sample() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_blocksize() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_channels() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_compression_level() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_do_escape_coding() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_do_exhaustive_model_search() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_do_mid_side_stereo() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_do_qlp_coeff_prec_search() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_loose_mid_side_stereo() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_max_lpc_order() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_max_residual_partition_order() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_metadata() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_min_residual_partition_order() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_ogg_serial_number() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_qlp_coeff_precision() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_rice_parameter_search_dist() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_sample_rate() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_streamable_subset() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_total_samples_estimate() +: stream_encoder.h +
  • +
  • FLAC__stream_encoder_set_verify() +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_TELL_STATUS_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_TELL_STATUS_OK +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_UNINITIALIZED +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_WRITE_STATUS_OK +: stream_encoder.h +
  • +
  • FLAC__STREAM_METADATA_APPLICATION_ID_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_HEADER_LENGTH +: format.h +
  • +
  • FLAC__STREAM_METADATA_IS_LAST_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_LENGTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_COLORS_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_ARTIST +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_BACK_COVER +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_BAND +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_BAND_LOGOTYPE +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_COMPOSER +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_CONDUCTOR +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_PERFORMANCE +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_RECORDING +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_FISH +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_ILLUSTRATION +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_LEAD_ARTIST +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_LEAFLET_PAGE +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_LYRICIST +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_PUBLISHER_LOGOTYPE +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_RECORDING_LOCATION +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_VIDEO_SCREEN_CAPTURE +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_SEEKPOINT_LENGTH +: format.h +
  • +
  • FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER +: format.h +
  • +
  • FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_LENGTH +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_TYPE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN +: format.h +
  • +
  • FLAC__STREAM_SYNC +: format.h +
  • +
  • FLAC__STREAM_SYNC_LEN +: format.h +
  • +
  • FLAC__STREAM_SYNC_LENGTH +: format.h +
  • +
  • FLAC__STREAM_SYNC_STRING +: format.h +
  • +
  • FLAC__StreamDecoderEofCallback +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderErrorCallback +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderErrorStatus +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderErrorStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderInitStatus +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderInitStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderLengthCallback +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderLengthStatus +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderLengthStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderMetadataCallback +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderReadCallback +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderReadStatus +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderReadStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderSeekCallback +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderSeekStatus +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderSeekStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderState +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderStateString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderTellCallback +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderTellStatus +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderTellStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderWriteCallback +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderWriteStatus +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderWriteStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamEncoderInitStatus +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderInitStatusString +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderMetadataCallback +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderProgressCallback +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderReadCallback +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderReadStatus +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderReadStatusString +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderSeekCallback +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderSeekStatus +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderSeekStatusString +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderState +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderStateString +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderTellCallback +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderTellStatus +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderTellStatusString +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderWriteCallback +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderWriteStatus +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderWriteStatusString +: stream_encoder.h +
  • +
  • FLAC__StreamMetadata_Picture_Type +: format.h +
  • +
  • FLAC__StreamMetadata_Picture_TypeString +: format.h +
  • +
  • FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN +: format.h +
  • +
  • FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_CONSTANT +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_FIXED +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_LEN +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_LPC +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_VERBATIM +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK +: format.h +
  • +
  • FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN +: format.h +
  • +
  • FLAC__SUBFRAME_ZERO_PAD_LEN +: format.h +
  • +
  • FLAC__SubframeType +: format.h +
  • +
  • FLAC__SubframeTypeString +: format.h +
  • +
  • FLAC__SUBSET_MAX_BLOCK_SIZE_48000HZ +: format.h +
  • +
  • FLAC__SUBSET_MAX_LPC_ORDER_48000HZ +: format.h +
  • +
  • FLAC__SUBSET_MAX_RICE_PARTITION_ORDER +: format.h +
  • +
  • FLAC__VENDOR_STRING +: format.h +
  • +
  • FLAC__VERSION_STRING +: format.h +
  • +
  • FLAC_API_SUPPORTS_OGG_FLAC +: export.h +
  • +
  • FLAC_API_VERSION_AGE +: export.h +
  • +
  • FLAC_API_VERSION_CURRENT +: export.h +
  • +
  • FLAC_API_VERSION_REVISION +: export.h +
  • +
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/globals_defs.html b/lib-src/libflac/doc/html/api/globals_defs.html new file mode 100644 index 000000000..f351a875e --- /dev/null +++ b/lib-src/libflac/doc/html/api/globals_defs.html @@ -0,0 +1,153 @@ + + + + + + +FLAC: File Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
    +
  • FLAC__MAX_BITS_PER_SAMPLE +: format.h +
  • +
  • FLAC__MAX_BLOCK_SIZE +: format.h +
  • +
  • FLAC__MAX_CHANNELS +: format.h +
  • +
  • FLAC__MAX_FIXED_ORDER +: format.h +
  • +
  • FLAC__MAX_LPC_ORDER +: format.h +
  • +
  • FLAC__MAX_METADATA_TYPE_CODE +: format.h +
  • +
  • FLAC__MAX_QLP_COEFF_PRECISION +: format.h +
  • +
  • FLAC__MAX_RICE_PARTITION_ORDER +: format.h +
  • +
  • FLAC__MAX_SAMPLE_RATE +: format.h +
  • +
  • FLAC__MIN_BITS_PER_SAMPLE +: format.h +
  • +
  • FLAC__MIN_BLOCK_SIZE +: format.h +
  • +
  • FLAC__MIN_QLP_COEFF_PRECISION +: format.h +
  • +
  • FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE +: format.h +
  • +
  • FLAC__STREAM_METADATA_HEADER_LENGTH +: format.h +
  • +
  • FLAC__STREAM_METADATA_SEEKPOINT_LENGTH +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_LENGTH +: format.h +
  • +
  • FLAC__STREAM_SYNC_LENGTH +: format.h +
  • +
  • FLAC__SUBSET_MAX_BLOCK_SIZE_48000HZ +: format.h +
  • +
  • FLAC__SUBSET_MAX_LPC_ORDER_48000HZ +: format.h +
  • +
  • FLAC__SUBSET_MAX_RICE_PARTITION_ORDER +: format.h +
  • +
  • FLAC_API_VERSION_AGE +: export.h +
  • +
  • FLAC_API_VERSION_CURRENT +: export.h +
  • +
  • FLAC_API_VERSION_REVISION +: export.h +
  • +
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/globals_enum.html b/lib-src/libflac/doc/html/api/globals_enum.html new file mode 100644 index 000000000..575e7dce4 --- /dev/null +++ b/lib-src/libflac/doc/html/api/globals_enum.html @@ -0,0 +1,150 @@ + + + + + + +FLAC: File Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/globals_eval.html b/lib-src/libflac/doc/html/api/globals_eval.html new file mode 100644 index 000000000..4a48d136c --- /dev/null +++ b/lib-src/libflac/doc/html/api/globals_eval.html @@ -0,0 +1,511 @@ + + + + + + +FLAC: File Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- f -

    +
  • FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT +: format.h +
  • +
  • FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE +: format.h +
  • +
  • FLAC__CHANNEL_ASSIGNMENT_MID_SIDE +: format.h +
  • +
  • FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2 +: format.h +
  • +
  • FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER +: format.h +
  • +
  • FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER +: format.h +
  • +
  • FLAC__MAX_METADATA_TYPE +: format.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_BAD_METADATA +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_ERROR_OPENING_FILE +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_ILLEGAL_INPUT +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_INVALID_CALLBACKS +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_NOT_A_FLAC_FILE +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_NOT_WRITABLE +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_OK +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_READ_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_RENAME_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_UNLINK_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_WRITE_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_INTERNAL_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR +: metadata.h +
  • +
  • FLAC__METADATA_TYPE_APPLICATION +: format.h +
  • +
  • FLAC__METADATA_TYPE_CUESHEET +: format.h +
  • +
  • FLAC__METADATA_TYPE_PADDING +: format.h +
  • +
  • FLAC__METADATA_TYPE_PICTURE +: format.h +
  • +
  • FLAC__METADATA_TYPE_SEEKTABLE +: format.h +
  • +
  • FLAC__METADATA_TYPE_STREAMINFO +: format.h +
  • +
  • FLAC__METADATA_TYPE_UNDEFINED +: format.h +
  • +
  • FLAC__METADATA_TYPE_VORBIS_COMMENT +: format.h +
  • +
  • FLAC__STREAM_DECODER_ABORTED +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_END_OF_STREAM +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_OK +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_LENGTH_STATUS_OK +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_OGG_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_READ_FRAME +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_READ_METADATA +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_READ_STATUS_ABORT +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_READ_STATUS_CONTINUE +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEARCH_FOR_METADATA +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEEK_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEEK_STATUS_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEEK_STATUS_OK +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_TELL_STATUS_ERROR +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_TELL_STATUS_OK +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_UNINITIALIZED +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_WRITE_STATUS_ABORT +: stream_decoder.h +
  • +
  • FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE +: stream_decoder.h +
  • +
  • FLAC__STREAM_ENCODER_CLIENT_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_FRAMING_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BLOCK_SIZE +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_NUMBER_OF_CHANNELS +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_OK +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_IO_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_OGG_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_OK +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_READ_STATUS_ABORT +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_SEEK_STATUS_OK +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_TELL_STATUS_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_TELL_STATUS_OK +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_UNINITIALIZED +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR +: stream_encoder.h +
  • +
  • FLAC__STREAM_ENCODER_WRITE_STATUS_OK +: stream_encoder.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_ARTIST +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_BACK_COVER +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_BAND +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_BAND_LOGOTYPE +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_COMPOSER +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_CONDUCTOR +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_PERFORMANCE +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_RECORDING +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_FISH +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_ILLUSTRATION +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_LEAD_ARTIST +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_LEAFLET_PAGE +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_LYRICIST +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_PUBLISHER_LOGOTYPE +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_RECORDING_LOCATION +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_VIDEO_SCREEN_CAPTURE +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_CONSTANT +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_FIXED +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_LPC +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_VERBATIM +: format.h +
  • +
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/globals_func.html b/lib-src/libflac/doc/html/api/globals_func.html new file mode 100644 index 000000000..14959dc13 --- /dev/null +++ b/lib-src/libflac/doc/html/api/globals_func.html @@ -0,0 +1,655 @@ + + + + + + +FLAC: File Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- f -

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/globals_type.html b/lib-src/libflac/doc/html/api/globals_type.html new file mode 100644 index 000000000..b35dc00f3 --- /dev/null +++ b/lib-src/libflac/doc/html/api/globals_type.html @@ -0,0 +1,156 @@ + + + + + + +FLAC: File Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/globals_vars.html b/lib-src/libflac/doc/html/api/globals_vars.html new file mode 100644 index 000000000..6bae633d5 --- /dev/null +++ b/lib-src/libflac/doc/html/api/globals_vars.html @@ -0,0 +1,382 @@ + + + + + + +FLAC: File Members + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + + +
+
+  + +

- f -

    +
  • FLAC__ChannelAssignmentString +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN +: format.h +
  • +
  • FLAC__ENTROPY_CODING_METHOD_TYPE_LEN +: format.h +
  • +
  • FLAC__EntropyCodingMethodTypeString +: format.h +
  • +
  • FLAC__FRAME_FOOTER_CRC_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_BLOCK_SIZE_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_CRC_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_RESERVED_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_SAMPLE_RATE_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_SYNC +: format.h +
  • +
  • FLAC__FRAME_HEADER_SYNC_LEN +: format.h +
  • +
  • FLAC__FRAME_HEADER_ZERO_PAD_LEN +: format.h +
  • +
  • FLAC__FrameNumberTypeString +: format.h +
  • +
  • FLAC__Metadata_ChainStatusString +: metadata.h +
  • +
  • FLAC__Metadata_SimpleIteratorStatusString +: metadata.h +
  • +
  • FLAC__MetadataTypeString +: format.h +
  • +
  • FLAC__STREAM_METADATA_APPLICATION_ID_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_IS_LAST_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_LENGTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_COLORS_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_TYPE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER +: format.h +
  • +
  • FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_TYPE_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN +: format.h +
  • +
  • FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN +: format.h +
  • +
  • FLAC__STREAM_SYNC +: format.h +
  • +
  • FLAC__STREAM_SYNC_LEN +: format.h +
  • +
  • FLAC__STREAM_SYNC_STRING +: format.h +
  • +
  • FLAC__StreamDecoderErrorStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderInitStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderLengthStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderReadStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderSeekStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderStateString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderTellStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamDecoderWriteStatusString +: stream_decoder.h +
  • +
  • FLAC__StreamEncoderInitStatusString +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderReadStatusString +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderSeekStatusString +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderStateString +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderTellStatusString +: stream_encoder.h +
  • +
  • FLAC__StreamEncoderWriteStatusString +: stream_encoder.h +
  • +
  • FLAC__StreamMetadata_Picture_TypeString +: format.h +
  • +
  • FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN +: format.h +
  • +
  • FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_LEN +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK +: format.h +
  • +
  • FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK +: format.h +
  • +
  • FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN +: format.h +
  • +
  • FLAC__SUBFRAME_ZERO_PAD_LEN +: format.h +
  • +
  • FLAC__SubframeTypeString +: format.h +
  • +
  • FLAC__VENDOR_STRING +: format.h +
  • +
  • FLAC__VERSION_STRING +: format.h +
  • +
  • FLAC_API_SUPPORTS_OGG_FLAC +: export.h +
  • +
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac.html b/lib-src/libflac/doc/html/api/group__flac.html new file mode 100644 index 000000000..bf44dd392 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac.html @@ -0,0 +1,90 @@ + + + + + + +FLAC: FLAC C API + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC C API
+
+
+ + + + + + + + + + + + + + +

+Modules

 FLAC/callback.h: I/O callback structures
 
 FLAC/export.h: export symbols
 
 FLAC/format.h: format components
 
 
 FLAC/_decoder.h: decoder interfaces
 
 FLAC/_encoder.h: encoder interfaces
 
+

Detailed Description

+

The FLAC C API is the interface to libFLAC, a set of structures describing the components of FLAC streams, and functions for encoding and decoding streams, as well as manipulating FLAC metadata in files.

+

You should start with the format components as all other modules are dependent on it.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__callbacks.html b/lib-src/libflac/doc/html/api/group__flac__callbacks.html new file mode 100644 index 000000000..a00db007e --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__callbacks.html @@ -0,0 +1,273 @@ + + + + + + +FLAC: FLAC/callback.h: I/O callback structures + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/callback.h: I/O callback structures
+
+
+ + + + +

+Classes

struct  FLAC__IOCallbacks
 
+ + + + + + + + + + + + + + + +

+Typedefs

typedef void * FLAC__IOHandle
 
typedef size_t(* FLAC__IOCallback_Read )(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
 
typedef size_t(* FLAC__IOCallback_Write )(const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
 
typedef int(* FLAC__IOCallback_Seek )(FLAC__IOHandle handle, FLAC__int64 offset, int whence)
 
typedef FLAC__int64(* FLAC__IOCallback_Tell )(FLAC__IOHandle handle)
 
typedef int(* FLAC__IOCallback_Eof )(FLAC__IOHandle handle)
 
typedef int(* FLAC__IOCallback_Close )(FLAC__IOHandle handle)
 
+

Detailed Description

+

This module defines the structures for describing I/O callbacks to the other FLAC interfaces.

+

The purpose of the I/O callback functions is to create a common way for the metadata interfaces to handle I/O.

+

Originally the metadata interfaces required filenames as the way of specifying FLAC files to operate on. This is problematic in some environments so there is an additional option to specify a set of callbacks for doing I/O on the FLAC file, instead of the filename.

+

In addition to the callbacks, a FLAC__IOHandle type is defined as an opaque structure for a data source.

+

The callback function prototypes are similar (but not identical) to the stdio functions fread, fwrite, fseek, ftell, feof, and fclose. If you use stdio streams to implement the callbacks, you can pass fread, fwrite, and fclose anywhere a FLAC__IOCallback_Read, FLAC__IOCallback_Write, or FLAC__IOCallback_Close is required, and a FILE* anywhere a FLAC__IOHandle is required.

Warning
You generally CANNOT directly use fseek or ftell for FLAC__IOCallback_Seek or FLAC__IOCallback_Tell since on most systems these use 32-bit offsets and FLAC requires 64-bit offsets to deal with large files. You will have to find an equivalent function (e.g. ftello), or write a wrapper. The same is true for feof() since this is usually implemented as a macro, not as a function whose address can be taken.
+

Typedef Documentation

+ +
+
+ + + + +
typedef void* FLAC__IOHandle
+
+

This is the opaque handle type used by the callbacks. Typically this is a FILE* or address of a file descriptor.

+ +
+
+ +
+
+ + + + +
typedef size_t(* FLAC__IOCallback_Read)(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
+
+

Signature for the read callback. The signature and semantics match POSIX fread() implementations and can generally be used interchangeably.

+
Parameters
+ + + + + +
ptrThe address of the read buffer.
sizeThe size of the records to be read.
nmembThe number of records to be read.
handleThe handle to the data source.
+
+
+
Return values
+ + +
size_tThe number of records read.
+
+
+ +
+
+ +
+
+ + + + +
typedef size_t(* FLAC__IOCallback_Write)(const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
+
+

Signature for the write callback. The signature and semantics match POSIX fwrite() implementations and can generally be used interchangeably.

+
Parameters
+ + + + + +
ptrThe address of the write buffer.
sizeThe size of the records to be written.
nmembThe number of records to be written.
handleThe handle to the data source.
+
+
+
Return values
+ + +
size_tThe number of records written.
+
+
+ +
+
+ +
+
+ + + + +
typedef int(* FLAC__IOCallback_Seek)(FLAC__IOHandle handle, FLAC__int64 offset, int whence)
+
+

Signature for the seek callback. The signature and semantics mostly match POSIX fseek() WITH ONE IMPORTANT EXCEPTION: the offset is a 64-bit type whereas fseek() is generally 'long' and 32-bits wide.

+
Parameters
+ + + + +
handleThe handle to the data source.
offsetThe new position, relative to whence
whenceSEEK_SET, SEEK_CUR, or SEEK_END
+
+
+
Return values
+ + +
int0 on success, -1 on error.
+
+
+ +
+
+ +
+
+ + + + +
typedef FLAC__int64(* FLAC__IOCallback_Tell)(FLAC__IOHandle handle)
+
+

Signature for the tell callback. The signature and semantics mostly match POSIX ftell() WITH ONE IMPORTANT EXCEPTION: the offset is a 64-bit type whereas ftell() is generally 'long' and 32-bits wide.

+
Parameters
+ + +
handleThe handle to the data source.
+
+
+
Return values
+ + +
FLAC__int64The current position on success, -1 on error.
+
+
+ +
+
+ +
+
+ + + + +
typedef int(* FLAC__IOCallback_Eof)(FLAC__IOHandle handle)
+
+

Signature for the EOF callback. The signature and semantics mostly match POSIX feof() but WATCHOUT: on many systems, feof() is a macro, so in this case a wrapper function must be provided instead.

+
Parameters
+ + +
handleThe handle to the data source.
+
+
+
Return values
+ + +
int0 if not at end of file, nonzero if at end of file.
+
+
+ +
+
+ +
+
+ + + + +
typedef int(* FLAC__IOCallback_Close)(FLAC__IOHandle handle)
+
+

Signature for the close callback. The signature and semantics match POSIX fclose() implementations and can generally be used interchangeably.

+
Parameters
+ + +
handleThe handle to the data source.
+
+
+
Return values
+ + +
int0 on success, EOF on error.
+
+
+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__decoder.html b/lib-src/libflac/doc/html/api/group__flac__decoder.html new file mode 100644 index 000000000..bfe9ec258 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__decoder.html @@ -0,0 +1,80 @@ + + + + + + +FLAC: FLAC/_decoder.h: decoder interfaces + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/_decoder.h: decoder interfaces
+
+
+ + + + +

+Modules

 FLAC/stream_decoder.h: stream decoder interface
 
+

Detailed Description

+

This module describes the decoder layers provided by libFLAC.

+

The stream decoder can be used to decode complete streams either from the client via callbacks, or directly from a file, depending on how it is initialized. When decoding via callbacks, the client provides callbacks for reading FLAC data and writing decoded samples, and handling metadata and errors. If the client also supplies seek-related callback, the decoder function for sample-accurate seeking within the FLAC input is also available. When decoding from a file, the client needs only supply a filename or open FILE* and write/metadata/error callbacks; the rest of the callbacks are supplied internally. For more info see the stream decoder module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__encoder.html b/lib-src/libflac/doc/html/api/group__flac__encoder.html new file mode 100644 index 000000000..a4a6c3ffd --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__encoder.html @@ -0,0 +1,80 @@ + + + + + + +FLAC: FLAC/_encoder.h: encoder interfaces + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/_encoder.h: encoder interfaces
+
+
+ + + + +

+Modules

 FLAC/stream_encoder.h: stream encoder interface
 
+

Detailed Description

+

This module describes the encoder layers provided by libFLAC.

+

The stream encoder can be used to encode complete streams either to the client via callbacks, or directly to a file, depending on how it is initialized. When encoding via callbacks, the client provides a write callback which will be called whenever FLAC data is ready to be written. If the client also supplies a seek callback, the encoder will also automatically handle the writing back of metadata discovered while encoding, like stream info, seek points offsets, etc. When encoding to a file, the client needs only supply a filename or open FILE* and an optional progress callback for periodic notification of progress; the write and seek callbacks are supplied internally. For more info see the stream encoder module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__export.html b/lib-src/libflac/doc/html/api/group__flac__export.html new file mode 100644 index 000000000..330593bf3 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__export.html @@ -0,0 +1,147 @@ + + + + + + +FLAC: FLAC/export.h: export symbols + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/export.h: export symbols
+
+
+ + + + + + + + + + +

+Macros

+#define FLAC_API
 
#define FLAC_API_VERSION_CURRENT   11
 
#define FLAC_API_VERSION_REVISION   0
 
#define FLAC_API_VERSION_AGE   3
 
+ + + +

+Variables

int FLAC_API_SUPPORTS_OGG_FLAC
 
+

Detailed Description

+

This module contains #defines and symbols for exporting function calls, and providing version information and compiled-in features.

+

If you are compiling with MSVC and will link to the static library (libFLAC.lib) you should define FLAC__NO_DLL in your project to make sure the symbols are exported properly.

+

Macro Definition Documentation

+ +
+
+ + + + +
#define FLAC_API_VERSION_CURRENT   11
+
+

These #defines will mirror the libtool-based library version number, see http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning

+ +
+
+ +
+
+ + + + +
#define FLAC_API_VERSION_REVISION   0
+
+

see above

+ +
+
+ +
+
+ + + + +
#define FLAC_API_VERSION_AGE   3
+
+

see above

+ +
+
+

Variable Documentation

+ +
+
+ + + + +
int FLAC_API_SUPPORTS_OGG_FLAC
+
+

1 if the library has been compiled with support for Ogg FLAC, else 0.

+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__format.html b/lib-src/libflac/doc/html/api/group__flac__format.html new file mode 100644 index 000000000..04a0ca688 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__format.html @@ -0,0 +1,2328 @@ + + + + + + +FLAC: FLAC/format.h: format components + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/format.h: format components
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Classes

struct  FLAC__EntropyCodingMethod_PartitionedRiceContents
 
struct  FLAC__EntropyCodingMethod_PartitionedRice
 
struct  FLAC__EntropyCodingMethod
 
struct  FLAC__Subframe_Constant
 
struct  FLAC__Subframe_Verbatim
 
struct  FLAC__Subframe_Fixed
 
struct  FLAC__Subframe_LPC
 
struct  FLAC__Subframe
 
struct  FLAC__FrameHeader
 
struct  FLAC__FrameFooter
 
struct  FLAC__Frame
 
struct  FLAC__StreamMetadata_StreamInfo
 
struct  FLAC__StreamMetadata_Padding
 
struct  FLAC__StreamMetadata_Application
 
struct  FLAC__StreamMetadata_SeekPoint
 
struct  FLAC__StreamMetadata_SeekTable
 
struct  FLAC__StreamMetadata_VorbisComment_Entry
 
struct  FLAC__StreamMetadata_VorbisComment
 
struct  FLAC__StreamMetadata_CueSheet_Index
 
struct  FLAC__StreamMetadata_CueSheet_Track
 
struct  FLAC__StreamMetadata_CueSheet
 
struct  FLAC__StreamMetadata_Picture
 
struct  FLAC__StreamMetadata_Unknown
 
struct  FLAC__StreamMetadata
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Macros

#define FLAC__MAX_METADATA_TYPE_CODE   (126u)
 
#define FLAC__MIN_BLOCK_SIZE   (16u)
 
#define FLAC__MAX_BLOCK_SIZE   (65535u)
 
#define FLAC__SUBSET_MAX_BLOCK_SIZE_48000HZ   (4608u)
 
#define FLAC__MAX_CHANNELS   (8u)
 
#define FLAC__MIN_BITS_PER_SAMPLE   (4u)
 
#define FLAC__MAX_BITS_PER_SAMPLE   (32u)
 
#define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE   (24u)
 
#define FLAC__MAX_SAMPLE_RATE   (655350u)
 
#define FLAC__MAX_LPC_ORDER   (32u)
 
#define FLAC__SUBSET_MAX_LPC_ORDER_48000HZ   (12u)
 
#define FLAC__MIN_QLP_COEFF_PRECISION   (5u)
 
#define FLAC__MAX_QLP_COEFF_PRECISION   (15u)
 
#define FLAC__MAX_FIXED_ORDER   (4u)
 
#define FLAC__MAX_RICE_PARTITION_ORDER   (15u)
 
#define FLAC__SUBSET_MAX_RICE_PARTITION_ORDER   (8u)
 
#define FLAC__STREAM_SYNC_LENGTH   (4u)
 
#define FLAC__STREAM_METADATA_STREAMINFO_LENGTH   (34u)
 
#define FLAC__STREAM_METADATA_SEEKPOINT_LENGTH   (18u)
 
#define FLAC__STREAM_METADATA_HEADER_LENGTH   (4u)
 
+ + + + + + + + + + + + + +

+Enumerations

enum  FLAC__EntropyCodingMethodType { FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE = 0, +FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2 = 1 + }
 
enum  FLAC__SubframeType { FLAC__SUBFRAME_TYPE_CONSTANT = 0, +FLAC__SUBFRAME_TYPE_VERBATIM = 1, +FLAC__SUBFRAME_TYPE_FIXED = 2, +FLAC__SUBFRAME_TYPE_LPC = 3 + }
 
enum  FLAC__ChannelAssignment { FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT = 0, +FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE = 1, +FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE = 2, +FLAC__CHANNEL_ASSIGNMENT_MID_SIDE = 3 + }
 
enum  FLAC__FrameNumberType { FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER, +FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER + }
 
enum  FLAC__MetadataType {
+  FLAC__METADATA_TYPE_STREAMINFO = 0, +FLAC__METADATA_TYPE_PADDING = 1, +FLAC__METADATA_TYPE_APPLICATION = 2, +FLAC__METADATA_TYPE_SEEKTABLE = 3, +
+  FLAC__METADATA_TYPE_VORBIS_COMMENT = 4, +FLAC__METADATA_TYPE_CUESHEET = 5, +FLAC__METADATA_TYPE_PICTURE = 6, +FLAC__METADATA_TYPE_UNDEFINED = 7, +
+  FLAC__MAX_METADATA_TYPE = FLAC__MAX_METADATA_TYPE_CODE +
+ }
 
enum  FLAC__StreamMetadata_Picture_Type {
+  FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER = 0, +FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD = 1, +FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON = 2, +FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER = 3, +
+  FLAC__STREAM_METADATA_PICTURE_TYPE_BACK_COVER = 4, +FLAC__STREAM_METADATA_PICTURE_TYPE_LEAFLET_PAGE = 5, +FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA = 6, +FLAC__STREAM_METADATA_PICTURE_TYPE_LEAD_ARTIST = 7, +
+  FLAC__STREAM_METADATA_PICTURE_TYPE_ARTIST = 8, +FLAC__STREAM_METADATA_PICTURE_TYPE_CONDUCTOR = 9, +FLAC__STREAM_METADATA_PICTURE_TYPE_BAND = 10, +FLAC__STREAM_METADATA_PICTURE_TYPE_COMPOSER = 11, +
+  FLAC__STREAM_METADATA_PICTURE_TYPE_LYRICIST = 12, +FLAC__STREAM_METADATA_PICTURE_TYPE_RECORDING_LOCATION = 13, +FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_RECORDING = 14, +FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_PERFORMANCE = 15, +
+  FLAC__STREAM_METADATA_PICTURE_TYPE_VIDEO_SCREEN_CAPTURE = 16, +FLAC__STREAM_METADATA_PICTURE_TYPE_FISH = 17, +FLAC__STREAM_METADATA_PICTURE_TYPE_ILLUSTRATION = 18, +FLAC__STREAM_METADATA_PICTURE_TYPE_BAND_LOGOTYPE = 19, +
+  FLAC__STREAM_METADATA_PICTURE_TYPE_PUBLISHER_LOGOTYPE = 20, +FLAC__STREAM_METADATA_PICTURE_TYPE_UNDEFINED +
+ }
 
+ + + + + + + + + + + + + + + + + + + + + +

+Functions

FLAC__bool FLAC__format_sample_rate_is_valid (unsigned sample_rate)
 
FLAC__bool FLAC__format_blocksize_is_subset (unsigned blocksize, unsigned sample_rate)
 
FLAC__bool FLAC__format_sample_rate_is_subset (unsigned sample_rate)
 
FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal (const char *name)
 
FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal (const FLAC__byte *value, unsigned length)
 
FLAC__bool FLAC__format_vorbiscomment_entry_is_legal (const FLAC__byte *entry, unsigned length)
 
FLAC__bool FLAC__format_seektable_is_legal (const FLAC__StreamMetadata_SeekTable *seek_table)
 
unsigned FLAC__format_seektable_sort (FLAC__StreamMetadata_SeekTable *seek_table)
 
FLAC__bool FLAC__format_cuesheet_is_legal (const FLAC__StreamMetadata_CueSheet *cue_sheet, FLAC__bool check_cd_da_subset, const char **violation)
 
FLAC__bool FLAC__format_picture_is_legal (const FLAC__StreamMetadata_Picture *picture, const char **violation)
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Variables

const char * FLAC__VERSION_STRING
 
const char * FLAC__VENDOR_STRING
 
const FLAC__byte FLAC__STREAM_SYNC_STRING [4]
 
const unsigned FLAC__STREAM_SYNC
 
const unsigned FLAC__STREAM_SYNC_LEN
 
const char *const FLAC__EntropyCodingMethodTypeString []
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER
 
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER
 
const unsigned FLAC__ENTROPY_CODING_METHOD_TYPE_LEN
 
const char *const FLAC__SubframeTypeString []
 
const unsigned FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN
 
const unsigned FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN
 
const unsigned FLAC__SUBFRAME_ZERO_PAD_LEN
 
const unsigned FLAC__SUBFRAME_TYPE_LEN
 
const unsigned FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN
 
const unsigned FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK
 
const unsigned FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK
 
const unsigned FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK
 
const unsigned FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK
 
const char *const FLAC__ChannelAssignmentString []
 
const char *const FLAC__FrameNumberTypeString []
 
const unsigned FLAC__FRAME_HEADER_SYNC
 
const unsigned FLAC__FRAME_HEADER_SYNC_LEN
 
const unsigned FLAC__FRAME_HEADER_RESERVED_LEN
 
const unsigned FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN
 
const unsigned FLAC__FRAME_HEADER_BLOCK_SIZE_LEN
 
const unsigned FLAC__FRAME_HEADER_SAMPLE_RATE_LEN
 
const unsigned FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN
 
const unsigned FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN
 
const unsigned FLAC__FRAME_HEADER_ZERO_PAD_LEN
 
const unsigned FLAC__FRAME_HEADER_CRC_LEN
 
const unsigned FLAC__FRAME_FOOTER_CRC_LEN
 
const char *const FLAC__MetadataTypeString []
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN
 
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN
 
const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN
 
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN
 
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN
 
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN
 
const FLAC__uint64 FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER
 
const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN
 
const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN
 
const unsigned FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN
 
const char *const FLAC__StreamMetadata_Picture_TypeString []
 
const unsigned FLAC__STREAM_METADATA_PICTURE_TYPE_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_COLORS_LEN
 
const unsigned FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN
 
const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN
 
const unsigned FLAC__STREAM_METADATA_TYPE_LEN
 
const unsigned FLAC__STREAM_METADATA_LENGTH_LEN
 
+

Detailed Description

+

This module contains structure definitions for the representation of FLAC format components in memory. These are the basic structures used by the rest of the interfaces.

+

First, you should be familiar with the FLAC format. Many of the values here follow directly from the specification. As a user of libFLAC, the interesting parts really are the structures that describe the frame header and metadata blocks.

+

The format structures here are very primitive, designed to store information in an efficient way. Reading information from the structures is easy but creating or modifying them directly is more complex. For the most part, as a user of a library, editing is not necessary; however, for metadata blocks it is, so there are convenience functions provided in the metadata module to simplify the manipulation of metadata blocks.

+
Note
It's not the best convention, but symbols ending in _LEN are in bits and _LENGTH are in bytes. _LENGTH symbols are #defines instead of global variables because they are usually used when declaring byte arrays and some compilers require compile-time knowledge of array sizes when declared on the stack.
+

Macro Definition Documentation

+ +
+
+ + + + +
#define FLAC__MAX_METADATA_TYPE_CODE   (126u)
+
+

The largest legal metadata type code.

+ +
+
+ +
+
+ + + + +
#define FLAC__MIN_BLOCK_SIZE   (16u)
+
+

The minimum block size, in samples, permitted by the format.

+ +
+
+ +
+
+ + + + +
#define FLAC__MAX_BLOCK_SIZE   (65535u)
+
+

The maximum block size, in samples, permitted by the format.

+ +
+
+ +
+
+ + + + +
#define FLAC__SUBSET_MAX_BLOCK_SIZE_48000HZ   (4608u)
+
+

The maximum block size, in samples, permitted by the FLAC subset for sample rates up to 48kHz.

+ +
+
+ +
+
+ + + + +
#define FLAC__MAX_CHANNELS   (8u)
+
+

The maximum number of channels permitted by the format.

+ +
+
+ +
+
+ + + + +
#define FLAC__MIN_BITS_PER_SAMPLE   (4u)
+
+

The minimum sample resolution permitted by the format.

+ +
+
+ +
+
+ + + + +
#define FLAC__MAX_BITS_PER_SAMPLE   (32u)
+
+

The maximum sample resolution permitted by the format.

+ +
+
+ +
+
+ + + + +
#define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE   (24u)
+
+

The maximum sample resolution permitted by libFLAC.

+
Warning
FLAC__MAX_BITS_PER_SAMPLE is the limit of the FLAC format. However, the reference encoder/decoder is currently limited to 24 bits because of prevalent 32-bit math, so make sure and use this value when appropriate.
+ +
+
+ +
+
+ + + + +
#define FLAC__MAX_SAMPLE_RATE   (655350u)
+
+

The maximum sample rate permitted by the format. The value is ((2 ^ 16) - 1) * 10; see FLAC format as to why.

+ +
+
+ +
+
+ + + + +
#define FLAC__MAX_LPC_ORDER   (32u)
+
+

The maximum LPC order permitted by the format.

+ +
+
+ +
+
+ + + + +
#define FLAC__SUBSET_MAX_LPC_ORDER_48000HZ   (12u)
+
+

The maximum LPC order permitted by the FLAC subset for sample rates up to 48kHz.

+ +
+
+ +
+
+ + + + +
#define FLAC__MIN_QLP_COEFF_PRECISION   (5u)
+
+

The minimum quantized linear predictor coefficient precision permitted by the format.

+ +
+
+ +
+
+ + + + +
#define FLAC__MAX_QLP_COEFF_PRECISION   (15u)
+
+

The maximum quantized linear predictor coefficient precision permitted by the format.

+ +
+
+ +
+
+ + + + +
#define FLAC__MAX_FIXED_ORDER   (4u)
+
+

The maximum order of the fixed predictors permitted by the format.

+ +
+
+ +
+
+ + + + +
#define FLAC__MAX_RICE_PARTITION_ORDER   (15u)
+
+

The maximum Rice partition order permitted by the format.

+ +
+
+ +
+
+ + + + +
#define FLAC__SUBSET_MAX_RICE_PARTITION_ORDER   (8u)
+
+

The maximum Rice partition order permitted by the FLAC Subset.

+ +
+
+ +
+
+ + + + +
#define FLAC__STREAM_SYNC_LENGTH   (4u)
+
+

The length of the FLAC signature in bytes.

+ +
+
+ +
+
+ + + + +
#define FLAC__STREAM_METADATA_STREAMINFO_LENGTH   (34u)
+
+

The total stream length of the STREAMINFO block in bytes.

+ +
+
+ +
+
+ + + + +
#define FLAC__STREAM_METADATA_SEEKPOINT_LENGTH   (18u)
+
+

The total stream length of a seek point in bytes.

+ +
+
+ +
+
+ + + + +
#define FLAC__STREAM_METADATA_HEADER_LENGTH   (4u)
+
+

The total stream length of a metadata block header in bytes.

+ +
+
+

Enumeration Type Documentation

+ +
+
+

An enumeration of the available entropy coding methods.

+ + + +
Enumerator
FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE  +

Residual is coded by partitioning into contexts, each with it's own 4-bit Rice parameter.

+
FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2  +

Residual is coded by partitioning into contexts, each with it's own 5-bit Rice parameter.

+
+ +
+
+ +
+
+ + + + +
enum FLAC__SubframeType
+
+

An enumeration of the available subframe types.

+ + + + + +
Enumerator
FLAC__SUBFRAME_TYPE_CONSTANT  +

constant signal

+
FLAC__SUBFRAME_TYPE_VERBATIM  +

uncompressed signal

+
FLAC__SUBFRAME_TYPE_FIXED  +

fixed polynomial prediction

+
FLAC__SUBFRAME_TYPE_LPC  +

linear prediction

+
+ +
+
+ +
+
+ + + + +
enum FLAC__ChannelAssignment
+
+

An enumeration of the available channel assignments.

+ + + + + +
Enumerator
FLAC__CHANNEL_ASSIGNMENT_INDEPENDENT  +

independent channels

+
FLAC__CHANNEL_ASSIGNMENT_LEFT_SIDE  +

left+side stereo

+
FLAC__CHANNEL_ASSIGNMENT_RIGHT_SIDE  +

right+side stereo

+
FLAC__CHANNEL_ASSIGNMENT_MID_SIDE  +

mid+side stereo

+
+ +
+
+ +
+
+ + + + +
enum FLAC__FrameNumberType
+
+

An enumeration of the possible frame numbering methods.

+ + + +
Enumerator
FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER  +

number contains the frame number

+
FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER  +

number contains the sample number of first sample in frame

+
+ +
+
+ +
+
+ + + + +
enum FLAC__MetadataType
+
+

An enumeration of the available metadata block types.

+ + + + + + + + + + +
Enumerator
FLAC__METADATA_TYPE_STREAMINFO  +

STREAMINFO block

+
FLAC__METADATA_TYPE_PADDING  +

PADDING block

+
FLAC__METADATA_TYPE_APPLICATION  +

APPLICATION block

+
FLAC__METADATA_TYPE_SEEKTABLE  +

SEEKTABLE block

+
FLAC__METADATA_TYPE_VORBIS_COMMENT  +

VORBISCOMMENT block (a.k.a. FLAC tags)

+
FLAC__METADATA_TYPE_CUESHEET  +

CUESHEET block

+
FLAC__METADATA_TYPE_PICTURE  +

PICTURE block

+
FLAC__METADATA_TYPE_UNDEFINED  +

marker to denote beginning of undefined type range; this number will increase as new metadata types are added

+
FLAC__MAX_METADATA_TYPE  +

No type will ever be greater than this. There is not enough room in the protocol block.

+
+ +
+
+ +
+
+

An enumeration of the PICTURE types (see FLAC__StreamMetadataPicture and id3 v2.4 APIC tag).

+ + + + + + + + + + + + + + + + + + + + + + +
Enumerator
FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER  +

Other

+
FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON_STANDARD  +

32x32 pixels 'file icon' (PNG only)

+
FLAC__STREAM_METADATA_PICTURE_TYPE_FILE_ICON  +

Other file icon

+
FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER  +

Cover (front)

+
FLAC__STREAM_METADATA_PICTURE_TYPE_BACK_COVER  +

Cover (back)

+
FLAC__STREAM_METADATA_PICTURE_TYPE_LEAFLET_PAGE  +

Leaflet page

+
FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA  +

Media (e.g. label side of CD)

+
FLAC__STREAM_METADATA_PICTURE_TYPE_LEAD_ARTIST  +

Lead artist/lead performer/soloist

+
FLAC__STREAM_METADATA_PICTURE_TYPE_ARTIST  +

Artist/performer

+
FLAC__STREAM_METADATA_PICTURE_TYPE_CONDUCTOR  +

Conductor

+
FLAC__STREAM_METADATA_PICTURE_TYPE_BAND  +

Band/Orchestra

+
FLAC__STREAM_METADATA_PICTURE_TYPE_COMPOSER  +

Composer

+
FLAC__STREAM_METADATA_PICTURE_TYPE_LYRICIST  +

Lyricist/text writer

+
FLAC__STREAM_METADATA_PICTURE_TYPE_RECORDING_LOCATION  +

Recording Location

+
FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_RECORDING  +

During recording

+
FLAC__STREAM_METADATA_PICTURE_TYPE_DURING_PERFORMANCE  +

During performance

+
FLAC__STREAM_METADATA_PICTURE_TYPE_VIDEO_SCREEN_CAPTURE  +

Movie/video screen capture

+
FLAC__STREAM_METADATA_PICTURE_TYPE_FISH  +

A bright coloured fish

+
FLAC__STREAM_METADATA_PICTURE_TYPE_ILLUSTRATION  +

Illustration

+
FLAC__STREAM_METADATA_PICTURE_TYPE_BAND_LOGOTYPE  +

Band/artist logotype

+
FLAC__STREAM_METADATA_PICTURE_TYPE_PUBLISHER_LOGOTYPE  +

Publisher/Studio logotype

+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
FLAC__bool FLAC__format_sample_rate_is_valid (unsigned sample_rate)
+
+

Tests that a sample rate is valid for FLAC.

+
Parameters
+ + +
sample_rateThe sample rate to test for compliance.
+
+
+
Return values
+ + +
FLAC__booltrue if the given sample rate conforms to the specification, else false.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__format_blocksize_is_subset (unsigned blocksize,
unsigned sample_rate 
)
+
+

Tests that a blocksize at the given sample rate is valid for the FLAC subset.

+
Parameters
+ + + +
blocksizeThe blocksize to test for compliance.
sample_rateThe sample rate is needed, since the valid subset blocksize depends on the sample rate.
+
+
+
Return values
+ + +
FLAC__booltrue if the given blocksize conforms to the specification for the subset at the given sample rate, else false.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__format_sample_rate_is_subset (unsigned sample_rate)
+
+

Tests that a sample rate is valid for the FLAC subset. The subset rules for valid sample rates are slightly more complex since the rate has to be expressible completely in the frame header.

+
Parameters
+ + +
sample_rateThe sample rate to test for compliance.
+
+
+
Return values
+ + +
FLAC__booltrue if the given sample rate conforms to the specification for the subset, else false.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__format_vorbiscomment_entry_name_is_legal (const char * name)
+
+

Check a Vorbis comment entry name to see if it conforms to the Vorbis comment specification.

+

Vorbis comment names must be composed only of characters from [0x20-0x3C,0x3E-0x7D].

+
Parameters
+ + +
nameA NUL-terminated string to be checked.
+
+
+
Assertions:
1 name != NULL
+
+
Return values
+ + +
FLAC__boolfalse if entry name is illegal, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__format_vorbiscomment_entry_value_is_legal (const FLAC__byte * value,
unsigned length 
)
+
+

Check a Vorbis comment entry value to see if it conforms to the Vorbis comment specification.

+

Vorbis comment values must be valid UTF-8 sequences.

+
Parameters
+ + + +
valueA string to be checked.
lengthA the length of value in bytes. May be (unsigned)(-1) to indicate that value is a plain UTF-8 NUL-terminated string.
+
+
+
Assertions:
1 value != NULL
+
+
Return values
+ + +
FLAC__boolfalse if entry name is illegal, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__format_vorbiscomment_entry_is_legal (const FLAC__byte * entry,
unsigned length 
)
+
+

Check a Vorbis comment entry to see if it conforms to the Vorbis comment specification.

+

Vorbis comment entries must be of the form 'name=value', and 'name' and 'value' must be legal according to FLAC__format_vorbiscomment_entry_name_is_legal() and FLAC__format_vorbiscomment_entry_value_is_legal() respectively.

+
Parameters
+ + + +
entryAn entry to be checked.
lengthThe length of entry in bytes.
+
+
+
Assertions:
1 value != NULL
+
+
Return values
+ + +
FLAC__boolfalse if entry name is illegal, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__format_seektable_is_legal (const FLAC__StreamMetadata_SeekTableseek_table)
+
+

Check a seek table to see if it conforms to the FLAC specification. See the format specification for limits on the contents of the seek table.

+
Parameters
+ + +
seek_tableA pointer to a seek table to be checked.
+
+
+
Assertions:
1 seek_table != NULL
+
+
Return values
+ + +
FLAC__boolfalse if seek table is illegal, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__format_seektable_sort (FLAC__StreamMetadata_SeekTableseek_table)
+
+

Sort a seek table's seek points according to the format specification. This includes a "unique-ification" step to remove duplicates, i.e. seek points with identical sample_number values. Duplicate seek points are converted into placeholder points and sorted to the end of the table.

+
Parameters
+ + +
seek_tableA pointer to a seek table to be sorted.
+
+
+
Assertions:
1 seek_table != NULL
+
+
Return values
+ + +
unsignedThe number of duplicate seek points converted into placeholders.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__format_cuesheet_is_legal (const FLAC__StreamMetadata_CueSheetcue_sheet,
FLAC__bool check_cd_da_subset,
const char ** violation 
)
+
+

Check a cue sheet to see if it conforms to the FLAC specification. See the format specification for limits on the contents of the cue sheet.

+
Parameters
+ + + + +
cue_sheetA pointer to an existing cue sheet to be checked.
check_cd_da_subsetIf true, check CUESHEET against more stringent requirements for a CD-DA (audio) disc.
violationAddress of a pointer to a string. If there is a violation, a pointer to a string explanation of the violation will be returned here. violation may be NULL if you don't need the returned string. Do not free the returned string; it will always point to static data.
+
+
+
Assertions:
1 cue_sheet != NULL
+
+
Return values
+ + +
FLAC__boolfalse if cue sheet is illegal, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__format_picture_is_legal (const FLAC__StreamMetadata_Picturepicture,
const char ** violation 
)
+
+

Check picture data to see if it conforms to the FLAC specification. See the format specification for limits on the contents of the PICTURE block.

+
Parameters
+ + + +
pictureA pointer to existing picture data to be checked.
violationAddress of a pointer to a string. If there is a violation, a pointer to a string explanation of the violation will be returned here. violation may be NULL if you don't need the returned string. Do not free the returned string; it will always point to static data.
+
+
+
Assertions:
1 picture != NULL
+
+
Return values
+ + +
FLAC__boolfalse if picture data is illegal, else true.
+
+
+ +
+
+

Variable Documentation

+ +
+
+ + + + +
const char* FLAC__VERSION_STRING
+
+

The version string of the release, stamped onto the libraries and binaries.

+
Note
This does not correspond to the shared library version number, which is used to determine binary compatibility.
+ +
+
+ +
+
+ + + + +
const char* FLAC__VENDOR_STRING
+
+

The vendor string inserted by the encoder into the VORBIS_COMMENT block. This is a NUL-terminated ASCII string; when inserted into the VORBIS_COMMENT the trailing null is stripped.

+ +
+
+ +
+
+ + + + +
const FLAC__byte FLAC__STREAM_SYNC_STRING[4]
+
+

The byte string representation of the beginning of a FLAC stream.

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_SYNC
+
+

The 32-bit integer big-endian representation of the beginning of a FLAC stream.

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_SYNC_LEN
+
+

The length of the FLAC signature in bits.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__EntropyCodingMethodTypeString[]
+
+

Maps a FLAC__EntropyCodingMethodType to a C string.

+

Using a FLAC__EntropyCodingMethodType as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ORDER_LEN
+
+

== 4 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN
+
+

== 4 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN
+
+

== 5 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN
+
+

== 5 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER
+
+

== (1<<FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN)-1

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER
+
+

== (1<<FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN)-1

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__ENTROPY_CODING_METHOD_TYPE_LEN
+
+

== 2 (bits)

+ +
+
+ +
+
+ + + + +
const char* const FLAC__SubframeTypeString[]
+
+

Maps a FLAC__SubframeType to a C string.

+

Using a FLAC__SubframeType as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__SUBFRAME_LPC_QLP_COEFF_PRECISION_LEN
+
+

== 4 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__SUBFRAME_LPC_QLP_SHIFT_LEN
+
+

== 5 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__SUBFRAME_ZERO_PAD_LEN
+
+

== 1 (bit)

+

This used to be a zero-padding bit (hence the name FLAC__SUBFRAME_ZERO_PAD_LEN) but is now a reserved bit. It still has a mandatory value of 0 but in the future may take on the value 0 or 1 to mean something else.

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__SUBFRAME_TYPE_LEN
+
+

== 6 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__SUBFRAME_WASTED_BITS_FLAG_LEN
+
+

== 1 (bit)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__SUBFRAME_TYPE_CONSTANT_BYTE_ALIGNED_MASK
+
+

= 0x00

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__SUBFRAME_TYPE_VERBATIM_BYTE_ALIGNED_MASK
+
+

= 0x02

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__SUBFRAME_TYPE_FIXED_BYTE_ALIGNED_MASK
+
+

= 0x10

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__SUBFRAME_TYPE_LPC_BYTE_ALIGNED_MASK
+
+

= 0x40

+ +
+
+ +
+
+ + + + +
const char* const FLAC__ChannelAssignmentString[]
+
+

Maps a FLAC__ChannelAssignment to a C string.

+

Using a FLAC__ChannelAssignment as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__FrameNumberTypeString[]
+
+

Maps a FLAC__FrameNumberType to a C string.

+

Using a FLAC__FrameNumberType as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_HEADER_SYNC
+
+

== 0x3ffe; the frame header sync code

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_HEADER_SYNC_LEN
+
+

== 14 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_HEADER_RESERVED_LEN
+
+

== 1 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN
+
+

== 1 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_HEADER_BLOCK_SIZE_LEN
+
+

== 4 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_HEADER_SAMPLE_RATE_LEN
+
+

== 4 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_HEADER_CHANNEL_ASSIGNMENT_LEN
+
+

== 4 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_HEADER_BITS_PER_SAMPLE_LEN
+
+

== 3 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_HEADER_ZERO_PAD_LEN
+
+

== 1 (bit)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_HEADER_CRC_LEN
+
+

== 8 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__FRAME_FOOTER_CRC_LEN
+
+

== 16 (bits)

+ +
+
+ +
+
+ + + + +
const char* const FLAC__MetadataTypeString[]
+
+

Maps a FLAC__MetadataType to a C string.

+

Using a FLAC__MetadataType as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN
+
+

== 16 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN
+
+

== 16 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_FRAME_SIZE_LEN
+
+

== 24 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_FRAME_SIZE_LEN
+
+

== 24 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_SAMPLE_RATE_LEN
+
+

== 20 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_CHANNELS_LEN
+
+

== 3 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_BITS_PER_SAMPLE_LEN
+
+

== 5 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_TOTAL_SAMPLES_LEN
+
+

== 36 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_STREAMINFO_MD5SUM_LEN
+
+

== 128 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_APPLICATION_ID_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN
+
+

== 64 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN
+
+

== 64 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN
+
+

== 16 (bits)

+ +
+
+ +
+
+ + + + +
const FLAC__uint64 FLAC__STREAM_METADATA_SEEKPOINT_PLACEHOLDER
+
+

The value used in the sample_number field of FLAC__StreamMetadataSeekPoint used to indicate a placeholder point (== 0xffffffffffffffff).

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN
+
+

== 64 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN
+
+

== 8 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN
+
+

== 3*8 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN
+
+

== 64 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN
+
+

== 8 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_ISRC_LEN
+
+

== 12*8 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_TYPE_LEN
+
+

== 1 (bit)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_PRE_EMPHASIS_LEN
+
+

== 1 (bit)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN
+
+

== 6+13*8 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN
+
+

== 8 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_MEDIA_CATALOG_NUMBER_LEN
+
+

== 128*8 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_LEAD_IN_LEN
+
+

== 64 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_IS_CD_LEN
+
+

== 1 (bit)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN
+
+

== 7+258*8 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN
+
+

== 8 (bits)

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamMetadata_Picture_TypeString[]
+
+

Maps a FLAC__StreamMetadata_Picture_Type to a C string.

+

Using a FLAC__StreamMetadata_Picture_Type as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_PICTURE_TYPE_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_PICTURE_COLORS_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN
+
+

== 32 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_IS_LAST_LEN
+
+

== 1 (bit)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_TYPE_LEN
+
+

== 7 (bits)

+ +
+
+ +
+
+ + + + +
const unsigned FLAC__STREAM_METADATA_LENGTH_LEN
+
+

== 24 (bits)

+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__metadata.html b/lib-src/libflac/doc/html/api/group__flac__metadata.html new file mode 100644 index 000000000..a40a1d872 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__metadata.html @@ -0,0 +1,96 @@ + + + + + + +FLAC: FLAC/metadata.h: metadata interfaces + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/metadata.h: metadata interfaces
+
+
+ + + + + + + + + + +

+Modules

 
 
 
 
+

Detailed Description

+

This module provides functions for creating and manipulating FLAC metadata blocks in memory, and three progressively more powerful interfaces for traversing and editing metadata in native FLAC files. Note that currently only the Chain interface (level 2) supports Ogg FLAC files, and it is read-only i.e. no writing back changed metadata to file.

+

There are three metadata interfaces of increasing complexity:

+

Level 0: Read-only access to the STREAMINFO, VORBIS_COMMENT, CUESHEET, and PICTURE blocks.

+

Level 1: Read-write access to all metadata blocks. This level is write- efficient in most cases (more on this below), and uses less memory than level 2.

+

Level 2: Read-write access to all metadata blocks. This level is write- efficient in all cases, but uses more memory since all metadata for the whole file is read into memory and manipulated before writing out again.

+

What do we mean by efficient? Since FLAC metadata appears at the beginning of the file, when writing metadata back to a FLAC file it is possible to grow or shrink the metadata such that the entire file must be rewritten. However, if the size remains the same during changes or PADDING blocks are utilized, only the metadata needs to be overwritten, which is much faster.

+

Efficient means the whole file is rewritten at most one time, and only when necessary. Level 1 is not efficient only in the case that you cause more than one metadata block to grow or shrink beyond what can be accomodated by padding. In this case you should probably use level 2, which allows you to edit all the metadata for a file in memory and write it out all at once.

+

All levels know how to skip over and not disturb an ID3v2 tag at the front of the file.

+

All levels access files via their filenames. In addition, level 2 has additional alternative read and write functions that take an I/O handle and callbacks, for situations where access by filename is not possible.

+

In addition to the three interfaces, this module defines functions for creating and manipulating various metadata objects in memory. As we see from the Format module, FLAC metadata blocks in memory are very primitive structures for storing information in an efficient way. Reading information from the structures is easy but creating or modifying them directly is more complex. The metadata object routines here facilitate this by taking care of the consistency and memory management drudgery.

+

Unless you will be using the level 1 or 2 interfaces to modify existing metadata however, you will not probably not need these.

+

From a dependency standpoint, none of the encoders or decoders require the metadata module. This is so that embedded users can strip out the metadata module from libFLAC to reduce the size and complexity.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__metadata__level0.html b/lib-src/libflac/doc/html/api/group__flac__metadata__level0.html new file mode 100644 index 000000000..b48c92fb3 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__metadata__level0.html @@ -0,0 +1,309 @@ + + + + + + +FLAC: FLAC/metadata.h: metadata level 0 interface + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/metadata.h: metadata level 0 interface
+
+
+ + + + + + + + + + +

+Functions

FLAC__bool FLAC__metadata_get_streaminfo (const char *filename, FLAC__StreamMetadata *streaminfo)
 
FLAC__bool FLAC__metadata_get_tags (const char *filename, FLAC__StreamMetadata **tags)
 
FLAC__bool FLAC__metadata_get_cuesheet (const char *filename, FLAC__StreamMetadata **cuesheet)
 
FLAC__bool FLAC__metadata_get_picture (const char *filename, FLAC__StreamMetadata **picture, FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors)
 
+

Detailed Description

+

The level 0 interface consists of individual routines to read the STREAMINFO, VORBIS_COMMENT, CUESHEET, and PICTURE blocks, requiring only a filename.

+

They try to skip any ID3v2 tag at the head of the file.

+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_get_streaminfo (const char * filename,
FLAC__StreamMetadatastreaminfo 
)
+
+

Read the STREAMINFO metadata block of the given FLAC file. This function will try to skip any ID3v2 tag at the head of the file.

+
Parameters
+ + + +
filenameThe path to the FLAC file to read.
streaminfoA pointer to space for the STREAMINFO block. Since FLAC__StreamMetadata is a simple structure with no memory allocation involved, you pass the address of an existing structure. It need not be initialized.
+
+
+
Assertions:
1 filename != NULL
+
1 streaminfo != NULL
+
+
Return values
+ + +
FLAC__booltrue if a valid STREAMINFO block was read from filename. Returns false if there was a memory allocation error, a file decoder error, or the file contained no STREAMINFO block. (A memory allocation error is possible because this function must set up a file decoder.)
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_get_tags (const char * filename,
FLAC__StreamMetadata ** tags 
)
+
+

Read the VORBIS_COMMENT metadata block of the given FLAC file. This function will try to skip any ID3v2 tag at the head of the file.

+
Parameters
+ + + +
filenameThe path to the FLAC file to read.
tagsThe address where the returned pointer will be stored. The tags object must be deleted by the caller using FLAC__metadata_object_delete().
+
+
+
Assertions:
1 filename != NULL
+
1 tags != NULL
+
+
Return values
+ + +
FLAC__booltrue if a valid VORBIS_COMMENT block was read from filename, and *tags will be set to the address of the metadata structure. Returns false if there was a memory allocation error, a file decoder error, or the file contained no VORBIS_COMMENT block, and *tags will be set to NULL.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_get_cuesheet (const char * filename,
FLAC__StreamMetadata ** cuesheet 
)
+
+

Read the CUESHEET metadata block of the given FLAC file. This function will try to skip any ID3v2 tag at the head of the file.

+
Parameters
+ + + +
filenameThe path to the FLAC file to read.
cuesheetThe address where the returned pointer will be stored. The cuesheet object must be deleted by the caller using FLAC__metadata_object_delete().
+
+
+
Assertions:
1 filename != NULL
+
1 cuesheet != NULL
+
+
Return values
+ + +
FLAC__booltrue if a valid CUESHEET block was read from filename, and *cuesheet will be set to the address of the metadata structure. Returns false if there was a memory allocation error, a file decoder error, or the file contained no CUESHEET block, and *cuesheet will be set to NULL.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_get_picture (const char * filename,
FLAC__StreamMetadata ** picture,
FLAC__StreamMetadata_Picture_Type type,
const char * mime_type,
const FLAC__byte * description,
unsigned max_width,
unsigned max_height,
unsigned max_depth,
unsigned max_colors 
)
+
+

Read a PICTURE metadata block of the given FLAC file. This function will try to skip any ID3v2 tag at the head of the file. Since there can be more than one PICTURE block in a file, this function takes a number of parameters that act as constraints to the search. The PICTURE block with the largest area matching all the constraints will be returned, or *picture will be set to NULL if there was no such block.

+
Parameters
+ + + + + + + + + + +
filenameThe path to the FLAC file to read.
pictureThe address where the returned pointer will be stored. The picture object must be deleted by the caller using FLAC__metadata_object_delete().
typeThe desired picture type. Use -1 to mean "any type".
mime_typeThe desired MIME type, e.g. "image/jpeg". The string will be matched exactly. Use NULL to mean "any MIME type".
descriptionThe desired description. The string will be matched exactly. Use NULL to mean "any + description".
max_widthThe maximum width in pixels desired. Use (unsigned)(-1) to mean "any width".
max_heightThe maximum height in pixels desired. Use (unsigned)(-1) to mean "any height".
max_depthThe maximum color depth in bits-per-pixel desired. Use (unsigned)(-1) to mean "any depth".
max_colorsThe maximum number of colors desired. Use (unsigned)(-1) to mean "any number of colors".
+
+
+
Assertions:
1 filename != NULL
+
1 picture != NULL
+
+
Return values
+ + +
FLAC__booltrue if a valid PICTURE block was read from filename, and *picture will be set to the address of the metadata structure. Returns false if there was a memory allocation error, a file decoder error, or the file contained no PICTURE block, and *picture will be set to NULL.
+
+
+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__metadata__level1.html b/lib-src/libflac/doc/html/api/group__flac__metadata__level1.html new file mode 100644 index 000000000..6937383c7 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__metadata__level1.html @@ -0,0 +1,828 @@ + + + + + + +FLAC: FLAC/metadata.h: metadata level 1 interface + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/metadata.h: metadata level 1 interface
+
+
+ + + + +

+Typedefs

typedef struct
+FLAC__Metadata_SimpleIterator 
FLAC__Metadata_SimpleIterator
 
+ + + +

+Enumerations

enum  FLAC__Metadata_SimpleIteratorStatus {
+  FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK = 0, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE, +
+  FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR, +
+  FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR, +
+  FLAC__METADATA_SIMPLE_ITERATOR_STATUS_INTERNAL_ERROR +
+ }
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Functions

FLAC__Metadata_SimpleIteratorFLAC__metadata_simple_iterator_new (void)
 
void FLAC__metadata_simple_iterator_delete (FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__Metadata_SimpleIteratorStatus FLAC__metadata_simple_iterator_status (FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_init (FLAC__Metadata_SimpleIterator *iterator, const char *filename, FLAC__bool read_only, FLAC__bool preserve_file_stats)
 
FLAC__bool FLAC__metadata_simple_iterator_is_writable (const FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_next (FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_prev (FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_is_last (const FLAC__Metadata_SimpleIterator *iterator)
 
off_t FLAC__metadata_simple_iterator_get_block_offset (const FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type (const FLAC__Metadata_SimpleIterator *iterator)
 
unsigned FLAC__metadata_simple_iterator_get_block_length (const FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_get_application_id (FLAC__Metadata_SimpleIterator *iterator, FLAC__byte *id)
 
FLAC__StreamMetadataFLAC__metadata_simple_iterator_get_block (FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_set_block (FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding)
 
FLAC__bool FLAC__metadata_simple_iterator_insert_block_after (FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding)
 
FLAC__bool FLAC__metadata_simple_iterator_delete_block (FLAC__Metadata_SimpleIterator *iterator, FLAC__bool use_padding)
 
+ + + +

+Variables

const char *const FLAC__Metadata_SimpleIteratorStatusString []
 
+

Detailed Description

+

The level 1 interface provides read-write access to FLAC file metadata and operates directly on the FLAC file.

+

The general usage of this interface is:

+ +
Note
The FLAC file remains open the whole time between FLAC__metadata_simple_iterator_init() and FLAC__metadata_simple_iterator_delete(), so make sure you are not altering the file during this time.
+
+Do not modify the is_last, length, or type fields of returned FLAC__StreamMetadata objects. These are managed automatically.
+
+If any of the modification functions (FLAC__metadata_simple_iterator_set_block(), FLAC__metadata_simple_iterator_delete_block(), FLAC__metadata_simple_iterator_insert_block_after(), etc.) return false, you should delete the iterator as it may no longer be valid.
+

Typedef Documentation

+ +
+
+

The opaque structure definition for the level 1 iterator type. See the metadata level 1 module for a detailed description.

+ +
+
+

Enumeration Type Documentation

+ +
+
+

Status type for FLAC__Metadata_SimpleIterator.

+

The iterator's current status can be obtained by calling FLAC__metadata_simple_iterator_status().

+ + + + + + + + + + + + + + +
Enumerator
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK  +

The iterator is in the normal OK state

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT  +

The data passed into a function violated the function's usage criteria

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE  +

The iterator could not open the target file

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE  +

The iterator could not find the FLAC signature at the start of the file

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE  +

The iterator tried to write to a file that was not writable

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA  +

The iterator encountered input that does not conform to the FLAC metadata specification

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR  +

The iterator encountered an error while reading the FLAC file

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR  +

The iterator encountered an error while seeking in the FLAC file

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR  +

The iterator encountered an error while writing the FLAC file

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR  +

The iterator encountered an error renaming the FLAC file

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR  +

The iterator encountered an error removing the temporary file

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR  +

Memory allocation failed

+
FLAC__METADATA_SIMPLE_ITERATOR_STATUS_INTERNAL_ERROR  +

The caller violated an assertion or an unexpected error occurred

+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
FLAC__Metadata_SimpleIterator* FLAC__metadata_simple_iterator_new (void )
+
+

Create a new iterator instance.

+
Return values
+ + +
FLAC__Metadata_SimpleIterator*NULL if there was an error allocating memory, else the new instance.
+
+
+ +
+
+ +
+
+ + + + + + + + +
void FLAC__metadata_simple_iterator_delete (FLAC__Metadata_SimpleIteratoriterator)
+
+

Free an iterator instance. Deletes the object pointed to by iterator.

+
Parameters
+ + +
iteratorA pointer to an existing iterator.
+
+
+
Assertions:
1 iterator != NULL
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__Metadata_SimpleIteratorStatus FLAC__metadata_simple_iterator_status (FLAC__Metadata_SimpleIteratoriterator)
+
+

Get the current status of the iterator. Call this after a function returns false to get the reason for the error. Also resets the status to FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK.

+
Parameters
+ + +
iteratorA pointer to an existing iterator.
+
+
+
Assertions:
1 iterator != NULL
+
+
Return values
+ + +
FLAC__Metadata_SimpleIteratorStatusThe current status of the iterator.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_simple_iterator_init (FLAC__Metadata_SimpleIteratoriterator,
const char * filename,
FLAC__bool read_only,
FLAC__bool preserve_file_stats 
)
+
+

Initialize the iterator to point to the first metadata block in the given FLAC file.

+
Parameters
+ + + + + +
iteratorA pointer to an existing iterator.
filenameThe path to the FLAC file.
read_onlyIf true, the FLAC file will be opened in read-only mode; if false, the FLAC file will be opened for edit even if no edits are performed.
preserve_file_statsIf true, the owner and modification time will be preserved even if the FLAC file is written to.
+
+
+
Assertions:
1 iterator != NULL
+
1 filename != NULL
+
+
Return values
+ + +
FLAC__boolfalse if a memory allocation error occurs, the file can't be opened, or another error occurs, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__metadata_simple_iterator_is_writable (const FLAC__Metadata_SimpleIteratoriterator)
+
+

Returns true if the FLAC file is writable. If false, calls to FLAC__metadata_simple_iterator_set_block() and FLAC__metadata_simple_iterator_insert_block_after() will fail.

+
Parameters
+ + +
iteratorA pointer to an existing iterator.
+
+
+
Assertions:
1 iterator != NULL
+
+
Return values
+ + +
FLAC__boolSee above.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__metadata_simple_iterator_next (FLAC__Metadata_SimpleIteratoriterator)
+
+

Moves the iterator forward one metadata block, returning false if already at the end.

+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
+
Return values
+ + +
FLAC__boolfalse if already at the last metadata block of the chain, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__metadata_simple_iterator_prev (FLAC__Metadata_SimpleIteratoriterator)
+
+

Moves the iterator backward one metadata block, returning false if already at the beginning.

+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
+
Return values
+ + +
FLAC__boolfalse if already at the first metadata block of the chain, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__metadata_simple_iterator_is_last (const FLAC__Metadata_SimpleIteratoriterator)
+
+

Returns a flag telling if the current metadata block is the last.

+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
+
Return values
+ + +
FLAC__booltrue if the current metadata block is the last in the file, else false.
+
+
+ +
+
+ +
+
+ + + + + + + + +
off_t FLAC__metadata_simple_iterator_get_block_offset (const FLAC__Metadata_SimpleIteratoriterator)
+
+

Get the offset of the metadata block at the current position. This avoids reading the actual block data which can save time for large blocks.

+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
+
Return values
+ + +
off_tThe offset of the metadata block at the current iterator position. This is the byte offset relative to the beginning of the file of the current metadata block's header.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type (const FLAC__Metadata_SimpleIteratoriterator)
+
+

Get the type of the metadata block at the current position. This avoids reading the actual block data which can save time for large blocks.

+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
+
Return values
+ + +
FLAC__MetadataTypeThe type of the metadata block at the current iterator position.
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__metadata_simple_iterator_get_block_length (const FLAC__Metadata_SimpleIteratoriterator)
+
+

Get the length of the metadata block at the current position. This avoids reading the actual block data which can save time for large blocks.

+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
+
Return values
+ + +
unsignedThe length of the metadata block at the current iterator position. The is same length as that in the metadata block header, i.e. the length of the metadata body that follows the header.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_simple_iterator_get_application_id (FLAC__Metadata_SimpleIteratoriterator,
FLAC__byte * id 
)
+
+

Get the application ID of the APPLICATION block at the current position. This avoids reading the actual block data which can save time for large blocks.

+
Parameters
+ + + +
iteratorA pointer to an existing initialized iterator.
idA pointer to a buffer of at least 4 bytes where the ID will be stored.
+
+
+
Assertions:
1 iterator != NULL
+
1 id != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
+
Return values
+ + +
FLAC__booltrue if the ID was successfully read, else false, in which case you should check FLAC__metadata_simple_iterator_status() to find out why. If the status is FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT, then the current metadata block is not an APPLICATION block. Otherwise if the status is FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR or FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR, an I/O error occurred and the iterator can no longer be used.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__StreamMetadata* FLAC__metadata_simple_iterator_get_block (FLAC__Metadata_SimpleIteratoriterator)
+
+

Get the metadata block at the current position. You can modify the block but must use FLAC__metadata_simple_iterator_set_block() to write it back to the FLAC file.

+

You must call FLAC__metadata_object_delete() on the returned object when you are finished with it.

+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
+
Return values
+ + +
FLAC__StreamMetadata*The current metadata block, or NULL if there was a memory allocation error.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_simple_iterator_set_block (FLAC__Metadata_SimpleIteratoriterator,
FLAC__StreamMetadatablock,
FLAC__bool use_padding 
)
+
+

Write a block back to the FLAC file. This function tries to be as efficient as possible; how the block is actually written is shown by the following:

+

Existing block is a STREAMINFO block and the new block is a STREAMINFO block: the new block is written in place. Make sure you know what you're doing when changing the values of a STREAMINFO block.

+

Existing block is a STREAMINFO block and the new block is a not a STREAMINFO block: this is an error since the first block must be a STREAMINFO block. Returns false without altering the file.

+

Existing block is not a STREAMINFO block and the new block is a STREAMINFO block: this is an error since there may be only one STREAMINFO block. Returns false without altering the file.

+

Existing block and new block are the same length: the existing block will be replaced by the new block, written in place.

+

Existing block is longer than new block: if use_padding is true, the existing block will be overwritten in place with the new block followed by a PADDING block, if possible, to make the total size the same as the existing block. Remember that a padding block requires at least four bytes so if the difference in size between the new block and existing block is less than that, the entire file will have to be rewritten, using the new block's exact size. If use_padding is false, the entire file will be rewritten, replacing the existing block by the new block.

+

Existing block is shorter than new block: if use_padding is true, the function will try and expand the new block into the following PADDING block, if it exists and doing so won't shrink the PADDING block to less than 4 bytes. If there is no following PADDING block, or it will shrink to less than 4 bytes, or use_padding is false, the entire file is rewritten, replacing the existing block with the new block. Note that in this case any following PADDING block is preserved as is.

+

After writing the block, the iterator will remain in the same place, i.e. pointing to the new block.

+
Parameters
+ + + + +
iteratorA pointer to an existing initialized iterator.
blockThe block to set.
use_paddingSee above.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
1 block != NULL
+
+
Return values
+ + +
FLAC__booltrue if successful, else false.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_simple_iterator_insert_block_after (FLAC__Metadata_SimpleIteratoriterator,
FLAC__StreamMetadatablock,
FLAC__bool use_padding 
)
+
+

This is similar to FLAC__metadata_simple_iterator_set_block() except that instead of writing over an existing block, it appends a block after the existing block. use_padding is again used to tell the function to try an expand into following padding in an attempt to avoid rewriting the entire file.

+

This function will fail and return false if given a STREAMINFO block.

+

After writing the block, the iterator will be pointing to the new block.

+
Parameters
+ + + + +
iteratorA pointer to an existing initialized iterator.
blockThe block to set.
use_paddingSee above.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
1 block != NULL
+
+
Return values
+ + +
FLAC__booltrue if successful, else false.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_simple_iterator_delete_block (FLAC__Metadata_SimpleIteratoriterator,
FLAC__bool use_padding 
)
+
+

Deletes the block at the current position. This will cause the entire FLAC file to be rewritten, unless use_padding is true, in which case the block will be replaced by an equal-sized PADDING block. The iterator will be left pointing to the block before the one just deleted.

+

You may not delete the STREAMINFO block.

+
Parameters
+ + + +
iteratorA pointer to an existing initialized iterator.
use_paddingSee above.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_simple_iterator_init()
+
Return values
+ + +
FLAC__booltrue if successful, else false.
+
+
+ +
+
+

Variable Documentation

+ +
+
+ + + + +
const char* const FLAC__Metadata_SimpleIteratorStatusString[]
+
+

Maps a FLAC__Metadata_SimpleIteratorStatus to a C string.

+

Using a FLAC__Metadata_SimpleIteratorStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__metadata__level2.html b/lib-src/libflac/doc/html/api/group__flac__metadata__level2.html new file mode 100644 index 000000000..72cd667dd --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__metadata__level2.html @@ -0,0 +1,1222 @@ + + + + + + +FLAC: FLAC/metadata.h: metadata level 2 interface + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/metadata.h: metadata level 2 interface
+
+
+ + + + + + +

+Typedefs

typedef struct FLAC__Metadata_Chain FLAC__Metadata_Chain
 
typedef struct
+FLAC__Metadata_Iterator 
FLAC__Metadata_Iterator
 
+ + + +

+Enumerations

enum  FLAC__Metadata_ChainStatus {
+  FLAC__METADATA_CHAIN_STATUS_OK = 0, +FLAC__METADATA_CHAIN_STATUS_ILLEGAL_INPUT, +FLAC__METADATA_CHAIN_STATUS_ERROR_OPENING_FILE, +FLAC__METADATA_CHAIN_STATUS_NOT_A_FLAC_FILE, +
+  FLAC__METADATA_CHAIN_STATUS_NOT_WRITABLE, +FLAC__METADATA_CHAIN_STATUS_BAD_METADATA, +FLAC__METADATA_CHAIN_STATUS_READ_ERROR, +FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR, +
+  FLAC__METADATA_CHAIN_STATUS_WRITE_ERROR, +FLAC__METADATA_CHAIN_STATUS_RENAME_ERROR, +FLAC__METADATA_CHAIN_STATUS_UNLINK_ERROR, +FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR, +
+  FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR, +FLAC__METADATA_CHAIN_STATUS_INVALID_CALLBACKS, +FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH, +FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL +
+ }
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Functions

FLAC__Metadata_ChainFLAC__metadata_chain_new (void)
 
void FLAC__metadata_chain_delete (FLAC__Metadata_Chain *chain)
 
FLAC__Metadata_ChainStatus FLAC__metadata_chain_status (FLAC__Metadata_Chain *chain)
 
FLAC__bool FLAC__metadata_chain_read (FLAC__Metadata_Chain *chain, const char *filename)
 
FLAC__bool FLAC__metadata_chain_read_ogg (FLAC__Metadata_Chain *chain, const char *filename)
 
FLAC__bool FLAC__metadata_chain_read_with_callbacks (FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
 
FLAC__bool FLAC__metadata_chain_read_ogg_with_callbacks (FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
 
FLAC__bool FLAC__metadata_chain_check_if_tempfile_needed (FLAC__Metadata_Chain *chain, FLAC__bool use_padding)
 
FLAC__bool FLAC__metadata_chain_write (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__bool preserve_file_stats)
 
FLAC__bool FLAC__metadata_chain_write_with_callbacks (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
 
FLAC__bool FLAC__metadata_chain_write_with_callbacks_and_tempfile (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, FLAC__IOHandle temp_handle, FLAC__IOCallbacks temp_callbacks)
 
void FLAC__metadata_chain_merge_padding (FLAC__Metadata_Chain *chain)
 
void FLAC__metadata_chain_sort_padding (FLAC__Metadata_Chain *chain)
 
FLAC__Metadata_IteratorFLAC__metadata_iterator_new (void)
 
void FLAC__metadata_iterator_delete (FLAC__Metadata_Iterator *iterator)
 
void FLAC__metadata_iterator_init (FLAC__Metadata_Iterator *iterator, FLAC__Metadata_Chain *chain)
 
FLAC__bool FLAC__metadata_iterator_next (FLAC__Metadata_Iterator *iterator)
 
FLAC__bool FLAC__metadata_iterator_prev (FLAC__Metadata_Iterator *iterator)
 
FLAC__MetadataType FLAC__metadata_iterator_get_block_type (const FLAC__Metadata_Iterator *iterator)
 
FLAC__StreamMetadataFLAC__metadata_iterator_get_block (FLAC__Metadata_Iterator *iterator)
 
FLAC__bool FLAC__metadata_iterator_set_block (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block)
 
FLAC__bool FLAC__metadata_iterator_delete_block (FLAC__Metadata_Iterator *iterator, FLAC__bool replace_with_padding)
 
FLAC__bool FLAC__metadata_iterator_insert_block_before (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block)
 
FLAC__bool FLAC__metadata_iterator_insert_block_after (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block)
 
+ + + +

+Variables

const char *const FLAC__Metadata_ChainStatusString []
 
+

Detailed Description

+

The level 2 interface provides read-write access to FLAC file metadata; all metadata is read into memory, operated on in memory, and then written to file, which is more efficient than level 1 when editing multiple blocks.

+

Currently Ogg FLAC is supported for read only, via FLAC__metadata_chain_read_ogg() but a subsequent FLAC__metadata_chain_write() will fail.

+

The general usage of this interface is:

+ +
Note
Even though the FLAC file is not open while the chain is being manipulated, you must not alter the file externally during this time. The chain assumes the FLAC file will not change between the time of FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg() and FLAC__metadata_chain_write().
+
+Do not modify the is_last, length, or type fields of returned FLAC__StreamMetadata objects. These are managed automatically.
+
+The metadata objects returned by FLAC__metadata_iterator_get_block() are owned by the chain; do not FLAC__metadata_object_delete() them. In the same way, blocks passed to FLAC__metadata_iterator_set_block() become owned by the chain and they will be deleted when the chain is deleted.
+

Typedef Documentation

+ +
+
+ + + + +
typedef struct FLAC__Metadata_Chain FLAC__Metadata_Chain
+
+

The opaque structure definition for the level 2 chain type.

+ +
+
+ +
+
+

The opaque structure definition for the level 2 iterator type.

+ +
+
+

Enumeration Type Documentation

+ +
+
+ + + + +
enum FLAC__Metadata_ChainStatus
+
+ + + + + + + + + + + + + + + + + +
Enumerator
FLAC__METADATA_CHAIN_STATUS_OK  +

The chain is in the normal OK state

+
FLAC__METADATA_CHAIN_STATUS_ILLEGAL_INPUT  +

The data passed into a function violated the function's usage criteria

+
FLAC__METADATA_CHAIN_STATUS_ERROR_OPENING_FILE  +

The chain could not open the target file

+
FLAC__METADATA_CHAIN_STATUS_NOT_A_FLAC_FILE  +

The chain could not find the FLAC signature at the start of the file

+
FLAC__METADATA_CHAIN_STATUS_NOT_WRITABLE  +

The chain tried to write to a file that was not writable

+
FLAC__METADATA_CHAIN_STATUS_BAD_METADATA  +

The chain encountered input that does not conform to the FLAC metadata specification

+
FLAC__METADATA_CHAIN_STATUS_READ_ERROR  +

The chain encountered an error while reading the FLAC file

+
FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR  +

The chain encountered an error while seeking in the FLAC file

+
FLAC__METADATA_CHAIN_STATUS_WRITE_ERROR  +

The chain encountered an error while writing the FLAC file

+
FLAC__METADATA_CHAIN_STATUS_RENAME_ERROR  +

The chain encountered an error renaming the FLAC file

+
FLAC__METADATA_CHAIN_STATUS_UNLINK_ERROR  +

The chain encountered an error removing the temporary file

+
FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR  +

Memory allocation failed

+
FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR  +

The caller violated an assertion or an unexpected error occurred

+
FLAC__METADATA_CHAIN_STATUS_INVALID_CALLBACKS  +

One or more of the required callbacks was NULL

+
FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH  +

FLAC__metadata_chain_write() was called on a chain read by FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(), or FLAC__metadata_chain_write_with_callbacks()/FLAC__metadata_chain_write_with_callbacks_and_tempfile() was called on a chain read by FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(). Matching read/write methods must always be used.

+
FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL  +

FLAC__metadata_chain_write_with_callbacks() was called when the chain write requires a tempfile; use FLAC__metadata_chain_write_with_callbacks_and_tempfile() instead. Or, FLAC__metadata_chain_write_with_callbacks_and_tempfile() was called when the chain write does not require a tempfile; use FLAC__metadata_chain_write_with_callbacks() instead. Always check FLAC__metadata_chain_check_if_tempfile_needed() before writing via callbacks.

+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
FLAC__Metadata_Chain* FLAC__metadata_chain_new (void )
+
+

Create a new chain instance.

+
Return values
+ + +
FLAC__Metadata_Chain*NULL if there was an error allocating memory, else the new instance.
+
+
+ +
+
+ +
+
+ + + + + + + + +
void FLAC__metadata_chain_delete (FLAC__Metadata_Chainchain)
+
+

Free a chain instance. Deletes the object pointed to by chain.

+
Parameters
+ + +
chainA pointer to an existing chain.
+
+
+
Assertions:
1 chain != NULL
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__Metadata_ChainStatus FLAC__metadata_chain_status (FLAC__Metadata_Chainchain)
+
+

Get the current status of the chain. Call this after a function returns false to get the reason for the error. Also resets the status to FLAC__METADATA_CHAIN_STATUS_OK.

+
Parameters
+ + +
chainA pointer to an existing chain.
+
+
+
Assertions:
1 chain != NULL
+
+
Return values
+ + +
FLAC__Metadata_ChainStatusThe current status of the chain.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_chain_read (FLAC__Metadata_Chainchain,
const char * filename 
)
+
+

Read all metadata from a FLAC file into the chain.

+
Parameters
+ + + +
chainA pointer to an existing chain.
filenameThe path to the FLAC file to read.
+
+
+
Assertions:
1 chain != NULL
+
1 filename != NULL
+
+
Return values
+ + +
FLAC__booltrue if a valid list of metadata blocks was read from filename, else false. On failure, check the status with FLAC__metadata_chain_status().
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_chain_read_ogg (FLAC__Metadata_Chainchain,
const char * filename 
)
+
+

Read all metadata from an Ogg FLAC file into the chain.

+
Note
Ogg FLAC metadata data writing is not supported yet and FLAC__metadata_chain_write() will fail.
+
Parameters
+ + + +
chainA pointer to an existing chain.
filenameThe path to the Ogg FLAC file to read.
+
+
+
Assertions:
1 chain != NULL
+
1 filename != NULL
+
+
Return values
+ + +
FLAC__booltrue if a valid list of metadata blocks was read from filename, else false. On failure, check the status with FLAC__metadata_chain_status().
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_chain_read_with_callbacks (FLAC__Metadata_Chainchain,
FLAC__IOHandle handle,
FLAC__IOCallbacks callbacks 
)
+
+

Read all metadata from a FLAC stream into the chain via I/O callbacks.

+

The handle need only be open for reading, but must be seekable. The equivalent minimum stdio fopen() file mode is "r" (or "rb" for Windows).

+
Parameters
+ + + + +
chainA pointer to an existing chain.
handleThe I/O handle of the FLAC stream to read. The handle will NOT be closed after the metadata is read; that is the duty of the caller.
callbacksA set of callbacks to use for I/O. The mandatory callbacks are read, seek, and tell.
+
+
+
Assertions:
1 chain != NULL
+
+
Return values
+ + +
FLAC__booltrue if a valid list of metadata blocks was read from handle, else false. On failure, check the status with FLAC__metadata_chain_status().
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_chain_read_ogg_with_callbacks (FLAC__Metadata_Chainchain,
FLAC__IOHandle handle,
FLAC__IOCallbacks callbacks 
)
+
+

Read all metadata from an Ogg FLAC stream into the chain via I/O callbacks.

+

The handle need only be open for reading, but must be seekable. The equivalent minimum stdio fopen() file mode is "r" (or "rb" for Windows).

+
Note
Ogg FLAC metadata data writing is not supported yet and FLAC__metadata_chain_write() will fail.
+
Parameters
+ + + + +
chainA pointer to an existing chain.
handleThe I/O handle of the Ogg FLAC stream to read. The handle will NOT be closed after the metadata is read; that is the duty of the caller.
callbacksA set of callbacks to use for I/O. The mandatory callbacks are read, seek, and tell.
+
+
+
Assertions:
1 chain != NULL
+
+
Return values
+ + +
FLAC__booltrue if a valid list of metadata blocks was read from handle, else false. On failure, check the status with FLAC__metadata_chain_status().
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_chain_check_if_tempfile_needed (FLAC__Metadata_Chainchain,
FLAC__bool use_padding 
)
+
+

Checks if writing the given chain would require the use of a temporary file, or if it could be written in place.

+

Under certain conditions, padding can be utilized so that writing edited metadata back to the FLAC file does not require rewriting the entire file. If rewriting is required, then a temporary workfile is required. When writing metadata using callbacks, you must check this function to know whether to call FLAC__metadata_chain_write_with_callbacks() or FLAC__metadata_chain_write_with_callbacks_and_tempfile(). When writing with FLAC__metadata_chain_write(), the temporary file is handled internally.

+
Parameters
+ + + +
chainA pointer to an existing chain.
use_paddingWhether or not padding will be allowed to be used during the write. The value of use_padding given here must match the value later passed to FLAC__metadata_chain_write_with_callbacks() or FLAC__metadata_chain_write_with_callbacks_with_tempfile().
+
+
+
Assertions:
1 chain != NULL
+
+
Return values
+ + +
FLAC__booltrue if writing the current chain would require a tempfile, or false if metadata can be written in place.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_chain_write (FLAC__Metadata_Chainchain,
FLAC__bool use_padding,
FLAC__bool preserve_file_stats 
)
+
+

Write all metadata out to the FLAC file. This function tries to be as efficient as possible; how the metadata is actually written is shown by the following:

+

If the current chain is the same size as the existing metadata, the new data is written in place.

+

If the current chain is longer than the existing metadata, and use_padding is true, and the last block is a PADDING block of sufficient length, the function will truncate the final padding block so that the overall size of the metadata is the same as the existing metadata, and then just rewrite the metadata. Otherwise, if not all of the above conditions are met, the entire FLAC file must be rewritten. If you want to use padding this way it is a good idea to call FLAC__metadata_chain_sort_padding() first so that you have the maximum amount of padding to work with, unless you need to preserve ordering of the PADDING blocks for some reason.

+

If the current chain is shorter than the existing metadata, and use_padding is true, and the final block is a PADDING block, the padding is extended to make the overall size the same as the existing data. If use_padding is true and the last block is not a PADDING block, a new PADDING block is added to the end of the new data to make it the same size as the existing data (if possible, see the note to FLAC__metadata_simple_iterator_set_block() about the four byte limit) and the new data is written in place. If none of the above apply or use_padding is false, the entire FLAC file is rewritten.

+

If preserve_file_stats is true, the owner and modification time will be preserved even if the FLAC file is written.

+

For this write function to be used, the chain must have been read with FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(), not FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks().

+
Parameters
+ + + + +
chainA pointer to an existing chain.
use_paddingSee above.
preserve_file_statsSee above.
+
+
+
Assertions:
1 chain != NULL
+
+
Return values
+ + +
FLAC__booltrue if the write succeeded, else false. On failure, check the status with FLAC__metadata_chain_status().
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_chain_write_with_callbacks (FLAC__Metadata_Chainchain,
FLAC__bool use_padding,
FLAC__IOHandle handle,
FLAC__IOCallbacks callbacks 
)
+
+

Write all metadata out to a FLAC stream via callbacks.

+

(See FLAC__metadata_chain_write() for the details on how padding is used to write metadata in place if possible.)

+

The handle must be open for updating and be seekable. The equivalent minimum stdio fopen() file mode is "r+" (or "r+b" for Windows).

+

For this write function to be used, the chain must have been read with FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(), not FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(). Also, FLAC__metadata_chain_check_if_tempfile_needed() must have returned false.

+
Parameters
+ + + + + +
chainA pointer to an existing chain.
use_paddingSee FLAC__metadata_chain_write()
handleThe I/O handle of the FLAC stream to write. The handle will NOT be closed after the metadata is written; that is the duty of the caller.
callbacksA set of callbacks to use for I/O. The mandatory callbacks are write and seek.
+
+
+
Assertions:
1 chain != NULL
+
+
Return values
+ + +
FLAC__booltrue if the write succeeded, else false. On failure, check the status with FLAC__metadata_chain_status().
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_chain_write_with_callbacks_and_tempfile (FLAC__Metadata_Chainchain,
FLAC__bool use_padding,
FLAC__IOHandle handle,
FLAC__IOCallbacks callbacks,
FLAC__IOHandle temp_handle,
FLAC__IOCallbacks temp_callbacks 
)
+
+

Write all metadata out to a FLAC stream via callbacks.

+

(See FLAC__metadata_chain_write() for the details on how padding is used to write metadata in place if possible.)

+

This version of the write-with-callbacks function must be used when FLAC__metadata_chain_check_if_tempfile_needed() returns true. In this function, you must supply an I/O handle corresponding to the FLAC file to edit, and a temporary handle to which the new FLAC file will be written. It is the caller's job to move this temporary FLAC file on top of the original FLAC file to complete the metadata edit.

+

The handle must be open for reading and be seekable. The equivalent minimum stdio fopen() file mode is "r" (or "rb" for Windows).

+

The temp_handle must be open for writing. The equivalent minimum stdio fopen() file mode is "w" (or "wb" for Windows). It should be an empty stream, or at least positioned at the start-of-file (in which case it is the caller's duty to truncate it on return).

+

For this write function to be used, the chain must have been read with FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(), not FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(). Also, FLAC__metadata_chain_check_if_tempfile_needed() must have returned true.

+
Parameters
+ + + + + + + +
chainA pointer to an existing chain.
use_paddingSee FLAC__metadata_chain_write()
handleThe I/O handle of the original FLAC stream to read. The handle will NOT be closed after the metadata is written; that is the duty of the caller.
callbacksA set of callbacks to use for I/O on handle. The mandatory callbacks are read, seek, and eof.
temp_handleThe I/O handle of the FLAC stream to write. The handle will NOT be closed after the metadata is written; that is the duty of the caller.
temp_callbacksA set of callbacks to use for I/O on temp_handle. The only mandatory callback is write.
+
+
+
Assertions:
1 chain != NULL
+
+
Return values
+ + +
FLAC__booltrue if the write succeeded, else false. On failure, check the status with FLAC__metadata_chain_status().
+
+
+ +
+
+ +
+
+ + + + + + + + +
void FLAC__metadata_chain_merge_padding (FLAC__Metadata_Chainchain)
+
+

Merge adjacent PADDING blocks into a single block.

+
Note
This function does not write to the FLAC file, it only modifies the chain.
+
Warning
Any iterator on the current chain will become invalid after this call. You should delete the iterator and get a new one.
+
Parameters
+ + +
chainA pointer to an existing chain.
+
+
+
Assertions:
1 chain != NULL
+
+ +
+
+ +
+
+ + + + + + + + +
void FLAC__metadata_chain_sort_padding (FLAC__Metadata_Chainchain)
+
+

This function will move all PADDING blocks to the end on the metadata, then merge them into a single block.

+
Note
This function does not write to the FLAC file, it only modifies the chain.
+
Warning
Any iterator on the current chain will become invalid after this call. You should delete the iterator and get a new one.
+
Parameters
+ + +
chainA pointer to an existing chain.
+
+
+
Assertions:
1 chain != NULL
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__Metadata_Iterator* FLAC__metadata_iterator_new (void )
+
+

Create a new iterator instance.

+
Return values
+ + +
FLAC__Metadata_Iterator*NULL if there was an error allocating memory, else the new instance.
+
+
+ +
+
+ +
+
+ + + + + + + + +
void FLAC__metadata_iterator_delete (FLAC__Metadata_Iteratoriterator)
+
+

Free an iterator instance. Deletes the object pointed to by iterator.

+
Parameters
+ + +
iteratorA pointer to an existing iterator.
+
+
+
Assertions:
1 iterator != NULL
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
void FLAC__metadata_iterator_init (FLAC__Metadata_Iteratoriterator,
FLAC__Metadata_Chainchain 
)
+
+

Initialize the iterator to point to the first metadata block in the given chain.

+
Parameters
+ + + +
iteratorA pointer to an existing iterator.
chainA pointer to an existing and initialized (read) chain.
+
+
+
Assertions:
1 iterator != NULL
+
1 chain != NULL
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__metadata_iterator_next (FLAC__Metadata_Iteratoriterator)
+
+

Moves the iterator forward one metadata block, returning false if already at the end.

+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_iterator_init()
+
Return values
+ + +
FLAC__boolfalse if already at the last metadata block of the chain, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__metadata_iterator_prev (FLAC__Metadata_Iteratoriterator)
+
+

Moves the iterator backward one metadata block, returning false if already at the beginning.

+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_iterator_init()
+
Return values
+ + +
FLAC__boolfalse if already at the first metadata block of the chain, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__MetadataType FLAC__metadata_iterator_get_block_type (const FLAC__Metadata_Iteratoriterator)
+
+

Get the type of the metadata block at the current position.

+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_iterator_init()
+
Return values
+ + +
FLAC__MetadataTypeThe type of the metadata block at the current iterator position.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__StreamMetadata* FLAC__metadata_iterator_get_block (FLAC__Metadata_Iteratoriterator)
+
+

Get the metadata block at the current position. You can modify the block in place but must write the chain before the changes are reflected to the FLAC file. You do not need to call FLAC__metadata_iterator_set_block() to reflect the changes; the pointer returned by FLAC__metadata_iterator_get_block() points directly into the chain.

+
Warning
Do not call FLAC__metadata_object_delete() on the returned object; to delete a block use FLAC__metadata_iterator_delete_block().
+
Parameters
+ + +
iteratorA pointer to an existing initialized iterator.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_iterator_init()
+
Return values
+ + +
FLAC__StreamMetadata*The current metadata block.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_iterator_set_block (FLAC__Metadata_Iteratoriterator,
FLAC__StreamMetadatablock 
)
+
+

Set the metadata block at the current position, replacing the existing block. The new block passed in becomes owned by the chain and it will be deleted when the chain is deleted.

+
Parameters
+ + + +
iteratorA pointer to an existing initialized iterator.
blockA pointer to a metadata block.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_iterator_init()
1 block != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the conditions in the above description are not met, or a memory allocation error occurs, otherwise true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_iterator_delete_block (FLAC__Metadata_Iteratoriterator,
FLAC__bool replace_with_padding 
)
+
+

Removes the current block from the chain. If replace_with_padding is true, the block will instead be replaced with a padding block of equal size. You can not delete the STREAMINFO block. The iterator will be left pointing to the block before the one just "deleted", even if replace_with_padding is true.

+
Parameters
+ + + +
iteratorA pointer to an existing initialized iterator.
replace_with_paddingSee above.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_iterator_init()
+
Return values
+ + +
FLAC__boolfalse if the conditions in the above description are not met, otherwise true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_iterator_insert_block_before (FLAC__Metadata_Iteratoriterator,
FLAC__StreamMetadatablock 
)
+
+

Insert a new block before the current block. You cannot insert a block before the first STREAMINFO block. You cannot insert a STREAMINFO block as there can be only one, the one that already exists at the head when you read in a chain. The chain takes ownership of the new block and it will be deleted when the chain is deleted. The iterator will be left pointing to the new block.

+
Parameters
+ + + +
iteratorA pointer to an existing initialized iterator.
blockA pointer to a metadata block to insert.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_iterator_init()
+
Return values
+ + +
FLAC__boolfalse if the conditions in the above description are not met, or a memory allocation error occurs, otherwise true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_iterator_insert_block_after (FLAC__Metadata_Iteratoriterator,
FLAC__StreamMetadatablock 
)
+
+

Insert a new block after the current block. You cannot insert a STREAMINFO block as there can be only one, the one that already exists at the head when you read in a chain. The chain takes ownership of the new block and it will be deleted when the chain is deleted. The iterator will be left pointing to the new block.

+
Parameters
+ + + +
iteratorA pointer to an existing initialized iterator.
blockA pointer to a metadata block to insert.
+
+
+
Assertions:
1 iterator != NULL
+
iterator has been successfully initialized with FLAC__metadata_iterator_init()
+
Return values
+ + +
FLAC__boolfalse if the conditions in the above description are not met, or a memory allocation error occurs, otherwise true.
+
+
+ +
+
+

Variable Documentation

+ +
+
+ + + + +
const char* const FLAC__Metadata_ChainStatusString[]
+
+

Maps a FLAC__Metadata_ChainStatus to a C string.

+

Using a FLAC__Metadata_ChainStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__metadata__object.html b/lib-src/libflac/doc/html/api/group__flac__metadata__object.html new file mode 100644 index 000000000..0e8337015 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__metadata__object.html @@ -0,0 +1,2407 @@ + + + + + + +FLAC: FLAC/metadata.h: metadata object methods + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/metadata.h: metadata object methods
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Functions

FLAC__StreamMetadataFLAC__metadata_object_new (FLAC__MetadataType type)
 
FLAC__StreamMetadataFLAC__metadata_object_clone (const FLAC__StreamMetadata *object)
 
void FLAC__metadata_object_delete (FLAC__StreamMetadata *object)
 
FLAC__bool FLAC__metadata_object_is_equal (const FLAC__StreamMetadata *block1, const FLAC__StreamMetadata *block2)
 
FLAC__bool FLAC__metadata_object_application_set_data (FLAC__StreamMetadata *object, FLAC__byte *data, unsigned length, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_seektable_resize_points (FLAC__StreamMetadata *object, unsigned new_num_points)
 
void FLAC__metadata_object_seektable_set_point (FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point)
 
FLAC__bool FLAC__metadata_object_seektable_insert_point (FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point)
 
FLAC__bool FLAC__metadata_object_seektable_delete_point (FLAC__StreamMetadata *object, unsigned point_num)
 
FLAC__bool FLAC__metadata_object_seektable_is_legal (const FLAC__StreamMetadata *object)
 
FLAC__bool FLAC__metadata_object_seektable_template_append_placeholders (FLAC__StreamMetadata *object, unsigned num)
 
FLAC__bool FLAC__metadata_object_seektable_template_append_point (FLAC__StreamMetadata *object, FLAC__uint64 sample_number)
 
FLAC__bool FLAC__metadata_object_seektable_template_append_points (FLAC__StreamMetadata *object, FLAC__uint64 sample_numbers[], unsigned num)
 
FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points (FLAC__StreamMetadata *object, unsigned num, FLAC__uint64 total_samples)
 
FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points_by_samples (FLAC__StreamMetadata *object, unsigned samples, FLAC__uint64 total_samples)
 
FLAC__bool FLAC__metadata_object_seektable_template_sort (FLAC__StreamMetadata *object, FLAC__bool compact)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_set_vendor_string (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments (FLAC__StreamMetadata *object, unsigned new_num_comments)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment (FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_insert_comment (FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_append_comment (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment (FLAC__StreamMetadata *object, unsigned comment_num)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair (FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair (const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches (const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length)
 
int FLAC__metadata_object_vorbiscomment_find_entry_from (const FLAC__StreamMetadata *object, unsigned offset, const char *field_name)
 
int FLAC__metadata_object_vorbiscomment_remove_entry_matching (FLAC__StreamMetadata *object, const char *field_name)
 
int FLAC__metadata_object_vorbiscomment_remove_entries_matching (FLAC__StreamMetadata *object, const char *field_name)
 
FLAC__StreamMetadata_CueSheet_TrackFLAC__metadata_object_cuesheet_track_new (void)
 
FLAC__StreamMetadata_CueSheet_TrackFLAC__metadata_object_cuesheet_track_clone (const FLAC__StreamMetadata_CueSheet_Track *object)
 
void FLAC__metadata_object_cuesheet_track_delete (FLAC__StreamMetadata_CueSheet_Track *object)
 
FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices (FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices)
 
FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index)
 
FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)
 
FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)
 
FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks (FLAC__StreamMetadata *object, unsigned new_num_tracks)
 
FLAC__bool FLAC__metadata_object_cuesheet_set_track (FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_cuesheet_insert_track (FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track (FLAC__StreamMetadata *object, unsigned track_num)
 
FLAC__bool FLAC__metadata_object_cuesheet_delete_track (FLAC__StreamMetadata *object, unsigned track_num)
 
FLAC__bool FLAC__metadata_object_cuesheet_is_legal (const FLAC__StreamMetadata *object, FLAC__bool check_cd_da_subset, const char **violation)
 
FLAC__uint32 FLAC__metadata_object_cuesheet_calculate_cddb_id (const FLAC__StreamMetadata *object)
 
FLAC__bool FLAC__metadata_object_picture_set_mime_type (FLAC__StreamMetadata *object, char *mime_type, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_picture_set_description (FLAC__StreamMetadata *object, FLAC__byte *description, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_picture_set_data (FLAC__StreamMetadata *object, FLAC__byte *data, FLAC__uint32 length, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_picture_is_legal (const FLAC__StreamMetadata *object, const char **violation)
 
+

Detailed Description

+

This module contains methods for manipulating FLAC metadata objects.

+

Since many are variable length we have to be careful about the memory management. We decree that all pointers to data in the object are owned by the object and memory-managed by the object.

+

Use the FLAC__metadata_object_new() and FLAC__metadata_object_delete() functions to create all instances. When using the FLAC__metadata_object_set_*() functions to set pointers to data, set copy to true to have the function make it's own copy of the data, or to false to give the object ownership of your data. In the latter case your pointer must be freeable by free() and will be free()d when the object is FLAC__metadata_object_delete()d. It is legal to pass a null pointer as the data pointer to a FLAC__metadata_object_set_*() function as long as the length argument is 0 and the copy argument is false.

+

The FLAC__metadata_object_new() and FLAC__metadata_object_clone() function will return NULL in the case of a memory allocation error, otherwise a new object. The FLAC__metadata_object_set_*() functions return false in the case of a memory allocation error.

+

We don't have the convenience of C++ here, so note that the library relies on you to keep the types straight. In other words, if you pass, for example, a FLAC__StreamMetadata* that represents a STREAMINFO block to FLAC__metadata_object_application_set_data(), you will get an assertion failure.

+

For convenience the FLAC__metadata_object_vorbiscomment_*() functions maintain a trailing NUL on each Vorbis comment entry. This is not counted toward the length or stored in the stream, but it can make working with plain comments (those that don't contain embedded-NULs in the value) easier. Entries passed into these functions have trailing NULs added if missing, and returned entries are guaranteed to have a trailing NUL.

+

The FLAC__metadata_object_vorbiscomment_*() functions that take a Vorbis comment entry/name/value will first validate that it complies with the Vorbis comment specification and return false if it does not.

+

There is no need to recalculate the length field on metadata blocks you have modified. They will be calculated automatically before they are written back to a file.

+

Function Documentation

+ +
+
+ + + + + + + + +
FLAC__StreamMetadata* FLAC__metadata_object_new (FLAC__MetadataType type)
+
+

Create a new metadata object instance of the given type.

+

The object will be "empty"; i.e. values and data pointers will be 0, with the exception of FLAC__METADATA_TYPE_VORBIS_COMMENT, which will have the vendor string set (but zero comments).

+

Do not pass in a value greater than or equal to FLAC__METADATA_TYPE_UNDEFINED unless you really know what you're doing.

+
Parameters
+ + +
typeType of object to create
+
+
+
Return values
+ + +
FLAC__StreamMetadata*NULL if there was an error allocating memory or the type code is greater than FLAC__MAX_METADATA_TYPE_CODE, else the new instance.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__StreamMetadata* FLAC__metadata_object_clone (const FLAC__StreamMetadataobject)
+
+

Create a copy of an existing metadata object.

+

The copy is a "deep" copy, i.e. dynamically allocated data within the object is also copied. The caller takes ownership of the new block and is responsible for freeing it with FLAC__metadata_object_delete().

+
Parameters
+ + +
objectPointer to object to copy.
+
+
+
Assertions:
1 object != NULL
+
+
Return values
+ + +
FLAC__StreamMetadata*NULL if there was an error allocating memory, else the new instance.
+
+
+ +
+
+ +
+
+ + + + + + + + +
void FLAC__metadata_object_delete (FLAC__StreamMetadataobject)
+
+

Free a metadata object. Deletes the object pointed to by object.

+

The delete is a "deep" delete, i.e. dynamically allocated data within the object is also deleted.

+
Parameters
+ + +
objectA pointer to an existing object.
+
+
+
Assertions:
1 object != NULL
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_is_equal (const FLAC__StreamMetadatablock1,
const FLAC__StreamMetadatablock2 
)
+
+

Compares two metadata objects.

+

The compare is "deep", i.e. dynamically allocated data within the object is also compared.

+
Parameters
+ + + +
block1A pointer to an existing object.
block2A pointer to an existing object.
+
+
+
Assertions:
1 block1 != NULL
+
1 block2 != NULL
+
+
Return values
+ + +
FLAC__booltrue if objects are identical, else false.
+
+
+ +

Referenced by FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_application_set_data (FLAC__StreamMetadataobject,
FLAC__byte * data,
unsigned length,
FLAC__bool copy 
)
+
+

Sets the application data of an APPLICATION block.

+

If copy is true, a copy of the data is stored; otherwise, the object takes ownership of the pointer. The existing data will be freed if this function is successful, otherwise the original data will remain if copy is true and malloc() fails.

+
Note
It is safe to pass a const pointer to data if copy is true.
+
Parameters
+ + + + + +
objectA pointer to an existing APPLICATION object.
dataA pointer to the data to set.
lengthThe length of data in bytes.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_APPLICATION
+
1  (data != NULL && length > 0) ||
+
2 (data == NULL && length == 0 && copy == false)
+
+
Return values
+ + +
FLAC__boolfalse if copy is true and malloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_seektable_resize_points (FLAC__StreamMetadataobject,
unsigned new_num_points 
)
+
+

Resize the seekpoint array.

+

If the size shrinks, elements will truncated; if it grows, new placeholder points will be added to the end.

+
Parameters
+ + + +
objectA pointer to an existing SEEKTABLE object.
new_num_pointsThe desired length of the array; may be 0.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
1  (object->data.seek_table.points == NULL && object->data.seek_table.num_points == 0) ||
+
2 (object->data.seek_table.points != NULL && object->data.seek_table.num_points > 0)
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation error, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
void FLAC__metadata_object_seektable_set_point (FLAC__StreamMetadataobject,
unsigned point_num,
FLAC__StreamMetadata_SeekPoint point 
)
+
+

Set a seekpoint in a seektable.

+
Parameters
+ + + + +
objectA pointer to an existing SEEKTABLE object.
point_numIndex into seekpoint array to set.
pointThe point to set.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
1 object->data.seek_table.num_points > point_num
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_seektable_insert_point (FLAC__StreamMetadataobject,
unsigned point_num,
FLAC__StreamMetadata_SeekPoint point 
)
+
+

Insert a seekpoint into a seektable.

+
Parameters
+ + + + +
objectA pointer to an existing SEEKTABLE object.
point_numIndex into seekpoint array to set.
pointThe point to set.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
1 object->data.seek_table.num_points >= point_num
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation error, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_seektable_delete_point (FLAC__StreamMetadataobject,
unsigned point_num 
)
+
+

Delete a seekpoint from a seektable.

+
Parameters
+ + + +
objectA pointer to an existing SEEKTABLE object.
point_numIndex into seekpoint array to set.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
1 object->data.seek_table.num_points > point_num
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation error, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__metadata_object_seektable_is_legal (const FLAC__StreamMetadataobject)
+
+

Check a seektable to see if it conforms to the FLAC specification. See the format specification for limits on the contents of the seektable.

+
Parameters
+ + +
objectA pointer to an existing SEEKTABLE object.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
+
Return values
+ + +
FLAC__boolfalse if seek table is illegal, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_seektable_template_append_placeholders (FLAC__StreamMetadataobject,
unsigned num 
)
+
+

Append a number of placeholder points to the end of a seek table.

+
Note
As with the other ..._seektable_template_... functions, you should call FLAC__metadata_object_seektable_template_sort() when finished to make the seek table legal.
+
Parameters
+ + + +
objectA pointer to an existing SEEKTABLE object.
numThe number of placeholder points to append.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_seektable_template_append_point (FLAC__StreamMetadataobject,
FLAC__uint64 sample_number 
)
+
+

Append a specific seek point template to the end of a seek table.

+
Note
As with the other ..._seektable_template_... functions, you should call FLAC__metadata_object_seektable_template_sort() when finished to make the seek table legal.
+
Parameters
+ + + +
objectA pointer to an existing SEEKTABLE object.
sample_numberThe sample number of the seek point template.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_seektable_template_append_points (FLAC__StreamMetadataobject,
FLAC__uint64 sample_numbers[],
unsigned num 
)
+
+

Append specific seek point templates to the end of a seek table.

+
Note
As with the other ..._seektable_template_... functions, you should call FLAC__metadata_object_seektable_template_sort() when finished to make the seek table legal.
+
Parameters
+ + + + +
objectA pointer to an existing SEEKTABLE object.
sample_numbersAn array of sample numbers for the seek points.
numThe number of seek point templates to append.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points (FLAC__StreamMetadataobject,
unsigned num,
FLAC__uint64 total_samples 
)
+
+

Append a set of evenly-spaced seek point templates to the end of a seek table.

+
Note
As with the other ..._seektable_template_... functions, you should call FLAC__metadata_object_seektable_template_sort() when finished to make the seek table legal.
+
Parameters
+ + + + +
objectA pointer to an existing SEEKTABLE object.
numThe number of placeholder points to append.
total_samplesThe total number of samples to be encoded; the seekpoints will be spaced approximately total_samples / num samples apart.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
1 total_samples > 0
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points_by_samples (FLAC__StreamMetadataobject,
unsigned samples,
FLAC__uint64 total_samples 
)
+
+

Append a set of evenly-spaced seek point templates to the end of a seek table.

+
Note
As with the other ..._seektable_template_... functions, you should call FLAC__metadata_object_seektable_template_sort() when finished to make the seek table legal.
+
Parameters
+ + + + +
objectA pointer to an existing SEEKTABLE object.
samplesThe number of samples apart to space the placeholder points. The first point will be at sample 0, the second at sample samples, then 2*samples, and so on. As long as samples and total_samples are greater than 0, there will always be at least one seekpoint at sample 0.
total_samplesThe total number of samples to be encoded; the seekpoints will be spaced samples samples apart.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
1 samples > 0
+
1 total_samples > 0
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_seektable_template_sort (FLAC__StreamMetadataobject,
FLAC__bool compact 
)
+
+

Sort a seek table's seek points according to the format specification, removing duplicates.

+
Parameters
+ + + +
objectA pointer to a seek table to be sorted.
compactIf false, behaves like FLAC__format_seektable_sort(). If true, duplicates are deleted and the seek table is shrunk appropriately; the number of placeholder points present in the seek table will be the same after the call as before.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_SEEKTABLE
+
+
Return values
+ + +
FLAC__boolfalse if realloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_vorbiscomment_set_vendor_string (FLAC__StreamMetadataobject,
FLAC__StreamMetadata_VorbisComment_Entry entry,
FLAC__bool copy 
)
+
+

Sets the vendor string in a VORBIS_COMMENT block.

+

For convenience, a trailing NUL is added to the entry if it doesn't have one already.

+

If copy is true, a copy of the entry is stored; otherwise, the object takes ownership of the entry.entry pointer.

+
Note
If this function returns false, the caller still owns the pointer.
+
Parameters
+ + + + +
objectA pointer to an existing VORBIS_COMMENT object.
entryThe entry to set the vendor string to.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT
+
1  (entry.entry != NULL && entry.length > 0) ||
+
2 (entry.entry == NULL && entry.length == 0)
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails or entry does not comply with the Vorbis comment specification, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments (FLAC__StreamMetadataobject,
unsigned new_num_comments 
)
+
+

Resize the comment array.

+

If the size shrinks, elements will truncated; if it grows, new empty fields will be added to the end.

+
Parameters
+ + + +
objectA pointer to an existing VORBIS_COMMENT object.
new_num_commentsThe desired length of the array; may be 0.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT
+
1  (object->data.vorbis_comment.comments == NULL && object->data.vorbis_comment.num_comments == 0) ||
+
2 (object->data.vorbis_comment.comments != NULL && object->data.vorbis_comment.num_comments > 0)
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment (FLAC__StreamMetadataobject,
unsigned comment_num,
FLAC__StreamMetadata_VorbisComment_Entry entry,
FLAC__bool copy 
)
+
+

Sets a comment in a VORBIS_COMMENT block.

+

For convenience, a trailing NUL is added to the entry if it doesn't have one already.

+

If copy is true, a copy of the entry is stored; otherwise, the object takes ownership of the entry.entry pointer.

+
Note
If this function returns false, the caller still owns the pointer.
+
Parameters
+ + + + + +
objectA pointer to an existing VORBIS_COMMENT object.
comment_numIndex into comment array to set.
entryThe entry to set the comment to.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT
+
1 comment_num < object->data.vorbis_comment.num_comments
+
1  (entry.entry != NULL && entry.length > 0) ||
+
2 (entry.entry == NULL && entry.length == 0)
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails or entry does not comply with the Vorbis comment specification, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_vorbiscomment_insert_comment (FLAC__StreamMetadataobject,
unsigned comment_num,
FLAC__StreamMetadata_VorbisComment_Entry entry,
FLAC__bool copy 
)
+
+

Insert a comment in a VORBIS_COMMENT block at the given index.

+

For convenience, a trailing NUL is added to the entry if it doesn't have one already.

+

If copy is true, a copy of the entry is stored; otherwise, the object takes ownership of the entry.entry pointer.

+
Note
If this function returns false, the caller still owns the pointer.
+
Parameters
+ + + + + +
objectA pointer to an existing VORBIS_COMMENT object.
comment_numThe index at which to insert the comment. The comments at and after comment_num move right one position. To append a comment to the end, set comment_num to object->data.vorbis_comment.num_comments .
entryThe comment to insert.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT
+
1 object->data.vorbis_comment.num_comments >= comment_num
+
1  (entry.entry != NULL && entry.length > 0) ||
+
2 (entry.entry == NULL && entry.length == 0 && copy == false)
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails or entry does not comply with the Vorbis comment specification, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_vorbiscomment_append_comment (FLAC__StreamMetadataobject,
FLAC__StreamMetadata_VorbisComment_Entry entry,
FLAC__bool copy 
)
+
+

Appends a comment to a VORBIS_COMMENT block.

+

For convenience, a trailing NUL is added to the entry if it doesn't have one already.

+

If copy is true, a copy of the entry is stored; otherwise, the object takes ownership of the entry.entry pointer.

+
Note
If this function returns false, the caller still owns the pointer.
+
Parameters
+ + + + +
objectA pointer to an existing VORBIS_COMMENT object.
entryThe comment to insert.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT
+
1  (entry.entry != NULL && entry.length > 0) ||
+
2 (entry.entry == NULL && entry.length == 0 && copy == false)
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails or entry does not comply with the Vorbis comment specification, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment (FLAC__StreamMetadataobject,
FLAC__StreamMetadata_VorbisComment_Entry entry,
FLAC__bool all,
FLAC__bool copy 
)
+
+

Replaces comments in a VORBIS_COMMENT block with a new one.

+

For convenience, a trailing NUL is added to the entry if it doesn't have one already.

+

Depending on the the value of all, either all or just the first comment whose field name(s) match the given entry's name will be replaced by the given entry. If no comments match, entry will simply be appended.

+

If copy is true, a copy of the entry is stored; otherwise, the object takes ownership of the entry.entry pointer.

+
Note
If this function returns false, the caller still owns the pointer.
+
Parameters
+ + + + + +
objectA pointer to an existing VORBIS_COMMENT object.
entryThe comment to insert.
allIf true, all comments whose field name matches entry's field name will be removed, and entry will be inserted at the position of the first matching comment. If false, only the first comment whose field name matches entry's field name will be replaced with entry.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT
+
1  (entry.entry != NULL && entry.length > 0) ||
+
2 (entry.entry == NULL && entry.length == 0 && copy == false)
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails or entry does not comply with the Vorbis comment specification, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment (FLAC__StreamMetadataobject,
unsigned comment_num 
)
+
+

Delete a comment in a VORBIS_COMMENT block at the given index.

+
Parameters
+ + + +
objectA pointer to an existing VORBIS_COMMENT object.
comment_numThe index of the comment to delete.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT
+
1 object->data.vorbis_comment.num_comments > comment_num
+
+
Return values
+ + +
FLAC__boolfalse if realloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair (FLAC__StreamMetadata_VorbisComment_Entryentry,
const char * field_name,
const char * field_value 
)
+
+

Creates a Vorbis comment entry from NUL-terminated name and value strings.

+

On return, the filled-in entry->entry pointer will point to malloc()ed memory and shall be owned by the caller. For convenience the entry will have a terminating NUL.

+
Parameters
+ + + + +
entryA pointer to a Vorbis comment entry. The entry's entry pointer should not point to allocated memory as it will be overwritten.
field_nameThe field name in ASCII, NUL terminated.
field_valueThe field value in UTF-8, NUL terminated.
+
+
+
Assertions:
1 entry != NULL
+
1 field_name != NULL
+
1 field_value != NULL
+
+
Return values
+ + +
FLAC__boolfalse if malloc() fails, or if field_name or field_value does not comply with the Vorbis comment specification, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair (const FLAC__StreamMetadata_VorbisComment_Entry entry,
char ** field_name,
char ** field_value 
)
+
+

Splits a Vorbis comment entry into NUL-terminated name and value strings.

+

The returned pointers to name and value will be allocated by malloc() and shall be owned by the caller.

+
Parameters
+ + + + +
entryAn existing Vorbis comment entry.
field_nameThe address of where the returned pointer to the field name will be stored.
field_valueThe address of where the returned pointer to the field value will be stored.
+
+
+
Assertions:
1 (entry.entry != NULL && entry.length > 0)
+
1 memchr(entry.entry, '=', entry.length) != NULL
+
1 field_name != NULL
+
1 field_value != NULL
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation fails or entry does not comply with the Vorbis comment specification, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches (const FLAC__StreamMetadata_VorbisComment_Entry entry,
const char * field_name,
unsigned field_name_length 
)
+
+

Check if the given Vorbis comment entry's field name matches the given field name.

+
Parameters
+ + + + +
entryAn existing Vorbis comment entry.
field_nameThe field name to check.
field_name_lengthThe length of field_name, not including the terminating NUL.
+
+
+
Assertions:
1 (entry.entry != NULL && entry.length > 0)
+
+
Return values
+ + +
FLAC__booltrue if the field names match, else false
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
int FLAC__metadata_object_vorbiscomment_find_entry_from (const FLAC__StreamMetadataobject,
unsigned offset,
const char * field_name 
)
+
+

Find a Vorbis comment with the given field name.

+

The search begins at entry number offset; use an offset of 0 to search from the beginning of the comment array.

+
Parameters
+ + + + +
objectA pointer to an existing VORBIS_COMMENT object.
offsetThe offset into the comment array from where to start the search.
field_nameThe field name of the comment to find.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT
+
1 field_name != NULL
+
+
Return values
+ + +
intThe offset in the comment array of the first comment whose field name matches field_name, or -1 if no match was found.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
int FLAC__metadata_object_vorbiscomment_remove_entry_matching (FLAC__StreamMetadataobject,
const char * field_name 
)
+
+

Remove first Vorbis comment matching the given field name.

+
Parameters
+ + + +
objectA pointer to an existing VORBIS_COMMENT object.
field_nameThe field name of comment to delete.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT
+
+
Return values
+ + +
int-1 for memory allocation error, 0 for no matching entries, 1 for one matching entry deleted.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
int FLAC__metadata_object_vorbiscomment_remove_entries_matching (FLAC__StreamMetadataobject,
const char * field_name 
)
+
+

Remove all Vorbis comments matching the given field name.

+
Parameters
+ + + +
objectA pointer to an existing VORBIS_COMMENT object.
field_nameThe field name of comments to delete.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT
+
+
Return values
+ + +
int-1 for memory allocation error, 0 for no matching entries, else the number of matching entries deleted.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__StreamMetadata_CueSheet_Track* FLAC__metadata_object_cuesheet_track_new (void )
+
+

Create a new CUESHEET track instance.

+

The object will be "empty"; i.e. values and data pointers will be 0.

+
Return values
+ + +
FLAC__StreamMetadata_CueSheet_Track*NULL if there was an error allocating memory, else the new instance.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__StreamMetadata_CueSheet_Track* FLAC__metadata_object_cuesheet_track_clone (const FLAC__StreamMetadata_CueSheet_Trackobject)
+
+

Create a copy of an existing CUESHEET track object.

+

The copy is a "deep" copy, i.e. dynamically allocated data within the object is also copied. The caller takes ownership of the new object and is responsible for freeing it with FLAC__metadata_object_cuesheet_track_delete().

+
Parameters
+ + +
objectPointer to object to copy.
+
+
+
Assertions:
1 object != NULL
+
+
Return values
+ + +
FLAC__StreamMetadata_CueSheet_Track*NULL if there was an error allocating memory, else the new instance.
+
+
+ +
+
+ +
+
+ + + + + + + + +
void FLAC__metadata_object_cuesheet_track_delete (FLAC__StreamMetadata_CueSheet_Trackobject)
+
+

Delete a CUESHEET track object

+
Parameters
+ + +
objectA pointer to an existing CUESHEET track object.
+
+
+
Assertions:
1 object != NULL
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices (FLAC__StreamMetadataobject,
unsigned track_num,
unsigned new_num_indices 
)
+
+

Resize a track's index point array.

+

If the size shrinks, elements will truncated; if it grows, new blank indices will be added to the end.

+
Parameters
+ + + + +
objectA pointer to an existing CUESHEET object.
track_numThe index of the track to modify. NOTE: this is not necessarily the same as the track's number field.
new_num_indicesThe desired length of the array; may be 0.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
1 object->data.cue_sheet.num_tracks > track_num
+
1  (object->data.cue_sheet.tracks[track_num].indices == NULL && object->data.cue_sheet.tracks[track_num].num_indices == 0) ||
+
2 (object->data.cue_sheet.tracks[track_num].indices != NULL && object->data.cue_sheet.tracks[track_num].num_indices > 0)
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation error, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index (FLAC__StreamMetadataobject,
unsigned track_num,
unsigned index_num,
FLAC__StreamMetadata_CueSheet_Index index 
)
+
+

Insert an index point in a CUESHEET track at the given index.

+
Parameters
+ + + + + +
objectA pointer to an existing CUESHEET object.
track_numThe index of the track to modify. NOTE: this is not necessarily the same as the track's number field.
index_numThe index into the track's index array at which to insert the index point. NOTE: this is not necessarily the same as the index point's number field. The indices at and after index_num move right one position. To append an index point to the end, set index_num to object->data.cue_sheet.tracks[track_num].num_indices .
indexThe index point to insert.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
1 object->data.cue_sheet.num_tracks > track_num
+
1 object->data.cue_sheet.tracks[track_num].num_indices >= index_num
+
+
Return values
+ + +
FLAC__boolfalse if realloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index (FLAC__StreamMetadataobject,
unsigned track_num,
unsigned index_num 
)
+
+

Insert a blank index point in a CUESHEET track at the given index.

+

A blank index point is one in which all field values are zero.

+
Parameters
+ + + + +
objectA pointer to an existing CUESHEET object.
track_numThe index of the track to modify. NOTE: this is not necessarily the same as the track's number field.
index_numThe index into the track's index array at which to insert the index point. NOTE: this is not necessarily the same as the index point's number field. The indices at and after index_num move right one position. To append an index point to the end, set index_num to object->data.cue_sheet.tracks[track_num].num_indices .
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
1 object->data.cue_sheet.num_tracks > track_num
+
1 object->data.cue_sheet.tracks[track_num].num_indices >= index_num
+
+
Return values
+ + +
FLAC__boolfalse if realloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index (FLAC__StreamMetadataobject,
unsigned track_num,
unsigned index_num 
)
+
+

Delete an index point in a CUESHEET track at the given index.

+
Parameters
+ + + + +
objectA pointer to an existing CUESHEET object.
track_numThe index into the track array of the track to modify. NOTE: this is not necessarily the same as the track's number field.
index_numThe index into the track's index array of the index to delete. NOTE: this is not necessarily the same as the index's number field.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
1 object->data.cue_sheet.num_tracks > track_num
+
1 object->data.cue_sheet.tracks[track_num].num_indices > index_num
+
+
Return values
+ + +
FLAC__boolfalse if realloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks (FLAC__StreamMetadataobject,
unsigned new_num_tracks 
)
+
+

Resize the track array.

+

If the size shrinks, elements will truncated; if it grows, new blank tracks will be added to the end.

+
Parameters
+ + + +
objectA pointer to an existing CUESHEET object.
new_num_tracksThe desired length of the array; may be 0.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
1  (object->data.cue_sheet.tracks == NULL && object->data.cue_sheet.num_tracks == 0) ||
+
2 (object->data.cue_sheet.tracks != NULL && object->data.cue_sheet.num_tracks > 0)
+
+
Return values
+ + +
FLAC__boolfalse if memory allocation error, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_cuesheet_set_track (FLAC__StreamMetadataobject,
unsigned track_num,
FLAC__StreamMetadata_CueSheet_Tracktrack,
FLAC__bool copy 
)
+
+

Sets a track in a CUESHEET block.

+

If copy is true, a copy of the track is stored; otherwise, the object takes ownership of the track pointer.

+
Parameters
+ + + + + +
objectA pointer to an existing CUESHEET object.
track_numIndex into track array to set. NOTE: this is not necessarily the same as the track's number field.
trackThe track to set the track to. You may safely pass in a const pointer if copy is true.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
1 track_num < object->data.cue_sheet.num_tracks
+
1  (track->indices != NULL && track->num_indices > 0) ||
+
2 (track->indices == NULL && track->num_indices == 0)
+
+
Return values
+ + +
FLAC__boolfalse if copy is true and malloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_cuesheet_insert_track (FLAC__StreamMetadataobject,
unsigned track_num,
FLAC__StreamMetadata_CueSheet_Tracktrack,
FLAC__bool copy 
)
+
+

Insert a track in a CUESHEET block at the given index.

+

If copy is true, a copy of the track is stored; otherwise, the object takes ownership of the track pointer.

+
Parameters
+ + + + + +
objectA pointer to an existing CUESHEET object.
track_numThe index at which to insert the track. NOTE: this is not necessarily the same as the track's number field. The tracks at and after track_num move right one position. To append a track to the end, set track_num to object->data.cue_sheet.num_tracks .
trackThe track to insert. You may safely pass in a const pointer if copy is true.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
1 object->data.cue_sheet.num_tracks >= track_num
+
+
Return values
+ + +
FLAC__boolfalse if copy is true and malloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track (FLAC__StreamMetadataobject,
unsigned track_num 
)
+
+

Insert a blank track in a CUESHEET block at the given index.

+

A blank track is one in which all field values are zero.

+
Parameters
+ + + +
objectA pointer to an existing CUESHEET object.
track_numThe index at which to insert the track. NOTE: this is not necessarily the same as the track's number field. The tracks at and after track_num move right one position. To append a track to the end, set track_num to object->data.cue_sheet.num_tracks .
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
1 object->data.cue_sheet.num_tracks >= track_num
+
+
Return values
+ + +
FLAC__boolfalse if copy is true and malloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_cuesheet_delete_track (FLAC__StreamMetadataobject,
unsigned track_num 
)
+
+

Delete a track in a CUESHEET block at the given index.

+
Parameters
+ + + +
objectA pointer to an existing CUESHEET object.
track_numThe index into the track array of the track to delete. NOTE: this is not necessarily the same as the track's number field.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
1 object->data.cue_sheet.num_tracks > track_num
+
+
Return values
+ + +
FLAC__boolfalse if realloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_cuesheet_is_legal (const FLAC__StreamMetadataobject,
FLAC__bool check_cd_da_subset,
const char ** violation 
)
+
+

Check a cue sheet to see if it conforms to the FLAC specification. See the format specification for limits on the contents of the cue sheet.

+
Parameters
+ + + + +
objectA pointer to an existing CUESHEET object.
check_cd_da_subsetIf true, check CUESHEET against more stringent requirements for a CD-DA (audio) disc.
violationAddress of a pointer to a string. If there is a violation, a pointer to a string explanation of the violation will be returned here. violation may be NULL if you don't need the returned string. Do not free the returned string; it will always point to static data.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
+
Return values
+ + +
FLAC__boolfalse if cue sheet is illegal, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__uint32 FLAC__metadata_object_cuesheet_calculate_cddb_id (const FLAC__StreamMetadataobject)
+
+

Calculate and return the CDDB/freedb ID for a cue sheet. The function assumes the cue sheet corresponds to a CD; the result is undefined if the cuesheet's is_cd bit is not set.

+
Parameters
+ + +
objectA pointer to an existing CUESHEET object.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_CUESHEET
+
+
Return values
+ + +
FLAC__uint32The unsigned integer representation of the CDDB/freedb ID
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_picture_set_mime_type (FLAC__StreamMetadataobject,
char * mime_type,
FLAC__bool copy 
)
+
+

Sets the MIME type of a PICTURE block.

+

If copy is true, a copy of the string is stored; otherwise, the object takes ownership of the pointer. The existing string will be freed if this function is successful, otherwise the original string will remain if copy is true and malloc() fails.

+
Note
It is safe to pass a const pointer to mime_type if copy is true.
+
Parameters
+ + + + +
objectA pointer to an existing PICTURE object.
mime_typeA pointer to the MIME type string. The string must be ASCII characters 0x20-0x7e, NUL-terminated. No validation is done.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_PICTURE
+
1 (mime_type != NULL)
+
+
Return values
+ + +
FLAC__boolfalse if copy is true and malloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_picture_set_description (FLAC__StreamMetadataobject,
FLAC__byte * description,
FLAC__bool copy 
)
+
+

Sets the description of a PICTURE block.

+

If copy is true, a copy of the string is stored; otherwise, the object takes ownership of the pointer. The existing string will be freed if this function is successful, otherwise the original string will remain if copy is true and malloc() fails.

+
Note
It is safe to pass a const pointer to description if copy is true.
+
Parameters
+ + + + +
objectA pointer to an existing PICTURE object.
descriptionA pointer to the description string. The string must be valid UTF-8, NUL-terminated. No validation is done.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_PICTURE
+
1 (description != NULL)
+
+
Return values
+ + +
FLAC__boolfalse if copy is true and malloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_picture_set_data (FLAC__StreamMetadataobject,
FLAC__byte * data,
FLAC__uint32 length,
FLAC__bool copy 
)
+
+

Sets the picture data of a PICTURE block.

+

If copy is true, a copy of the data is stored; otherwise, the object takes ownership of the pointer. Also sets the data_length field of the metadata object to what is passed in as the length parameter. The existing data will be freed if this function is successful, otherwise the original data and data_length will remain if copy is true and malloc() fails.

+
Note
It is safe to pass a const pointer to data if copy is true.
+
Parameters
+ + + + + +
objectA pointer to an existing PICTURE object.
dataA pointer to the data to set.
lengthThe length of data in bytes.
copySee above.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_PICTURE
+
1  (data != NULL && length > 0) ||
+
2 (data == NULL && length == 0 && copy == false)
+
+
Return values
+ + +
FLAC__boolfalse if copy is true and malloc() fails, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__metadata_object_picture_is_legal (const FLAC__StreamMetadataobject,
const char ** violation 
)
+
+

Check a PICTURE block to see if it conforms to the FLAC specification. See the format specification for limits on the contents of the PICTURE block.

+
Parameters
+ + + +
objectA pointer to existing PICTURE block to be checked.
violationAddress of a pointer to a string. If there is a violation, a pointer to a string explanation of the violation will be returned here. violation may be NULL if you don't need the returned string. Do not free the returned string; it will always point to static data.
+
+
+
Assertions:
1 object != NULL
+
1 object->type == FLAC__METADATA_TYPE_PICTURE
+
+
Return values
+ + +
FLAC__boolfalse if PICTURE block is illegal, else true.
+
+
+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__stream__decoder.html b/lib-src/libflac/doc/html/api/group__flac__stream__decoder.html new file mode 100644 index 000000000..e5cb964c8 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__stream__decoder.html @@ -0,0 +1,2367 @@ + + + + + + +FLAC: FLAC/stream_decoder.h: stream decoder interface + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/stream_decoder.h: stream decoder interface
+
+
+ + + + +

+Classes

struct  FLAC__StreamDecoder
 
+ + + + + + + + + + + + + + + + + +

+Typedefs

typedef
+FLAC__StreamDecoderReadStatus(* 
FLAC__StreamDecoderReadCallback )(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
 
typedef
+FLAC__StreamDecoderSeekStatus(* 
FLAC__StreamDecoderSeekCallback )(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
 
typedef
+FLAC__StreamDecoderTellStatus(* 
FLAC__StreamDecoderTellCallback )(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
 
typedef
+FLAC__StreamDecoderLengthStatus(* 
FLAC__StreamDecoderLengthCallback )(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
 
typedef FLAC__bool(* FLAC__StreamDecoderEofCallback )(const FLAC__StreamDecoder *decoder, void *client_data)
 
typedef
+FLAC__StreamDecoderWriteStatus(* 
FLAC__StreamDecoderWriteCallback )(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data)
 
typedef void(* FLAC__StreamDecoderMetadataCallback )(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
 
typedef void(* FLAC__StreamDecoderErrorCallback )(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
 
+ + + + + + + + + + + + + + + + + +

+Enumerations

enum  FLAC__StreamDecoderState {
+  FLAC__STREAM_DECODER_SEARCH_FOR_METADATA = 0, +FLAC__STREAM_DECODER_READ_METADATA, +FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC, +FLAC__STREAM_DECODER_READ_FRAME, +
+  FLAC__STREAM_DECODER_END_OF_STREAM, +FLAC__STREAM_DECODER_OGG_ERROR, +FLAC__STREAM_DECODER_SEEK_ERROR, +FLAC__STREAM_DECODER_ABORTED, +
+  FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR, +FLAC__STREAM_DECODER_UNINITIALIZED +
+ }
 
enum  FLAC__StreamDecoderInitStatus {
+  FLAC__STREAM_DECODER_INIT_STATUS_OK = 0, +FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER, +FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS, +FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR, +
+  FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE, +FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED +
+ }
 
enum  FLAC__StreamDecoderReadStatus { FLAC__STREAM_DECODER_READ_STATUS_CONTINUE, +FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM, +FLAC__STREAM_DECODER_READ_STATUS_ABORT + }
 
enum  FLAC__StreamDecoderSeekStatus { FLAC__STREAM_DECODER_SEEK_STATUS_OK, +FLAC__STREAM_DECODER_SEEK_STATUS_ERROR, +FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED + }
 
enum  FLAC__StreamDecoderTellStatus { FLAC__STREAM_DECODER_TELL_STATUS_OK, +FLAC__STREAM_DECODER_TELL_STATUS_ERROR, +FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED + }
 
enum  FLAC__StreamDecoderLengthStatus { FLAC__STREAM_DECODER_LENGTH_STATUS_OK, +FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR, +FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED + }
 
enum  FLAC__StreamDecoderWriteStatus { FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE, +FLAC__STREAM_DECODER_WRITE_STATUS_ABORT + }
 
enum  FLAC__StreamDecoderErrorStatus { FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC, +FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER, +FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH, +FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM + }
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Functions

FLAC__StreamDecoderFLAC__stream_decoder_new (void)
 
void FLAC__stream_decoder_delete (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_set_ogg_serial_number (FLAC__StreamDecoder *decoder, long serial_number)
 
FLAC__bool FLAC__stream_decoder_set_md5_checking (FLAC__StreamDecoder *decoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_decoder_set_metadata_respond (FLAC__StreamDecoder *decoder, FLAC__MetadataType type)
 
FLAC__bool FLAC__stream_decoder_set_metadata_respond_application (FLAC__StreamDecoder *decoder, const FLAC__byte id[4])
 
FLAC__bool FLAC__stream_decoder_set_metadata_respond_all (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_set_metadata_ignore (FLAC__StreamDecoder *decoder, FLAC__MetadataType type)
 
FLAC__bool FLAC__stream_decoder_set_metadata_ignore_application (FLAC__StreamDecoder *decoder, const FLAC__byte id[4])
 
FLAC__bool FLAC__stream_decoder_set_metadata_ignore_all (FLAC__StreamDecoder *decoder)
 
FLAC__StreamDecoderState FLAC__stream_decoder_get_state (const FLAC__StreamDecoder *decoder)
 
const char * FLAC__stream_decoder_get_resolved_state_string (const FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_get_md5_checking (const FLAC__StreamDecoder *decoder)
 
FLAC__uint64 FLAC__stream_decoder_get_total_samples (const FLAC__StreamDecoder *decoder)
 
unsigned FLAC__stream_decoder_get_channels (const FLAC__StreamDecoder *decoder)
 
FLAC__ChannelAssignment FLAC__stream_decoder_get_channel_assignment (const FLAC__StreamDecoder *decoder)
 
unsigned FLAC__stream_decoder_get_bits_per_sample (const FLAC__StreamDecoder *decoder)
 
unsigned FLAC__stream_decoder_get_sample_rate (const FLAC__StreamDecoder *decoder)
 
unsigned FLAC__stream_decoder_get_blocksize (const FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_get_decode_position (const FLAC__StreamDecoder *decoder, FLAC__uint64 *position)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_stream (FLAC__StreamDecoder *decoder, FLAC__StreamDecoderReadCallback read_callback, FLAC__StreamDecoderSeekCallback seek_callback, FLAC__StreamDecoderTellCallback tell_callback, FLAC__StreamDecoderLengthCallback length_callback, FLAC__StreamDecoderEofCallback eof_callback, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_stream (FLAC__StreamDecoder *decoder, FLAC__StreamDecoderReadCallback read_callback, FLAC__StreamDecoderSeekCallback seek_callback, FLAC__StreamDecoderTellCallback tell_callback, FLAC__StreamDecoderLengthCallback length_callback, FLAC__StreamDecoderEofCallback eof_callback, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_FILE (FLAC__StreamDecoder *decoder, FILE *file, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_FILE (FLAC__StreamDecoder *decoder, FILE *file, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_file (FLAC__StreamDecoder *decoder, const char *filename, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_file (FLAC__StreamDecoder *decoder, const char *filename, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__bool FLAC__stream_decoder_finish (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_flush (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_reset (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_process_single (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_process_until_end_of_metadata (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_process_until_end_of_stream (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_skip_single_frame (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_seek_absolute (FLAC__StreamDecoder *decoder, FLAC__uint64 sample)
 
+ + + + + + + + + + + + + + + + + +

+Variables

const char *const FLAC__StreamDecoderStateString []
 
const char *const FLAC__StreamDecoderInitStatusString []
 
const char *const FLAC__StreamDecoderReadStatusString []
 
const char *const FLAC__StreamDecoderSeekStatusString []
 
const char *const FLAC__StreamDecoderTellStatusString []
 
const char *const FLAC__StreamDecoderLengthStatusString []
 
const char *const FLAC__StreamDecoderWriteStatusString []
 
const char *const FLAC__StreamDecoderErrorStatusString []
 
+

Detailed Description

+

This module contains the functions which implement the stream decoder.

+

The stream decoder can decode native FLAC, and optionally Ogg FLAC (check FLAC_API_SUPPORTS_OGG_FLAC) streams and files.

+

The basic usage of this decoder is as follows:

+

In more detail, the program will create a new instance by calling FLAC__stream_decoder_new(), then call FLAC__stream_decoder_set_*() functions to override the default decoder options, and call one of the FLAC__stream_decoder_init_*() functions.

+

There are three initialization functions for native FLAC, one for setting up the decoder to decode FLAC data from the client via callbacks, and two for decoding directly from a FLAC file.

+

For decoding via callbacks, use FLAC__stream_decoder_init_stream(). You must also supply several callbacks for handling I/O. Some (like seeking) are optional, depending on the capabilities of the input.

+

For decoding directly from a file, use FLAC__stream_decoder_init_FILE() or FLAC__stream_decoder_init_file(). Then you must only supply an open FILE* or filename and fewer callbacks; the decoder will handle the other callbacks internally.

+

There are three similarly-named init functions for decoding from Ogg FLAC streams. Check FLAC_API_SUPPORTS_OGG_FLAC to find out if the library has been built with Ogg support.

+

Once the decoder is initialized, your program will call one of several functions to start the decoding process:

+
    +
  • FLAC__stream_decoder_process_single() - Tells the decoder to process at most one metadata block or audio frame and return, calling either the metadata callback or write callback, respectively, once. If the decoder loses sync it will return with only the error callback being called.
  • +
  • FLAC__stream_decoder_process_until_end_of_metadata() - Tells the decoder to process the stream from the current location and stop upon reaching the first audio frame. The client will get one metadata, write, or error callback per metadata block, audio frame, or sync error, respectively.
  • +
  • FLAC__stream_decoder_process_until_end_of_stream() - Tells the decoder to process the stream from the current location until the read callback returns FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM or FLAC__STREAM_DECODER_READ_STATUS_ABORT. The client will get one metadata, write, or error callback per metadata block, audio frame, or sync error, respectively.
  • +
+

When the decoder has finished decoding (normally or through an abort), the instance is finished by calling FLAC__stream_decoder_finish(), which ensures the decoder is in the correct state and frees memory. Then the instance may be deleted with FLAC__stream_decoder_delete() or initialized again to decode another stream.

+

Seeking is exposed through the FLAC__stream_decoder_seek_absolute() method. At any point after the stream decoder has been initialized, the client can call this function to seek to an exact sample within the stream. Subsequently, the first time the write callback is called it will be passed a (possibly partial) block starting at that sample.

+

If the client cannot seek via the callback interface provided, but still has another way of seeking, it can flush the decoder using FLAC__stream_decoder_flush() and start feeding data from the new position through the read callback.

+

The stream decoder also provides MD5 signature checking. If this is turned on before initialization, FLAC__stream_decoder_finish() will report when the decoded MD5 signature does not match the one stored in the STREAMINFO block. MD5 checking is automatically turned off (until the next FLAC__stream_decoder_reset()) if there is no signature in the STREAMINFO block or when a seek is attempted.

+

The FLAC__stream_decoder_set_metadata_*() functions deserve special attention. By default, the decoder only calls the metadata_callback for the STREAMINFO block. These functions allow you to tell the decoder explicitly which blocks to parse and return via the metadata_callback and/or which to skip. Use a FLAC__stream_decoder_set_metadata_respond_all(), FLAC__stream_decoder_set_metadata_ignore() ... or FLAC__stream_decoder_set_metadata_ignore_all(), FLAC__stream_decoder_set_metadata_respond() ... sequence to exactly specify which blocks to return. Remember that metadata blocks can potentially be big (for example, cover art) so filtering out the ones you don't use can reduce the memory requirements of the decoder. Also note the special forms FLAC__stream_decoder_set_metadata_respond_application(id) and FLAC__stream_decoder_set_metadata_ignore_application(id) for filtering APPLICATION blocks based on the application ID.

+

STREAMINFO and SEEKTABLE blocks are always parsed and used internally, but they still can legally be filtered from the metadata_callback.

+
Note
The "set" functions may only be called when the decoder is in the state FLAC__STREAM_DECODER_UNINITIALIZED, i.e. after FLAC__stream_decoder_new() or FLAC__stream_decoder_finish(), but before FLAC__stream_decoder_init_*(). If this is the case they will return true, otherwise false.
+
+FLAC__stream_decoder_finish() resets all settings to the constructor defaults, including the callbacks.
+

Typedef Documentation

+ +
+
+ + + + +
typedef FLAC__StreamDecoderReadStatus(* FLAC__StreamDecoderReadCallback)(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
+
+

Signature for the read callback.

+

A function pointer matching this signature must be passed to FLAC__stream_decoder_init*_stream(). The supplied function will be called when the decoder needs more input data. The address of the buffer to be filled is supplied, along with the number of bytes the buffer can hold. The callback may choose to supply less data and modify the byte count but must be careful not to overflow the buffer. The callback then returns a status code chosen from FLAC__StreamDecoderReadStatus.

+

Here is an example of a read callback for stdio streams:

1 FLAC__StreamDecoderReadStatus read_cb(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
+
2 {
+
3  FILE *file = ((MyClientData*)client_data)->file;
+
4  if(*bytes > 0) {
+
5  *bytes = fread(buffer, sizeof(FLAC__byte), *bytes, file);
+
6  if(ferror(file))
+
7  return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
+
8  else if(*bytes == 0)
+
9  return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+
10  else
+
11  return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+
12  }
+
13  else
+
14  return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
+
15 }
+
Note
In general, FLAC__StreamDecoder functions which change the state should not be called on the decoder while in the callback.
+
Parameters
+ + + + + +
decoderThe decoder instance calling the callback.
bufferA pointer to a location for the callee to store data to be decoded.
bytesA pointer to the size of the buffer. On entry to the callback, it contains the maximum number of bytes that may be stored in buffer. The callee must set it to the actual number of bytes stored (0 in case of error or end-of-stream) before returning.
client_dataThe callee's client data set through FLAC__stream_decoder_init_*().
+
+
+
Return values
+ + +
FLAC__StreamDecoderReadStatusThe callee's return status. Note that the callback should return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM if and only if zero bytes were read and there is no more data to be read.
+
+
+ +
+
+ +
+
+ + + + +
typedef FLAC__StreamDecoderSeekStatus(* FLAC__StreamDecoderSeekCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
+
+

Signature for the seek callback.

+

A function pointer matching this signature may be passed to FLAC__stream_decoder_init*_stream(). The supplied function will be called when the decoder needs to seek the input stream. The decoder will pass the absolute byte offset to seek to, 0 meaning the beginning of the stream.

+

Here is an example of a seek callback for stdio streams:

1 FLAC__StreamDecoderSeekStatus seek_cb(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
+
2 {
+
3  FILE *file = ((MyClientData*)client_data)->file;
+
4  if(file == stdin)
+
5  return FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED;
+
6  else if(fseeko(file, (off_t)absolute_byte_offset, SEEK_SET) < 0)
+
7  return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
+
8  else
+
9  return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
+
10 }
+
Note
In general, FLAC__StreamDecoder functions which change the state should not be called on the decoder while in the callback.
+
Parameters
+ + + + +
decoderThe decoder instance calling the callback.
absolute_byte_offsetThe offset from the beginning of the stream to seek to.
client_dataThe callee's client data set through FLAC__stream_decoder_init_*().
+
+
+
Return values
+ + +
FLAC__StreamDecoderSeekStatusThe callee's return status.
+
+
+ +
+
+ +
+
+ + + + +
typedef FLAC__StreamDecoderTellStatus(* FLAC__StreamDecoderTellCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
+
+

Signature for the tell callback.

+

A function pointer matching this signature may be passed to FLAC__stream_decoder_init*_stream(). The supplied function will be called when the decoder wants to know the current position of the stream. The callback should return the byte offset from the beginning of the stream.

+

Here is an example of a tell callback for stdio streams:

1 FLAC__StreamDecoderTellStatus tell_cb(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
+
2 {
+
3  FILE *file = ((MyClientData*)client_data)->file;
+
4  off_t pos;
+
5  if(file == stdin)
+
6  return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
+
7  else if((pos = ftello(file)) < 0)
+
8  return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
+
9  else {
+
10  *absolute_byte_offset = (FLAC__uint64)pos;
+
11  return FLAC__STREAM_DECODER_TELL_STATUS_OK;
+
12  }
+
13 }
+
Note
In general, FLAC__StreamDecoder functions which change the state should not be called on the decoder while in the callback.
+
Parameters
+ + + + +
decoderThe decoder instance calling the callback.
absolute_byte_offsetA pointer to storage for the current offset from the beginning of the stream.
client_dataThe callee's client data set through FLAC__stream_decoder_init_*().
+
+
+
Return values
+ + +
FLAC__StreamDecoderTellStatusThe callee's return status.
+
+
+ +
+
+ +
+
+ + + + +
typedef FLAC__StreamDecoderLengthStatus(* FLAC__StreamDecoderLengthCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
+
+

Signature for the length callback.

+

A function pointer matching this signature may be passed to FLAC__stream_decoder_init*_stream(). The supplied function will be called when the decoder wants to know the total length of the stream in bytes.

+

Here is an example of a length callback for stdio streams:

1 FLAC__StreamDecoderLengthStatus length_cb(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
+
2 {
+
3  FILE *file = ((MyClientData*)client_data)->file;
+
4  struct stat filestats;
+
5 
+
6  if(file == stdin)
+
7  return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;
+
8  else if(fstat(fileno(file), &filestats) != 0)
+
9  return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR;
+
10  else {
+
11  *stream_length = (FLAC__uint64)filestats.st_size;
+
12  return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
+
13  }
+
14 }
+
Note
In general, FLAC__StreamDecoder functions which change the state should not be called on the decoder while in the callback.
+
Parameters
+ + + + +
decoderThe decoder instance calling the callback.
stream_lengthA pointer to storage for the length of the stream in bytes.
client_dataThe callee's client data set through FLAC__stream_decoder_init_*().
+
+
+
Return values
+ + +
FLAC__StreamDecoderLengthStatusThe callee's return status.
+
+
+ +
+
+ +
+
+ + + + +
typedef FLAC__bool(* FLAC__StreamDecoderEofCallback)(const FLAC__StreamDecoder *decoder, void *client_data)
+
+

Signature for the EOF callback.

+

A function pointer matching this signature may be passed to FLAC__stream_decoder_init*_stream(). The supplied function will be called when the decoder needs to know if the end of the stream has been reached.

+

Here is an example of a EOF callback for stdio streams: FLAC__bool eof_cb(const FLAC__StreamDecoder *decoder, void *client_data)

1 {
+
2  FILE *file = ((MyClientData*)client_data)->file;
+
3  return feof(file)? true : false;
+
4 }
+
Note
In general, FLAC__StreamDecoder functions which change the state should not be called on the decoder while in the callback.
+
Parameters
+ + + +
decoderThe decoder instance calling the callback.
client_dataThe callee's client data set through FLAC__stream_decoder_init_*().
+
+
+
Return values
+ + +
FLAC__booltrue if the currently at the end of the stream, else false.
+
+
+ +
+
+ +
+
+ + + + +
typedef FLAC__StreamDecoderWriteStatus(* FLAC__StreamDecoderWriteCallback)(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data)
+
+

Signature for the write callback.

+

A function pointer matching this signature must be passed to one of the FLAC__stream_decoder_init_*() functions. The supplied function will be called when the decoder has decoded a single audio frame. The decoder will pass the frame metadata as well as an array of pointers (one for each channel) pointing to the decoded audio.

+
Note
In general, FLAC__StreamDecoder functions which change the state should not be called on the decoder while in the callback.
+
Parameters
+ + + + + +
decoderThe decoder instance calling the callback.
frameThe description of the decoded frame. See FLAC__Frame.
bufferAn array of pointers to decoded channels of data. Each pointer will point to an array of signed samples of length frame->header.blocksize. Channels will be ordered according to the FLAC specification; see the documentation for the frame header.
client_dataThe callee's client data set through FLAC__stream_decoder_init_*().
+
+
+
Return values
+ + +
FLAC__StreamDecoderWriteStatusThe callee's return status.
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* FLAC__StreamDecoderMetadataCallback)(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+
+

Signature for the metadata callback.

+

A function pointer matching this signature must be passed to one of the FLAC__stream_decoder_init_*() functions. The supplied function will be called when the decoder has decoded a metadata block. In a valid FLAC file there will always be one STREAMINFO block, followed by zero or more other metadata blocks. These will be supplied by the decoder in the same order as they appear in the stream and always before the first audio frame (i.e. write callback). The metadata block that is passed in must not be modified, and it doesn't live beyond the callback, so you should make a copy of it with FLAC__metadata_object_clone() if you will need it elsewhere. Since metadata blocks can potentially be large, by default the decoder only calls the metadata callback for the STREAMINFO block; you can instruct the decoder to pass or filter other blocks with FLAC__stream_decoder_set_metadata_*() calls.

+
Note
In general, FLAC__StreamDecoder functions which change the state should not be called on the decoder while in the callback.
+
Parameters
+ + + + +
decoderThe decoder instance calling the callback.
metadataThe decoded metadata block.
client_dataThe callee's client data set through FLAC__stream_decoder_init_*().
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* FLAC__StreamDecoderErrorCallback)(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+
+

Signature for the error callback.

+

A function pointer matching this signature must be passed to one of the FLAC__stream_decoder_init_*() functions. The supplied function will be called whenever an error occurs during decoding.

+
Note
In general, FLAC__StreamDecoder functions which change the state should not be called on the decoder while in the callback.
+
Parameters
+ + + + +
decoderThe decoder instance calling the callback.
statusThe error encountered by the decoder.
client_dataThe callee's client data set through FLAC__stream_decoder_init_*().
+
+
+ +
+
+

Enumeration Type Documentation

+ +
+
+ + + + +
enum FLAC__StreamDecoderState
+
+

State values for a FLAC__StreamDecoder

+

The decoder's state can be obtained by calling FLAC__stream_decoder_get_state().

+ + + + + + + + + + + +
Enumerator
FLAC__STREAM_DECODER_SEARCH_FOR_METADATA  +

The decoder is ready to search for metadata.

+
FLAC__STREAM_DECODER_READ_METADATA  +

The decoder is ready to or is in the process of reading metadata.

+
FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC  +

The decoder is ready to or is in the process of searching for the frame sync code.

+
FLAC__STREAM_DECODER_READ_FRAME  +

The decoder is ready to or is in the process of reading a frame.

+
FLAC__STREAM_DECODER_END_OF_STREAM  +

The decoder has reached the end of the stream.

+
FLAC__STREAM_DECODER_OGG_ERROR  +

An error occurred in the underlying Ogg layer.

+
FLAC__STREAM_DECODER_SEEK_ERROR  +

An error occurred while seeking. The decoder must be flushed with FLAC__stream_decoder_flush() or reset with FLAC__stream_decoder_reset() before decoding can continue.

+
FLAC__STREAM_DECODER_ABORTED  +

The decoder was aborted by the read callback.

+
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR  +

An error occurred allocating memory. The decoder is in an invalid state and can no longer be used.

+
FLAC__STREAM_DECODER_UNINITIALIZED  +

The decoder is in the uninitialized state; one of the FLAC__stream_decoder_init_*() functions must be called before samples can be processed.

+
+ +
+
+ +
+
+

Possible return values for the FLAC__stream_decoder_init_*() functions.

+ + + + + + + +
Enumerator
FLAC__STREAM_DECODER_INIT_STATUS_OK  +

Initialization was successful.

+
FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER  +

The library was not compiled with support for the given container format.

+
FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS  +

A required callback was not supplied.

+
FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR  +

An error occurred allocating memory.

+
FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE  +

fopen() failed in FLAC__stream_decoder_init_file() or FLAC__stream_decoder_init_ogg_file().

+
FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED  +

FLAC__stream_decoder_init_*() was called when the decoder was already initialized, usually because FLAC__stream_decoder_finish() was not called.

+
+ +
+
+ +
+
+

Return values for the FLAC__StreamDecoder read callback.

+ + + + +
Enumerator
FLAC__STREAM_DECODER_READ_STATUS_CONTINUE  +

The read was OK and decoding can continue.

+
FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM  +

The read was attempted while at the end of the stream. Note that the client must only return this value when the read callback was called when already at the end of the stream. Otherwise, if the read itself moves to the end of the stream, the client should still return the data and FLAC__STREAM_DECODER_READ_STATUS_CONTINUE, and then on the next read callback it should return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM with a byte count of 0.

+
FLAC__STREAM_DECODER_READ_STATUS_ABORT  +

An unrecoverable error occurred. The decoder will return from the process call.

+
+ +
+
+ +
+
+

Return values for the FLAC__StreamDecoder seek callback.

+ + + + +
Enumerator
FLAC__STREAM_DECODER_SEEK_STATUS_OK  +

The seek was OK and decoding can continue.

+
FLAC__STREAM_DECODER_SEEK_STATUS_ERROR  +

An unrecoverable error occurred. The decoder will return from the process call.

+
FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED  +

Client does not support seeking.

+
+ +
+
+ +
+
+

Return values for the FLAC__StreamDecoder tell callback.

+ + + + +
Enumerator
FLAC__STREAM_DECODER_TELL_STATUS_OK  +

The tell was OK and decoding can continue.

+
FLAC__STREAM_DECODER_TELL_STATUS_ERROR  +

An unrecoverable error occurred. The decoder will return from the process call.

+
FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED  +

Client does not support telling the position.

+
+ +
+
+ +
+
+

Return values for the FLAC__StreamDecoder length callback.

+ + + + +
Enumerator
FLAC__STREAM_DECODER_LENGTH_STATUS_OK  +

The length call was OK and decoding can continue.

+
FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR  +

An unrecoverable error occurred. The decoder will return from the process call.

+
FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED  +

Client does not support reporting the length.

+
+ +
+
+ +
+
+

Return values for the FLAC__StreamDecoder write callback.

+ + + +
Enumerator
FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE  +

The write was OK and decoding can continue.

+
FLAC__STREAM_DECODER_WRITE_STATUS_ABORT  +

An unrecoverable error occurred. The decoder will return from the process call.

+
+ +
+
+ +
+
+

Possible values passed back to the FLAC__StreamDecoder error callback. FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC is the generic catch- all. The rest could be caused by bad sync (false synchronization on data that is not the start of a frame) or corrupted data. The error itself is the decoder's best guess at what happened assuming a correct sync. For example FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER could be caused by a correct sync on the start of a frame, but some data in the frame header was corrupted. Or it could be the result of syncing on a point the stream that looked like the starting of a frame but was not. FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM could be because the decoder encountered a valid frame made by a future version of the encoder which it cannot parse, or because of a false sync making it appear as though an encountered frame was generated by a future encoder.

+ + + + + +
Enumerator
FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC  +

An error in the stream caused the decoder to lose synchronization.

+
FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER  +

The decoder encountered a corrupted frame header.

+
FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH  +

The frame's data did not match the CRC in the footer.

+
FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM  +

The decoder encountered reserved fields in use in the stream.

+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
FLAC__StreamDecoder* FLAC__stream_decoder_new (void )
+
+

Create a new stream decoder instance. The instance is created with default settings; see the individual FLAC__stream_decoder_set_*() functions for each setting's default.

+
Return values
+ + +
FLAC__StreamDecoder*NULL if there was an error allocating memory, else the new instance.
+
+
+ +
+
+ +
+
+ + + + + + + + +
void FLAC__stream_decoder_delete (FLAC__StreamDecoderdecoder)
+
+

Free a decoder instance. Deletes the object pointed to by decoder.

+
Parameters
+ + +
decoderA pointer to an existing decoder.
+
+
+
Assertions:
1 decoder != NULL
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_decoder_set_ogg_serial_number (FLAC__StreamDecoderdecoder,
long serial_number 
)
+
+

Set the serial number for the FLAC stream within the Ogg container. The default behavior is to use the serial number of the first Ogg page. Setting a serial number here will explicitly specify which stream is to be decoded.

+
Note
This does not need to be set for native FLAC decoding.
+
Default Value:
use serial number of first page
+
Parameters
+ + + +
decoderA decoder instance to set.
serial_numberSee above.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the decoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_decoder_set_md5_checking (FLAC__StreamDecoderdecoder,
FLAC__bool value 
)
+
+

Set the "MD5 signature checking" flag. If true, the decoder will compute the MD5 signature of the unencoded audio data while decoding and compare it to the signature from the STREAMINFO block, if it exists, during FLAC__stream_decoder_finish().

+

MD5 signature checking will be turned off (until the next FLAC__stream_decoder_reset()) if there is no signature in the STREAMINFO block or when a seek is attempted.

+

Clients that do not use the MD5 check should leave this off to speed up decoding.

+
Default Value:
false
+
Parameters
+ + + +
decoderA decoder instance to set.
valueFlag value (see above).
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the decoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_decoder_set_metadata_respond (FLAC__StreamDecoderdecoder,
FLAC__MetadataType type 
)
+
+

Direct the decoder to pass on all metadata blocks of type type.

+
Default Value:
By default, only the STREAMINFO block is returned via the metadata callback.
+
Parameters
+ + + +
decoderA decoder instance to set.
typeSee above.
+
+
+
Assertions:
1 decoder != NULL
+
type is valid
+
Return values
+ + +
FLAC__boolfalse if the decoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_decoder_set_metadata_respond_application (FLAC__StreamDecoderdecoder,
const FLAC__byte id[4] 
)
+
+

Direct the decoder to pass on all APPLICATION metadata blocks of the given id.

+
Default Value:
By default, only the STREAMINFO block is returned via the metadata callback.
+
Parameters
+ + + +
decoderA decoder instance to set.
idSee above.
+
+
+
Assertions:
1 decoder != NULL
+
1 id != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the decoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_decoder_set_metadata_respond_all (FLAC__StreamDecoderdecoder)
+
+

Direct the decoder to pass on all metadata blocks of any type.

+
Default Value:
By default, only the STREAMINFO block is returned via the metadata callback.
+
Parameters
+ + +
decoderA decoder instance to set.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the decoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_decoder_set_metadata_ignore (FLAC__StreamDecoderdecoder,
FLAC__MetadataType type 
)
+
+

Direct the decoder to filter out all metadata blocks of type type.

+
Default Value:
By default, only the STREAMINFO block is returned via the metadata callback.
+
Parameters
+ + + +
decoderA decoder instance to set.
typeSee above.
+
+
+
Assertions:
1 decoder != NULL
+
type is valid
+
Return values
+ + +
FLAC__boolfalse if the decoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_decoder_set_metadata_ignore_application (FLAC__StreamDecoderdecoder,
const FLAC__byte id[4] 
)
+
+

Direct the decoder to filter out all APPLICATION metadata blocks of the given id.

+
Default Value:
By default, only the STREAMINFO block is returned via the metadata callback.
+
Parameters
+ + + +
decoderA decoder instance to set.
idSee above.
+
+
+
Assertions:
1 decoder != NULL
+
1 id != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the decoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_decoder_set_metadata_ignore_all (FLAC__StreamDecoderdecoder)
+
+

Direct the decoder to filter out all metadata blocks of any type.

+
Default Value:
By default, only the STREAMINFO block is returned via the metadata callback.
+
Parameters
+ + +
decoderA decoder instance to set.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the decoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__StreamDecoderState FLAC__stream_decoder_get_state (const FLAC__StreamDecoderdecoder)
+
+

Get the current decoder state.

+
Parameters
+ + +
decoderA decoder instance to query.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__StreamDecoderStateThe current decoder state.
+
+
+ +
+
+ +
+
+ + + + + + + + +
const char* FLAC__stream_decoder_get_resolved_state_string (const FLAC__StreamDecoderdecoder)
+
+

Get the current decoder state as a C string.

+
Parameters
+ + +
decoderA decoder instance to query.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
constchar * The decoder state as a C string. Do not modify the contents.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_decoder_get_md5_checking (const FLAC__StreamDecoderdecoder)
+
+

Get the "MD5 signature checking" flag. This is the value of the setting, not whether or not the decoder is currently checking the MD5 (remember, it can be turned off automatically by a seek). When the decoder is reset the flag will be restored to the value returned by this function.

+
Parameters
+ + +
decoderA decoder instance to query.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__boolSee above.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__uint64 FLAC__stream_decoder_get_total_samples (const FLAC__StreamDecoderdecoder)
+
+

Get the total number of samples in the stream being decoded. Will only be valid after decoding has started and will contain the value from the STREAMINFO block. A value of 0 means "unknown".

+
Parameters
+ + +
decoderA decoder instance to query.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
unsignedSee above.
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_decoder_get_channels (const FLAC__StreamDecoderdecoder)
+
+

Get the current number of channels in the stream being decoded. Will only be valid after decoding has started and will contain the value from the most recently decoded frame header.

+
Parameters
+ + +
decoderA decoder instance to query.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
unsignedSee above.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__ChannelAssignment FLAC__stream_decoder_get_channel_assignment (const FLAC__StreamDecoderdecoder)
+
+

Get the current channel assignment in the stream being decoded. Will only be valid after decoding has started and will contain the value from the most recently decoded frame header.

+
Parameters
+ + +
decoderA decoder instance to query.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__ChannelAssignmentSee above.
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_decoder_get_bits_per_sample (const FLAC__StreamDecoderdecoder)
+
+

Get the current sample resolution in the stream being decoded. Will only be valid after decoding has started and will contain the value from the most recently decoded frame header.

+
Parameters
+ + +
decoderA decoder instance to query.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
unsignedSee above.
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_decoder_get_sample_rate (const FLAC__StreamDecoderdecoder)
+
+

Get the current sample rate in Hz of the stream being decoded. Will only be valid after decoding has started and will contain the value from the most recently decoded frame header.

+
Parameters
+ + +
decoderA decoder instance to query.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
unsignedSee above.
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_decoder_get_blocksize (const FLAC__StreamDecoderdecoder)
+
+

Get the current blocksize of the stream being decoded. Will only be valid after decoding has started and will contain the value from the most recently decoded frame header.

+
Parameters
+ + +
decoderA decoder instance to query.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
unsignedSee above.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_decoder_get_decode_position (const FLAC__StreamDecoderdecoder,
FLAC__uint64 * position 
)
+
+

Returns the decoder's current read position within the stream. The position is the byte offset from the start of the stream. Bytes before this position have been fully decoded. Note that there may still be undecoded bytes in the decoder's read FIFO. The returned position is correct even after a seek.

+
Warning
This function currently only works for native FLAC, not Ogg FLAC streams.
+
Parameters
+ + + +
decoderA decoder instance to query.
positionAddress at which to return the desired position.
+
+
+
Assertions:
1 decoder != NULL
+
1 position != NULL
+
+
Return values
+ + +
FLAC__booltrue if successful, false if the stream is not native FLAC, or there was an error from the 'tell' callback or it returned FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_stream (FLAC__StreamDecoderdecoder,
FLAC__StreamDecoderReadCallback read_callback,
FLAC__StreamDecoderSeekCallback seek_callback,
FLAC__StreamDecoderTellCallback tell_callback,
FLAC__StreamDecoderLengthCallback length_callback,
FLAC__StreamDecoderEofCallback eof_callback,
FLAC__StreamDecoderWriteCallback write_callback,
FLAC__StreamDecoderMetadataCallback metadata_callback,
FLAC__StreamDecoderErrorCallback error_callback,
void * client_data 
)
+
+

Initialize the decoder instance to decode native FLAC streams.

+

This flavor of initialization sets up the decoder to decode from a native FLAC stream. I/O is performed via callbacks to the client. For decoding from a plain file via filename or open FILE*, FLAC__stream_decoder_init_file() and FLAC__stream_decoder_init_FILE() provide a simpler interface.

+

This function should be called after FLAC__stream_decoder_new() and FLAC__stream_decoder_set_*() but before any of the FLAC__stream_decoder_process_*() functions. Will set and return the decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA if initialization succeeded.

+
Parameters
+ + + + + + + + + + + +
decoderAn uninitialized decoder instance.
read_callbackSee FLAC__StreamDecoderReadCallback. This pointer must not be NULL.
seek_callbackSee FLAC__StreamDecoderSeekCallback. This pointer may be NULL if seeking is not supported. If seek_callback is not NULL then a tell_callback, length_callback, and eof_callback must also be supplied. Alternatively, a dummy seek callback that just returns FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED may also be supplied, all though this is slightly less efficient for the decoder.
tell_callbackSee FLAC__StreamDecoderTellCallback. This pointer may be NULL if not supported by the client. If seek_callback is not NULL then a tell_callback must also be supplied. Alternatively, a dummy tell callback that just returns FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED may also be supplied, all though this is slightly less efficient for the decoder.
length_callbackSee FLAC__StreamDecoderLengthCallback. This pointer may be NULL if not supported by the client. If seek_callback is not NULL then a length_callback must also be supplied. Alternatively, a dummy length callback that just returns FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED may also be supplied, all though this is slightly less efficient for the decoder.
eof_callbackSee FLAC__StreamDecoderEofCallback. This pointer may be NULL if not supported by the client. If seek_callback is not NULL then a eof_callback must also be supplied. Alternatively, a dummy length callback that just returns false may also be supplied, all though this is slightly less efficient for the decoder.
write_callbackSee FLAC__StreamDecoderWriteCallback. This pointer must not be NULL.
metadata_callbackSee FLAC__StreamDecoderMetadataCallback. This pointer may be NULL if the callback is not desired.
error_callbackSee FLAC__StreamDecoderErrorCallback. This pointer must not be NULL.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__StreamDecoderInitStatusFLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamDecoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_stream (FLAC__StreamDecoderdecoder,
FLAC__StreamDecoderReadCallback read_callback,
FLAC__StreamDecoderSeekCallback seek_callback,
FLAC__StreamDecoderTellCallback tell_callback,
FLAC__StreamDecoderLengthCallback length_callback,
FLAC__StreamDecoderEofCallback eof_callback,
FLAC__StreamDecoderWriteCallback write_callback,
FLAC__StreamDecoderMetadataCallback metadata_callback,
FLAC__StreamDecoderErrorCallback error_callback,
void * client_data 
)
+
+

Initialize the decoder instance to decode Ogg FLAC streams.

+

This flavor of initialization sets up the decoder to decode from a FLAC stream in an Ogg container. I/O is performed via callbacks to the client. For decoding from a plain file via filename or open FILE*, FLAC__stream_decoder_init_ogg_file() and FLAC__stream_decoder_init_ogg_FILE() provide a simpler interface.

+

This function should be called after FLAC__stream_decoder_new() and FLAC__stream_decoder_set_*() but before any of the FLAC__stream_decoder_process_*() functions. Will set and return the decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA if initialization succeeded.

+
Note
Support for Ogg FLAC in the library is optional. If this library has been built without support for Ogg FLAC, this function will return FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER.
+
Parameters
+ + + + + + + + + + + +
decoderAn uninitialized decoder instance.
read_callbackSee FLAC__StreamDecoderReadCallback. This pointer must not be NULL.
seek_callbackSee FLAC__StreamDecoderSeekCallback. This pointer may be NULL if seeking is not supported. If seek_callback is not NULL then a tell_callback, length_callback, and eof_callback must also be supplied. Alternatively, a dummy seek callback that just returns FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED may also be supplied, all though this is slightly less efficient for the decoder.
tell_callbackSee FLAC__StreamDecoderTellCallback. This pointer may be NULL if not supported by the client. If seek_callback is not NULL then a tell_callback must also be supplied. Alternatively, a dummy tell callback that just returns FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED may also be supplied, all though this is slightly less efficient for the decoder.
length_callbackSee FLAC__StreamDecoderLengthCallback. This pointer may be NULL if not supported by the client. If seek_callback is not NULL then a length_callback must also be supplied. Alternatively, a dummy length callback that just returns FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED may also be supplied, all though this is slightly less efficient for the decoder.
eof_callbackSee FLAC__StreamDecoderEofCallback. This pointer may be NULL if not supported by the client. If seek_callback is not NULL then a eof_callback must also be supplied. Alternatively, a dummy length callback that just returns false may also be supplied, all though this is slightly less efficient for the decoder.
write_callbackSee FLAC__StreamDecoderWriteCallback. This pointer must not be NULL.
metadata_callbackSee FLAC__StreamDecoderMetadataCallback. This pointer may be NULL if the callback is not desired.
error_callbackSee FLAC__StreamDecoderErrorCallback. This pointer must not be NULL.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__StreamDecoderInitStatusFLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamDecoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_FILE (FLAC__StreamDecoderdecoder,
FILE * file,
FLAC__StreamDecoderWriteCallback write_callback,
FLAC__StreamDecoderMetadataCallback metadata_callback,
FLAC__StreamDecoderErrorCallback error_callback,
void * client_data 
)
+
+

Initialize the decoder instance to decode native FLAC files.

+

This flavor of initialization sets up the decoder to decode from a plain native FLAC file. For non-stdio streams, you must use FLAC__stream_decoder_init_stream() and provide callbacks for the I/O.

+

This function should be called after FLAC__stream_decoder_new() and FLAC__stream_decoder_set_*() but before any of the FLAC__stream_decoder_process_*() functions. Will set and return the decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA if initialization succeeded.

+
Parameters
+ + + + + + + +
decoderAn uninitialized decoder instance.
fileAn open FLAC file. The file should have been opened with mode "rb" and rewound. The file becomes owned by the decoder and should not be manipulated by the client while decoding. Unless file is stdin, it will be closed when FLAC__stream_decoder_finish() is called. Note however that seeking will not work when decoding from stdout since it is not seekable.
write_callbackSee FLAC__StreamDecoderWriteCallback. This pointer must not be NULL.
metadata_callbackSee FLAC__StreamDecoderMetadataCallback. This pointer may be NULL if the callback is not desired.
error_callbackSee FLAC__StreamDecoderErrorCallback. This pointer must not be NULL.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 decoder != NULL
+
1 file != NULL
+
+
Return values
+ + +
FLAC__StreamDecoderInitStatusFLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamDecoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_FILE (FLAC__StreamDecoderdecoder,
FILE * file,
FLAC__StreamDecoderWriteCallback write_callback,
FLAC__StreamDecoderMetadataCallback metadata_callback,
FLAC__StreamDecoderErrorCallback error_callback,
void * client_data 
)
+
+

Initialize the decoder instance to decode Ogg FLAC files.

+

This flavor of initialization sets up the decoder to decode from a plain Ogg FLAC file. For non-stdio streams, you must use FLAC__stream_decoder_init_ogg_stream() and provide callbacks for the I/O.

+

This function should be called after FLAC__stream_decoder_new() and FLAC__stream_decoder_set_*() but before any of the FLAC__stream_decoder_process_*() functions. Will set and return the decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA if initialization succeeded.

+
Note
Support for Ogg FLAC in the library is optional. If this library has been built without support for Ogg FLAC, this function will return FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER.
+
Parameters
+ + + + + + + +
decoderAn uninitialized decoder instance.
fileAn open FLAC file. The file should have been opened with mode "rb" and rewound. The file becomes owned by the decoder and should not be manipulated by the client while decoding. Unless file is stdin, it will be closed when FLAC__stream_decoder_finish() is called. Note however that seeking will not work when decoding from stdout since it is not seekable.
write_callbackSee FLAC__StreamDecoderWriteCallback. This pointer must not be NULL.
metadata_callbackSee FLAC__StreamDecoderMetadataCallback. This pointer may be NULL if the callback is not desired.
error_callbackSee FLAC__StreamDecoderErrorCallback. This pointer must not be NULL.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 decoder != NULL
+
1 file != NULL
+
+
Return values
+ + +
FLAC__StreamDecoderInitStatusFLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamDecoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_file (FLAC__StreamDecoderdecoder,
const char * filename,
FLAC__StreamDecoderWriteCallback write_callback,
FLAC__StreamDecoderMetadataCallback metadata_callback,
FLAC__StreamDecoderErrorCallback error_callback,
void * client_data 
)
+
+

Initialize the decoder instance to decode native FLAC files.

+

This flavor of initialization sets up the decoder to decode from a plain native FLAC file. If POSIX fopen() semantics are not sufficient, (for example, with Unicode filenames on Windows), you must use FLAC__stream_decoder_init_FILE(), or FLAC__stream_decoder_init_stream() and provide callbacks for the I/O.

+

This function should be called after FLAC__stream_decoder_new() and FLAC__stream_decoder_set_*() but before any of the FLAC__stream_decoder_process_*() functions. Will set and return the decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA if initialization succeeded.

+
Parameters
+ + + + + + + +
decoderAn uninitialized decoder instance.
filenameThe name of the file to decode from. The file will be opened with fopen(). Use NULL to decode from stdin. Note that stdin is not seekable.
write_callbackSee FLAC__StreamDecoderWriteCallback. This pointer must not be NULL.
metadata_callbackSee FLAC__StreamDecoderMetadataCallback. This pointer may be NULL if the callback is not desired.
error_callbackSee FLAC__StreamDecoderErrorCallback. This pointer must not be NULL.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__StreamDecoderInitStatusFLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamDecoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_file (FLAC__StreamDecoderdecoder,
const char * filename,
FLAC__StreamDecoderWriteCallback write_callback,
FLAC__StreamDecoderMetadataCallback metadata_callback,
FLAC__StreamDecoderErrorCallback error_callback,
void * client_data 
)
+
+

Initialize the decoder instance to decode Ogg FLAC files.

+

This flavor of initialization sets up the decoder to decode from a plain Ogg FLAC file. If POSIX fopen() semantics are not sufficient, (for example, with Unicode filenames on Windows), you must use FLAC__stream_decoder_init_ogg_FILE(), or FLAC__stream_decoder_init_ogg_stream() and provide callbacks for the I/O.

+

This function should be called after FLAC__stream_decoder_new() and FLAC__stream_decoder_set_*() but before any of the FLAC__stream_decoder_process_*() functions. Will set and return the decoder state, which will be FLAC__STREAM_DECODER_SEARCH_FOR_METADATA if initialization succeeded.

+
Note
Support for Ogg FLAC in the library is optional. If this library has been built without support for Ogg FLAC, this function will return FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER.
+
Parameters
+ + + + + + + +
decoderAn uninitialized decoder instance.
filenameThe name of the file to decode from. The file will be opened with fopen(). Use NULL to decode from stdin. Note that stdin is not seekable.
write_callbackSee FLAC__StreamDecoderWriteCallback. This pointer must not be NULL.
metadata_callbackSee FLAC__StreamDecoderMetadataCallback. This pointer may be NULL if the callback is not desired.
error_callbackSee FLAC__StreamDecoderErrorCallback. This pointer must not be NULL.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__StreamDecoderInitStatusFLAC__STREAM_DECODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamDecoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_decoder_finish (FLAC__StreamDecoderdecoder)
+
+

Finish the decoding process. Flushes the decoding buffer, releases resources, resets the decoder settings to their defaults, and returns the decoder state to FLAC__STREAM_DECODER_UNINITIALIZED.

+

In the event of a prematurely-terminated decode, it is not strictly necessary to call this immediately before FLAC__stream_decoder_delete() but it is good practice to match every FLAC__stream_decoder_init_*() with a FLAC__stream_decoder_finish().

+
Parameters
+ + +
decoderAn uninitialized decoder instance.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if MD5 checking is on AND a STREAMINFO block was available AND the MD5 signature in the STREAMINFO block was non-zero AND the signature does not match the one computed by the decoder; else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_decoder_flush (FLAC__StreamDecoderdecoder)
+
+

Flush the stream input. The decoder's input buffer will be cleared and the state set to FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC. This will also turn off MD5 checking.

+
Parameters
+ + +
decoderA decoder instance.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__booltrue if successful, else false if a memory allocation error occurs (in which case the state will be set to FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR).
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_decoder_reset (FLAC__StreamDecoderdecoder)
+
+

Reset the decoding process. The decoder's input buffer will be cleared and the state set to FLAC__STREAM_DECODER_SEARCH_FOR_METADATA. This is similar to FLAC__stream_decoder_finish() except that the settings are preserved; there is no need to call FLAC__stream_decoder_init_*() before decoding again. MD5 checking will be restored to its original setting.

+

If the decoder is seekable, or was initialized with FLAC__stream_decoder_init*_FILE() or FLAC__stream_decoder_init*_file(), the decoder will also attempt to seek to the beginning of the file. If this rewind fails, this function will return false. It follows that FLAC__stream_decoder_reset() cannot be used when decoding from stdin.

+

If the decoder was initialized with FLAC__stream_encoder_init*_stream() and is not seekable (i.e. no seek callback was provided or the seek callback returns FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED), it is the duty of the client to start feeding data from the beginning of the stream on the next FLAC__stream_decoder_process() or FLAC__stream_decoder_process_interleaved() call.

+
Parameters
+ + +
decoderA decoder instance.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__booltrue if successful, else false if a memory allocation occurs (in which case the state will be set to FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR) or a seek error occurs (the state will be unchanged).
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_decoder_process_single (FLAC__StreamDecoderdecoder)
+
+

Decode one metadata block or audio frame. This version instructs the decoder to decode a either a single metadata block or a single frame and stop, unless the callbacks return a fatal error or the read callback returns FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM.

+

As the decoder needs more input it will call the read callback. Depending on what was decoded, the metadata or write callback will be called with the decoded metadata block or audio frame.

+

Unless there is a fatal read error or end of stream, this function will return once one whole frame is decoded. In other words, if the stream is not synchronized or points to a corrupt frame header, the decoder will continue to try and resync until it gets to a valid frame, then decode one frame, then return. If the decoder points to a frame whose frame CRC in the frame footer does not match the computed frame CRC, this function will issue a FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH error to the error callback, and return, having decoded one complete, although corrupt, frame. (Such corrupted frames are sent as silence of the correct length to the write callback.)

+
Parameters
+ + +
decoderAn initialized decoder instance.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if any fatal read, write, or memory allocation error occurred (meaning decoding must stop), else true; for more information about the decoder, check the decoder state with FLAC__stream_decoder_get_state().
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_decoder_process_until_end_of_metadata (FLAC__StreamDecoderdecoder)
+
+

Decode until the end of the metadata. This version instructs the decoder to decode from the current position and continue until all the metadata has been read, or until the callbacks return a fatal error or the read callback returns FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM.

+

As the decoder needs more input it will call the read callback. As each metadata block is decoded, the metadata callback will be called with the decoded metadata.

+
Parameters
+ + +
decoderAn initialized decoder instance.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if any fatal read, write, or memory allocation error occurred (meaning decoding must stop), else true; for more information about the decoder, check the decoder state with FLAC__stream_decoder_get_state().
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_decoder_process_until_end_of_stream (FLAC__StreamDecoderdecoder)
+
+

Decode until the end of the stream. This version instructs the decoder to decode from the current position and continue until the end of stream (the read callback returns FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM), or until the callbacks return a fatal error.

+

As the decoder needs more input it will call the read callback. As each metadata block and frame is decoded, the metadata or write callback will be called with the decoded metadata or frame.

+
Parameters
+ + +
decoderAn initialized decoder instance.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if any fatal read, write, or memory allocation error occurred (meaning decoding must stop), else true; for more information about the decoder, check the decoder state with FLAC__stream_decoder_get_state().
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_decoder_skip_single_frame (FLAC__StreamDecoderdecoder)
+
+

Skip one audio frame. This version instructs the decoder to 'skip' a single frame and stop, unless the callbacks return a fatal error or the read callback returns FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM.

+

The decoding flow is the same as what occurs when FLAC__stream_decoder_process_single() is called to process an audio frame, except that this function does not decode the parsed data into PCM or call the write callback. The integrity of the frame is still checked the same way as in the other process functions.

+

This function will return once one whole frame is skipped, in the same way that FLAC__stream_decoder_process_single() will return once one whole frame is decoded.

+

This function can be used in more quickly determining FLAC frame boundaries when decoding of the actual data is not needed, for example when an application is separating a FLAC stream into frames for editing or storing in a container. To do this, the application can use FLAC__stream_decoder_skip_single_frame() to quickly advance to the next frame, then use FLAC__stream_decoder_get_decode_position() to find the new frame boundary.

+

This function should only be called when the stream has advanced past all the metadata, otherwise it will return false.

+
Parameters
+ + +
decoderAn initialized decoder instance not in a metadata state.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if any fatal read, write, or memory allocation error occurred (meaning decoding must stop), or if the decoder is in the FLAC__STREAM_DECODER_SEARCH_FOR_METADATA or FLAC__STREAM_DECODER_READ_METADATA state, else true; for more information about the decoder, check the decoder state with FLAC__stream_decoder_get_state().
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_decoder_seek_absolute (FLAC__StreamDecoderdecoder,
FLAC__uint64 sample 
)
+
+

Flush the input and seek to an absolute sample. Decoding will resume at the given sample. Note that because of this, the next write callback may contain a partial block. The client must support seeking the input or this function will fail and return false. Furthermore, if the decoder state is FLAC__STREAM_DECODER_SEEK_ERROR, then the decoder must be flushed with FLAC__stream_decoder_flush() or reset with FLAC__stream_decoder_reset() before decoding can continue.

+
Parameters
+ + + +
decoderA decoder instance.
sampleThe target sample number to seek to.
+
+
+
Assertions:
1 decoder != NULL
+
+
Return values
+ + +
FLAC__booltrue if successful, else false.
+
+
+ +
+
+

Variable Documentation

+ +
+
+ + + + +
const char* const FLAC__StreamDecoderStateString[]
+
+

Maps a FLAC__StreamDecoderState to a C string.

+

Using a FLAC__StreamDecoderState as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamDecoderInitStatusString[]
+
+

Maps a FLAC__StreamDecoderInitStatus to a C string.

+

Using a FLAC__StreamDecoderInitStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamDecoderReadStatusString[]
+
+

Maps a FLAC__StreamDecoderReadStatus to a C string.

+

Using a FLAC__StreamDecoderReadStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamDecoderSeekStatusString[]
+
+

Maps a FLAC__StreamDecoderSeekStatus to a C string.

+

Using a FLAC__StreamDecoderSeekStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamDecoderTellStatusString[]
+
+

Maps a FLAC__StreamDecoderTellStatus to a C string.

+

Using a FLAC__StreamDecoderTellStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamDecoderLengthStatusString[]
+
+

Maps a FLAC__StreamDecoderLengthStatus to a C string.

+

Using a FLAC__StreamDecoderLengthStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamDecoderWriteStatusString[]
+
+

Maps a FLAC__StreamDecoderWriteStatus to a C string.

+

Using a FLAC__StreamDecoderWriteStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamDecoderErrorStatusString[]
+
+

Maps a FLAC__StreamDecoderErrorStatus to a C string.

+

Using a FLAC__StreamDecoderErrorStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flac__stream__encoder.html b/lib-src/libflac/doc/html/api/group__flac__stream__encoder.html new file mode 100644 index 000000000..206eeee52 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flac__stream__encoder.html @@ -0,0 +1,3080 @@ + + + + + + +FLAC: FLAC/stream_encoder.h: stream encoder interface + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC/stream_encoder.h: stream encoder interface
+
+
+ + + + +

+Classes

struct  FLAC__StreamEncoder
 
+ + + + + + + + + + + + + +

+Typedefs

typedef
+FLAC__StreamEncoderReadStatus(* 
FLAC__StreamEncoderReadCallback )(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
 
typedef
+FLAC__StreamEncoderWriteStatus(* 
FLAC__StreamEncoderWriteCallback )(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
 
typedef
+FLAC__StreamEncoderSeekStatus(* 
FLAC__StreamEncoderSeekCallback )(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
 
typedef
+FLAC__StreamEncoderTellStatus(* 
FLAC__StreamEncoderTellCallback )(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
 
typedef void(* FLAC__StreamEncoderMetadataCallback )(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data)
 
typedef void(* FLAC__StreamEncoderProgressCallback )(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data)
 
+ + + + + + + + + + + + + +

+Enumerations

enum  FLAC__StreamEncoderState {
+  FLAC__STREAM_ENCODER_OK = 0, +FLAC__STREAM_ENCODER_UNINITIALIZED, +FLAC__STREAM_ENCODER_OGG_ERROR, +FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR, +
+  FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA, +FLAC__STREAM_ENCODER_CLIENT_ERROR, +FLAC__STREAM_ENCODER_IO_ERROR, +FLAC__STREAM_ENCODER_FRAMING_ERROR, +
+  FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR +
+ }
 
enum  FLAC__StreamEncoderInitStatus {
+  FLAC__STREAM_ENCODER_INIT_STATUS_OK = 0, +FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR, +FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER, +FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS, +
+  FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_NUMBER_OF_CHANNELS, +FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE, +FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE, +FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BLOCK_SIZE, +
+  FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER, +FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION, +FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER, +FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE, +
+  FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA, +FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED +
+ }
 
enum  FLAC__StreamEncoderReadStatus { FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE, +FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM, +FLAC__STREAM_ENCODER_READ_STATUS_ABORT, +FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED + }
 
enum  FLAC__StreamEncoderWriteStatus { FLAC__STREAM_ENCODER_WRITE_STATUS_OK = 0, +FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR + }
 
enum  FLAC__StreamEncoderSeekStatus { FLAC__STREAM_ENCODER_SEEK_STATUS_OK, +FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR, +FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED + }
 
enum  FLAC__StreamEncoderTellStatus { FLAC__STREAM_ENCODER_TELL_STATUS_OK, +FLAC__STREAM_ENCODER_TELL_STATUS_ERROR, +FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED + }
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Functions

FLAC__StreamEncoderFLAC__stream_encoder_new (void)
 
void FLAC__stream_encoder_delete (FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_set_ogg_serial_number (FLAC__StreamEncoder *encoder, long serial_number)
 
FLAC__bool FLAC__stream_encoder_set_verify (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_streamable_subset (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_channels (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_bits_per_sample (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_sample_rate (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_compression_level (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_blocksize (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_do_mid_side_stereo (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_apodization (FLAC__StreamEncoder *encoder, const char *specification)
 
FLAC__bool FLAC__stream_encoder_set_max_lpc_order (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_qlp_coeff_precision (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_do_qlp_coeff_prec_search (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_do_escape_coding (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_do_exhaustive_model_search (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_rice_parameter_search_dist (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_total_samples_estimate (FLAC__StreamEncoder *encoder, FLAC__uint64 value)
 
FLAC__bool FLAC__stream_encoder_set_metadata (FLAC__StreamEncoder *encoder, FLAC__StreamMetadata **metadata, unsigned num_blocks)
 
FLAC__StreamEncoderState FLAC__stream_encoder_get_state (const FLAC__StreamEncoder *encoder)
 
FLAC__StreamDecoderState FLAC__stream_encoder_get_verify_decoder_state (const FLAC__StreamEncoder *encoder)
 
const char * FLAC__stream_encoder_get_resolved_state_string (const FLAC__StreamEncoder *encoder)
 
void FLAC__stream_encoder_get_verify_decoder_error_stats (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got)
 
FLAC__bool FLAC__stream_encoder_get_verify (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_streamable_subset (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_channels (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_bits_per_sample (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_sample_rate (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_blocksize (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_do_mid_side_stereo (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_loose_mid_side_stereo (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_max_lpc_order (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_qlp_coeff_precision (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_do_qlp_coeff_prec_search (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_do_escape_coding (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_do_exhaustive_model_search (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_min_residual_partition_order (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_max_residual_partition_order (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_rice_parameter_search_dist (const FLAC__StreamEncoder *encoder)
 
FLAC__uint64 FLAC__stream_encoder_get_total_samples_estimate (const FLAC__StreamEncoder *encoder)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_stream (FLAC__StreamEncoder *encoder, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_stream (FLAC__StreamEncoder *encoder, FLAC__StreamEncoderReadCallback read_callback, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_FILE (FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_FILE (FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_file (FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_file (FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
 
FLAC__bool FLAC__stream_encoder_finish (FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_process (FLAC__StreamEncoder *encoder, const FLAC__int32 *const buffer[], unsigned samples)
 
FLAC__bool FLAC__stream_encoder_process_interleaved (FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], unsigned samples)
 
+ + + + + + + + + + + + + +

+Variables

const char *const FLAC__StreamEncoderStateString []
 
const char *const FLAC__StreamEncoderInitStatusString []
 
const char *const FLAC__StreamEncoderReadStatusString []
 
const char *const FLAC__StreamEncoderWriteStatusString []
 
const char *const FLAC__StreamEncoderSeekStatusString []
 
const char *const FLAC__StreamEncoderTellStatusString []
 
+

Detailed Description

+

This module contains the functions which implement the stream encoder.

+

The stream encoder can encode to native FLAC, and optionally Ogg FLAC (check FLAC_API_SUPPORTS_OGG_FLAC) streams and files.

+

The basic usage of this encoder is as follows:

+

In more detail, the stream encoder functions similarly to the stream decoder , but has fewer callbacks and more options. Typically the client will create a new instance by calling FLAC__stream_encoder_new(), then set the necessary parameters with FLAC__stream_encoder_set_*(), and initialize it by calling one of the FLAC__stream_encoder_init_*() functions.

+

Unlike the decoders, the stream encoder has many options that can affect the speed and compression ratio. When setting these parameters you should have some basic knowledge of the format (see the user-level documentation or the formal description). The FLAC__stream_encoder_set_*() functions themselves do not validate the values as many are interdependent. The FLAC__stream_encoder_init_*() functions will do this, so make sure to pay attention to the state returned by FLAC__stream_encoder_init_*() to make sure that it is FLAC__STREAM_ENCODER_INIT_STATUS_OK. Any parameters that are not set before FLAC__stream_encoder_init_*() will take on the defaults from the constructor.

+

There are three initialization functions for native FLAC, one for setting up the encoder to encode FLAC data to the client via callbacks, and two for encoding directly to a file.

+

For encoding via callbacks, use FLAC__stream_encoder_init_stream(). You must also supply a write callback which will be called anytime there is raw encoded data to write. If the client can seek the output it is best to also supply seek and tell callbacks, as this allows the encoder to go back after encoding is finished to write back information that was collected while encoding, like seek point offsets, frame sizes, etc.

+

For encoding directly to a file, use FLAC__stream_encoder_init_FILE() or FLAC__stream_encoder_init_file(). Then you must only supply a filename or open FILE*; the encoder will handle all the callbacks internally. You may also supply a progress callback for periodic notification of the encoding progress.

+

There are three similarly-named init functions for encoding to Ogg FLAC streams. Check FLAC_API_SUPPORTS_OGG_FLAC to find out if the library has been built with Ogg support.

+

The call to FLAC__stream_encoder_init_*() currently will also immediately call the write callback several times, once with the fLaC signature, and once for each encoded metadata block. Note that for Ogg FLAC encoding you will usually get at least twice the number of callbacks than with native FLAC, one for the Ogg page header and one for the page body.

+

After initializing the instance, the client may feed audio data to the encoder in one of two ways:

+
    +
  • Channel separate, through FLAC__stream_encoder_process() - The client will pass an array of pointers to buffers, one for each channel, to the encoder, each of the same length. The samples need not be block-aligned, but each channel should have the same number of samples.
  • +
  • Channel interleaved, through FLAC__stream_encoder_process_interleaved() - The client will pass a single pointer to data that is channel-interleaved (i.e. channel0_sample0, channel1_sample0, ... , channelN_sample0, channel0_sample1, ...). Again, the samples need not be block-aligned but they must be sample-aligned, i.e. the first value should be channel0_sample0 and the last value channelN_sampleM.
  • +
+

Note that for either process call, each sample in the buffers should be a signed integer, right-justified to the resolution set by FLAC__stream_encoder_set_bits_per_sample(). For example, if the resolution is 16 bits per sample, the samples should all be in the range [-32768,32767].

+

When the client is finished encoding data, it calls FLAC__stream_encoder_finish(), which causes the encoder to encode any data still in its input pipe, and call the metadata callback with the final encoding statistics. Then the instance may be deleted with FLAC__stream_encoder_delete() or initialized again to encode another stream.

+

For programs that write their own metadata, but that do not know the actual metadata until after encoding, it is advantageous to instruct the encoder to write a PADDING block of the correct size, so that instead of rewriting the whole stream after encoding, the program can just overwrite the PADDING block. If only the maximum size of the metadata is known, the program can write a slightly larger padding block, then split it after encoding.

+

Make sure you understand how lengths are calculated. All FLAC metadata blocks have a 4 byte header which contains the type and length. This length does not include the 4 bytes of the header. See the format page for the specification of metadata blocks and their lengths.

+
Note
If you are writing the FLAC data to a file via callbacks, make sure it is open for update (e.g. mode "w+" for stdio streams). This is because after the first encoding pass, the encoder will try to seek back to the beginning of the stream, to the STREAMINFO block, to write some data there. (If using FLAC__stream_encoder_init*_file() or FLAC__stream_encoder_init*_FILE(), the file is managed internally.)
+
+The "set" functions may only be called when the encoder is in the state FLAC__STREAM_ENCODER_UNINITIALIZED, i.e. after FLAC__stream_encoder_new() or FLAC__stream_encoder_finish(), but before FLAC__stream_encoder_init_*(). If this is the case they will return true, otherwise false.
+
+FLAC__stream_encoder_finish() resets all settings to the constructor defaults.
+

Typedef Documentation

+ +
+
+ + + + +
typedef FLAC__StreamEncoderReadStatus(* FLAC__StreamEncoderReadCallback)(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
+
+

Signature for the read callback.

+

A function pointer matching this signature must be passed to FLAC__stream_encoder_init_ogg_stream() if seeking is supported. The supplied function will be called when the encoder needs to read back encoded data. This happens during the metadata callback, when the encoder has to read, modify, and rewrite the metadata (e.g. seekpoints) gathered while encoding. The address of the buffer to be filled is supplied, along with the number of bytes the buffer can hold. The callback may choose to supply less data and modify the byte count but must be careful not to overflow the buffer. The callback then returns a status code chosen from FLAC__StreamEncoderReadStatus.

+

Here is an example of a read callback for stdio streams:

1 FLAC__StreamEncoderReadStatus read_cb(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
+
2 {
+
3  FILE *file = ((MyClientData*)client_data)->file;
+
4  if(*bytes > 0) {
+
5  *bytes = fread(buffer, sizeof(FLAC__byte), *bytes, file);
+
6  if(ferror(file))
+
7  return FLAC__STREAM_ENCODER_READ_STATUS_ABORT;
+
8  else if(*bytes == 0)
+
9  return FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM;
+
10  else
+
11  return FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE;
+
12  }
+
13  else
+
14  return FLAC__STREAM_ENCODER_READ_STATUS_ABORT;
+
15 }
+
Note
In general, FLAC__StreamEncoder functions which change the state should not be called on the encoder while in the callback.
+
Parameters
+ + + + + +
encoderThe encoder instance calling the callback.
bufferA pointer to a location for the callee to store data to be encoded.
bytesA pointer to the size of the buffer. On entry to the callback, it contains the maximum number of bytes that may be stored in buffer. The callee must set it to the actual number of bytes stored (0 in case of error or end-of-stream) before returning.
client_dataThe callee's client data set through FLAC__stream_encoder_set_client_data().
+
+
+
Return values
+ + +
FLAC__StreamEncoderReadStatusThe callee's return status.
+
+
+ +
+
+ +
+
+ + + + +
typedef FLAC__StreamEncoderWriteStatus(* FLAC__StreamEncoderWriteCallback)(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
+
+

Signature for the write callback.

+

A function pointer matching this signature must be passed to FLAC__stream_encoder_init*_stream(). The supplied function will be called by the encoder anytime there is raw encoded data ready to write. It may include metadata mixed with encoded audio frames and the data is not guaranteed to be aligned on frame or metadata block boundaries.

+

The only duty of the callback is to write out the bytes worth of data in buffer to the current position in the output stream. The arguments samples and current_frame are purely informational. If samples is greater than 0, then current_frame will hold the current frame number that is being written; otherwise it indicates that the write callback is being called to write metadata.

+
Note
Unlike when writing to native FLAC, when writing to Ogg FLAC the write callback will be called twice when writing each audio frame; once for the page header, and once for the page body. When writing the page header, the samples argument to the write callback will be 0.
+
+In general, FLAC__StreamEncoder functions which change the state should not be called on the encoder while in the callback.
+
Parameters
+ + + + + + + +
encoderThe encoder instance calling the callback.
bufferAn array of encoded data of length bytes.
bytesThe byte length of buffer.
samplesThe number of samples encoded by buffer. 0 has a special meaning; see above.
current_frameThe number of the current frame being encoded.
client_dataThe callee's client data set through FLAC__stream_encoder_init_*().
+
+
+
Return values
+ + +
FLAC__StreamEncoderWriteStatusThe callee's return status.
+
+
+ +
+
+ +
+
+ + + + +
typedef FLAC__StreamEncoderSeekStatus(* FLAC__StreamEncoderSeekCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
+
+

Signature for the seek callback.

+

A function pointer matching this signature may be passed to FLAC__stream_encoder_init*_stream(). The supplied function will be called when the encoder needs to seek the output stream. The encoder will pass the absolute byte offset to seek to, 0 meaning the beginning of the stream.

+

Here is an example of a seek callback for stdio streams:

1 FLAC__StreamEncoderSeekStatus seek_cb(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
+
2 {
+
3  FILE *file = ((MyClientData*)client_data)->file;
+
4  if(file == stdin)
+
5  return FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED;
+
6  else if(fseeko(file, (off_t)absolute_byte_offset, SEEK_SET) < 0)
+
7  return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR;
+
8  else
+
9  return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
+
10 }
+
Note
In general, FLAC__StreamEncoder functions which change the state should not be called on the encoder while in the callback.
+
Parameters
+ + + + +
encoderThe encoder instance calling the callback.
absolute_byte_offsetThe offset from the beginning of the stream to seek to.
client_dataThe callee's client data set through FLAC__stream_encoder_init_*().
+
+
+
Return values
+ + +
FLAC__StreamEncoderSeekStatusThe callee's return status.
+
+
+ +
+
+ +
+
+ + + + +
typedef FLAC__StreamEncoderTellStatus(* FLAC__StreamEncoderTellCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
+
+

Signature for the tell callback.

+

A function pointer matching this signature may be passed to FLAC__stream_encoder_init*_stream(). The supplied function will be called when the encoder needs to know the current position of the output stream.

+
Warning
The callback must return the true current byte offset of the output to which the encoder is writing. If you are buffering the output, make sure and take this into account. If you are writing directly to a FILE* from your write callback, ftell() is sufficient. If you are writing directly to a file descriptor from your write callback, you can use lseek(fd, SEEK_CUR, 0). The encoder may later seek back to these points to rewrite metadata after encoding.
+

Here is an example of a tell callback for stdio streams:

1 FLAC__StreamEncoderTellStatus tell_cb(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
+
2 {
+
3  FILE *file = ((MyClientData*)client_data)->file;
+
4  off_t pos;
+
5  if(file == stdin)
+
6  return FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED;
+
7  else if((pos = ftello(file)) < 0)
+
8  return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR;
+
9  else {
+
10  *absolute_byte_offset = (FLAC__uint64)pos;
+
11  return FLAC__STREAM_ENCODER_TELL_STATUS_OK;
+
12  }
+
13 }
+
Note
In general, FLAC__StreamEncoder functions which change the state should not be called on the encoder while in the callback.
+
Parameters
+ + + + +
encoderThe encoder instance calling the callback.
absolute_byte_offsetThe address at which to store the current position of the output.
client_dataThe callee's client data set through FLAC__stream_encoder_init_*().
+
+
+
Return values
+ + +
FLAC__StreamEncoderTellStatusThe callee's return status.
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* FLAC__StreamEncoderMetadataCallback)(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data)
+
+

Signature for the metadata callback.

+

A function pointer matching this signature may be passed to FLAC__stream_encoder_init*_stream(). The supplied function will be called once at the end of encoding with the populated STREAMINFO structure. This is so the client can seek back to the beginning of the file and write the STREAMINFO block with the correct statistics after encoding (like minimum/maximum frame size and total samples).

+
Note
In general, FLAC__StreamEncoder functions which change the state should not be called on the encoder while in the callback.
+
Parameters
+ + + + +
encoderThe encoder instance calling the callback.
metadataThe final populated STREAMINFO block.
client_dataThe callee's client data set through FLAC__stream_encoder_init_*().
+
+
+ +
+
+ +
+
+ + + + +
typedef void(* FLAC__StreamEncoderProgressCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data)
+
+

Signature for the progress callback.

+

A function pointer matching this signature may be passed to FLAC__stream_encoder_init*_file() or FLAC__stream_encoder_init*_FILE(). The supplied function will be called when the encoder has finished writing a frame. The total_frames_estimate argument to the callback will be based on the value from FLAC__stream_encoder_set_total_samples_estimate().

+
Note
In general, FLAC__StreamEncoder functions which change the state should not be called on the encoder while in the callback.
+
Parameters
+ + + + + + + +
encoderThe encoder instance calling the callback.
bytes_writtenBytes written so far.
samples_writtenSamples written so far.
frames_writtenFrames written so far.
total_frames_estimateThe estimate of the total number of frames to be written.
client_dataThe callee's client data set through FLAC__stream_encoder_init_*().
+
+
+ +
+
+

Enumeration Type Documentation

+ +
+
+ + + + +
enum FLAC__StreamEncoderState
+
+

State values for a FLAC__StreamEncoder.

+

The encoder's state can be obtained by calling FLAC__stream_encoder_get_state().

+

If the encoder gets into any other state besides FLAC__STREAM_ENCODER_OK or FLAC__STREAM_ENCODER_UNINITIALIZED, it becomes invalid for encoding and must be deleted with FLAC__stream_encoder_delete().

+ + + + + + + + + + +
Enumerator
FLAC__STREAM_ENCODER_OK  +

The encoder is in the normal OK state and samples can be processed.

+
FLAC__STREAM_ENCODER_UNINITIALIZED  +

The encoder is in the uninitialized state; one of the FLAC__stream_encoder_init_*() functions must be called before samples can be processed.

+
FLAC__STREAM_ENCODER_OGG_ERROR  +

An error occurred in the underlying Ogg layer.

+
FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR  +

An error occurred in the underlying verify stream decoder; check FLAC__stream_encoder_get_verify_decoder_state().

+
FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA  +

The verify decoder detected a mismatch between the original audio signal and the decoded audio signal.

+
FLAC__STREAM_ENCODER_CLIENT_ERROR  +

One of the callbacks returned a fatal error.

+
FLAC__STREAM_ENCODER_IO_ERROR  +

An I/O error occurred while opening/reading/writing a file. Check errno.

+
FLAC__STREAM_ENCODER_FRAMING_ERROR  +

An error occurred while writing the stream; usually, the write_callback returned an error.

+
FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR  +

Memory allocation failed.

+
+ +
+
+ +
+
+

Possible return values for the FLAC__stream_encoder_init_*() functions.

+ + + + + + + + + + + + + + + +
Enumerator
FLAC__STREAM_ENCODER_INIT_STATUS_OK  +

Initialization was successful.

+
FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR  +

General failure to set up encoder; call FLAC__stream_encoder_get_state() for cause.

+
FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER  +

The library was not compiled with support for the given container format.

+
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS  +

A required callback was not supplied.

+
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_NUMBER_OF_CHANNELS  +

The encoder has an invalid setting for number of channels.

+
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE  +

The encoder has an invalid setting for bits-per-sample. FLAC supports 4-32 bps but the reference encoder currently supports only up to 24 bps.

+
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE  +

The encoder has an invalid setting for the input sample rate.

+
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BLOCK_SIZE  +

The encoder has an invalid setting for the block size.

+
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER  +

The encoder has an invalid setting for the maximum LPC order.

+
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION  +

The encoder has an invalid setting for the precision of the quantized linear predictor coefficients.

+
FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER  +

The specified block size is less than the maximum LPC order.

+
FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE  +

The encoder is bound to the Subset but other settings violate it.

+
FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA  +

The metadata input to the encoder is invalid, in one of the following ways:

+
FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED  +

FLAC__stream_encoder_init_*() was called when the encoder was already initialized, usually because FLAC__stream_encoder_finish() was not called.

+
+ +
+
+ +
+
+

Return values for the FLAC__StreamEncoder read callback.

+ + + + + +
Enumerator
FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE  +

The read was OK and decoding can continue.

+
FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM  +

The read was attempted at the end of the stream.

+
FLAC__STREAM_ENCODER_READ_STATUS_ABORT  +

An unrecoverable error occurred.

+
FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED  +

Client does not support reading back from the output.

+
+ +
+
+ +
+
+

Return values for the FLAC__StreamEncoder write callback.

+ + + +
Enumerator
FLAC__STREAM_ENCODER_WRITE_STATUS_OK  +

The write was OK and encoding can continue.

+
FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR  +

An unrecoverable error occurred. The encoder will return from the process call.

+
+ +
+
+ +
+
+

Return values for the FLAC__StreamEncoder seek callback.

+ + + + +
Enumerator
FLAC__STREAM_ENCODER_SEEK_STATUS_OK  +

The seek was OK and encoding can continue.

+
FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR  +

An unrecoverable error occurred.

+
FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED  +

Client does not support seeking.

+
+ +
+
+ +
+
+

Return values for the FLAC__StreamEncoder tell callback.

+ + + + +
Enumerator
FLAC__STREAM_ENCODER_TELL_STATUS_OK  +

The tell was OK and encoding can continue.

+
FLAC__STREAM_ENCODER_TELL_STATUS_ERROR  +

An unrecoverable error occurred.

+
FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED  +

Client does not support seeking.

+
+ +
+
+

Function Documentation

+ +
+
+ + + + + + + + +
FLAC__StreamEncoder* FLAC__stream_encoder_new (void )
+
+

Create a new stream encoder instance. The instance is created with default settings; see the individual FLAC__stream_encoder_set_*() functions for each setting's default.

+
Return values
+ + +
FLAC__StreamEncoder*NULL if there was an error allocating memory, else the new instance.
+
+
+ +
+
+ +
+
+ + + + + + + + +
void FLAC__stream_encoder_delete (FLAC__StreamEncoderencoder)
+
+

Free an encoder instance. Deletes the object pointed to by encoder.

+
Parameters
+ + +
encoderA pointer to an existing encoder.
+
+
+
Assertions:
1 encoder != NULL
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_ogg_serial_number (FLAC__StreamEncoderencoder,
long serial_number 
)
+
+

Set the serial number for the FLAC stream to use in the Ogg container.

+
Note
This does not need to be set for native FLAC encoding.
+
+It is recommended to set a serial number explicitly as the default of '0' may collide with other streams.
+
Default Value:
0
+
Parameters
+ + + +
encoderAn encoder instance to set.
serial_numberSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_verify (FLAC__StreamEncoderencoder,
FLAC__bool value 
)
+
+

Set the "verify" flag. If true, the encoder will verify it's own encoded output by feeding it through an internal decoder and comparing the original signal against the decoded signal. If a mismatch occurs, the process call will return false. Note that this will slow the encoding process by the extra time required for decoding and comparison.

+
Default Value:
false
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueFlag value (see above).
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_streamable_subset (FLAC__StreamEncoderencoder,
FLAC__bool value 
)
+
+

Set the Subset flag. If true, the encoder will comply with the Subset and will check the settings during FLAC__stream_encoder_init_*() to see if all settings comply. If false, the settings may take advantage of the full range that the format allows.

+

Make sure you know what it entails before setting this to false.

+
Default Value:
true
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueFlag value (see above).
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_channels (FLAC__StreamEncoderencoder,
unsigned value 
)
+
+

Set the number of channels to be encoded.

+
Default Value:
2
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_bits_per_sample (FLAC__StreamEncoderencoder,
unsigned value 
)
+
+

Set the sample resolution of the input to be encoded.

+
Warning
Do not feed the encoder data that is wider than the value you set here or you will generate an invalid stream.
+
Default Value:
16
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_sample_rate (FLAC__StreamEncoderencoder,
unsigned value 
)
+
+

Set the sample rate (in Hz) of the input to be encoded.

+
Default Value:
44100
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_compression_level (FLAC__StreamEncoderencoder,
unsigned value 
)
+
+

Set the compression level

+

The compression level is roughly proportional to the amount of effort the encoder expends to compress the file. A higher level usually means more computation but higher compression. The default level is suitable for most applications.

+

Currently the levels range from 0 (fastest, least compression) to 8 (slowest, most compression). A value larger than 8 will be treated as 8.

+

This function automatically calls the following other set functions with appropriate values, so the client does not need to unless it specifically wants to override them:

+

The actual values set for each level are:

+ + + + + + + + + + + + + + + + + + + + +
level do mid-side stereo loose mid-side stereo apodization max lpc order qlp coeff precision qlp coeff prec search escape coding exhaustive model search min residual partition order max residual partition order rice parameter search dist
0 false false tukey(0.5)0 0 false false false 0 3 0
1 true true tukey(0.5)0 0 false false false 0 3 0
2 true false tukey(0.5)0 0 false false false 0 3 0
3 false false tukey(0.5)6 0 false false false 0 4 0
4 true true tukey(0.5)8 0 false false false 0 4 0
5 true false tukey(0.5)8 0 false false false 0 5 0
6 true false tukey(0.5);partial_tukey(2)8 0 false false false 0 6 0
7 true false tukey(0.5);partial_tukey(2)12 0 false false false 0 6 0
8 true false tukey(0.5);partial_tukey(2);punchout_tukey(3) 12 0 false false false 0 6 0
+
Default Value:
5
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_blocksize (FLAC__StreamEncoderencoder,
unsigned value 
)
+
+

Set the blocksize to use while encoding.

+

The number of samples to use per frame. Use 0 to let the encoder estimate a blocksize; this is usually best.

+
Default Value:
0
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_do_mid_side_stereo (FLAC__StreamEncoderencoder,
FLAC__bool value 
)
+
+

Set to true to enable mid-side encoding on stereo input. The number of channels must be 2 for this to have any effect. Set to false to use only independent channel coding.

+
Default Value:
false
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueFlag value (see above).
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo (FLAC__StreamEncoderencoder,
FLAC__bool value 
)
+
+

Set to true to enable adaptive switching between mid-side and left-right encoding on stereo input. Set to false to use exhaustive searching. Setting this to true requires FLAC__stream_encoder_set_do_mid_side_stereo() to also be set to true in order to have any effect.

+
Default Value:
false
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueFlag value (see above).
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_apodization (FLAC__StreamEncoderencoder,
const char * specification 
)
+
+

Sets the apodization function(s) the encoder will use when windowing audio data for LPC analysis.

+

The specification is a plain ASCII string which specifies exactly which functions to use. There may be more than one (up to 32), separated by ';' characters. Some functions take one or more comma-separated arguments in parentheses.

+

The available functions are bartlett, bartlett_hann, blackman, blackman_harris_4term_92db, connes, flattop, gauss(STDDEV), hamming, hann, kaiser_bessel, nuttall, rectangle, triangle, tukey(P), partial_tukey(n[/ov[/P]]), punchout_tukey(n[/ov[/P]]), welch.

+

For gauss(STDDEV), STDDEV specifies the standard deviation (0<STDDEV<=0.5).

+

For tukey(P), P specifies the fraction of the window that is tapered (0<=P<=1). P=0 corresponds to rectangle and P=1 corresponds to hann.

+

Specifying partial_tukey or punchout_tukey works a little different. These do not specify a single apodization function, but a series of them with some overlap. partial_tukey specifies a series of small windows (all treated separately) while punchout_tukey specifies a series of windows that have a hole in them. In this way, the predictor is constructed with only a part of the block, which helps in case a block consists of dissimilar parts.

+

The three parameters that can be specified for the functions are n, ov and P. n is the number of functions to add, ov is the overlap of the windows in case of partial_tukey and the overlap in the gaps in case of punchout_tukey. P is the fraction of the window that is tapered, like with a regular tukey window. The function can be specified with only a number, a number and an overlap, or a number an overlap and a P, for example, partial_tukey(3), partial_tukey(3/0.3) and partial_tukey(3/0.3/0.5) are all valid. ov should be smaller than 1 and can be negative.

+

Example specifications are "blackman" or "hann;triangle;tukey(0.5);tukey(0.25);tukey(0.125)"

+

Any function that is specified erroneously is silently dropped. Up to 32 functions are kept, the rest are dropped. If the specification is empty the encoder defaults to "tukey(0.5)".

+

When more than one function is specified, then for every subframe the encoder will try each of them separately and choose the window that results in the smallest compressed subframe.

+

Note that each function specified causes the encoder to occupy a floating point array in which to store the window. Also note that the values of P, STDDEV and ov are locale-specific, so if the comma separator specified by the locale is a comma, a comma should be used.

+
Default Value:
"tukey(0.5)"
+
Parameters
+ + + +
encoderAn encoder instance to set.
specificationSee above.
+
+
+
Assertions:
1 encoder != NULL
+
1 specification != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_max_lpc_order (FLAC__StreamEncoderencoder,
unsigned value 
)
+
+

Set the maximum LPC order, or 0 to use only the fixed predictors.

+
Default Value:
0
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_qlp_coeff_precision (FLAC__StreamEncoderencoder,
unsigned value 
)
+
+

Set the precision, in bits, of the quantized linear predictor coefficients, or 0 to let the encoder select it based on the blocksize.

+
Note
In the current implementation, qlp_coeff_precision + bits_per_sample must be less than 32.
+
Default Value:
0
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_do_qlp_coeff_prec_search (FLAC__StreamEncoderencoder,
FLAC__bool value 
)
+
+

Set to false to use only the specified quantized linear predictor coefficient precision, or true to search neighboring precision values and use the best one.

+
Default Value:
false
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_do_escape_coding (FLAC__StreamEncoderencoder,
FLAC__bool value 
)
+
+

Deprecated. Setting this value has no effect.

+
Default Value:
false
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_do_exhaustive_model_search (FLAC__StreamEncoderencoder,
FLAC__bool value 
)
+
+

Set to false to let the encoder estimate the best model order based on the residual signal energy, or true to force the encoder to evaluate all order models and select the best.

+
Default Value:
false
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order (FLAC__StreamEncoderencoder,
unsigned value 
)
+
+

Set the minimum partition order to search when coding the residual. This is used in tandem with FLAC__stream_encoder_set_max_residual_partition_order().

+

The partition order determines the context size in the residual. The context size will be approximately blocksize / (2 ^ order).

+

Set both min and max values to 0 to force a single context, whose Rice parameter is based on the residual signal variance. Otherwise, set a min and max order, and the encoder will search all orders, using the mean of each context for its Rice parameter, and use the best.

+
Default Value:
0
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order (FLAC__StreamEncoderencoder,
unsigned value 
)
+
+

Set the maximum partition order to search when coding the residual. This is used in tandem with FLAC__stream_encoder_set_min_residual_partition_order().

+

The partition order determines the context size in the residual. The context size will be approximately blocksize / (2 ^ order).

+

Set both min and max values to 0 to force a single context, whose Rice parameter is based on the residual signal variance. Otherwise, set a min and max order, and the encoder will search all orders, using the mean of each context for its Rice parameter, and use the best.

+
Default Value:
0
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_rice_parameter_search_dist (FLAC__StreamEncoderencoder,
unsigned value 
)
+
+

Deprecated. Setting this value has no effect.

+
Default Value:
0
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_total_samples_estimate (FLAC__StreamEncoderencoder,
FLAC__uint64 value 
)
+
+

Set an estimate of the total samples that will be encoded. This is merely an estimate and may be set to 0 if unknown. This value will be written to the STREAMINFO block before encoding, and can remove the need for the caller to rewrite the value later if the value is known before encoding.

+
Default Value:
0
+
Parameters
+ + + +
encoderAn encoder instance to set.
valueSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_set_metadata (FLAC__StreamEncoderencoder,
FLAC__StreamMetadata ** metadata,
unsigned num_blocks 
)
+
+

Set the metadata blocks to be emitted to the stream before encoding. A value of NULL, 0 implies no metadata; otherwise, supply an array of pointers to metadata blocks. The array is non-const since the encoder may need to change the is_last flag inside them, and in some cases update seek point offsets. Otherwise, the encoder will not modify or free the blocks. It is up to the caller to free the metadata blocks after encoding finishes.

+
Note
The encoder stores only copies of the pointers in the metadata array; the metadata blocks themselves must survive at least until after FLAC__stream_encoder_finish() returns. Do not free the blocks until then.
+
+The STREAMINFO block is always written and no STREAMINFO block may occur in the supplied array.
+
+By default the encoder does not create a SEEKTABLE. If one is supplied in the metadata array, but the client has specified that it does not support seeking, then the SEEKTABLE will be written verbatim. However by itself this is not very useful as the client will not know the stream offsets for the seekpoints ahead of time. In order to get a proper seektable the client must support seeking. See next note.
+
+SEEKTABLE blocks are handled specially. Since you will not know the values for the seek point stream offsets, you should pass in a SEEKTABLE 'template', that is, a SEEKTABLE object with the required sample numbers (or placeholder points), with 0 for the frame_samples and stream_offset fields for each point. If the client has specified that it supports seeking by providing a seek callback to FLAC__stream_encoder_init_stream() or both seek AND read callback to FLAC__stream_encoder_init_ogg_stream() (or by using FLAC__stream_encoder_init*_file() or FLAC__stream_encoder_init*_FILE()), then while it is encoding the encoder will fill the stream offsets in for you and when encoding is finished, it will seek back and write the real values into the SEEKTABLE block in the stream. There are helper routines for manipulating seektable template blocks; see metadata.h: FLAC__metadata_object_seektable_template_*(). If the client does not support seeking, the SEEKTABLE will have inaccurate offsets which will slow down or remove the ability to seek in the FLAC stream.
+
+The encoder instance will modify the first SEEKTABLE block as it transforms the template to a valid seektable while encoding, but it is still up to the caller to free all metadata blocks after encoding.
+
+A VORBIS_COMMENT block may be supplied. The vendor string in it will be ignored. libFLAC will use it's own vendor string. libFLAC will not modify the passed-in VORBIS_COMMENT's vendor string, it will simply write it's own into the stream. If no VORBIS_COMMENT block is present in the metadata array, libFLAC will write an empty one, containing only the vendor string.
+
+The Ogg FLAC mapping requires that the VORBIS_COMMENT block be the second metadata block of the stream. The encoder already supplies the STREAMINFO block automatically. If metadata does not contain a VORBIS_COMMENT block, the encoder will supply that too. Otherwise, if metadata does contain a VORBIS_COMMENT block and it is not the first, the init function will reorder metadata by moving the VORBIS_COMMENT block to the front; the relative ordering of the other blocks will remain as they were.
+
+The Ogg FLAC mapping limits the number of metadata blocks per stream to 65535. If num_blocks exceeds this the function will return false.
+
Default Value:
NULL, 0
+
Parameters
+ + + + +
encoderAn encoder instance to set.
metadataSee above.
num_blocksSee above.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if the encoder is already initialized, else true. false if the encoder is already initialized, or if num_blocks > 65535 if encoding to Ogg FLAC, else true.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__StreamEncoderState FLAC__stream_encoder_get_state (const FLAC__StreamEncoderencoder)
+
+

Get the current encoder state.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__StreamEncoderStateThe current encoder state.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__StreamDecoderState FLAC__stream_encoder_get_verify_decoder_state (const FLAC__StreamEncoderencoder)
+
+

Get the state of the verify stream decoder. Useful when the stream encoder state is FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__StreamDecoderStateThe verify stream decoder state.
+
+
+ +
+
+ +
+
+ + + + + + + + +
const char* FLAC__stream_encoder_get_resolved_state_string (const FLAC__StreamEncoderencoder)
+
+

Get the current encoder state as a C string. This version automatically resolves FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR by getting the verify decoder's state.

+
Parameters
+ + +
encoderA encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
constchar * The encoder state as a C string. Do not modify the contents.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void FLAC__stream_encoder_get_verify_decoder_error_stats (const FLAC__StreamEncoderencoder,
FLAC__uint64 * absolute_sample,
unsigned * frame_number,
unsigned * channel,
unsigned * sample,
FLAC__int32 * expected,
FLAC__int32 * got 
)
+
+

Get relevant values about the nature of a verify decoder error. Useful when the stream encoder state is FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR. The arguments should be addresses in which the stats will be returned, or NULL if value is not desired.

+
Parameters
+ + + + + + + + +
encoderAn encoder instance to query.
absolute_sampleThe absolute sample number of the mismatch.
frame_numberThe number of the frame in which the mismatch occurred.
channelThe channel in which the mismatch occurred.
sampleThe number of the sample (relative to the frame) in which the mismatch occurred.
expectedThe expected value for the sample in question.
gotThe actual value returned by the decoder.
+
+
+
Assertions:
1 encoder != NULL
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_encoder_get_verify (const FLAC__StreamEncoderencoder)
+
+

Get the "verify" flag.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolSee FLAC__stream_encoder_set_verify().
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_encoder_get_streamable_subset (const FLAC__StreamEncoderencoder)
+
+

Get the <A HREF="../format.html::subset>Subset flag.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolSee FLAC__stream_encoder_set_streamable_subset().
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_encoder_get_channels (const FLAC__StreamEncoderencoder)
+
+

Get the number of input channels being processed.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
unsignedSee FLAC__stream_encoder_set_channels().
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_encoder_get_bits_per_sample (const FLAC__StreamEncoderencoder)
+
+

Get the input sample resolution setting.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
unsignedSee FLAC__stream_encoder_set_bits_per_sample().
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_encoder_get_sample_rate (const FLAC__StreamEncoderencoder)
+
+

Get the input sample rate setting.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
unsignedSee FLAC__stream_encoder_set_sample_rate().
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_encoder_get_blocksize (const FLAC__StreamEncoderencoder)
+
+

Get the blocksize setting.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
unsignedSee FLAC__stream_encoder_set_blocksize().
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_encoder_get_do_mid_side_stereo (const FLAC__StreamEncoderencoder)
+
+

Get the "mid/side stereo coding" flag.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolSee FLAC__stream_encoder_get_do_mid_side_stereo().
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_encoder_get_loose_mid_side_stereo (const FLAC__StreamEncoderencoder)
+
+

Get the "adaptive mid/side switching" flag.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolSee FLAC__stream_encoder_set_loose_mid_side_stereo().
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_encoder_get_max_lpc_order (const FLAC__StreamEncoderencoder)
+
+

Get the maximum LPC order setting.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
unsignedSee FLAC__stream_encoder_set_max_lpc_order().
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_encoder_get_qlp_coeff_precision (const FLAC__StreamEncoderencoder)
+
+

Get the quantized linear predictor coefficient precision setting.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
unsignedSee FLAC__stream_encoder_set_qlp_coeff_precision().
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_encoder_get_do_qlp_coeff_prec_search (const FLAC__StreamEncoderencoder)
+
+

Get the qlp coefficient precision search flag.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolSee FLAC__stream_encoder_set_do_qlp_coeff_prec_search().
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_encoder_get_do_escape_coding (const FLAC__StreamEncoderencoder)
+
+

Get the "escape coding" flag.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolSee FLAC__stream_encoder_set_do_escape_coding().
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_encoder_get_do_exhaustive_model_search (const FLAC__StreamEncoderencoder)
+
+

Get the exhaustive model search flag.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolSee FLAC__stream_encoder_set_do_exhaustive_model_search().
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_encoder_get_min_residual_partition_order (const FLAC__StreamEncoderencoder)
+
+

Get the minimum residual partition order setting.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
unsignedSee FLAC__stream_encoder_set_min_residual_partition_order().
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_encoder_get_max_residual_partition_order (const FLAC__StreamEncoderencoder)
+
+

Get maximum residual partition order setting.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
unsignedSee FLAC__stream_encoder_set_max_residual_partition_order().
+
+
+ +
+
+ +
+
+ + + + + + + + +
unsigned FLAC__stream_encoder_get_rice_parameter_search_dist (const FLAC__StreamEncoderencoder)
+
+

Get the Rice parameter search distance setting.

+
Parameters
+ + +
encoderAn encoder instance to query.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
unsignedSee FLAC__stream_encoder_set_rice_parameter_search_dist().
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__uint64 FLAC__stream_encoder_get_total_samples_estimate (const FLAC__StreamEncoderencoder)
+
+

Get the previously set estimate of the total samples to be encoded. The encoder merely mimics back the value given to FLAC__stream_encoder_set_total_samples_estimate() since it has no other way of knowing how many samples the client will encode.

+
Parameters
+ + +
encoderAn encoder instance to set.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__uint64See FLAC__stream_encoder_get_total_samples_estimate().
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_stream (FLAC__StreamEncoderencoder,
FLAC__StreamEncoderWriteCallback write_callback,
FLAC__StreamEncoderSeekCallback seek_callback,
FLAC__StreamEncoderTellCallback tell_callback,
FLAC__StreamEncoderMetadataCallback metadata_callback,
void * client_data 
)
+
+

Initialize the encoder instance to encode native FLAC streams.

+

This flavor of initialization sets up the encoder to encode to a native FLAC stream. I/O is performed via callbacks to the client. For encoding to a plain file via filename or open FILE*, FLAC__stream_encoder_init_file() and FLAC__stream_encoder_init_FILE() provide a simpler interface.

+

This function should be called after FLAC__stream_encoder_new() and FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process() or FLAC__stream_encoder_process_interleaved(). initialization succeeded.

+

The call to FLAC__stream_encoder_init_stream() currently will also immediately call the write callback several times, once with the fLaC signature, and once for each encoded metadata block.

+
Parameters
+ + + + + + + +
encoderAn uninitialized encoder instance.
write_callbackSee FLAC__StreamEncoderWriteCallback. This pointer must not be NULL.
seek_callbackSee FLAC__StreamEncoderSeekCallback. This pointer may be NULL if seeking is not supported. The encoder uses seeking to go back and write some some stream statistics to the STREAMINFO block; this is recommended but not necessary to create a valid FLAC stream. If seek_callback is not NULL then a tell_callback must also be supplied. Alternatively, a dummy seek callback that just returns FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED may also be supplied, all though this is slightly less efficient for the encoder.
tell_callbackSee FLAC__StreamEncoderTellCallback. This pointer may be NULL if seeking is not supported. If seek_callback is NULL then this argument will be ignored. If seek_callback is not NULL then a tell_callback must also be supplied. Alternatively, a dummy tell callback that just returns FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED may also be supplied, all though this is slightly less efficient for the encoder.
metadata_callbackSee FLAC__StreamEncoderMetadataCallback. This pointer may be NULL if the callback is not desired. If the client provides a seek callback, this function is not necessary as the encoder will automatically seek back and update the STREAMINFO block. It may also be NULL if the client does not support seeking, since it will have no way of going back to update the STREAMINFO. However the client can still supply a callback if it would like to know the details from the STREAMINFO.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__StreamEncoderInitStatusFLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamEncoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_stream (FLAC__StreamEncoderencoder,
FLAC__StreamEncoderReadCallback read_callback,
FLAC__StreamEncoderWriteCallback write_callback,
FLAC__StreamEncoderSeekCallback seek_callback,
FLAC__StreamEncoderTellCallback tell_callback,
FLAC__StreamEncoderMetadataCallback metadata_callback,
void * client_data 
)
+
+

Initialize the encoder instance to encode Ogg FLAC streams.

+

This flavor of initialization sets up the encoder to encode to a FLAC stream in an Ogg container. I/O is performed via callbacks to the client. For encoding to a plain file via filename or open FILE*, FLAC__stream_encoder_init_ogg_file() and FLAC__stream_encoder_init_ogg_FILE() provide a simpler interface.

+

This function should be called after FLAC__stream_encoder_new() and FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process() or FLAC__stream_encoder_process_interleaved(). initialization succeeded.

+

The call to FLAC__stream_encoder_init_ogg_stream() currently will also immediately call the write callback several times to write the metadata packets.

+
Parameters
+ + + + + + + + +
encoderAn uninitialized encoder instance.
read_callbackSee FLAC__StreamEncoderReadCallback. This pointer must not be NULL if seek_callback is non-NULL since they are both needed to be able to write data back to the Ogg FLAC stream in the post-encode phase.
write_callbackSee FLAC__StreamEncoderWriteCallback. This pointer must not be NULL.
seek_callbackSee FLAC__StreamEncoderSeekCallback. This pointer may be NULL if seeking is not supported. The encoder uses seeking to go back and write some some stream statistics to the STREAMINFO block; this is recommended but not necessary to create a valid FLAC stream. If seek_callback is not NULL then a tell_callback must also be supplied. Alternatively, a dummy seek callback that just returns FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED may also be supplied, all though this is slightly less efficient for the encoder.
tell_callbackSee FLAC__StreamEncoderTellCallback. This pointer may be NULL if seeking is not supported. If seek_callback is NULL then this argument will be ignored. If seek_callback is not NULL then a tell_callback must also be supplied. Alternatively, a dummy tell callback that just returns FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED may also be supplied, all though this is slightly less efficient for the encoder.
metadata_callbackSee FLAC__StreamEncoderMetadataCallback. This pointer may be NULL if the callback is not desired. If the client provides a seek callback, this function is not necessary as the encoder will automatically seek back and update the STREAMINFO block. It may also be NULL if the client does not support seeking, since it will have no way of going back to update the STREAMINFO. However the client can still supply a callback if it would like to know the details from the STREAMINFO.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__StreamEncoderInitStatusFLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamEncoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_FILE (FLAC__StreamEncoderencoder,
FILE * file,
FLAC__StreamEncoderProgressCallback progress_callback,
void * client_data 
)
+
+

Initialize the encoder instance to encode native FLAC files.

+

This flavor of initialization sets up the encoder to encode to a plain native FLAC file. For non-stdio streams, you must use FLAC__stream_encoder_init_stream() and provide callbacks for the I/O.

+

This function should be called after FLAC__stream_encoder_new() and FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process() or FLAC__stream_encoder_process_interleaved(). initialization succeeded.

+
Parameters
+ + + + + +
encoderAn uninitialized encoder instance.
fileAn open file. The file should have been opened with mode "w+b" and rewound. The file becomes owned by the encoder and should not be manipulated by the client while encoding. Unless file is stdout, it will be closed when FLAC__stream_encoder_finish() is called. Note however that a proper SEEKTABLE cannot be created when encoding to stdout since it is not seekable.
progress_callbackSee FLAC__StreamEncoderProgressCallback. This pointer may be NULL if the callback is not desired.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 encoder != NULL
+
1 file != NULL
+
+
Return values
+ + +
FLAC__StreamEncoderInitStatusFLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamEncoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_FILE (FLAC__StreamEncoderencoder,
FILE * file,
FLAC__StreamEncoderProgressCallback progress_callback,
void * client_data 
)
+
+

Initialize the encoder instance to encode Ogg FLAC files.

+

This flavor of initialization sets up the encoder to encode to a plain Ogg FLAC file. For non-stdio streams, you must use FLAC__stream_encoder_init_ogg_stream() and provide callbacks for the I/O.

+

This function should be called after FLAC__stream_encoder_new() and FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process() or FLAC__stream_encoder_process_interleaved(). initialization succeeded.

+
Parameters
+ + + + + +
encoderAn uninitialized encoder instance.
fileAn open file. The file should have been opened with mode "w+b" and rewound. The file becomes owned by the encoder and should not be manipulated by the client while encoding. Unless file is stdout, it will be closed when FLAC__stream_encoder_finish() is called. Note however that a proper SEEKTABLE cannot be created when encoding to stdout since it is not seekable.
progress_callbackSee FLAC__StreamEncoderProgressCallback. This pointer may be NULL if the callback is not desired.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 encoder != NULL
+
1 file != NULL
+
+
Return values
+ + +
FLAC__StreamEncoderInitStatusFLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamEncoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_file (FLAC__StreamEncoderencoder,
const char * filename,
FLAC__StreamEncoderProgressCallback progress_callback,
void * client_data 
)
+
+

Initialize the encoder instance to encode native FLAC files.

+

This flavor of initialization sets up the encoder to encode to a plain FLAC file. If POSIX fopen() semantics are not sufficient (for example, with Unicode filenames on Windows), you must use FLAC__stream_encoder_init_FILE(), or FLAC__stream_encoder_init_stream() and provide callbacks for the I/O.

+

This function should be called after FLAC__stream_encoder_new() and FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process() or FLAC__stream_encoder_process_interleaved(). initialization succeeded.

+
Parameters
+ + + + + +
encoderAn uninitialized encoder instance.
filenameThe name of the file to encode to. The file will be opened with fopen(). Use NULL to encode to stdout. Note however that a proper SEEKTABLE cannot be created when encoding to stdout since it is not seekable.
progress_callbackSee FLAC__StreamEncoderProgressCallback. This pointer may be NULL if the callback is not desired.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__StreamEncoderInitStatusFLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamEncoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_file (FLAC__StreamEncoderencoder,
const char * filename,
FLAC__StreamEncoderProgressCallback progress_callback,
void * client_data 
)
+
+

Initialize the encoder instance to encode Ogg FLAC files.

+

This flavor of initialization sets up the encoder to encode to a plain Ogg FLAC file. If POSIX fopen() semantics are not sufficient (for example, with Unicode filenames on Windows), you must use FLAC__stream_encoder_init_ogg_FILE(), or FLAC__stream_encoder_init_ogg_stream() and provide callbacks for the I/O.

+

This function should be called after FLAC__stream_encoder_new() and FLAC__stream_encoder_set_*() but before FLAC__stream_encoder_process() or FLAC__stream_encoder_process_interleaved(). initialization succeeded.

+
Parameters
+ + + + + +
encoderAn uninitialized encoder instance.
filenameThe name of the file to encode to. The file will be opened with fopen(). Use NULL to encode to stdout. Note however that a proper SEEKTABLE cannot be created when encoding to stdout since it is not seekable.
progress_callbackSee FLAC__StreamEncoderProgressCallback. This pointer may be NULL if the callback is not desired.
client_dataThis value will be supplied to callbacks in their client_data argument.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__StreamEncoderInitStatusFLAC__STREAM_ENCODER_INIT_STATUS_OK if initialization was successful; see FLAC__StreamEncoderInitStatus for the meanings of other return values.
+
+
+ +
+
+ +
+
+ + + + + + + + +
FLAC__bool FLAC__stream_encoder_finish (FLAC__StreamEncoderencoder)
+
+

Finish the encoding process. Flushes the encoding buffer, releases resources, resets the encoder settings to their defaults, and returns the encoder state to FLAC__STREAM_ENCODER_UNINITIALIZED. Note that this can generate one or more write callbacks before returning, and will generate a metadata callback.

+

Note that in the course of processing the last frame, errors can occur, so the caller should be sure to check the return value to ensure the file was encoded properly.

+

In the event of a prematurely-terminated encode, it is not strictly necessary to call this immediately before FLAC__stream_encoder_delete() but it is good practice to match every FLAC__stream_encoder_init_*() with a FLAC__stream_encoder_finish().

+
Parameters
+ + +
encoderAn uninitialized encoder instance.
+
+
+
Assertions:
1 encoder != NULL
+
+
Return values
+ + +
FLAC__boolfalse if an error occurred processing the last frame; or if verify mode is set (see FLAC__stream_encoder_set_verify()), there was a verify mismatch; else true. If false, caller should check the state with FLAC__stream_encoder_get_state() for more information about the error.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_process (FLAC__StreamEncoderencoder,
const FLAC__int32 *const buffer[],
unsigned samples 
)
+
+

Submit data for encoding. This version allows you to supply the input data via an array of pointers, each pointer pointing to an array of samples samples representing one channel. The samples need not be block-aligned, but each channel should have the same number of samples. Each sample should be a signed integer, right-justified to the resolution set by FLAC__stream_encoder_set_bits_per_sample(). For example, if the resolution is 16 bits per sample, the samples should all be in the range [-32768,32767].

+

For applications where channel order is important, channels must follow the order as described in the frame header.

+
Parameters
+ + + + +
encoderAn initialized encoder instance in the OK state.
bufferAn array of pointers to each channel's signal.
samplesThe number of samples in one channel.
+
+
+
Assertions:
1 encoder != NULL
+
1 FLAC__stream_encoder_get_state(encoder) == FLAC__STREAM_ENCODER_OK
+
+
Return values
+ + +
FLAC__booltrue if successful, else false; in this case, check the encoder state with FLAC__stream_encoder_get_state() to see what went wrong.
+
+
+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
FLAC__bool FLAC__stream_encoder_process_interleaved (FLAC__StreamEncoderencoder,
const FLAC__int32 buffer[],
unsigned samples 
)
+
+

Submit data for encoding. This version allows you to supply the input data where the channels are interleaved into a single array (i.e. channel0_sample0, channel1_sample0, ... , channelN_sample0, channel0_sample1, ...). The samples need not be block-aligned but they must be sample-aligned, i.e. the first value should be channel0_sample0 and the last value channelN_sampleM. Each sample should be a signed integer, right-justified to the resolution set by FLAC__stream_encoder_set_bits_per_sample(). For example, if the resolution is 16 bits per sample, the samples should all be in the range [-32768,32767].

+

For applications where channel order is important, channels must follow the order as described in the frame header.

+
Parameters
+ + + + +
encoderAn initialized encoder instance in the OK state.
bufferAn array of channel-interleaved data (see above).
samplesThe number of samples in one channel, the same as for FLAC__stream_encoder_process(). For example, if encoding two channels, 1000 samples corresponds to a buffer of 2000 values.
+
+
+
Assertions:
1 encoder != NULL
+
1 FLAC__stream_encoder_get_state(encoder) == FLAC__STREAM_ENCODER_OK
+
+
Return values
+ + +
FLAC__booltrue if successful, else false; in this case, check the encoder state with FLAC__stream_encoder_get_state() to see what went wrong.
+
+
+ +
+
+

Variable Documentation

+ +
+
+ + + + +
const char* const FLAC__StreamEncoderStateString[]
+
+

Maps a FLAC__StreamEncoderState to a C string.

+

Using a FLAC__StreamEncoderState as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamEncoderInitStatusString[]
+
+

Maps a FLAC__StreamEncoderInitStatus to a C string.

+

Using a FLAC__StreamEncoderInitStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamEncoderReadStatusString[]
+
+

Maps a FLAC__StreamEncoderReadStatus to a C string.

+

Using a FLAC__StreamEncoderReadStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamEncoderWriteStatusString[]
+
+

Maps a FLAC__StreamEncoderWriteStatus to a C string.

+

Using a FLAC__StreamEncoderWriteStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamEncoderSeekStatusString[]
+
+

Maps a FLAC__StreamEncoderSeekStatus to a C string.

+

Using a FLAC__StreamEncoderSeekStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+ +
+
+ + + + +
const char* const FLAC__StreamEncoderTellStatusString[]
+
+

Maps a FLAC__StreamEncoderTellStatus to a C string.

+

Using a FLAC__StreamEncoderTellStatus as the index to this array will give the string equivalent. The contents should not be modified.

+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flacpp.html b/lib-src/libflac/doc/html/api/group__flacpp.html new file mode 100644 index 000000000..cc643de3d --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flacpp.html @@ -0,0 +1,85 @@ + + + + + + +FLAC: FLAC C++ API + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC C++ API
+
+
+ + + + + + + + + + +

+Modules

 FLAC++/decoder.h: decoder classes
 
 FLAC++/encoder.h: encoder classes
 
 FLAC++/export.h: export symbols
 
 
+

Detailed Description

+

The FLAC C++ API is the interface to libFLAC++, a set of classes that encapsulate the encoders, decoders, and metadata interfaces in libFLAC.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flacpp__decoder.html b/lib-src/libflac/doc/html/api/group__flacpp__decoder.html new file mode 100644 index 000000000..8d5352fe0 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flacpp__decoder.html @@ -0,0 +1,86 @@ + + + + + + +FLAC: FLAC++/decoder.h: decoder classes + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC++/decoder.h: decoder classes
+
+
+ + + + + + + + +

+Classes

class  FLAC::Decoder::Stream
 
class  FLAC::Decoder::Stream::State
 
class  FLAC::Decoder::File
 
+

Detailed Description

+

This module describes the decoder layers provided by libFLAC++.

+

The libFLAC++ decoder classes are object wrappers around their counterparts in libFLAC. All decoding layers available in libFLAC are also provided here. The interface is very similar; make sure to read the libFLAC decoder module .

+

There are only two significant differences here. First, instead of passing in C function pointers for callbacks, you inherit from the decoder class and provide implementations for the callbacks in your derived class; because of this there is no need for a 'client_data' property.

+

Second, there are two stream decoder classes. FLAC::Decoder::Stream is used for the same cases that FLAC__stream_decoder_init_stream() / FLAC__stream_decoder_init_ogg_stream() are used, and FLAC::Decoder::File is used for the same cases that FLAC__stream_decoder_init_FILE() and FLAC__stream_decoder_init_file() / FLAC__stream_decoder_init_ogg_FILE() and FLAC__stream_decoder_init_ogg_file() are used.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flacpp__encoder.html b/lib-src/libflac/doc/html/api/group__flacpp__encoder.html new file mode 100644 index 000000000..b4df0b7a5 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flacpp__encoder.html @@ -0,0 +1,86 @@ + + + + + + +FLAC: FLAC++/encoder.h: encoder classes + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC++/encoder.h: encoder classes
+
+
+ + + + + + + + +

+Classes

class  FLAC::Encoder::Stream
 
class  FLAC::Encoder::Stream::State
 
class  FLAC::Encoder::File
 
+

Detailed Description

+

This module describes the encoder layers provided by libFLAC++.

+

The libFLAC++ encoder classes are object wrappers around their counterparts in libFLAC. All encoding layers available in libFLAC are also provided here. The interface is very similar; make sure to read the libFLAC encoder module .

+

There are only two significant differences here. First, instead of passing in C function pointers for callbacks, you inherit from the encoder class and provide implementations for the callbacks in your derived class; because of this there is no need for a 'client_data' property.

+

Second, there are two stream encoder classes. FLAC::Encoder::Stream is used for the same cases that FLAC__stream_encoder_init_stream() / FLAC__stream_encoder_init_ogg_stream() are used, and FLAC::Encoder::File is used for the same cases that FLAC__stream_encoder_init_FILE() and FLAC__stream_encoder_init_file() / FLAC__stream_encoder_init_ogg_FILE() and FLAC__stream_encoder_init_ogg_file() are used.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flacpp__export.html b/lib-src/libflac/doc/html/api/group__flacpp__export.html new file mode 100644 index 000000000..bef7f19a3 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flacpp__export.html @@ -0,0 +1,90 @@ + + + + + + +FLAC: FLAC++/export.h: export symbols + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC++/export.h: export symbols
+
+
+ + + + + + + + + + +

+Macros

+#define FLACPP_API
 
+#define FLACPP_API_VERSION_CURRENT   9
 
+#define FLACPP_API_VERSION_REVISION   0
 
+#define FLACPP_API_VERSION_AGE   3
 
+

Detailed Description

+

This module contains #defines and symbols for exporting function calls, and providing version information and compiled-in features.

+

If you are compiling with MSVC and will link to the static library (libFLAC++.lib) you should define FLAC__NO_DLL in your project to make sure the symbols are exported properly.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flacpp__metadata.html b/lib-src/libflac/doc/html/api/group__flacpp__metadata.html new file mode 100644 index 000000000..72aac3dcc --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flacpp__metadata.html @@ -0,0 +1,86 @@ + + + + + + +FLAC: FLAC++/metadata.h: metadata interfaces + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC++/metadata.h: metadata interfaces
+
+
+ + + + + + + + + + +

+Modules

 
 
 
 
+

Detailed Description

+

This module provides classes for creating and manipulating FLAC metadata blocks in memory, and three progressively more powerful interfaces for traversing and editing metadata in FLAC files.

+

The behavior closely mimics the C layer interface; be sure to read the detailed description of the C metadata module . Note that like the C layer, currently only the Chain interface (level 2) supports Ogg FLAC files, and it is read-only i.e. no writing back changed metadata to file.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flacpp__metadata__level0.html b/lib-src/libflac/doc/html/api/group__flacpp__metadata__level0.html new file mode 100644 index 000000000..6b4dcc715 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flacpp__metadata__level0.html @@ -0,0 +1,373 @@ + + + + + + +FLAC: FLAC++/metadata.h: metadata level 0 interface + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC++/metadata.h: metadata level 0 interface
+
+
+ + + + + + + + + + + + + + + + +

+Functions

bool FLAC::Metadata::get_streaminfo (const char *filename, StreamInfo &streaminfo)
 
bool FLAC::Metadata::get_tags (const char *filename, VorbisComment *&tags)
 
bool FLAC::Metadata::get_tags (const char *filename, VorbisComment &tags)
 
bool FLAC::Metadata::get_cuesheet (const char *filename, CueSheet *&cuesheet)
 
bool FLAC::Metadata::get_cuesheet (const char *filename, CueSheet &cuesheet)
 
bool FLAC::Metadata::get_picture (const char *filename, Picture *&picture,::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors)
 
bool FLAC::Metadata::get_picture (const char *filename, Picture &picture,::FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors)
 
+

Detailed Description

+

Level 0 metadata iterators.

+

See the C layer equivalent for more.

+

Function Documentation

+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::get_streaminfo (const char * filename,
StreamInfo & streaminfo 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::get_tags (const char * filename,
VorbisComment *& tags 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::get_tags (const char * filename,
VorbisComment & tags 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::get_cuesheet (const char * filename,
CueSheet *& cuesheet 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::get_cuesheet (const char * filename,
CueSheet & cuesheet 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::get_picture (const char * filename,
Picture *& picture,
::FLAC__StreamMetadata_Picture_Type type,
const char * mime_type,
const FLAC__byte * description,
unsigned max_width,
unsigned max_height,
unsigned max_depth,
unsigned max_colors 
)
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
bool FLAC::Metadata::get_picture (const char * filename,
Picture & picture,
::FLAC__StreamMetadata_Picture_Type type,
const char * mime_type,
const FLAC__byte * description,
unsigned max_width,
unsigned max_height,
unsigned max_depth,
unsigned max_colors 
)
+
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flacpp__metadata__level1.html b/lib-src/libflac/doc/html/api/group__flacpp__metadata__level1.html new file mode 100644 index 000000000..7f683a799 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flacpp__metadata__level1.html @@ -0,0 +1,92 @@ + + + + + + +FLAC: FLAC++/metadata.h: metadata level 1 interface + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC++/metadata.h: metadata level 1 interface
+
+
+ + + + + + +

+Classes

class  FLAC::Metadata::SimpleIterator
 
class  FLAC::Metadata::SimpleIterator::Status
 
+

Detailed Description

+

Level 1 metadata iterator.

+

The flow through the iterator in the C++ layer is similar to the C layer:

+

The ownership of pointers in the C++ layer follows that in the C layer, i.e.

    +
  • The objects returned by get_block() are yours to modify, but changes are not reflected in the FLAC file until you call set_block(). The objects are also yours to delete; they are not automatically deleted when passed to set_block() or insert_block_after().
  • +
+

See the C layer equivalent for more.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flacpp__metadata__level2.html b/lib-src/libflac/doc/html/api/group__flacpp__metadata__level2.html new file mode 100644 index 000000000..b5e46cbd1 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flacpp__metadata__level2.html @@ -0,0 +1,134 @@ + + + + + + +FLAC: FLAC++/metadata.h: metadata level 2 interface + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC++/metadata.h: metadata level 2 interface
+
+
+ + + + + + + + +

+Classes

class  FLAC::Metadata::Chain
 
class  FLAC::Metadata::Chain::Status
 
class  FLAC::Metadata::Iterator
 
+ + + + + + + +

+Functions

 FLAC::Metadata::Prototype::Prototype (const Prototype &)
 
FLAC::Metadata::Prototype::Prototype (const ::FLAC__StreamMetadata &)
 
FLAC::Metadata::Prototype::Prototype (const ::FLAC__StreamMetadata *)
 
+

Detailed Description

+

Level 2 metadata iterator.

+

The flow through the iterator in the C++ layer is similar to the C layer:

+

The ownership of pointers in the C++ layer is slightly different than in the C layer, i.e.

+

See the C layer equivalent for more.

+

Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
FLAC::Metadata::Prototype::Prototype (const Prototype)
+
+protected
+
+

Constructs a copy of the given object. This form always performs a deep copy.

+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__flacpp__metadata__object.html b/lib-src/libflac/doc/html/api/group__flacpp__metadata__object.html new file mode 100644 index 000000000..13d7625bd --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__flacpp__metadata__object.html @@ -0,0 +1,358 @@ + + + + + + +FLAC: FLAC++/metadata.h: metadata object classes + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
FLAC++/metadata.h: metadata object classes
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +

+Classes

class  FLAC::Metadata::Prototype
 
class  FLAC::Metadata::StreamInfo
 
class  FLAC::Metadata::Padding
 
class  FLAC::Metadata::Application
 
class  FLAC::Metadata::SeekTable
 
class  FLAC::Metadata::VorbisComment
 
class  FLAC::Metadata::VorbisComment::Entry
 
class  FLAC::Metadata::CueSheet
 
class  FLAC::Metadata::CueSheet::Track
 
class  FLAC::Metadata::Picture
 
class  FLAC::Metadata::Unknown
 
+ + + + + + + + + + + + + + + + + + + +

+Functions

Prototype * FLAC::Metadata::clone (const Prototype *)
 
bool FLAC::Metadata::Prototype::is_valid () const
 
 FLAC::Metadata::Prototype::operator const ::FLAC__StreamMetadata * () const
 
bool FLAC::Metadata::Prototype::operator== (const Prototype &) const
 
bool FLAC::Metadata::Prototype::operator== (const ::FLAC__StreamMetadata &) const
 
bool FLAC::Metadata::Prototype::operator== (const ::FLAC__StreamMetadata *) const
 
bool FLAC::Metadata::Prototype::operator!= (const Prototype &) const
 
bool FLAC::Metadata::Prototype::operator!= (const ::FLAC__StreamMetadata &) const
 
bool FLAC::Metadata::Prototype::operator!= (const ::FLAC__StreamMetadata *) const
 
+

Detailed Description

+

This module contains classes representing FLAC metadata blocks in memory.

+

The behavior closely mimics the C layer interface; be sure to read the detailed description of the C metadata object module .

+

Any time a metadata object is constructed or assigned, you should check is_valid() to make sure the underlying FLAC__StreamMetadata object was able to be created.

+
Warning
When the get_*() methods of any metadata object method return you a const pointer, DO NOT disobey and write into it. Always use the set_*() methods.
+

Function Documentation

+ +
+
+ + + + + + + + +
Prototype* FLAC::Metadata::clone (const Prototype * )
+
+

Create a deep copy of an object and return it.

+ +
+
+ + + +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Prototype::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC__metadata_object_is_equal().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Prototype::operator== (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for equality, performing a deep compare by following pointers.

+ +

References FLAC__metadata_object_is_equal().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Prototype::operator!= (const Prototypeobject) const
+
+inline
+
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Prototype::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + +
bool FLAC::Metadata::Prototype::operator!= (const ::FLAC__StreamMetadataobject) const
+
+inline
+
+

Check for inequality, performing a deep compare by following pointers.

+ +

References FLAC::Metadata::Prototype::operator==().

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
bool FLAC::Metadata::Prototype::is_valid () const
+
+inline
+
+

Returns true if the object was correctly constructed (i.e. the underlying FLAC__StreamMetadata object was properly allocated), else false.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
FLAC::Metadata::Prototype::operator const ::FLAC__StreamMetadata * () const
+
+inline
+
+

Returns a pointer to the underlying FLAC__StreamMetadata object. This can be useful for plugging any holes between the C++ and C interfaces.

+
Assertions:
+ +
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__porting.html b/lib-src/libflac/doc/html/api/group__porting.html new file mode 100644 index 000000000..8a96990f1 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__porting.html @@ -0,0 +1,91 @@ + + + + + + +FLAC: Porting Guide for New Versions + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+ +
+
Porting Guide for New Versions
+
+
+ + + + + + + + +

+Modules

 Porting from FLAC 1.1.2 to 1.1.3
 
 Porting from FLAC 1.1.3 to 1.1.4
 
 Porting from FLAC 1.1.4 to 1.2.0
 
+

Detailed Description

+

This module describes differences in the library interfaces from version to version. It assists in the porting of code that uses the libraries to newer versions of FLAC.

+

One simple facility for making porting easier that has been added in FLAC 1.1.3 is a set of #defines in export.h of each library's includes (e.g. include/FLAC/export.h). The #defines mirror the libraries' libtool version numbers, e.g. in libFLAC there are FLAC_API_VERSION_CURRENT, FLAC_API_VERSION_REVISION, and FLAC_API_VERSION_AGE. These can be used to support multiple versions of an API during the transition phase, e.g.

+
#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
+
legacy code
+
#else
+
new code
+
#endif
+

The the source will work for multiple versions and the legacy code can easily be removed when the transition is complete.

+

Another available symbol is FLAC_API_SUPPORTS_OGG_FLAC (defined in include/FLAC/export.h), which can be used to determine whether or not the library has been compiled with support for Ogg FLAC. This is simpler than trying to call an Ogg init function and catching the error.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__porting__1__1__2__to__1__1__3.html b/lib-src/libflac/doc/html/api/group__porting__1__1__2__to__1__1__3.html new file mode 100644 index 000000000..ac68716c7 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__porting__1__1__2__to__1__1__3.html @@ -0,0 +1,130 @@ + + + + + + +FLAC: Porting from FLAC 1.1.2 to 1.1.3 + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+
+
Porting from FLAC 1.1.2 to 1.1.3
+
+
+

This module describes porting from FLAC 1.1.2 to FLAC 1.1.3.

+

The main change between the APIs in 1.1.2 and 1.1.3 is that they have been simplified. First, libOggFLAC has been merged into libFLAC and libOggFLAC++ has been merged into libFLAC++. Second, both the three decoding layers and three encoding layers have been merged into a single stream decoder and stream encoder. That is, the functionality of FLAC__SeekableStreamDecoder and FLAC__FileDecoder has been merged into FLAC__StreamDecoder, and FLAC__SeekableStreamEncoder and FLAC__FileEncoder into FLAC__StreamEncoder. Only the FLAC__StreamDecoder and FLAC__StreamEncoder remain. What this means is there is now a single API that can be used to encode or decode streams to/from native FLAC or Ogg FLAC and the single API can work on both seekable and non-seekable streams.

+

Instead of creating an encoder or decoder of a certain layer, now the client will always create a FLAC__StreamEncoder or FLAC__StreamDecoder. The old layers are now differentiated by the initialization function. For example, for the decoder, FLAC__stream_decoder_init() has been replaced by FLAC__stream_decoder_init_stream(). This init function takes callbacks for the I/O, and the seeking callbacks are optional. This allows the client to use the same object for seekable and non-seekable streams. For decoding a FLAC file directly, the client can use FLAC__stream_decoder_init_file() and pass just a filename and fewer callbacks; most of the other callbacks are supplied internally. For situations where fopen()ing by filename is not possible (e.g. Unicode filenames on Windows) the client can instead open the file itself and supply the FILE* to FLAC__stream_decoder_init_FILE(). The init functions now returns a FLAC__StreamDecoderInitStatus instead of FLAC__StreamDecoderState. Since the callbacks and client data are now passed to the init function, the FLAC__stream_decoder_set_*_callback() functions and FLAC__stream_decoder_set_client_data() are no longer needed. The rest of the calls to the decoder are the same as before.

+

There are counterpart init functions for Ogg FLAC, e.g. FLAC__stream_decoder_init_ogg_stream(). All the rest of the calls and callbacks are the same as for native FLAC.

+

As an example, in FLAC 1.1.2 a seekable stream decoder would have been set up like so:

+
FLAC__SeekableStreamDecoder *decoder = FLAC__seekable_stream_decoder_new();
+
if(decoder == NULL) do_something;
+
FLAC__seekable_stream_decoder_set_md5_checking(decoder, true);
+
[... other settings ...]
+
FLAC__seekable_stream_decoder_set_read_callback(decoder, my_read_callback);
+
FLAC__seekable_stream_decoder_set_seek_callback(decoder, my_seek_callback);
+
FLAC__seekable_stream_decoder_set_tell_callback(decoder, my_tell_callback);
+
FLAC__seekable_stream_decoder_set_length_callback(decoder, my_length_callback);
+
FLAC__seekable_stream_decoder_set_eof_callback(decoder, my_eof_callback);
+
FLAC__seekable_stream_decoder_set_write_callback(decoder, my_write_callback);
+
FLAC__seekable_stream_decoder_set_metadata_callback(decoder, my_metadata_callback);
+
FLAC__seekable_stream_decoder_set_error_callback(decoder, my_error_callback);
+
FLAC__seekable_stream_decoder_set_client_data(decoder, my_client_data);
+
if(FLAC__seekable_stream_decoder_init(decoder) != FLAC__SEEKABLE_STREAM_DECODER_OK) do_something;
+

In FLAC 1.1.3 it is like this:

+
+
if(decoder == NULL) do_something;
+ +
[... other settings ...]
+ +
decoder,
+
my_read_callback,
+
my_seek_callback, // or NULL
+
my_tell_callback, // or NULL
+
my_length_callback, // or NULL
+
my_eof_callback, // or NULL
+
my_write_callback,
+
my_metadata_callback, // or NULL
+
my_error_callback,
+
my_client_data
+ +

or you could do;

+
[...]
+
FILE *file = fopen("somefile.flac","rb");
+
if(file == NULL) do_somthing;
+ +
decoder,
+
file,
+
my_write_callback,
+
my_metadata_callback, // or NULL
+
my_error_callback,
+
my_client_data
+ +

or just:

+
[...]
+ +
decoder,
+
"somefile.flac",
+
my_write_callback,
+
my_metadata_callback, // or NULL
+
my_error_callback,
+
my_client_data
+ +

Another small change to the decoder is in how it handles unparseable streams. Before, when the decoder found an unparseable stream (reserved for when the decoder encounters a stream from a future encoder that it can't parse), it changed the state to FLAC__STREAM_DECODER_UNPARSEABLE_STREAM. Now the decoder instead drops sync and calls the error callback with a new error code FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM. This is more robust. If your error callback does not discriminate on the the error state, your code does not need to be changed.

+

The encoder now has a new setting: FLAC__stream_encoder_set_apodization(). This is for setting the method used to window the data before LPC analysis. You only need to add a call to this function if the default is not suitable. There are also two new convenience functions that may be useful: FLAC__metadata_object_cuesheet_calculate_cddb_id() and FLAC__metadata_get_cuesheet().

+

The bytes parameter to FLAC__StreamDecoderReadCallback, FLAC__StreamEncoderReadCallback, and FLAC__StreamEncoderWriteCallback is now size_t instead of unsigned.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__porting__1__1__3__to__1__1__4.html b/lib-src/libflac/doc/html/api/group__porting__1__1__3__to__1__1__4.html new file mode 100644 index 000000000..c8dfc5a90 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__porting__1__1__3__to__1__1__4.html @@ -0,0 +1,71 @@ + + + + + + +FLAC: Porting from FLAC 1.1.3 to 1.1.4 + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+
+
Porting from FLAC 1.1.3 to 1.1.4
+
+
+

This module describes porting from FLAC 1.1.3 to FLAC 1.1.4.

+

There were no changes to any of the interfaces from 1.1.3 to 1.1.4. There was a slight change in the implementation of FLAC__stream_encoder_set_metadata(); the function now makes a copy of the metadata array of pointers so the client no longer needs to maintain it after the call. The objects themselves that are pointed to by the array are still not copied though and must be maintained until the call to FLAC__stream_encoder_finish().

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/group__porting__1__1__4__to__1__2__0.html b/lib-src/libflac/doc/html/api/group__porting__1__1__4__to__1__2__0.html new file mode 100644 index 000000000..7945531f2 --- /dev/null +++ b/lib-src/libflac/doc/html/api/group__porting__1__1__4__to__1__2__0.html @@ -0,0 +1,72 @@ + + + + + + +FLAC: Porting from FLAC 1.1.4 to 1.2.0 + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+
+
Porting from FLAC 1.1.4 to 1.2.0
+
+
+

This module describes porting from FLAC 1.1.4 to FLAC 1.2.0.

+

There were only very minor changes to the interfaces from 1.1.4 to 1.2.0. In libFLAC, FLAC__format_sample_rate_is_subset() was added. In libFLAC++, FLAC::Decoder::Stream::get_decode_position() was added.

+

Finally, value of the constant FLAC__FRAME_HEADER_RESERVED_LEN has changed to reflect the conversion of one of the reserved bits into active use. It used to be 2 and now is 1. However the FLAC frame header length has not changed, so to skip the proper number of bits, use FLAC__FRAME_HEADER_RESERVED_LEN + FLAC__FRAME_HEADER_BLOCKING_STRATEGY_LEN

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/hierarchy.html b/lib-src/libflac/doc/html/api/hierarchy.html new file mode 100644 index 000000000..243cc259e --- /dev/null +++ b/lib-src/libflac/doc/html/api/hierarchy.html @@ -0,0 +1,130 @@ + + + + + + +FLAC: Class Hierarchy + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
Class Hierarchy
+
+
+
This inheritance list is sorted roughly, but not completely, alphabetically:
+
[detail level 12]
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 CFLAC::Decoder::StreamThis class wraps the FLAC__StreamDecoder. If you are decoding from a file, FLAC::Decoder::File may be more convenient
 CFLAC::Decoder::FileThis class wraps the FLAC__StreamDecoder. If you are not decoding from a file, you may need to use FLAC::Decoder::Stream
 CFLAC::Decoder::Stream::State
 CFLAC::Encoder::StreamThis class wraps the FLAC__StreamEncoder. If you are encoding to a file, FLAC::Encoder::File may be more convenient
 CFLAC::Encoder::FileThis class wraps the FLAC__StreamEncoder. If you are not encoding to a file, you may need to use FLAC::Encoder::Stream
 CFLAC::Encoder::Stream::State
 CFLAC::Metadata::Chain
 CFLAC::Metadata::Chain::Status
 CFLAC::Metadata::CueSheet::Track
 CFLAC::Metadata::Iterator
 CFLAC::Metadata::Prototype
 CFLAC::Metadata::Application
 CFLAC::Metadata::CueSheet
 CFLAC::Metadata::Padding
 CFLAC::Metadata::Picture
 CFLAC::Metadata::SeekTable
 CFLAC::Metadata::StreamInfo
 CFLAC::Metadata::Unknown
 CFLAC::Metadata::VorbisComment
 CFLAC::Metadata::SimpleIterator
 CFLAC::Metadata::SimpleIterator::Status
 CFLAC::Metadata::VorbisComment::Entry
 CFLAC__EntropyCodingMethod
 CFLAC__EntropyCodingMethod_PartitionedRice
 CFLAC__EntropyCodingMethod_PartitionedRiceContents
 CFLAC__Frame
 CFLAC__FrameFooter
 CFLAC__FrameHeader
 CFLAC__IOCallbacks
 CFLAC__StreamDecoder
 CFLAC__StreamEncoder
 CFLAC__StreamMetadata
 CFLAC__StreamMetadata_Application
 CFLAC__StreamMetadata_CueSheet
 CFLAC__StreamMetadata_CueSheet_Index
 CFLAC__StreamMetadata_CueSheet_Track
 CFLAC__StreamMetadata_Padding
 CFLAC__StreamMetadata_Picture
 CFLAC__StreamMetadata_SeekPoint
 CFLAC__StreamMetadata_SeekTable
 CFLAC__StreamMetadata_StreamInfo
 CFLAC__StreamMetadata_Unknown
 CFLAC__StreamMetadata_VorbisComment
 CFLAC__StreamMetadata_VorbisComment_Entry
 CFLAC__Subframe
 CFLAC__Subframe_Constant
 CFLAC__Subframe_Fixed
 CFLAC__Subframe_LPC
 CFLAC__Subframe_Verbatim
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/index.html b/lib-src/libflac/doc/html/api/index.html new file mode 100644 index 000000000..ea9ab7a4e --- /dev/null +++ b/lib-src/libflac/doc/html/api/index.html @@ -0,0 +1,104 @@ + + + + + + +FLAC: Main Page + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+
+
FLAC Documentation
+
+
+

+Introduction

+

This is the documentation for the FLAC C and C++ APIs. It is highly interconnected; this introduction should give you a top level idea of the structure and how to find the information you need. As a prerequisite you should have at least a basic knowledge of the FLAC format, documented here.

+

+FLAC C API

+

The FLAC C API is the interface to libFLAC, a set of structures describing the components of FLAC streams, and functions for encoding and decoding streams, as well as manipulating FLAC metadata in files. The public include files will be installed in your include area (for example /usr/include/FLAC/...).

+

By writing a little code and linking against libFLAC, it is relatively easy to add FLAC support to another program. The library is licensed under Xiph's BSD license. Complete source code of libFLAC as well as the command-line encoder and plugins is available and is a useful source of examples.

+

Aside from encoders and decoders, libFLAC provides a powerful metadata interface for manipulating metadata in FLAC files. It allows the user to add, delete, and modify FLAC metadata blocks and it can automatically take advantage of PADDING blocks to avoid rewriting the entire FLAC file when changing the size of the metadata.

+

libFLAC usually only requires the standard C library and C math library. In particular, threading is not used so there is no dependency on a thread library. However, libFLAC does not use global variables and should be thread-safe.

+

libFLAC also supports encoding to and decoding from Ogg FLAC. However the metadata editing interfaces currently have limited read-only support for Ogg FLAC files.

+

+FLAC C++ API

+

The FLAC C++ API is a set of classes that encapsulate the structures and functions in libFLAC. They provide slightly more functionality with respect to metadata but are otherwise equivalent. For the most part, they share the same usage as their counterparts in libFLAC, and the FLAC C API documentation can be used as a supplement. The public include files for the C++ API will be installed in your include area (for example /usr/include/FLAC++/...).

+

libFLAC++ is also licensed under Xiph's BSD license.

+

+Getting Started

+

A good starting point for learning the API is to browse through the modules. Modules are logical groupings of related functions or classes, which correspond roughly to header files or sections of header files. Each module includes a detailed description of the general usage of its functions or classes.

+

From there you can go on to look at the documentation of individual functions. You can see different views of the individual functions through the links in top bar across this page.

+

If you prefer a more hands-on approach, you can jump right to some example code.

+

+Porting Guide

+

Starting with FLAC 1.1.3 a Porting Guide has been introduced which gives detailed instructions on how to port your code to newer versions of FLAC.

+

+Embedded Developers

+

libFLAC has grown larger over time as more functionality has been included, but much of it may be unnecessary for a particular embedded implementation. Unused parts may be pruned by some simple editing of src/libFLAC/Makefile.am. In general, the decoders, encoders, and metadata interface are all independent from each other.

+

It is easiest to just describe the dependencies:

+
    +
  • All modules depend on the Format module.
  • +
  • The decoders and encoders depend on the bitbuffer.
  • +
  • The decoder is independent of the encoder. The encoder uses the decoder because of the verify feature, but this can be removed if not needed.
  • +
  • Parts of the metadata interface require the stream decoder (but not the encoder).
  • +
  • Ogg support is selectable through the compile time macro FLAC__HAS_OGG.
  • +
+

For example, if your application only requires the stream decoder, no encoder, and no metadata interface, you can remove the stream encoder and the metadata interface, which will greatly reduce the size of the library.

+

Also, there are several places in the libFLAC code with comments marked with "OPT:" where a #define can be changed to enable code that might be faster on a specific platform. Experimenting with these can yield faster binaries.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/metadata_8h.html b/lib-src/libflac/doc/html/api/metadata_8h.html new file mode 100644 index 000000000..e0c17aeea --- /dev/null +++ b/lib-src/libflac/doc/html/api/metadata_8h.html @@ -0,0 +1,343 @@ + + + + + + +FLAC: include/FLAC/metadata.h File Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+ +
+
metadata.h File Reference
+
+
+
#include <sys/types.h>
+#include "export.h"
+#include "callback.h"
+#include "format.h"
+
+

Go to the source code of this file.

+ + + + + + + + +

+Typedefs

typedef struct
+FLAC__Metadata_SimpleIterator 
FLAC__Metadata_SimpleIterator
 
typedef struct FLAC__Metadata_Chain FLAC__Metadata_Chain
 
typedef struct
+FLAC__Metadata_Iterator 
FLAC__Metadata_Iterator
 
+ + + + + +

+Enumerations

enum  FLAC__Metadata_SimpleIteratorStatus {
+  FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK = 0, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ERROR_OPENING_FILE, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_A_FLAC_FILE, +
+  FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR, +
+  FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_RENAME_ERROR, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR, +FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR, +
+  FLAC__METADATA_SIMPLE_ITERATOR_STATUS_INTERNAL_ERROR +
+ }
 
enum  FLAC__Metadata_ChainStatus {
+  FLAC__METADATA_CHAIN_STATUS_OK = 0, +FLAC__METADATA_CHAIN_STATUS_ILLEGAL_INPUT, +FLAC__METADATA_CHAIN_STATUS_ERROR_OPENING_FILE, +FLAC__METADATA_CHAIN_STATUS_NOT_A_FLAC_FILE, +
+  FLAC__METADATA_CHAIN_STATUS_NOT_WRITABLE, +FLAC__METADATA_CHAIN_STATUS_BAD_METADATA, +FLAC__METADATA_CHAIN_STATUS_READ_ERROR, +FLAC__METADATA_CHAIN_STATUS_SEEK_ERROR, +
+  FLAC__METADATA_CHAIN_STATUS_WRITE_ERROR, +FLAC__METADATA_CHAIN_STATUS_RENAME_ERROR, +FLAC__METADATA_CHAIN_STATUS_UNLINK_ERROR, +FLAC__METADATA_CHAIN_STATUS_MEMORY_ALLOCATION_ERROR, +
+  FLAC__METADATA_CHAIN_STATUS_INTERNAL_ERROR, +FLAC__METADATA_CHAIN_STATUS_INVALID_CALLBACKS, +FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH, +FLAC__METADATA_CHAIN_STATUS_WRONG_WRITE_CALL +
+ }
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Functions

FLAC__bool FLAC__metadata_get_streaminfo (const char *filename, FLAC__StreamMetadata *streaminfo)
 
FLAC__bool FLAC__metadata_get_tags (const char *filename, FLAC__StreamMetadata **tags)
 
FLAC__bool FLAC__metadata_get_cuesheet (const char *filename, FLAC__StreamMetadata **cuesheet)
 
FLAC__bool FLAC__metadata_get_picture (const char *filename, FLAC__StreamMetadata **picture, FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors)
 
FLAC__Metadata_SimpleIteratorFLAC__metadata_simple_iterator_new (void)
 
void FLAC__metadata_simple_iterator_delete (FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__Metadata_SimpleIteratorStatus FLAC__metadata_simple_iterator_status (FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_init (FLAC__Metadata_SimpleIterator *iterator, const char *filename, FLAC__bool read_only, FLAC__bool preserve_file_stats)
 
FLAC__bool FLAC__metadata_simple_iterator_is_writable (const FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_next (FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_prev (FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_is_last (const FLAC__Metadata_SimpleIterator *iterator)
 
off_t FLAC__metadata_simple_iterator_get_block_offset (const FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type (const FLAC__Metadata_SimpleIterator *iterator)
 
unsigned FLAC__metadata_simple_iterator_get_block_length (const FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_get_application_id (FLAC__Metadata_SimpleIterator *iterator, FLAC__byte *id)
 
FLAC__StreamMetadataFLAC__metadata_simple_iterator_get_block (FLAC__Metadata_SimpleIterator *iterator)
 
FLAC__bool FLAC__metadata_simple_iterator_set_block (FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding)
 
FLAC__bool FLAC__metadata_simple_iterator_insert_block_after (FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding)
 
FLAC__bool FLAC__metadata_simple_iterator_delete_block (FLAC__Metadata_SimpleIterator *iterator, FLAC__bool use_padding)
 
FLAC__Metadata_ChainFLAC__metadata_chain_new (void)
 
void FLAC__metadata_chain_delete (FLAC__Metadata_Chain *chain)
 
FLAC__Metadata_ChainStatus FLAC__metadata_chain_status (FLAC__Metadata_Chain *chain)
 
FLAC__bool FLAC__metadata_chain_read (FLAC__Metadata_Chain *chain, const char *filename)
 
FLAC__bool FLAC__metadata_chain_read_ogg (FLAC__Metadata_Chain *chain, const char *filename)
 
FLAC__bool FLAC__metadata_chain_read_with_callbacks (FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
 
FLAC__bool FLAC__metadata_chain_read_ogg_with_callbacks (FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
 
FLAC__bool FLAC__metadata_chain_check_if_tempfile_needed (FLAC__Metadata_Chain *chain, FLAC__bool use_padding)
 
FLAC__bool FLAC__metadata_chain_write (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__bool preserve_file_stats)
 
FLAC__bool FLAC__metadata_chain_write_with_callbacks (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
 
FLAC__bool FLAC__metadata_chain_write_with_callbacks_and_tempfile (FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, FLAC__IOHandle temp_handle, FLAC__IOCallbacks temp_callbacks)
 
void FLAC__metadata_chain_merge_padding (FLAC__Metadata_Chain *chain)
 
void FLAC__metadata_chain_sort_padding (FLAC__Metadata_Chain *chain)
 
FLAC__Metadata_IteratorFLAC__metadata_iterator_new (void)
 
void FLAC__metadata_iterator_delete (FLAC__Metadata_Iterator *iterator)
 
void FLAC__metadata_iterator_init (FLAC__Metadata_Iterator *iterator, FLAC__Metadata_Chain *chain)
 
FLAC__bool FLAC__metadata_iterator_next (FLAC__Metadata_Iterator *iterator)
 
FLAC__bool FLAC__metadata_iterator_prev (FLAC__Metadata_Iterator *iterator)
 
FLAC__MetadataType FLAC__metadata_iterator_get_block_type (const FLAC__Metadata_Iterator *iterator)
 
FLAC__StreamMetadataFLAC__metadata_iterator_get_block (FLAC__Metadata_Iterator *iterator)
 
FLAC__bool FLAC__metadata_iterator_set_block (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block)
 
FLAC__bool FLAC__metadata_iterator_delete_block (FLAC__Metadata_Iterator *iterator, FLAC__bool replace_with_padding)
 
FLAC__bool FLAC__metadata_iterator_insert_block_before (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block)
 
FLAC__bool FLAC__metadata_iterator_insert_block_after (FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block)
 
FLAC__StreamMetadataFLAC__metadata_object_new (FLAC__MetadataType type)
 
FLAC__StreamMetadataFLAC__metadata_object_clone (const FLAC__StreamMetadata *object)
 
void FLAC__metadata_object_delete (FLAC__StreamMetadata *object)
 
FLAC__bool FLAC__metadata_object_is_equal (const FLAC__StreamMetadata *block1, const FLAC__StreamMetadata *block2)
 
FLAC__bool FLAC__metadata_object_application_set_data (FLAC__StreamMetadata *object, FLAC__byte *data, unsigned length, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_seektable_resize_points (FLAC__StreamMetadata *object, unsigned new_num_points)
 
void FLAC__metadata_object_seektable_set_point (FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point)
 
FLAC__bool FLAC__metadata_object_seektable_insert_point (FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point)
 
FLAC__bool FLAC__metadata_object_seektable_delete_point (FLAC__StreamMetadata *object, unsigned point_num)
 
FLAC__bool FLAC__metadata_object_seektable_is_legal (const FLAC__StreamMetadata *object)
 
FLAC__bool FLAC__metadata_object_seektable_template_append_placeholders (FLAC__StreamMetadata *object, unsigned num)
 
FLAC__bool FLAC__metadata_object_seektable_template_append_point (FLAC__StreamMetadata *object, FLAC__uint64 sample_number)
 
FLAC__bool FLAC__metadata_object_seektable_template_append_points (FLAC__StreamMetadata *object, FLAC__uint64 sample_numbers[], unsigned num)
 
FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points (FLAC__StreamMetadata *object, unsigned num, FLAC__uint64 total_samples)
 
FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points_by_samples (FLAC__StreamMetadata *object, unsigned samples, FLAC__uint64 total_samples)
 
FLAC__bool FLAC__metadata_object_seektable_template_sort (FLAC__StreamMetadata *object, FLAC__bool compact)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_set_vendor_string (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments (FLAC__StreamMetadata *object, unsigned new_num_comments)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment (FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_insert_comment (FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_append_comment (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment (FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment (FLAC__StreamMetadata *object, unsigned comment_num)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair (FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair (const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value)
 
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches (const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length)
 
int FLAC__metadata_object_vorbiscomment_find_entry_from (const FLAC__StreamMetadata *object, unsigned offset, const char *field_name)
 
int FLAC__metadata_object_vorbiscomment_remove_entry_matching (FLAC__StreamMetadata *object, const char *field_name)
 
int FLAC__metadata_object_vorbiscomment_remove_entries_matching (FLAC__StreamMetadata *object, const char *field_name)
 
FLAC__StreamMetadata_CueSheet_TrackFLAC__metadata_object_cuesheet_track_new (void)
 
FLAC__StreamMetadata_CueSheet_TrackFLAC__metadata_object_cuesheet_track_clone (const FLAC__StreamMetadata_CueSheet_Track *object)
 
void FLAC__metadata_object_cuesheet_track_delete (FLAC__StreamMetadata_CueSheet_Track *object)
 
FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices (FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices)
 
FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index)
 
FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)
 
FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index (FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)
 
FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks (FLAC__StreamMetadata *object, unsigned new_num_tracks)
 
FLAC__bool FLAC__metadata_object_cuesheet_set_track (FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_cuesheet_insert_track (FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track (FLAC__StreamMetadata *object, unsigned track_num)
 
FLAC__bool FLAC__metadata_object_cuesheet_delete_track (FLAC__StreamMetadata *object, unsigned track_num)
 
FLAC__bool FLAC__metadata_object_cuesheet_is_legal (const FLAC__StreamMetadata *object, FLAC__bool check_cd_da_subset, const char **violation)
 
FLAC__uint32 FLAC__metadata_object_cuesheet_calculate_cddb_id (const FLAC__StreamMetadata *object)
 
FLAC__bool FLAC__metadata_object_picture_set_mime_type (FLAC__StreamMetadata *object, char *mime_type, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_picture_set_description (FLAC__StreamMetadata *object, FLAC__byte *description, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_picture_set_data (FLAC__StreamMetadata *object, FLAC__byte *data, FLAC__uint32 length, FLAC__bool copy)
 
FLAC__bool FLAC__metadata_object_picture_is_legal (const FLAC__StreamMetadata *object, const char **violation)
 
+ + + + + +

+Variables

const char *const FLAC__Metadata_SimpleIteratorStatusString []
 
const char *const FLAC__Metadata_ChainStatusString []
 
+

Detailed Description

+

This module provides functions for creating and manipulating FLAC metadata blocks in memory, and three progressively more powerful interfaces for traversing and editing metadata in FLAC files.

+

See the detailed documentation for each interface in the metadata module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/metadata_8h_source.html b/lib-src/libflac/doc/html/api/metadata_8h_source.html new file mode 100644 index 000000000..9a92f7793 --- /dev/null +++ b/lib-src/libflac/doc/html/api/metadata_8h_source.html @@ -0,0 +1,522 @@ + + + + + + +FLAC: include/FLAC/metadata.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
metadata.h
+
+
+Go to the documentation of this file.
1 /* libFLAC - Free Lossless Audio Codec library
+
2  * Copyright (C) 2001-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLAC__METADATA_H
+
34 #define FLAC__METADATA_H
+
35 
+
36 #include <sys/types.h> /* for off_t */
+
37 #include "export.h"
+
38 #include "callback.h"
+
39 #include "format.h"
+
40 
+
41 /* --------------------------------------------------------------------
+
42  (For an example of how all these routines are used, see the source
+
43  code for the unit tests in src/test_libFLAC/metadata_*.c, or
+
44  metaflac in src/metaflac/)
+
45  ------------------------------------------------------------------*/
+
46 
+
124 #ifdef __cplusplus
+
125 extern "C" {
+
126 #endif
+
127 
+
128 
+
159 FLAC_API FLAC__bool FLAC__metadata_get_streaminfo(const char *filename, FLAC__StreamMetadata *streaminfo);
+
160 
+
178 FLAC_API FLAC__bool FLAC__metadata_get_tags(const char *filename, FLAC__StreamMetadata **tags);
+
179 
+
197 FLAC_API FLAC__bool FLAC__metadata_get_cuesheet(const char *filename, FLAC__StreamMetadata **cuesheet);
+
198 
+
237 FLAC_API FLAC__bool FLAC__metadata_get_picture(const char *filename, FLAC__StreamMetadata **picture, FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors);
+
238 
+
239 /* \} */
+
240 
+
241 
+ + +
304 
+
309 typedef enum {
+
310 
+ + + + + + + + + + + + + + +
351 
+
357 extern FLAC_API const char * const FLAC__Metadata_SimpleIteratorStatusString[];
+
358 
+
359 
+ +
366 
+ +
374 
+ +
386 
+
406 FLAC_API FLAC__bool FLAC__metadata_simple_iterator_init(FLAC__Metadata_SimpleIterator *iterator, const char *filename, FLAC__bool read_only, FLAC__bool preserve_file_stats);
+
407 
+ +
419 
+ +
433 
+ +
447 
+
459 FLAC_API FLAC__bool FLAC__metadata_simple_iterator_is_last(const FLAC__Metadata_SimpleIterator *iterator);
+
460 
+ +
476 
+ +
490 
+ +
507 
+
531 FLAC_API FLAC__bool FLAC__metadata_simple_iterator_get_application_id(FLAC__Metadata_SimpleIterator *iterator, FLAC__byte *id);
+
532 
+ +
550 
+
605 FLAC_API FLAC__bool FLAC__metadata_simple_iterator_set_block(FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding);
+
606 
+
630 FLAC_API FLAC__bool FLAC__metadata_simple_iterator_insert_block_after(FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding);
+
631 
+
649 FLAC_API FLAC__bool FLAC__metadata_simple_iterator_delete_block(FLAC__Metadata_SimpleIterator *iterator, FLAC__bool use_padding);
+
650 
+
651 /* \} */
+
652 
+
653 
+
711 struct FLAC__Metadata_Chain;
+ +
715 
+ + +
720 
+
721 typedef enum {
+ + + + + + + + + + + + + + + + + +
784 
+
790 extern FLAC_API const char * const FLAC__Metadata_ChainStatusString[];
+
791 
+
792 /*********** FLAC__Metadata_Chain ***********/
+
793 
+ +
800 
+ +
808 
+ +
820 
+
833 FLAC_API FLAC__bool FLAC__metadata_chain_read(FLAC__Metadata_Chain *chain, const char *filename);
+
834 
+
850 FLAC_API FLAC__bool FLAC__metadata_chain_read_ogg(FLAC__Metadata_Chain *chain, const char *filename);
+
851 
+ +
873 
+ +
898 
+
925 FLAC_API FLAC__bool FLAC__metadata_chain_check_if_tempfile_needed(FLAC__Metadata_Chain *chain, FLAC__bool use_padding);
+
926 
+
971 FLAC_API FLAC__bool FLAC__metadata_chain_write(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__bool preserve_file_stats);
+
972 
+
1001 FLAC_API FLAC__bool FLAC__metadata_chain_write_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks);
+
1002 
+
1052 FLAC_API FLAC__bool FLAC__metadata_chain_write_with_callbacks_and_tempfile(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, FLAC__IOHandle temp_handle, FLAC__IOCallbacks temp_callbacks);
+
1053 
+ +
1067 
+ +
1082 
+
1083 
+
1084 /*********** FLAC__Metadata_Iterator ***********/
+
1085 
+ +
1092 
+ +
1100 
+ +
1111 
+
1124 FLAC_API FLAC__bool FLAC__metadata_iterator_next(FLAC__Metadata_Iterator *iterator);
+
1125 
+
1138 FLAC_API FLAC__bool FLAC__metadata_iterator_prev(FLAC__Metadata_Iterator *iterator);
+
1139 
+ +
1151 
+ +
1172 
+ +
1189 
+
1206 FLAC_API FLAC__bool FLAC__metadata_iterator_delete_block(FLAC__Metadata_Iterator *iterator, FLAC__bool replace_with_padding);
+
1207 
+ +
1226 
+ +
1244 
+
1245 /* \} */
+
1246 
+
1247 
+ +
1314 
+ +
1328 
+
1338 FLAC_API void FLAC__metadata_object_delete(FLAC__StreamMetadata *object);
+
1339 
+
1353 FLAC_API FLAC__bool FLAC__metadata_object_is_equal(const FLAC__StreamMetadata *block1, const FLAC__StreamMetadata *block2);
+
1354 
+
1376 FLAC_API FLAC__bool FLAC__metadata_object_application_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, unsigned length, FLAC__bool copy);
+
1377 
+
1393 FLAC_API FLAC__bool FLAC__metadata_object_seektable_resize_points(FLAC__StreamMetadata *object, unsigned new_num_points);
+
1394 
+ +
1406 
+
1419 FLAC_API FLAC__bool FLAC__metadata_object_seektable_insert_point(FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point);
+
1420 
+
1432 FLAC_API FLAC__bool FLAC__metadata_object_seektable_delete_point(FLAC__StreamMetadata *object, unsigned point_num);
+
1433 
+
1445 FLAC_API FLAC__bool FLAC__metadata_object_seektable_is_legal(const FLAC__StreamMetadata *object);
+
1446 
+ +
1463 
+
1479 FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_point(FLAC__StreamMetadata *object, FLAC__uint64 sample_number);
+
1480 
+
1497 FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_points(FLAC__StreamMetadata *object, FLAC__uint64 sample_numbers[], unsigned num);
+
1498 
+
1519 FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points(FLAC__StreamMetadata *object, unsigned num, FLAC__uint64 total_samples);
+
1520 
+
1547 FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points_by_samples(FLAC__StreamMetadata *object, unsigned samples, FLAC__uint64 total_samples);
+
1548 
+
1564 FLAC_API FLAC__bool FLAC__metadata_object_seektable_template_sort(FLAC__StreamMetadata *object, FLAC__bool compact);
+
1565 
+ +
1590 
+
1606 FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments(FLAC__StreamMetadata *object, unsigned new_num_comments);
+
1607 
+
1633 FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
+
1634 
+
1663 FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_insert_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy);
+
1664 
+ +
1689 
+
1723 FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy);
+
1724 
+
1736 FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment(FLAC__StreamMetadata *object, unsigned comment_num);
+
1737 
+
1757 FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value);
+
1758 
+
1778 FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value);
+
1779 
+
1792 FLAC_API FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length);
+
1793 
+
1811 FLAC_API int FLAC__metadata_object_vorbiscomment_find_entry_from(const FLAC__StreamMetadata *object, unsigned offset, const char *field_name);
+
1812 
+
1824 FLAC_API int FLAC__metadata_object_vorbiscomment_remove_entry_matching(FLAC__StreamMetadata *object, const char *field_name);
+
1825 
+
1837 FLAC_API int FLAC__metadata_object_vorbiscomment_remove_entries_matching(FLAC__StreamMetadata *object, const char *field_name);
+
1838 
+ +
1847 
+ +
1862 
+ +
1870 
+
1889 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices(FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices);
+
1890 
+
1912 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index);
+
1913 
+
1936 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num);
+
1937 
+
1955 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num);
+
1956 
+
1972 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks(FLAC__StreamMetadata *object, unsigned new_num_tracks);
+
1973 
+
1994 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_set_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy);
+
1995 
+
2017 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy);
+
2018 
+
2036 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track(FLAC__StreamMetadata *object, unsigned track_num);
+
2037 
+
2051 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_delete_track(FLAC__StreamMetadata *object, unsigned track_num);
+
2052 
+
2072 FLAC_API FLAC__bool FLAC__metadata_object_cuesheet_is_legal(const FLAC__StreamMetadata *object, FLAC__bool check_cd_da_subset, const char **violation);
+
2073 
+
2085 FLAC_API FLAC__uint32 FLAC__metadata_object_cuesheet_calculate_cddb_id(const FLAC__StreamMetadata *object);
+
2086 
+
2108 FLAC_API FLAC__bool FLAC__metadata_object_picture_set_mime_type(FLAC__StreamMetadata *object, char *mime_type, FLAC__bool copy);
+
2109 
+
2130 FLAC_API FLAC__bool FLAC__metadata_object_picture_set_description(FLAC__StreamMetadata *object, FLAC__byte *description, FLAC__bool copy);
+
2131 
+
2155 FLAC_API FLAC__bool FLAC__metadata_object_picture_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, FLAC__uint32 length, FLAC__bool copy);
+
2156 
+
2174 FLAC_API FLAC__bool FLAC__metadata_object_picture_is_legal(const FLAC__StreamMetadata *object, const char **violation);
+
2175 
+
2176 /* \} */
+
2177 
+
2178 #ifdef __cplusplus
+
2179 }
+
2180 #endif
+
2181 
+
2182 #endif
+ +
FLAC__bool FLAC__metadata_get_tags(const char *filename, FLAC__StreamMetadata **tags)
+
FLAC__bool FLAC__metadata_object_picture_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, FLAC__uint32 length, FLAC__bool copy)
+
FLAC__bool FLAC__metadata_object_seektable_is_legal(const FLAC__StreamMetadata *object)
+
FLAC__bool FLAC__metadata_chain_check_if_tempfile_needed(FLAC__Metadata_Chain *chain, FLAC__bool use_padding)
+
unsigned FLAC__metadata_simple_iterator_get_block_length(const FLAC__Metadata_SimpleIterator *iterator)
+
void FLAC__metadata_object_cuesheet_track_delete(FLAC__StreamMetadata_CueSheet_Track *object)
+
int FLAC__metadata_object_vorbiscomment_remove_entries_matching(FLAC__StreamMetadata *object, const char *field_name)
+
void FLAC__metadata_iterator_delete(FLAC__Metadata_Iterator *iterator)
+
FLAC__bool FLAC__metadata_simple_iterator_insert_block_after(FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding)
+ + +
FLAC__bool FLAC__metadata_simple_iterator_is_writable(const FLAC__Metadata_SimpleIterator *iterator)
+
FLAC__bool FLAC__metadata_object_picture_set_description(FLAC__StreamMetadata *object, FLAC__byte *description, FLAC__bool copy)
+
FLAC__bool FLAC__metadata_object_cuesheet_track_insert_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num, FLAC__StreamMetadata_CueSheet_Index index)
+
This module contains #defines and symbols for exporting function calls, and providing version informa...
+
void FLAC__metadata_object_delete(FLAC__StreamMetadata *object)
+ +
FLAC__Metadata_SimpleIterator * FLAC__metadata_simple_iterator_new(void)
+
FLAC__bool FLAC__metadata_object_picture_is_legal(const FLAC__StreamMetadata *object, const char **violation)
+
FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points_by_samples(FLAC__StreamMetadata *object, unsigned samples, FLAC__uint64 total_samples)
+ +
FLAC__bool FLAC__metadata_get_cuesheet(const char *filename, FLAC__StreamMetadata **cuesheet)
+
FLAC__bool FLAC__metadata_object_seektable_template_append_point(FLAC__StreamMetadata *object, FLAC__uint64 sample_number)
+
FLAC__StreamMetadata * FLAC__metadata_object_new(FLAC__MetadataType type)
+
FLAC__bool FLAC__metadata_object_vorbiscomment_replace_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool all, FLAC__bool copy)
+
FLAC__bool FLAC__metadata_chain_write_with_callbacks_and_tempfile(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks, FLAC__IOHandle temp_handle, FLAC__IOCallbacks temp_callbacks)
+
Definition: callback.h:170
+
const char *const FLAC__Metadata_SimpleIteratorStatusString[]
+
FLAC__bool FLAC__metadata_object_seektable_resize_points(FLAC__StreamMetadata *object, unsigned new_num_points)
+ +
FLAC__bool FLAC__metadata_object_seektable_template_append_spaced_points(FLAC__StreamMetadata *object, unsigned num, FLAC__uint64 total_samples)
+
FLAC__Metadata_ChainStatus FLAC__metadata_chain_status(FLAC__Metadata_Chain *chain)
+
FLAC__bool FLAC__metadata_simple_iterator_get_application_id(FLAC__Metadata_SimpleIterator *iterator, FLAC__byte *id)
+ +
FLAC__bool FLAC__metadata_simple_iterator_delete_block(FLAC__Metadata_SimpleIterator *iterator, FLAC__bool use_padding)
+ +
This module defines the structures for describing I/O callbacks to the other FLAC interfaces...
+ + +
Definition: format.h:666
+
FLAC__StreamMetadata_CueSheet_Track * FLAC__metadata_object_cuesheet_track_clone(const FLAC__StreamMetadata_CueSheet_Track *object)
+
FLAC__bool FLAC__metadata_object_seektable_template_append_points(FLAC__StreamMetadata *object, FLAC__uint64 sample_numbers[], unsigned num)
+
This module contains structure definitions for the representation of FLAC format components in memory...
+
FLAC__bool FLAC__metadata_object_seektable_delete_point(FLAC__StreamMetadata *object, unsigned point_num)
+ +
FLAC__bool FLAC__metadata_object_cuesheet_track_resize_indices(FLAC__StreamMetadata *object, unsigned track_num, unsigned new_num_indices)
+
FLAC__StreamMetadata * FLAC__metadata_object_clone(const FLAC__StreamMetadata *object)
+
FLAC__bool FLAC__metadata_simple_iterator_set_block(FLAC__Metadata_SimpleIterator *iterator, FLAC__StreamMetadata *block, FLAC__bool use_padding)
+
FLAC__bool FLAC__metadata_iterator_delete_block(FLAC__Metadata_Iterator *iterator, FLAC__bool replace_with_padding)
+
Definition: format.h:647
+
FLAC__bool FLAC__metadata_object_cuesheet_delete_track(FLAC__StreamMetadata *object, unsigned track_num)
+
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_matches(const FLAC__StreamMetadata_VorbisComment_Entry entry, const char *field_name, unsigned field_name_length)
+
FLAC__bool FLAC__metadata_object_is_equal(const FLAC__StreamMetadata *block1, const FLAC__StreamMetadata *block2)
+
void FLAC__metadata_chain_delete(FLAC__Metadata_Chain *chain)
+
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(const FLAC__StreamMetadata_VorbisComment_Entry entry, char **field_name, char **field_value)
+
FLAC__bool FLAC__metadata_object_cuesheet_track_delete_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)
+
FLAC__bool FLAC__metadata_object_vorbiscomment_resize_comments(FLAC__StreamMetadata *object, unsigned new_num_comments)
+ +
FLAC__StreamMetadata * FLAC__metadata_iterator_get_block(FLAC__Metadata_Iterator *iterator)
+
FLAC__bool FLAC__metadata_chain_read_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
+
FLAC__bool FLAC__metadata_chain_read(FLAC__Metadata_Chain *chain, const char *filename)
+
FLAC__bool FLAC__metadata_chain_write(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__bool preserve_file_stats)
+
FLAC__MetadataType FLAC__metadata_iterator_get_block_type(const FLAC__Metadata_Iterator *iterator)
+
FLAC__bool FLAC__metadata_object_application_set_data(FLAC__StreamMetadata *object, FLAC__byte *data, unsigned length, FLAC__bool copy)
+
void FLAC__metadata_simple_iterator_delete(FLAC__Metadata_SimpleIterator *iterator)
+
struct FLAC__Metadata_Chain FLAC__Metadata_Chain
Definition: metadata.h:714
+
Definition: format.h:834
+
void FLAC__metadata_chain_merge_padding(FLAC__Metadata_Chain *chain)
+ + +
FLAC__bool FLAC__metadata_object_cuesheet_is_legal(const FLAC__StreamMetadata *object, FLAC__bool check_cd_da_subset, const char **violation)
+
const char *const FLAC__Metadata_ChainStatusString[]
+ +
FLAC__bool FLAC__metadata_get_streaminfo(const char *filename, FLAC__StreamMetadata *streaminfo)
+ +
FLAC__bool FLAC__metadata_simple_iterator_next(FLAC__Metadata_SimpleIterator *iterator)
+
FLAC__bool FLAC__metadata_chain_read_ogg_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
+
FLAC__bool FLAC__metadata_chain_read_ogg(FLAC__Metadata_Chain *chain, const char *filename)
+
FLAC__StreamMetadata * FLAC__metadata_simple_iterator_get_block(FLAC__Metadata_SimpleIterator *iterator)
+
FLAC__bool FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *field_name, const char *field_value)
+
Definition: metadata.h:746
+
FLAC__bool FLAC__metadata_simple_iterator_init(FLAC__Metadata_SimpleIterator *iterator, const char *filename, FLAC__bool read_only, FLAC__bool preserve_file_stats)
+
FLAC__bool FLAC__metadata_object_vorbiscomment_delete_comment(FLAC__StreamMetadata *object, unsigned comment_num)
+
FLAC__bool FLAC__metadata_get_picture(const char *filename, FLAC__StreamMetadata **picture, FLAC__StreamMetadata_Picture_Type type, const char *mime_type, const FLAC__byte *description, unsigned max_width, unsigned max_height, unsigned max_depth, unsigned max_colors)
+
FLAC__bool FLAC__metadata_object_vorbiscomment_insert_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
+
FLAC__bool FLAC__metadata_iterator_insert_block_after(FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block)
+
FLAC__MetadataType
Definition: format.h:489
+
struct FLAC__Metadata_Iterator FLAC__Metadata_Iterator
Definition: metadata.h:719
+
FLAC__bool FLAC__metadata_iterator_set_block(FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block)
+
Definition: format.h:624
+
void FLAC__metadata_iterator_init(FLAC__Metadata_Iterator *iterator, FLAC__Metadata_Chain *chain)
+
FLAC__StreamMetadata_CueSheet_Track * FLAC__metadata_object_cuesheet_track_new(void)
+
FLAC__bool FLAC__metadata_iterator_insert_block_before(FLAC__Metadata_Iterator *iterator, FLAC__StreamMetadata *block)
+ + + +
FLAC__bool FLAC__metadata_simple_iterator_prev(FLAC__Metadata_SimpleIterator *iterator)
+
void * FLAC__IOHandle
Definition: callback.h:89
+
FLAC__bool FLAC__metadata_object_vorbiscomment_set_vendor_string(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
+ +
void FLAC__metadata_chain_sort_padding(FLAC__Metadata_Chain *chain)
+
FLAC__Metadata_SimpleIteratorStatus FLAC__metadata_simple_iterator_status(FLAC__Metadata_SimpleIterator *iterator)
+
Definition: metadata.h:743
+
FLAC__bool FLAC__metadata_object_cuesheet_insert_blank_track(FLAC__StreamMetadata *object, unsigned track_num)
+
FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type(const FLAC__Metadata_SimpleIterator *iterator)
+
FLAC__bool FLAC__metadata_object_vorbiscomment_set_comment(FLAC__StreamMetadata *object, unsigned comment_num, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
+
FLAC__StreamMetadata_Picture_Type
Definition: format.h:732
+
struct FLAC__Metadata_SimpleIterator FLAC__Metadata_SimpleIterator
Definition: metadata.h:303
+
FLAC__uint32 FLAC__metadata_object_cuesheet_calculate_cddb_id(const FLAC__StreamMetadata *object)
+
FLAC__bool FLAC__metadata_object_seektable_template_sort(FLAC__StreamMetadata *object, FLAC__bool compact)
+
FLAC__Metadata_Iterator * FLAC__metadata_iterator_new(void)
+
FLAC__bool FLAC__metadata_object_seektable_template_append_placeholders(FLAC__StreamMetadata *object, unsigned num)
+
FLAC__bool FLAC__metadata_simple_iterator_is_last(const FLAC__Metadata_SimpleIterator *iterator)
+
FLAC__bool FLAC__metadata_object_cuesheet_insert_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy)
+ + +
void FLAC__metadata_object_seektable_set_point(FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point)
+
FLAC__bool FLAC__metadata_iterator_next(FLAC__Metadata_Iterator *iterator)
+
FLAC__bool FLAC__metadata_object_seektable_insert_point(FLAC__StreamMetadata *object, unsigned point_num, FLAC__StreamMetadata_SeekPoint point)
+
FLAC__Metadata_SimpleIteratorStatus
Definition: metadata.h:309
+
FLAC__Metadata_Chain * FLAC__metadata_chain_new(void)
+
FLAC__bool FLAC__metadata_iterator_prev(FLAC__Metadata_Iterator *iterator)
+
Definition: metadata.h:722
+
FLAC__bool FLAC__metadata_object_vorbiscomment_append_comment(FLAC__StreamMetadata *object, FLAC__StreamMetadata_VorbisComment_Entry entry, FLAC__bool copy)
+
FLAC__bool FLAC__metadata_object_cuesheet_set_track(FLAC__StreamMetadata *object, unsigned track_num, FLAC__StreamMetadata_CueSheet_Track *track, FLAC__bool copy)
+
FLAC__bool FLAC__metadata_object_picture_set_mime_type(FLAC__StreamMetadata *object, char *mime_type, FLAC__bool copy)
+
int FLAC__metadata_object_vorbiscomment_remove_entry_matching(FLAC__StreamMetadata *object, const char *field_name)
+
Definition: format.h:574
+
off_t FLAC__metadata_simple_iterator_get_block_offset(const FLAC__Metadata_SimpleIterator *iterator)
+ +
FLAC__bool FLAC__metadata_object_cuesheet_track_insert_blank_index(FLAC__StreamMetadata *object, unsigned track_num, unsigned index_num)
+
FLAC__Metadata_ChainStatus
Definition: metadata.h:721
+ +
Definition: metadata.h:740
+
int FLAC__metadata_object_vorbiscomment_find_entry_from(const FLAC__StreamMetadata *object, unsigned offset, const char *field_name)
+
FLAC__bool FLAC__metadata_object_cuesheet_resize_tracks(FLAC__StreamMetadata *object, unsigned new_num_tracks)
+ +
FLAC__bool FLAC__metadata_chain_write_with_callbacks(FLAC__Metadata_Chain *chain, FLAC__bool use_padding, FLAC__IOHandle handle, FLAC__IOCallbacks callbacks)
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/modules.html b/lib-src/libflac/doc/html/api/modules.html new file mode 100644 index 000000000..870805afe --- /dev/null +++ b/lib-src/libflac/doc/html/api/modules.html @@ -0,0 +1,99 @@ + + + + + + +FLAC: Modules + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + +
+
+
+
Modules
+
+
+
Here is a list of all modules:
+
[detail level 123]
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
 Porting Guide for New Versions
 Porting from FLAC 1.1.2 to 1.1.3This module describes porting from FLAC 1.1.2 to FLAC 1.1.3
 Porting from FLAC 1.1.3 to 1.1.4This module describes porting from FLAC 1.1.3 to FLAC 1.1.4
 Porting from FLAC 1.1.4 to 1.2.0This module describes porting from FLAC 1.1.4 to FLAC 1.2.0
 FLAC C API
 FLAC/callback.h: I/O callback structuresThis module defines the structures for describing I/O callbacks to the other FLAC interfaces
 FLAC/export.h: export symbolsThis module contains #defines and symbols for exporting function calls, and providing version information and compiled-in features
 FLAC/format.h: format componentsThis module contains structure definitions for the representation of FLAC format components in memory. These are the basic structures used by the rest of the interfaces
 FLAC/metadata.h: metadata interfacesThis module provides functions for creating and manipulating FLAC metadata blocks in memory, and three progressively more powerful interfaces for traversing and editing metadata in native FLAC files. Note that currently only the Chain interface (level 2) supports Ogg FLAC files, and it is read-only i.e. no writing back changed metadata to file
 FLAC/metadata.h: metadata level 0 interfaceThe level 0 interface consists of individual routines to read the STREAMINFO, VORBIS_COMMENT, CUESHEET, and PICTURE blocks, requiring only a filename
 FLAC/metadata.h: metadata level 1 interfaceThe level 1 interface provides read-write access to FLAC file metadata and operates directly on the FLAC file
 FLAC/metadata.h: metadata level 2 interfaceThe level 2 interface provides read-write access to FLAC file metadata; all metadata is read into memory, operated on in memory, and then written to file, which is more efficient than level 1 when editing multiple blocks
 FLAC/metadata.h: metadata object methodsThis module contains methods for manipulating FLAC metadata objects
 FLAC/_decoder.h: decoder interfacesThis module describes the decoder layers provided by libFLAC
 FLAC/stream_decoder.h: stream decoder interfaceThis module contains the functions which implement the stream decoder
 FLAC/_encoder.h: encoder interfacesThis module describes the encoder layers provided by libFLAC
 FLAC/stream_encoder.h: stream encoder interfaceThis module contains the functions which implement the stream encoder
 FLAC C++ API
 FLAC++/decoder.h: decoder classesThis module describes the decoder layers provided by libFLAC++
 FLAC++/encoder.h: encoder classesThis module describes the encoder layers provided by libFLAC++
 FLAC++/export.h: export symbolsThis module contains #defines and symbols for exporting function calls, and providing version information and compiled-in features
 FLAC++/metadata.h: metadata interfacesThis module provides classes for creating and manipulating FLAC metadata blocks in memory, and three progressively more powerful interfaces for traversing and editing metadata in FLAC files
 FLAC++/metadata.h: metadata object classes
 FLAC++/metadata.h: metadata level 0 interfaceLevel 0 metadata iterators
 FLAC++/metadata.h: metadata level 1 interfaceLevel 1 metadata iterator
 FLAC++/metadata.h: metadata level 2 interfaceLevel 2 metadata iterator
+
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/nav_f.png b/lib-src/libflac/doc/html/api/nav_f.png new file mode 100644 index 000000000..72a58a529 Binary files /dev/null and b/lib-src/libflac/doc/html/api/nav_f.png differ diff --git a/lib-src/libflac/doc/html/api/nav_g.png b/lib-src/libflac/doc/html/api/nav_g.png new file mode 100644 index 000000000..2093a237a Binary files /dev/null and b/lib-src/libflac/doc/html/api/nav_g.png differ diff --git a/lib-src/libflac/doc/html/api/nav_h.png b/lib-src/libflac/doc/html/api/nav_h.png new file mode 100644 index 000000000..33389b101 Binary files /dev/null and b/lib-src/libflac/doc/html/api/nav_h.png differ diff --git a/lib-src/libflac/doc/html/api/open.png b/lib-src/libflac/doc/html/api/open.png new file mode 100644 index 000000000..30f75c7ef Binary files /dev/null and b/lib-src/libflac/doc/html/api/open.png differ diff --git a/lib-src/libflac/doc/html/api/ordinals_8h_source.html b/lib-src/libflac/doc/html/api/ordinals_8h_source.html new file mode 100644 index 000000000..c72444233 --- /dev/null +++ b/lib-src/libflac/doc/html/api/ordinals_8h_source.html @@ -0,0 +1,165 @@ + + + + + + +FLAC: include/FLAC/ordinals.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
ordinals.h
+
+
+
1 /* libFLAC - Free Lossless Audio Codec library
+
2  * Copyright (C) 2000-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLAC__ORDINALS_H
+
34 #define FLAC__ORDINALS_H
+
35 
+
36 #if defined(_MSC_VER) && _MSC_VER < 1600
+
37 
+
38 /* Microsoft Visual Studio earlier than the 2010 version did not provide
+
39  * the 1999 ISO C Standard header file <stdint.h>.
+
40  */
+
41 
+
42 typedef __int8 FLAC__int8;
+
43 typedef unsigned __int8 FLAC__uint8;
+
44 
+
45 typedef __int16 FLAC__int16;
+
46 typedef __int32 FLAC__int32;
+
47 typedef __int64 FLAC__int64;
+
48 typedef unsigned __int16 FLAC__uint16;
+
49 typedef unsigned __int32 FLAC__uint32;
+
50 typedef unsigned __int64 FLAC__uint64;
+
51 
+
52 #else
+
53 
+
54 /* For MSVC 2010 and everything else which provides <stdint.h>. */
+
55 
+
56 #include <stdint.h>
+
57 
+
58 typedef int8_t FLAC__int8;
+
59 typedef uint8_t FLAC__uint8;
+
60 
+
61 typedef int16_t FLAC__int16;
+
62 typedef int32_t FLAC__int32;
+
63 typedef int64_t FLAC__int64;
+
64 typedef uint16_t FLAC__uint16;
+
65 typedef uint32_t FLAC__uint32;
+
66 typedef uint64_t FLAC__uint64;
+
67 
+
68 #endif
+
69 
+
70 typedef int FLAC__bool;
+
71 
+
72 typedef FLAC__uint8 FLAC__byte;
+
73 
+
74 
+
75 #ifdef true
+
76 #undef true
+
77 #endif
+
78 #ifdef false
+
79 #undef false
+
80 #endif
+
81 #ifndef __cplusplus
+
82 #define true 1
+
83 #define false 0
+
84 #endif
+
85 
+
86 #endif
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/stream__decoder_8h.html b/lib-src/libflac/doc/html/api/stream__decoder_8h.html new file mode 100644 index 000000000..71954b391 --- /dev/null +++ b/lib-src/libflac/doc/html/api/stream__decoder_8h.html @@ -0,0 +1,273 @@ + + + + + + +FLAC: include/FLAC/stream_decoder.h File Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+ +
+
stream_decoder.h File Reference
+
+
+
#include <stdio.h>
+#include "export.h"
+#include "format.h"
+
+

Go to the source code of this file.

+ + + + +

+Classes

struct  FLAC__StreamDecoder
 
+ + + + + + + + + + + + + + + + + +

+Typedefs

typedef
+FLAC__StreamDecoderReadStatus(* 
FLAC__StreamDecoderReadCallback )(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
 
typedef
+FLAC__StreamDecoderSeekStatus(* 
FLAC__StreamDecoderSeekCallback )(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
 
typedef
+FLAC__StreamDecoderTellStatus(* 
FLAC__StreamDecoderTellCallback )(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
 
typedef
+FLAC__StreamDecoderLengthStatus(* 
FLAC__StreamDecoderLengthCallback )(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
 
typedef FLAC__bool(* FLAC__StreamDecoderEofCallback )(const FLAC__StreamDecoder *decoder, void *client_data)
 
typedef
+FLAC__StreamDecoderWriteStatus(* 
FLAC__StreamDecoderWriteCallback )(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data)
 
typedef void(* FLAC__StreamDecoderMetadataCallback )(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
 
typedef void(* FLAC__StreamDecoderErrorCallback )(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
 
+ + + + + + + + + + + + + + + + + +

+Enumerations

enum  FLAC__StreamDecoderState {
+  FLAC__STREAM_DECODER_SEARCH_FOR_METADATA = 0, +FLAC__STREAM_DECODER_READ_METADATA, +FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC, +FLAC__STREAM_DECODER_READ_FRAME, +
+  FLAC__STREAM_DECODER_END_OF_STREAM, +FLAC__STREAM_DECODER_OGG_ERROR, +FLAC__STREAM_DECODER_SEEK_ERROR, +FLAC__STREAM_DECODER_ABORTED, +
+  FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR, +FLAC__STREAM_DECODER_UNINITIALIZED +
+ }
 
enum  FLAC__StreamDecoderInitStatus {
+  FLAC__STREAM_DECODER_INIT_STATUS_OK = 0, +FLAC__STREAM_DECODER_INIT_STATUS_UNSUPPORTED_CONTAINER, +FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS, +FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR, +
+  FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE, +FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED +
+ }
 
enum  FLAC__StreamDecoderReadStatus { FLAC__STREAM_DECODER_READ_STATUS_CONTINUE, +FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM, +FLAC__STREAM_DECODER_READ_STATUS_ABORT + }
 
enum  FLAC__StreamDecoderSeekStatus { FLAC__STREAM_DECODER_SEEK_STATUS_OK, +FLAC__STREAM_DECODER_SEEK_STATUS_ERROR, +FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED + }
 
enum  FLAC__StreamDecoderTellStatus { FLAC__STREAM_DECODER_TELL_STATUS_OK, +FLAC__STREAM_DECODER_TELL_STATUS_ERROR, +FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED + }
 
enum  FLAC__StreamDecoderLengthStatus { FLAC__STREAM_DECODER_LENGTH_STATUS_OK, +FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR, +FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED + }
 
enum  FLAC__StreamDecoderWriteStatus { FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE, +FLAC__STREAM_DECODER_WRITE_STATUS_ABORT + }
 
enum  FLAC__StreamDecoderErrorStatus { FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC, +FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER, +FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH, +FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM + }
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Functions

FLAC__StreamDecoderFLAC__stream_decoder_new (void)
 
void FLAC__stream_decoder_delete (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_set_ogg_serial_number (FLAC__StreamDecoder *decoder, long serial_number)
 
FLAC__bool FLAC__stream_decoder_set_md5_checking (FLAC__StreamDecoder *decoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_decoder_set_metadata_respond (FLAC__StreamDecoder *decoder, FLAC__MetadataType type)
 
FLAC__bool FLAC__stream_decoder_set_metadata_respond_application (FLAC__StreamDecoder *decoder, const FLAC__byte id[4])
 
FLAC__bool FLAC__stream_decoder_set_metadata_respond_all (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_set_metadata_ignore (FLAC__StreamDecoder *decoder, FLAC__MetadataType type)
 
FLAC__bool FLAC__stream_decoder_set_metadata_ignore_application (FLAC__StreamDecoder *decoder, const FLAC__byte id[4])
 
FLAC__bool FLAC__stream_decoder_set_metadata_ignore_all (FLAC__StreamDecoder *decoder)
 
FLAC__StreamDecoderState FLAC__stream_decoder_get_state (const FLAC__StreamDecoder *decoder)
 
const char * FLAC__stream_decoder_get_resolved_state_string (const FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_get_md5_checking (const FLAC__StreamDecoder *decoder)
 
FLAC__uint64 FLAC__stream_decoder_get_total_samples (const FLAC__StreamDecoder *decoder)
 
unsigned FLAC__stream_decoder_get_channels (const FLAC__StreamDecoder *decoder)
 
FLAC__ChannelAssignment FLAC__stream_decoder_get_channel_assignment (const FLAC__StreamDecoder *decoder)
 
unsigned FLAC__stream_decoder_get_bits_per_sample (const FLAC__StreamDecoder *decoder)
 
unsigned FLAC__stream_decoder_get_sample_rate (const FLAC__StreamDecoder *decoder)
 
unsigned FLAC__stream_decoder_get_blocksize (const FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_get_decode_position (const FLAC__StreamDecoder *decoder, FLAC__uint64 *position)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_stream (FLAC__StreamDecoder *decoder, FLAC__StreamDecoderReadCallback read_callback, FLAC__StreamDecoderSeekCallback seek_callback, FLAC__StreamDecoderTellCallback tell_callback, FLAC__StreamDecoderLengthCallback length_callback, FLAC__StreamDecoderEofCallback eof_callback, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_stream (FLAC__StreamDecoder *decoder, FLAC__StreamDecoderReadCallback read_callback, FLAC__StreamDecoderSeekCallback seek_callback, FLAC__StreamDecoderTellCallback tell_callback, FLAC__StreamDecoderLengthCallback length_callback, FLAC__StreamDecoderEofCallback eof_callback, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_FILE (FLAC__StreamDecoder *decoder, FILE *file, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_FILE (FLAC__StreamDecoder *decoder, FILE *file, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_file (FLAC__StreamDecoder *decoder, const char *filename, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_file (FLAC__StreamDecoder *decoder, const char *filename, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
 
FLAC__bool FLAC__stream_decoder_finish (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_flush (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_reset (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_process_single (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_process_until_end_of_metadata (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_process_until_end_of_stream (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_skip_single_frame (FLAC__StreamDecoder *decoder)
 
FLAC__bool FLAC__stream_decoder_seek_absolute (FLAC__StreamDecoder *decoder, FLAC__uint64 sample)
 
+ + + + + + + + + + + + + + + + + +

+Variables

const char *const FLAC__StreamDecoderStateString []
 
const char *const FLAC__StreamDecoderInitStatusString []
 
const char *const FLAC__StreamDecoderReadStatusString []
 
const char *const FLAC__StreamDecoderSeekStatusString []
 
const char *const FLAC__StreamDecoderTellStatusString []
 
const char *const FLAC__StreamDecoderLengthStatusString []
 
const char *const FLAC__StreamDecoderWriteStatusString []
 
const char *const FLAC__StreamDecoderErrorStatusString []
 
+

Detailed Description

+

This module contains the functions which implement the stream decoder.

+

See the detailed documentation in the stream decoder module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/stream__decoder_8h_source.html b/lib-src/libflac/doc/html/api/stream__decoder_8h_source.html new file mode 100644 index 000000000..1cf4ac77c --- /dev/null +++ b/lib-src/libflac/doc/html/api/stream__decoder_8h_source.html @@ -0,0 +1,480 @@ + + + + + + +FLAC: include/FLAC/stream_decoder.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
stream_decoder.h
+
+
+Go to the documentation of this file.
1 /* libFLAC - Free Lossless Audio Codec library
+
2  * Copyright (C) 2000-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLAC__STREAM_DECODER_H
+
34 #define FLAC__STREAM_DECODER_H
+
35 
+
36 #include <stdio.h> /* for FILE */
+
37 #include "export.h"
+
38 #include "format.h"
+
39 
+
40 #ifdef __cplusplus
+
41 extern "C" {
+
42 #endif
+
43 
+
44 
+
202 typedef enum {
+
203 
+ + + + + + + + + + + +
245 
+
251 extern FLAC_API const char * const FLAC__StreamDecoderStateString[];
+
252 
+
253 
+
256 typedef enum {
+
257 
+ + + + + + + +
283 
+
289 extern FLAC_API const char * const FLAC__StreamDecoderInitStatusString[];
+
290 
+
291 
+
294 typedef enum {
+
295 
+ + + + +
314 
+
320 extern FLAC_API const char * const FLAC__StreamDecoderReadStatusString[];
+
321 
+
322 
+
325 typedef enum {
+
326 
+ + + + +
337 
+
343 extern FLAC_API const char * const FLAC__StreamDecoderSeekStatusString[];
+
344 
+
345 
+
348 typedef enum {
+
349 
+ + + + +
360 
+
366 extern FLAC_API const char * const FLAC__StreamDecoderTellStatusString[];
+
367 
+
368 
+
371 typedef enum {
+
372 
+ + + + +
383 
+
389 extern FLAC_API const char * const FLAC__StreamDecoderLengthStatusString[];
+
390 
+
391 
+
394 typedef enum {
+
395 
+ + + +
403 
+
409 extern FLAC_API const char * const FLAC__StreamDecoderWriteStatusString[];
+
410 
+
411 
+
427 typedef enum {
+
428 
+ + + + + +
442 
+
448 extern FLAC_API const char * const FLAC__StreamDecoderErrorStatusString[];
+
449 
+
450 
+
451 /***********************************************************************
+
452  *
+
453  * class FLAC__StreamDecoder
+
454  *
+
455  ***********************************************************************/
+
456 
+
457 struct FLAC__StreamDecoderProtected;
+
458 struct FLAC__StreamDecoderPrivate;
+
463 typedef struct {
+
464  struct FLAC__StreamDecoderProtected *protected_; /* avoid the C++ keyword 'protected' */
+
465  struct FLAC__StreamDecoderPrivate *private_; /* avoid the C++ keyword 'private' */
+ +
467 
+
517 typedef FLAC__StreamDecoderReadStatus (*FLAC__StreamDecoderReadCallback)(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
+
518 
+
552 typedef FLAC__StreamDecoderSeekStatus (*FLAC__StreamDecoderSeekCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data);
+
553 
+
590 typedef FLAC__StreamDecoderTellStatus (*FLAC__StreamDecoderTellCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
+
591 
+
628 typedef FLAC__StreamDecoderLengthStatus (*FLAC__StreamDecoderLengthCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data);
+
629 
+
655 typedef FLAC__bool (*FLAC__StreamDecoderEofCallback)(const FLAC__StreamDecoder *decoder, void *client_data);
+
656 
+
683 typedef FLAC__StreamDecoderWriteStatus (*FLAC__StreamDecoderWriteCallback)(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);
+
684 
+
710 typedef void (*FLAC__StreamDecoderMetadataCallback)(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+
711 
+
727 typedef void (*FLAC__StreamDecoderErrorCallback)(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+
728 
+
729 
+
730 /***********************************************************************
+
731  *
+
732  * Class constructor/destructor
+
733  *
+
734  ***********************************************************************/
+
735 
+ +
744 
+
751 FLAC_API void FLAC__stream_decoder_delete(FLAC__StreamDecoder *decoder);
+
752 
+
753 
+
754 /***********************************************************************
+
755  *
+
756  * Public class method prototypes
+
757  *
+
758  ***********************************************************************/
+
759 
+
776 FLAC_API FLAC__bool FLAC__stream_decoder_set_ogg_serial_number(FLAC__StreamDecoder *decoder, long serial_number);
+
777 
+
798 FLAC_API FLAC__bool FLAC__stream_decoder_set_md5_checking(FLAC__StreamDecoder *decoder, FLAC__bool value);
+
799 
+ +
813 
+
827 FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_respond_application(FLAC__StreamDecoder *decoder, const FLAC__byte id[4]);
+
828 
+ +
840 
+ +
854 
+
868 FLAC_API FLAC__bool FLAC__stream_decoder_set_metadata_ignore_application(FLAC__StreamDecoder *decoder, const FLAC__byte id[4]);
+
869 
+ +
881 
+ +
891 
+
900 FLAC_API const char *FLAC__stream_decoder_get_resolved_state_string(const FLAC__StreamDecoder *decoder);
+
901 
+
914 FLAC_API FLAC__bool FLAC__stream_decoder_get_md5_checking(const FLAC__StreamDecoder *decoder);
+
915 
+
926 FLAC_API FLAC__uint64 FLAC__stream_decoder_get_total_samples(const FLAC__StreamDecoder *decoder);
+
927 
+
938 FLAC_API unsigned FLAC__stream_decoder_get_channels(const FLAC__StreamDecoder *decoder);
+
939 
+ +
951 
+
962 FLAC_API unsigned FLAC__stream_decoder_get_bits_per_sample(const FLAC__StreamDecoder *decoder);
+
963 
+
974 FLAC_API unsigned FLAC__stream_decoder_get_sample_rate(const FLAC__StreamDecoder *decoder);
+
975 
+
986 FLAC_API unsigned FLAC__stream_decoder_get_blocksize(const FLAC__StreamDecoder *decoder);
+
987 
+
1007 FLAC_API FLAC__bool FLAC__stream_decoder_get_decode_position(const FLAC__StreamDecoder *decoder, FLAC__uint64 *position);
+
1008 
+ +
1074  FLAC__StreamDecoder *decoder,
+
1075  FLAC__StreamDecoderReadCallback read_callback,
+
1076  FLAC__StreamDecoderSeekCallback seek_callback,
+
1077  FLAC__StreamDecoderTellCallback tell_callback,
+
1078  FLAC__StreamDecoderLengthCallback length_callback,
+
1079  FLAC__StreamDecoderEofCallback eof_callback,
+
1080  FLAC__StreamDecoderWriteCallback write_callback,
+
1081  FLAC__StreamDecoderMetadataCallback metadata_callback,
+
1082  FLAC__StreamDecoderErrorCallback error_callback,
+
1083  void *client_data
+
1084 );
+
1085 
+ +
1155  FLAC__StreamDecoder *decoder,
+
1156  FLAC__StreamDecoderReadCallback read_callback,
+
1157  FLAC__StreamDecoderSeekCallback seek_callback,
+
1158  FLAC__StreamDecoderTellCallback tell_callback,
+
1159  FLAC__StreamDecoderLengthCallback length_callback,
+
1160  FLAC__StreamDecoderEofCallback eof_callback,
+
1161  FLAC__StreamDecoderWriteCallback write_callback,
+
1162  FLAC__StreamDecoderMetadataCallback metadata_callback,
+
1163  FLAC__StreamDecoderErrorCallback error_callback,
+
1164  void *client_data
+
1165 );
+
1166 
+ +
1205  FLAC__StreamDecoder *decoder,
+
1206  FILE *file,
+
1207  FLAC__StreamDecoderWriteCallback write_callback,
+
1208  FLAC__StreamDecoderMetadataCallback metadata_callback,
+
1209  FLAC__StreamDecoderErrorCallback error_callback,
+
1210  void *client_data
+
1211 );
+
1212 
+ +
1255  FLAC__StreamDecoder *decoder,
+
1256  FILE *file,
+
1257  FLAC__StreamDecoderWriteCallback write_callback,
+
1258  FLAC__StreamDecoderMetadataCallback metadata_callback,
+
1259  FLAC__StreamDecoderErrorCallback error_callback,
+
1260  void *client_data
+
1261 );
+
1262 
+ +
1297  FLAC__StreamDecoder *decoder,
+
1298  const char *filename,
+
1299  FLAC__StreamDecoderWriteCallback write_callback,
+
1300  FLAC__StreamDecoderMetadataCallback metadata_callback,
+
1301  FLAC__StreamDecoderErrorCallback error_callback,
+
1302  void *client_data
+
1303 );
+
1304 
+ +
1343  FLAC__StreamDecoder *decoder,
+
1344  const char *filename,
+
1345  FLAC__StreamDecoderWriteCallback write_callback,
+
1346  FLAC__StreamDecoderMetadataCallback metadata_callback,
+
1347  FLAC__StreamDecoderErrorCallback error_callback,
+
1348  void *client_data
+
1349 );
+
1350 
+
1370 FLAC_API FLAC__bool FLAC__stream_decoder_finish(FLAC__StreamDecoder *decoder);
+
1371 
+
1385 FLAC_API FLAC__bool FLAC__stream_decoder_flush(FLAC__StreamDecoder *decoder);
+
1386 
+
1418 FLAC_API FLAC__bool FLAC__stream_decoder_reset(FLAC__StreamDecoder *decoder);
+
1419 
+
1451 FLAC_API FLAC__bool FLAC__stream_decoder_process_single(FLAC__StreamDecoder *decoder);
+
1452 
+ +
1473 
+ +
1494 
+
1534 FLAC_API FLAC__bool FLAC__stream_decoder_skip_single_frame(FLAC__StreamDecoder *decoder);
+
1535 
+
1552 FLAC_API FLAC__bool FLAC__stream_decoder_seek_absolute(FLAC__StreamDecoder *decoder, FLAC__uint64 sample);
+
1553 
+
1554 /* \} */
+
1555 
+
1556 #ifdef __cplusplus
+
1557 }
+
1558 #endif
+
1559 
+
1560 #endif
+
Definition: stream_decoder.h:353
+
Definition: stream_decoder.h:356
+
const char * FLAC__stream_decoder_get_resolved_state_string(const FLAC__StreamDecoder *decoder)
+
Definition: stream_decoder.h:215
+ +
FLAC__bool FLAC__stream_decoder_get_decode_position(const FLAC__StreamDecoder *decoder, FLAC__uint64 *position)
+
Definition: stream_decoder.h:299
+
FLAC__bool FLAC__stream_decoder_set_metadata_respond_all(FLAC__StreamDecoder *decoder)
+ +
Definition: stream_decoder.h:210
+
Definition: stream_decoder.h:204
+
FLAC__ChannelAssignment FLAC__stream_decoder_get_channel_assignment(const FLAC__StreamDecoder *decoder)
+
This module contains #defines and symbols for exporting function calls, and providing version informa...
+
const char *const FLAC__StreamDecoderSeekStatusString[]
+
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_stream(FLAC__StreamDecoder *decoder, FLAC__StreamDecoderReadCallback read_callback, FLAC__StreamDecoderSeekCallback seek_callback, FLAC__StreamDecoderTellCallback tell_callback, FLAC__StreamDecoderLengthCallback length_callback, FLAC__StreamDecoderEofCallback eof_callback, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
+ +
Definition: stream_decoder.h:333
+
Definition: stream_decoder.h:429
+
FLAC__bool FLAC__stream_decoder_set_metadata_respond(FLAC__StreamDecoder *decoder, FLAC__MetadataType type)
+
FLAC__StreamDecoderTellStatus
Definition: stream_decoder.h:348
+
Definition: stream_decoder.h:399
+
const char *const FLAC__StreamDecoderStateString[]
+
Definition: stream_decoder.h:230
+
Definition: stream_decoder.h:218
+
FLAC__StreamDecoderErrorStatus
Definition: stream_decoder.h:427
+
Definition: stream_decoder.h:463
+
Definition: stream_decoder.h:296
+
FLAC__bool FLAC__stream_decoder_set_metadata_ignore(FLAC__StreamDecoder *decoder, FLAC__MetadataType type)
+
void(* FLAC__StreamDecoderMetadataCallback)(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
Definition: stream_decoder.h:710
+
const char *const FLAC__StreamDecoderReadStatusString[]
+
FLAC__bool FLAC__stream_decoder_flush(FLAC__StreamDecoder *decoder)
+
const char *const FLAC__StreamDecoderInitStatusString[]
+
unsigned FLAC__stream_decoder_get_sample_rate(const FLAC__StreamDecoder *decoder)
+
This module contains structure definitions for the representation of FLAC format components in memory...
+ +
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_stream(FLAC__StreamDecoder *decoder, FLAC__StreamDecoderReadCallback read_callback, FLAC__StreamDecoderSeekCallback seek_callback, FLAC__StreamDecoderTellCallback tell_callback, FLAC__StreamDecoderLengthCallback length_callback, FLAC__StreamDecoderEofCallback eof_callback, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
+
FLAC__bool FLAC__stream_decoder_process_single(FLAC__StreamDecoder *decoder)
+
FLAC__bool FLAC__stream_decoder_process_until_end_of_stream(FLAC__StreamDecoder *decoder)
+
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_FILE(FLAC__StreamDecoder *decoder, FILE *file, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
+
Definition: stream_decoder.h:396
+
Definition: stream_decoder.h:258
+
FLAC__bool FLAC__stream_decoder_skip_single_frame(FLAC__StreamDecoder *decoder)
+ +
const char *const FLAC__StreamDecoderErrorStatusString[]
+
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_file(FLAC__StreamDecoder *decoder, const char *filename, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
+
FLAC__StreamDecoderInitStatus
Definition: stream_decoder.h:256
+
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_file(FLAC__StreamDecoder *decoder, const char *filename, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
+
FLAC__StreamDecoderWriteStatus
Definition: stream_decoder.h:394
+ +
FLAC__StreamDecoderLengthStatus(* FLAC__StreamDecoderLengthCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
Definition: stream_decoder.h:628
+
Definition: stream_decoder.h:207
+
Definition: format.h:473
+
FLAC__StreamDecoderSeekStatus(* FLAC__StreamDecoderSeekCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
Definition: stream_decoder.h:552
+
Definition: stream_decoder.h:330
+
Definition: format.h:834
+
const char *const FLAC__StreamDecoderWriteStatusString[]
+
const char *const FLAC__StreamDecoderTellStatusString[]
+
FLAC__uint64 FLAC__stream_decoder_get_total_samples(const FLAC__StreamDecoder *decoder)
+
FLAC__bool(* FLAC__StreamDecoderEofCallback)(const FLAC__StreamDecoder *decoder, void *client_data)
Definition: stream_decoder.h:655
+
Definition: stream_decoder.h:379
+
FLAC__bool FLAC__stream_decoder_seek_absolute(FLAC__StreamDecoder *decoder, FLAC__uint64 sample)
+
Definition: stream_decoder.h:224
+
void FLAC__stream_decoder_delete(FLAC__StreamDecoder *decoder)
+
FLAC__bool FLAC__stream_decoder_finish(FLAC__StreamDecoder *decoder)
+
FLAC__bool FLAC__stream_decoder_set_md5_checking(FLAC__StreamDecoder *decoder, FLAC__bool value)
+
FLAC__bool FLAC__stream_decoder_set_ogg_serial_number(FLAC__StreamDecoder *decoder, long serial_number)
+
FLAC__StreamDecoderWriteStatus(* FLAC__StreamDecoderWriteCallback)(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer[], void *client_data)
Definition: stream_decoder.h:683
+
FLAC__MetadataType
Definition: format.h:489
+
Definition: stream_decoder.h:233
+
FLAC__bool FLAC__stream_decoder_set_metadata_ignore_application(FLAC__StreamDecoder *decoder, const FLAC__byte id[4])
+
FLAC__bool FLAC__stream_decoder_get_md5_checking(const FLAC__StreamDecoder *decoder)
+
void(* FLAC__StreamDecoderErrorCallback)(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
Definition: stream_decoder.h:727
+
FLAC__StreamDecoderState FLAC__stream_decoder_get_state(const FLAC__StreamDecoder *decoder)
+
FLAC__StreamDecoderReadStatus
Definition: stream_decoder.h:294
+
FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_ogg_FILE(FLAC__StreamDecoder *decoder, FILE *file, FLAC__StreamDecoderWriteCallback write_callback, FLAC__StreamDecoderMetadataCallback metadata_callback, FLAC__StreamDecoderErrorCallback error_callback, void *client_data)
+
Definition: stream_decoder.h:432
+
FLAC__bool FLAC__stream_decoder_set_metadata_respond_application(FLAC__StreamDecoder *decoder, const FLAC__byte id[4])
+
FLAC__bool FLAC__stream_decoder_process_until_end_of_metadata(FLAC__StreamDecoder *decoder)
+
FLAC__StreamDecoderState
Definition: stream_decoder.h:202
+
FLAC__StreamDecoderReadStatus(* FLAC__StreamDecoderReadCallback)(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
Definition: stream_decoder.h:517
+
Definition: stream_decoder.h:373
+
FLAC__StreamDecoderLengthStatus
Definition: stream_decoder.h:371
+
FLAC__ChannelAssignment
Definition: format.h:381
+
unsigned FLAC__stream_decoder_get_bits_per_sample(const FLAC__StreamDecoder *decoder)
+
Definition: stream_decoder.h:327
+
Definition: stream_decoder.h:238
+
unsigned FLAC__stream_decoder_get_blocksize(const FLAC__StreamDecoder *decoder)
+
const char *const FLAC__StreamDecoderLengthStatusString[]
+
FLAC__StreamDecoderTellStatus(* FLAC__StreamDecoderTellCallback)(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
Definition: stream_decoder.h:590
+
unsigned FLAC__stream_decoder_get_channels(const FLAC__StreamDecoder *decoder)
+
FLAC__bool FLAC__stream_decoder_set_metadata_ignore_all(FLAC__StreamDecoder *decoder)
+ +
FLAC__bool FLAC__stream_decoder_reset(FLAC__StreamDecoder *decoder)
+
Definition: stream_decoder.h:376
+
Definition: stream_decoder.h:221
+
Definition: stream_decoder.h:310
+
FLAC__StreamDecoderSeekStatus
Definition: stream_decoder.h:325
+
FLAC__StreamDecoder * FLAC__stream_decoder_new(void)
+
Definition: stream_decoder.h:350
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/stream__encoder_8h.html b/lib-src/libflac/doc/html/api/stream__encoder_8h.html new file mode 100644 index 000000000..13730adbe --- /dev/null +++ b/lib-src/libflac/doc/html/api/stream__encoder_8h.html @@ -0,0 +1,302 @@ + + + + + + +FLAC: include/FLAC/stream_encoder.h File Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+ +
+
stream_encoder.h File Reference
+
+
+
#include <stdio.h>
+#include "export.h"
+#include "format.h"
+#include "stream_decoder.h"
+
+

Go to the source code of this file.

+ + + + +

+Classes

struct  FLAC__StreamEncoder
 
+ + + + + + + + + + + + + +

+Typedefs

typedef
+FLAC__StreamEncoderReadStatus(* 
FLAC__StreamEncoderReadCallback )(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
 
typedef
+FLAC__StreamEncoderWriteStatus(* 
FLAC__StreamEncoderWriteCallback )(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
 
typedef
+FLAC__StreamEncoderSeekStatus(* 
FLAC__StreamEncoderSeekCallback )(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
 
typedef
+FLAC__StreamEncoderTellStatus(* 
FLAC__StreamEncoderTellCallback )(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
 
typedef void(* FLAC__StreamEncoderMetadataCallback )(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data)
 
typedef void(* FLAC__StreamEncoderProgressCallback )(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data)
 
+ + + + + + + + + + + + + +

+Enumerations

enum  FLAC__StreamEncoderState {
+  FLAC__STREAM_ENCODER_OK = 0, +FLAC__STREAM_ENCODER_UNINITIALIZED, +FLAC__STREAM_ENCODER_OGG_ERROR, +FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR, +
+  FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA, +FLAC__STREAM_ENCODER_CLIENT_ERROR, +FLAC__STREAM_ENCODER_IO_ERROR, +FLAC__STREAM_ENCODER_FRAMING_ERROR, +
+  FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR +
+ }
 
enum  FLAC__StreamEncoderInitStatus {
+  FLAC__STREAM_ENCODER_INIT_STATUS_OK = 0, +FLAC__STREAM_ENCODER_INIT_STATUS_ENCODER_ERROR, +FLAC__STREAM_ENCODER_INIT_STATUS_UNSUPPORTED_CONTAINER, +FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_CALLBACKS, +
+  FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_NUMBER_OF_CHANNELS, +FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE, +FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE, +FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BLOCK_SIZE, +
+  FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_MAX_LPC_ORDER, +FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_QLP_COEFF_PRECISION, +FLAC__STREAM_ENCODER_INIT_STATUS_BLOCK_SIZE_TOO_SMALL_FOR_LPC_ORDER, +FLAC__STREAM_ENCODER_INIT_STATUS_NOT_STREAMABLE, +
+  FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_METADATA, +FLAC__STREAM_ENCODER_INIT_STATUS_ALREADY_INITIALIZED +
+ }
 
enum  FLAC__StreamEncoderReadStatus { FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE, +FLAC__STREAM_ENCODER_READ_STATUS_END_OF_STREAM, +FLAC__STREAM_ENCODER_READ_STATUS_ABORT, +FLAC__STREAM_ENCODER_READ_STATUS_UNSUPPORTED + }
 
enum  FLAC__StreamEncoderWriteStatus { FLAC__STREAM_ENCODER_WRITE_STATUS_OK = 0, +FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR + }
 
enum  FLAC__StreamEncoderSeekStatus { FLAC__STREAM_ENCODER_SEEK_STATUS_OK, +FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR, +FLAC__STREAM_ENCODER_SEEK_STATUS_UNSUPPORTED + }
 
enum  FLAC__StreamEncoderTellStatus { FLAC__STREAM_ENCODER_TELL_STATUS_OK, +FLAC__STREAM_ENCODER_TELL_STATUS_ERROR, +FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED + }
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Functions

FLAC__StreamEncoderFLAC__stream_encoder_new (void)
 
void FLAC__stream_encoder_delete (FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_set_ogg_serial_number (FLAC__StreamEncoder *encoder, long serial_number)
 
FLAC__bool FLAC__stream_encoder_set_verify (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_streamable_subset (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_channels (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_bits_per_sample (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_sample_rate (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_compression_level (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_blocksize (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_do_mid_side_stereo (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_apodization (FLAC__StreamEncoder *encoder, const char *specification)
 
FLAC__bool FLAC__stream_encoder_set_max_lpc_order (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_qlp_coeff_precision (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_do_qlp_coeff_prec_search (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_do_escape_coding (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_do_exhaustive_model_search (FLAC__StreamEncoder *encoder, FLAC__bool value)
 
FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_rice_parameter_search_dist (FLAC__StreamEncoder *encoder, unsigned value)
 
FLAC__bool FLAC__stream_encoder_set_total_samples_estimate (FLAC__StreamEncoder *encoder, FLAC__uint64 value)
 
FLAC__bool FLAC__stream_encoder_set_metadata (FLAC__StreamEncoder *encoder, FLAC__StreamMetadata **metadata, unsigned num_blocks)
 
FLAC__StreamEncoderState FLAC__stream_encoder_get_state (const FLAC__StreamEncoder *encoder)
 
FLAC__StreamDecoderState FLAC__stream_encoder_get_verify_decoder_state (const FLAC__StreamEncoder *encoder)
 
const char * FLAC__stream_encoder_get_resolved_state_string (const FLAC__StreamEncoder *encoder)
 
void FLAC__stream_encoder_get_verify_decoder_error_stats (const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got)
 
FLAC__bool FLAC__stream_encoder_get_verify (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_streamable_subset (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_channels (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_bits_per_sample (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_sample_rate (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_blocksize (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_do_mid_side_stereo (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_loose_mid_side_stereo (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_max_lpc_order (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_qlp_coeff_precision (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_do_qlp_coeff_prec_search (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_do_escape_coding (const FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_get_do_exhaustive_model_search (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_min_residual_partition_order (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_max_residual_partition_order (const FLAC__StreamEncoder *encoder)
 
unsigned FLAC__stream_encoder_get_rice_parameter_search_dist (const FLAC__StreamEncoder *encoder)
 
FLAC__uint64 FLAC__stream_encoder_get_total_samples_estimate (const FLAC__StreamEncoder *encoder)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_stream (FLAC__StreamEncoder *encoder, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_stream (FLAC__StreamEncoder *encoder, FLAC__StreamEncoderReadCallback read_callback, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_FILE (FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_FILE (FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_file (FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
 
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_file (FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
 
FLAC__bool FLAC__stream_encoder_finish (FLAC__StreamEncoder *encoder)
 
FLAC__bool FLAC__stream_encoder_process (FLAC__StreamEncoder *encoder, const FLAC__int32 *const buffer[], unsigned samples)
 
FLAC__bool FLAC__stream_encoder_process_interleaved (FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], unsigned samples)
 
+ + + + + + + + + + + + + +

+Variables

const char *const FLAC__StreamEncoderStateString []
 
const char *const FLAC__StreamEncoderInitStatusString []
 
const char *const FLAC__StreamEncoderReadStatusString []
 
const char *const FLAC__StreamEncoderWriteStatusString []
 
const char *const FLAC__StreamEncoderSeekStatusString []
 
const char *const FLAC__StreamEncoderTellStatusString []
 
+

Detailed Description

+

This module contains the functions which implement the stream encoder.

+

See the detailed documentation in the stream encoder module.

+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/stream__encoder_8h_source.html b/lib-src/libflac/doc/html/api/stream__encoder_8h_source.html new file mode 100644 index 000000000..27314c660 --- /dev/null +++ b/lib-src/libflac/doc/html/api/stream__encoder_8h_source.html @@ -0,0 +1,465 @@ + + + + + + +FLAC: include/FLAC/stream_encoder.h Source File + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + + +
+
+
+
stream_encoder.h
+
+
+Go to the documentation of this file.
1 /* libFLAC - Free Lossless Audio Codec library
+
2  * Copyright (C) 2000-2009 Josh Coalson
+
3  * Copyright (C) 2011-2014 Xiph.Org Foundation
+
4  *
+
5  * Redistribution and use in source and binary forms, with or without
+
6  * modification, are permitted provided that the following conditions
+
7  * are met:
+
8  *
+
9  * - Redistributions of source code must retain the above copyright
+
10  * notice, this list of conditions and the following disclaimer.
+
11  *
+
12  * - Redistributions in binary form must reproduce the above copyright
+
13  * notice, this list of conditions and the following disclaimer in the
+
14  * documentation and/or other materials provided with the distribution.
+
15  *
+
16  * - Neither the name of the Xiph.org Foundation nor the names of its
+
17  * contributors may be used to endorse or promote products derived from
+
18  * this software without specific prior written permission.
+
19  *
+
20  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+
21  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+
22  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+
23  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+
24  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+
25  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+
26  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+
27  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+
28  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+
29  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+
30  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
31  */
+
32 
+
33 #ifndef FLAC__STREAM_ENCODER_H
+
34 #define FLAC__STREAM_ENCODER_H
+
35 
+
36 #include <stdio.h> /* for FILE */
+
37 #include "export.h"
+
38 #include "format.h"
+
39 #include "stream_decoder.h"
+
40 
+
41 #ifdef __cplusplus
+
42 extern "C" {
+
43 #endif
+
44 
+
45 
+
241 typedef enum {
+
242 
+ + + + + + + + + + +
282 
+
288 extern FLAC_API const char * const FLAC__StreamEncoderStateString[];
+
289 
+
290 
+
293 typedef enum {
+
294 
+ + + + + + + + + + + + + + + +
352 
+
358 extern FLAC_API const char * const FLAC__StreamEncoderInitStatusString[];
+
359 
+
360 
+
363 typedef enum {
+
364 
+ + + + + +
378 
+
384 extern FLAC_API const char * const FLAC__StreamEncoderReadStatusString[];
+
385 
+
386 
+
389 typedef enum {
+
390 
+ + + +
398 
+
404 extern FLAC_API const char * const FLAC__StreamEncoderWriteStatusString[];
+
405 
+
406 
+
409 typedef enum {
+
410 
+ + + + +
421 
+
427 extern FLAC_API const char * const FLAC__StreamEncoderSeekStatusString[];
+
428 
+
429 
+
432 typedef enum {
+
433 
+ + + + +
444 
+
450 extern FLAC_API const char * const FLAC__StreamEncoderTellStatusString[];
+
451 
+
452 
+
453 /***********************************************************************
+
454  *
+
455  * class FLAC__StreamEncoder
+
456  *
+
457  ***********************************************************************/
+
458 
+
459 struct FLAC__StreamEncoderProtected;
+
460 struct FLAC__StreamEncoderPrivate;
+
465 typedef struct {
+
466  struct FLAC__StreamEncoderProtected *protected_; /* avoid the C++ keyword 'protected' */
+
467  struct FLAC__StreamEncoderPrivate *private_; /* avoid the C++ keyword 'private' */
+ +
469 
+
519 typedef FLAC__StreamEncoderReadStatus (*FLAC__StreamEncoderReadCallback)(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data);
+
520 
+
557 typedef FLAC__StreamEncoderWriteStatus (*FLAC__StreamEncoderWriteCallback)(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data);
+
558 
+
591 typedef FLAC__StreamEncoderSeekStatus (*FLAC__StreamEncoderSeekCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data);
+
592 
+
636 typedef FLAC__StreamEncoderTellStatus (*FLAC__StreamEncoderTellCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
+
637 
+
655 typedef void (*FLAC__StreamEncoderMetadataCallback)(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data);
+
656 
+
678 typedef void (*FLAC__StreamEncoderProgressCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data);
+
679 
+
680 
+
681 /***********************************************************************
+
682  *
+
683  * Class constructor/destructor
+
684  *
+
685  ***********************************************************************/
+
686 
+ +
695 
+
702 FLAC_API void FLAC__stream_encoder_delete(FLAC__StreamEncoder *encoder);
+
703 
+
704 
+
705 /***********************************************************************
+
706  *
+
707  * Public class method prototypes
+
708  *
+
709  ***********************************************************************/
+
710 
+
728 FLAC_API FLAC__bool FLAC__stream_encoder_set_ogg_serial_number(FLAC__StreamEncoder *encoder, long serial_number);
+
729 
+
744 FLAC_API FLAC__bool FLAC__stream_encoder_set_verify(FLAC__StreamEncoder *encoder, FLAC__bool value);
+
745 
+
762 FLAC_API FLAC__bool FLAC__stream_encoder_set_streamable_subset(FLAC__StreamEncoder *encoder, FLAC__bool value);
+
763 
+
774 FLAC_API FLAC__bool FLAC__stream_encoder_set_channels(FLAC__StreamEncoder *encoder, unsigned value);
+
775 
+
790 FLAC_API FLAC__bool FLAC__stream_encoder_set_bits_per_sample(FLAC__StreamEncoder *encoder, unsigned value);
+
791 
+
802 FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *encoder, unsigned value);
+
803 
+
865 FLAC_API FLAC__bool FLAC__stream_encoder_set_compression_level(FLAC__StreamEncoder *encoder, unsigned value);
+
866 
+
880 FLAC_API FLAC__bool FLAC__stream_encoder_set_blocksize(FLAC__StreamEncoder *encoder, unsigned value);
+
881 
+
894 FLAC_API FLAC__bool FLAC__stream_encoder_set_do_mid_side_stereo(FLAC__StreamEncoder *encoder, FLAC__bool value);
+
895 
+
910 FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamEncoder *encoder, FLAC__bool value);
+
911 
+
976 FLAC_API FLAC__bool FLAC__stream_encoder_set_apodization(FLAC__StreamEncoder *encoder, const char *specification);
+
977 
+
988 FLAC_API FLAC__bool FLAC__stream_encoder_set_max_lpc_order(FLAC__StreamEncoder *encoder, unsigned value);
+
989 
+
1006 FLAC_API FLAC__bool FLAC__stream_encoder_set_qlp_coeff_precision(FLAC__StreamEncoder *encoder, unsigned value);
+
1007 
+
1020 FLAC_API FLAC__bool FLAC__stream_encoder_set_do_qlp_coeff_prec_search(FLAC__StreamEncoder *encoder, FLAC__bool value);
+
1021 
+
1032 FLAC_API FLAC__bool FLAC__stream_encoder_set_do_escape_coding(FLAC__StreamEncoder *encoder, FLAC__bool value);
+
1033 
+
1046 FLAC_API FLAC__bool FLAC__stream_encoder_set_do_exhaustive_model_search(FLAC__StreamEncoder *encoder, FLAC__bool value);
+
1047 
+
1069 FLAC_API FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order(FLAC__StreamEncoder *encoder, unsigned value);
+
1070 
+
1092 FLAC_API FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order(FLAC__StreamEncoder *encoder, unsigned value);
+
1093 
+
1104 FLAC_API FLAC__bool FLAC__stream_encoder_set_rice_parameter_search_dist(FLAC__StreamEncoder *encoder, unsigned value);
+
1105 
+
1120 FLAC_API FLAC__bool FLAC__stream_encoder_set_total_samples_estimate(FLAC__StreamEncoder *encoder, FLAC__uint64 value);
+
1121 
+
1203 FLAC_API FLAC__bool FLAC__stream_encoder_set_metadata(FLAC__StreamEncoder *encoder, FLAC__StreamMetadata **metadata, unsigned num_blocks);
+
1204 
+ +
1214 
+ +
1226 
+
1238 FLAC_API const char *FLAC__stream_encoder_get_resolved_state_string(const FLAC__StreamEncoder *encoder);
+
1239 
+
1257 FLAC_API void FLAC__stream_encoder_get_verify_decoder_error_stats(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got);
+
1258 
+
1267 FLAC_API FLAC__bool FLAC__stream_encoder_get_verify(const FLAC__StreamEncoder *encoder);
+
1268 
+
1277 FLAC_API FLAC__bool FLAC__stream_encoder_get_streamable_subset(const FLAC__StreamEncoder *encoder);
+
1278 
+
1287 FLAC_API unsigned FLAC__stream_encoder_get_channels(const FLAC__StreamEncoder *encoder);
+
1288 
+
1297 FLAC_API unsigned FLAC__stream_encoder_get_bits_per_sample(const FLAC__StreamEncoder *encoder);
+
1298 
+
1307 FLAC_API unsigned FLAC__stream_encoder_get_sample_rate(const FLAC__StreamEncoder *encoder);
+
1308 
+
1317 FLAC_API unsigned FLAC__stream_encoder_get_blocksize(const FLAC__StreamEncoder *encoder);
+
1318 
+
1327 FLAC_API FLAC__bool FLAC__stream_encoder_get_do_mid_side_stereo(const FLAC__StreamEncoder *encoder);
+
1328 
+
1337 FLAC_API FLAC__bool FLAC__stream_encoder_get_loose_mid_side_stereo(const FLAC__StreamEncoder *encoder);
+
1338 
+
1347 FLAC_API unsigned FLAC__stream_encoder_get_max_lpc_order(const FLAC__StreamEncoder *encoder);
+
1348 
+
1357 FLAC_API unsigned FLAC__stream_encoder_get_qlp_coeff_precision(const FLAC__StreamEncoder *encoder);
+
1358 
+ +
1368 
+
1377 FLAC_API FLAC__bool FLAC__stream_encoder_get_do_escape_coding(const FLAC__StreamEncoder *encoder);
+
1378 
+ +
1388 
+ +
1398 
+ +
1408 
+ +
1418 
+
1430 FLAC_API FLAC__uint64 FLAC__stream_encoder_get_total_samples_estimate(const FLAC__StreamEncoder *encoder);
+
1431 
+ +
1494 
+ +
1562 
+
1596 FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_FILE(FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
+
1597 
+
1631 FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_FILE(FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
+
1632 
+
1663 FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_file(FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
+
1664 
+
1695 FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_file(FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data);
+
1696 
+
1723 FLAC_API FLAC__bool FLAC__stream_encoder_finish(FLAC__StreamEncoder *encoder);
+
1724 
+
1750 FLAC_API FLAC__bool FLAC__stream_encoder_process(FLAC__StreamEncoder *encoder, const FLAC__int32 * const buffer[], unsigned samples);
+
1751 
+
1782 FLAC_API FLAC__bool FLAC__stream_encoder_process_interleaved(FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], unsigned samples);
+
1783 
+
1784 /* \} */
+
1785 
+
1786 #ifdef __cplusplus
+
1787 }
+
1788 #endif
+
1789 
+
1790 #endif
+
FLAC__bool FLAC__stream_encoder_get_do_mid_side_stereo(const FLAC__StreamEncoder *encoder)
+
Definition: stream_encoder.h:368
+
unsigned FLAC__stream_encoder_get_rice_parameter_search_dist(const FLAC__StreamEncoder *encoder)
+ +
FLAC__bool FLAC__stream_encoder_set_metadata(FLAC__StreamEncoder *encoder, FLAC__StreamMetadata **metadata, unsigned num_blocks)
+
FLAC__bool FLAC__stream_encoder_get_do_qlp_coeff_prec_search(const FLAC__StreamEncoder *encoder)
+
unsigned FLAC__stream_encoder_get_sample_rate(const FLAC__StreamEncoder *encoder)
+
Definition: stream_encoder.h:265
+
void(* FLAC__StreamEncoderMetadataCallback)(const FLAC__StreamEncoder *encoder, const FLAC__StreamMetadata *metadata, void *client_data)
Definition: stream_encoder.h:655
+
FLAC__StreamEncoderTellStatus
Definition: stream_encoder.h:432
+
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_stream(FLAC__StreamEncoder *encoder, FLAC__StreamEncoderReadCallback read_callback, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data)
+
const char *const FLAC__StreamEncoderSeekStatusString[]
+
FLAC__StreamEncoder * FLAC__stream_encoder_new(void)
+
Definition: stream_encoder.h:252
+
Definition: stream_encoder.h:414
+
FLAC__bool FLAC__stream_encoder_set_min_residual_partition_order(FLAC__StreamEncoder *encoder, unsigned value)
+
This module contains #defines and symbols for exporting function calls, and providing version informa...
+
Definition: stream_encoder.h:333
+
unsigned FLAC__stream_encoder_get_min_residual_partition_order(const FLAC__StreamEncoder *encoder)
+
unsigned FLAC__stream_encoder_get_channels(const FLAC__StreamEncoder *encoder)
+
FLAC__bool FLAC__stream_encoder_get_verify(const FLAC__StreamEncoder *encoder)
+
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_file(FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
+
FLAC__bool FLAC__stream_encoder_set_max_lpc_order(FLAC__StreamEncoder *encoder, unsigned value)
+
FLAC__bool FLAC__stream_encoder_get_loose_mid_side_stereo(const FLAC__StreamEncoder *encoder)
+
Definition: stream_encoder.h:278
+
unsigned FLAC__stream_encoder_get_max_residual_partition_order(const FLAC__StreamEncoder *encoder)
+
FLAC__StreamEncoderSeekStatus
Definition: stream_encoder.h:409
+
Definition: stream_encoder.h:295
+
unsigned FLAC__stream_encoder_get_qlp_coeff_precision(const FLAC__StreamEncoder *encoder)
+ + +
FLAC__bool FLAC__stream_encoder_set_rice_parameter_search_dist(FLAC__StreamEncoder *encoder, unsigned value)
+
FLAC__bool FLAC__stream_encoder_set_qlp_coeff_precision(FLAC__StreamEncoder *encoder, unsigned value)
+ +
FLAC__bool FLAC__stream_encoder_set_apodization(FLAC__StreamEncoder *encoder, const char *specification)
+
FLAC__bool FLAC__stream_encoder_set_compression_level(FLAC__StreamEncoder *encoder, unsigned value)
+
FLAC__bool FLAC__stream_encoder_process(FLAC__StreamEncoder *encoder, const FLAC__int32 *const buffer[], unsigned samples)
+
FLAC__StreamEncoderReadStatus(* FLAC__StreamEncoderReadCallback)(const FLAC__StreamEncoder *encoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
Definition: stream_encoder.h:519
+
const char *const FLAC__StreamEncoderWriteStatusString[]
+
Definition: stream_encoder.h:246
+
Definition: stream_encoder.h:365
+
This module contains structure definitions for the representation of FLAC format components in memory...
+
unsigned FLAC__stream_encoder_get_max_lpc_order(const FLAC__StreamEncoder *encoder)
+
FLAC__bool FLAC__stream_encoder_set_total_samples_estimate(FLAC__StreamEncoder *encoder, FLAC__uint64 value)
+ +
FLAC__bool FLAC__stream_encoder_set_blocksize(FLAC__StreamEncoder *encoder, unsigned value)
+
unsigned FLAC__stream_encoder_get_blocksize(const FLAC__StreamEncoder *encoder)
+
Definition: stream_encoder.h:394
+
FLAC__bool FLAC__stream_encoder_set_do_qlp_coeff_prec_search(FLAC__StreamEncoder *encoder, FLAC__bool value)
+
FLAC__StreamEncoderReadStatus
Definition: stream_encoder.h:363
+
FLAC__bool FLAC__stream_encoder_get_do_escape_coding(const FLAC__StreamEncoder *encoder)
+
Definition: stream_encoder.h:411
+
void FLAC__stream_encoder_get_verify_decoder_error_stats(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_sample, unsigned *frame_number, unsigned *channel, unsigned *sample, FLAC__int32 *expected, FLAC__int32 *got)
+
FLAC__StreamEncoderState
Definition: stream_encoder.h:241
+
FLAC__bool FLAC__stream_encoder_set_do_exhaustive_model_search(FLAC__StreamEncoder *encoder, FLAC__bool value)
+
Definition: stream_encoder.h:273
+
Definition: stream_encoder.h:391
+
FLAC__bool FLAC__stream_encoder_process_interleaved(FLAC__StreamEncoder *encoder, const FLAC__int32 buffer[], unsigned samples)
+
Definition: stream_encoder.h:255
+
const char * FLAC__stream_encoder_get_resolved_state_string(const FLAC__StreamEncoder *encoder)
+
FLAC__uint64 FLAC__stream_encoder_get_total_samples_estimate(const FLAC__StreamEncoder *encoder)
+
FLAC__bool FLAC__stream_encoder_set_do_escape_coding(FLAC__StreamEncoder *encoder, FLAC__bool value)
+
Definition: format.h:834
+
FLAC__StreamEncoderSeekStatus(* FLAC__StreamEncoderSeekCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
Definition: stream_encoder.h:591
+
void FLAC__stream_encoder_delete(FLAC__StreamEncoder *encoder)
+
Definition: stream_encoder.h:371
+
Definition: stream_encoder.h:374
+
FLAC__bool FLAC__stream_encoder_set_max_residual_partition_order(FLAC__StreamEncoder *encoder, unsigned value)
+
FLAC__bool FLAC__stream_encoder_get_do_exhaustive_model_search(const FLAC__StreamEncoder *encoder)
+ +
const char *const FLAC__StreamEncoderInitStatusString[]
+
Definition: stream_encoder.h:437
+ +
Definition: stream_encoder.h:243
+
unsigned FLAC__stream_encoder_get_bits_per_sample(const FLAC__StreamEncoder *encoder)
+ +
FLAC__bool FLAC__stream_encoder_set_bits_per_sample(FLAC__StreamEncoder *encoder, unsigned value)
+
FLAC__bool FLAC__stream_encoder_set_streamable_subset(FLAC__StreamEncoder *encoder, FLAC__bool value)
+
Definition: stream_encoder.h:440
+
FLAC__StreamDecoderState FLAC__stream_encoder_get_verify_decoder_state(const FLAC__StreamEncoder *encoder)
+
Definition: stream_encoder.h:298
+
FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *encoder, unsigned value)
+
Definition: stream_encoder.h:268
+
Definition: stream_encoder.h:434
+
FLAC__StreamDecoderState
Definition: stream_decoder.h:202
+
const char *const FLAC__StreamEncoderTellStatusString[]
+ +
FLAC__StreamEncoderInitStatus
Definition: stream_encoder.h:293
+
void(* FLAC__StreamEncoderProgressCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data)
Definition: stream_encoder.h:678
+
FLAC__bool FLAC__stream_encoder_finish(FLAC__StreamEncoder *encoder)
+
FLAC__bool FLAC__stream_encoder_set_verify(FLAC__StreamEncoder *encoder, FLAC__bool value)
+
FLAC__StreamEncoderWriteStatus
Definition: stream_encoder.h:389
+
Definition: stream_encoder.h:417
+
FLAC__StreamEncoderWriteStatus(* FLAC__StreamEncoderWriteCallback)(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
Definition: stream_encoder.h:557
+
FLAC__bool FLAC__stream_encoder_set_do_mid_side_stereo(FLAC__StreamEncoder *encoder, FLAC__bool value)
+
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_ogg_FILE(FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
+
FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamEncoder *encoder, FLAC__bool value)
+
FLAC__bool FLAC__stream_encoder_set_ogg_serial_number(FLAC__StreamEncoder *encoder, long serial_number)
+
Definition: stream_encoder.h:465
+
FLAC__bool FLAC__stream_encoder_set_channels(FLAC__StreamEncoder *encoder, unsigned value)
+
const char *const FLAC__StreamEncoderStateString[]
+
FLAC__StreamEncoderTellStatus(* FLAC__StreamEncoderTellCallback)(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
Definition: stream_encoder.h:636
+ +
const char *const FLAC__StreamEncoderReadStatusString[]
+ +
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_file(FLAC__StreamEncoder *encoder, const char *filename, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
+
FLAC__bool FLAC__stream_encoder_get_streamable_subset(const FLAC__StreamEncoder *encoder)
+
FLAC__StreamEncoderState FLAC__stream_encoder_get_state(const FLAC__StreamEncoder *encoder)
+ +
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_FILE(FLAC__StreamEncoder *encoder, FILE *file, FLAC__StreamEncoderProgressCallback progress_callback, void *client_data)
+
FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_stream(FLAC__StreamEncoder *encoder, FLAC__StreamEncoderWriteCallback write_callback, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderTellCallback tell_callback, FLAC__StreamEncoderMetadataCallback metadata_callback, void *client_data)
+
This module contains the functions which implement the stream decoder.
+
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod-members.html b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod-members.html new file mode 100644 index 000000000..a171d4c0a --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod-members.html @@ -0,0 +1,83 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__EntropyCodingMethod Member List
+
+
+ +

This is the complete list of members for FLAC__EntropyCodingMethod, including all inherited members.

+ + + + +
data (defined in FLAC__EntropyCodingMethod)FLAC__EntropyCodingMethod
partitioned_rice (defined in FLAC__EntropyCodingMethod)FLAC__EntropyCodingMethod
type (defined in FLAC__EntropyCodingMethod)FLAC__EntropyCodingMethod
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod.html b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod.html new file mode 100644 index 000000000..da5fd23d2 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod.html @@ -0,0 +1,101 @@ + + + + + + +FLAC: FLAC__EntropyCodingMethod Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__EntropyCodingMethod Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + + +

+Public Attributes

+FLAC__EntropyCodingMethodType type
 
+union {
+   FLAC__EntropyCodingMethod_PartitionedRice   partitioned_rice
 
data
 
+

Detailed Description

+

Header for the entropy coding method. (c.f. format specification)

+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html new file mode 100644 index 000000000..4490cf9d0 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html @@ -0,0 +1,82 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__EntropyCodingMethod_PartitionedRice Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html new file mode 100644 index 000000000..24ff88ecd --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html @@ -0,0 +1,123 @@ + + + + + + +FLAC: FLAC__EntropyCodingMethod_PartitionedRice Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__EntropyCodingMethod_PartitionedRice Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + +

+Public Attributes

unsigned order
 
const
+FLAC__EntropyCodingMethod_PartitionedRiceContents
contents
 
+

Detailed Description

+

Header for a Rice partitioned residual. (c.f. format specification)

+

Member Data Documentation

+ +
+
+ + + + +
unsigned FLAC__EntropyCodingMethod_PartitionedRice::order
+
+

The partition order, i.e. # of contexts = 2 ^ order.

+ +
+
+ +
+
+ + + + +
const FLAC__EntropyCodingMethod_PartitionedRiceContents* FLAC__EntropyCodingMethod_PartitionedRice::contents
+
+

The context's Rice parameters and/or raw bits.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html new file mode 100644 index 000000000..256e237d4 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html @@ -0,0 +1,83 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__EntropyCodingMethod_PartitionedRiceContents Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html new file mode 100644 index 000000000..620b3b97c --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html @@ -0,0 +1,137 @@ + + + + + + +FLAC: FLAC__EntropyCodingMethod_PartitionedRiceContents Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__EntropyCodingMethod_PartitionedRiceContents Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + +

+Public Attributes

unsigned * parameters
 
unsigned * raw_bits
 
unsigned capacity_by_order
 
+

Detailed Description

+

Contents of a Rice partitioned residual

+

Member Data Documentation

+ +
+
+ + + + +
unsigned* FLAC__EntropyCodingMethod_PartitionedRiceContents::parameters
+
+

The Rice parameters for each context.

+ +
+
+ +
+
+ + + + +
unsigned* FLAC__EntropyCodingMethod_PartitionedRiceContents::raw_bits
+
+

Widths for escape-coded partitions. Will be non-zero for escaped partitions and zero for unescaped partitions.

+ +
+
+ +
+
+ + + + +
unsigned FLAC__EntropyCodingMethod_PartitionedRiceContents::capacity_by_order
+
+

The capacity of the parameters and raw_bits arrays specified as an order, i.e. the number of array elements allocated is 2 ^ capacity_by_order.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Frame-members.html b/lib-src/libflac/doc/html/api/structFLAC____Frame-members.html new file mode 100644 index 000000000..53ec7a971 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Frame-members.html @@ -0,0 +1,83 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__Frame Member List
+
+
+ +

This is the complete list of members for FLAC__Frame, including all inherited members.

+ + + + +
footer (defined in FLAC__Frame)FLAC__Frame
header (defined in FLAC__Frame)FLAC__Frame
subframes (defined in FLAC__Frame)FLAC__Frame
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Frame.html b/lib-src/libflac/doc/html/api/structFLAC____Frame.html new file mode 100644 index 000000000..14bd970ad --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Frame.html @@ -0,0 +1,100 @@ + + + + + + +FLAC: FLAC__Frame Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+ +
+ +

#include <format.h>

+ + + + + + + + +

+Public Attributes

+FLAC__FrameHeader header
 
+FLAC__Subframe subframes [FLAC__MAX_CHANNELS]
 
+FLAC__FrameFooter footer
 
+

Detailed Description

+

FLAC frame structure. (c.f. format specification)

+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____FrameFooter-members.html b/lib-src/libflac/doc/html/api/structFLAC____FrameFooter-members.html new file mode 100644 index 000000000..11f08bdbf --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____FrameFooter-members.html @@ -0,0 +1,81 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__FrameFooter Member List
+
+
+ +

This is the complete list of members for FLAC__FrameFooter, including all inherited members.

+ + +
crcFLAC__FrameFooter
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____FrameFooter.html b/lib-src/libflac/doc/html/api/structFLAC____FrameFooter.html new file mode 100644 index 000000000..ff2273992 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____FrameFooter.html @@ -0,0 +1,107 @@ + + + + + + +FLAC: FLAC__FrameFooter Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__FrameFooter Struct Reference
+
+
+ +

#include <format.h>

+ + + + +

+Public Attributes

FLAC__uint16 crc
 
+

Detailed Description

+

FLAC frame footer structure. (c.f. format specification)

+

Member Data Documentation

+ +
+
+ + + + +
FLAC__uint16 FLAC__FrameFooter::crc
+
+

CRC-16 (polynomial = x^16 + x^15 + x^2 + x^0, initialized with 0) of the bytes before the crc, back to and including the frame header sync code.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____FrameHeader-members.html b/lib-src/libflac/doc/html/api/structFLAC____FrameHeader-members.html new file mode 100644 index 000000000..0ab83e2f7 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____FrameHeader-members.html @@ -0,0 +1,90 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__FrameHeader Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____FrameHeader.html b/lib-src/libflac/doc/html/api/structFLAC____FrameHeader.html new file mode 100644 index 000000000..65e20dbfb --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____FrameHeader.html @@ -0,0 +1,219 @@ + + + + + + +FLAC: FLAC__FrameHeader Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__FrameHeader Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + + + + + + + + + + + + + + + + +

+Public Attributes

unsigned blocksize
 
unsigned sample_rate
 
unsigned channels
 
FLAC__ChannelAssignment channel_assignment
 
unsigned bits_per_sample
 
FLAC__FrameNumberType number_type
 
union {
+   FLAC__uint32   frame_number
 
+   FLAC__uint64   sample_number
 
number
 
FLAC__uint8 crc
 
+

Detailed Description

+

FLAC frame header structure. (c.f. format specification)

+

Member Data Documentation

+ +
+
+ + + + +
unsigned FLAC__FrameHeader::blocksize
+
+

The number of samples per subframe.

+ +
+
+ +
+
+ + + + +
unsigned FLAC__FrameHeader::sample_rate
+
+

The sample rate in Hz.

+ +
+
+ +
+
+ + + + +
unsigned FLAC__FrameHeader::channels
+
+

The number of channels (== number of subframes).

+ +
+
+ +
+
+ + + + +
FLAC__ChannelAssignment FLAC__FrameHeader::channel_assignment
+
+

The channel assignment for the frame.

+ +
+
+ +
+
+ + + + +
unsigned FLAC__FrameHeader::bits_per_sample
+
+

The sample resolution.

+ +
+
+ +
+
+ + + + +
FLAC__FrameNumberType FLAC__FrameHeader::number_type
+
+

The numbering scheme used for the frame. As a convenience, the decoder will always convert a frame number to a sample number because the rules are complex.

+ +
+
+ +
+
+ + + + +
union { ... } FLAC__FrameHeader::number
+
+

The frame number or sample number of first sample in frame; use the number_type value to determine which to use.

+ +
+
+ +
+
+ + + + +
FLAC__uint8 FLAC__FrameHeader::crc
+
+

CRC-8 (polynomial = x^8 + x^2 + x^1 + x^0, initialized with 0) of the raw frame header bytes, meaning everything before the CRC byte including the sync code.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____IOCallbacks-members.html b/lib-src/libflac/doc/html/api/structFLAC____IOCallbacks-members.html new file mode 100644 index 000000000..fc3ef20fd --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____IOCallbacks-members.html @@ -0,0 +1,86 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__IOCallbacks Member List
+
+
+ +

This is the complete list of members for FLAC__IOCallbacks, including all inherited members.

+ + + + + + + +
close (defined in FLAC__IOCallbacks)FLAC__IOCallbacks
eof (defined in FLAC__IOCallbacks)FLAC__IOCallbacks
read (defined in FLAC__IOCallbacks)FLAC__IOCallbacks
seek (defined in FLAC__IOCallbacks)FLAC__IOCallbacks
tell (defined in FLAC__IOCallbacks)FLAC__IOCallbacks
write (defined in FLAC__IOCallbacks)FLAC__IOCallbacks
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____IOCallbacks.html b/lib-src/libflac/doc/html/api/structFLAC____IOCallbacks.html new file mode 100644 index 000000000..3e556245b --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____IOCallbacks.html @@ -0,0 +1,110 @@ + + + + + + +FLAC: FLAC__IOCallbacks Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+ +
+ +

#include <callback.h>

+ + + + + + + + + + + + + + +

+Public Attributes

+FLAC__IOCallback_Read read
 
+FLAC__IOCallback_Write write
 
+FLAC__IOCallback_Seek seek
 
+FLAC__IOCallback_Tell tell
 
+FLAC__IOCallback_Eof eof
 
+FLAC__IOCallback_Close close
 
+

Detailed Description

+

A structure for holding a set of callbacks. Each FLAC interface that requires a FLAC__IOCallbacks structure will describe which of the callbacks are required. The ones that are not required may be set to NULL.

+

If the seek requirement for an interface is optional, you can signify that a data sorce is not seekable by setting the seek field to NULL.

+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamDecoder-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamDecoder-members.html new file mode 100644 index 000000000..464d8d02b --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamDecoder-members.html @@ -0,0 +1,82 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamDecoder Member List
+
+
+ +

This is the complete list of members for FLAC__StreamDecoder, including all inherited members.

+ + + +
private_ (defined in FLAC__StreamDecoder)FLAC__StreamDecoder
protected_ (defined in FLAC__StreamDecoder)FLAC__StreamDecoder
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamDecoder.html b/lib-src/libflac/doc/html/api/structFLAC____StreamDecoder.html new file mode 100644 index 000000000..1d5ffb1d4 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamDecoder.html @@ -0,0 +1,98 @@ + + + + + + +FLAC: FLAC__StreamDecoder Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+ +
+ +

#include <stream_decoder.h>

+ + + + + + +

+Public Attributes

+struct
+FLAC__StreamDecoderProtected * 
protected_
 
+struct FLAC__StreamDecoderPrivate * private_
 
+

Detailed Description

+

The opaque structure definition for the stream decoder type. See the stream decoder module for a detailed description.

+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamEncoder-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamEncoder-members.html new file mode 100644 index 000000000..6bd272ddd --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamEncoder-members.html @@ -0,0 +1,82 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamEncoder Member List
+
+
+ +

This is the complete list of members for FLAC__StreamEncoder, including all inherited members.

+ + + +
private_ (defined in FLAC__StreamEncoder)FLAC__StreamEncoder
protected_ (defined in FLAC__StreamEncoder)FLAC__StreamEncoder
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamEncoder.html b/lib-src/libflac/doc/html/api/structFLAC____StreamEncoder.html new file mode 100644 index 000000000..d3e5b8e1d --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamEncoder.html @@ -0,0 +1,98 @@ + + + + + + +FLAC: FLAC__StreamEncoder Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+ +
+ +

#include <stream_encoder.h>

+ + + + + + +

+Public Attributes

+struct
+FLAC__StreamEncoderProtected * 
protected_
 
+struct FLAC__StreamEncoderPrivate * private_
 
+

Detailed Description

+

The opaque structure definition for the stream encoder type. See the stream encoder module for a detailed description.

+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata-members.html new file mode 100644 index 000000000..b95cbd1ef --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata-members.html @@ -0,0 +1,92 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata Member List
+
+
+ +

This is the complete list of members for FLAC__StreamMetadata, including all inherited members.

+ + + + + + + + + + + + + +
application (defined in FLAC__StreamMetadata)FLAC__StreamMetadata
cue_sheet (defined in FLAC__StreamMetadata)FLAC__StreamMetadata
dataFLAC__StreamMetadata
is_lastFLAC__StreamMetadata
lengthFLAC__StreamMetadata
padding (defined in FLAC__StreamMetadata)FLAC__StreamMetadata
picture (defined in FLAC__StreamMetadata)FLAC__StreamMetadata
seek_table (defined in FLAC__StreamMetadata)FLAC__StreamMetadata
stream_info (defined in FLAC__StreamMetadata)FLAC__StreamMetadata
typeFLAC__StreamMetadata
unknown (defined in FLAC__StreamMetadata)FLAC__StreamMetadata
vorbis_comment (defined in FLAC__StreamMetadata)FLAC__StreamMetadata
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata.html new file mode 100644 index 000000000..8a0e4dffe --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata.html @@ -0,0 +1,177 @@ + + + + + + +FLAC: FLAC__StreamMetadata Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +

+Public Attributes

FLAC__MetadataType type
 
FLAC__bool is_last
 
unsigned length
 
union {
+   FLAC__StreamMetadata_StreamInfo   stream_info
 
+   FLAC__StreamMetadata_Padding   padding
 
+   FLAC__StreamMetadata_Application   application
 
+   FLAC__StreamMetadata_SeekTable   seek_table
 
+   FLAC__StreamMetadata_VorbisComment   vorbis_comment
 
+   FLAC__StreamMetadata_CueSheet   cue_sheet
 
+   FLAC__StreamMetadata_Picture   picture
 
+   FLAC__StreamMetadata_Unknown   unknown
 
data
 
+

Detailed Description

+

FLAC metadata block structure. (c.f. format specification)

+

Member Data Documentation

+ +
+
+ + + + +
FLAC__MetadataType FLAC__StreamMetadata::type
+
+

The type of the metadata block; used determine which member of the data union to dereference. If type >= FLAC__METADATA_TYPE_UNDEFINED then data.unknown must be used.

+ +
+
+ +
+
+ + + + +
FLAC__bool FLAC__StreamMetadata::is_last
+
+

true if this metadata block is the last, else false

+ +
+
+ +
+
+ + + + +
unsigned FLAC__StreamMetadata::length
+
+

Length, in bytes, of the block data as it appears in the stream.

+ +
+
+ +
+
+ + + + +
union { ... } FLAC__StreamMetadata::data
+
+

Polymorphic block data; use the type value to determine which to use.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Application-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Application-members.html new file mode 100644 index 000000000..6368212bd --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Application-members.html @@ -0,0 +1,82 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_Application Member List
+
+
+ +

This is the complete list of members for FLAC__StreamMetadata_Application, including all inherited members.

+ + + +
data (defined in FLAC__StreamMetadata_Application)FLAC__StreamMetadata_Application
id (defined in FLAC__StreamMetadata_Application)FLAC__StreamMetadata_Application
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Application.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Application.html new file mode 100644 index 000000000..cd5676824 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Application.html @@ -0,0 +1,97 @@ + + + + + + +FLAC: FLAC__StreamMetadata_Application Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_Application Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + +

+Public Attributes

+FLAC__byte id [4]
 
+FLAC__byte * data
 
+

Detailed Description

+

FLAC APPLICATION structure. (c.f. format specification)

+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet-members.html new file mode 100644 index 000000000..e152d9218 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet-members.html @@ -0,0 +1,85 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_CueSheet Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet.html new file mode 100644 index 000000000..a28820690 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet.html @@ -0,0 +1,167 @@ + + + + + + +FLAC: FLAC__StreamMetadata_CueSheet Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_CueSheet Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + + + + + +

+Public Attributes

char media_catalog_number [129]
 
FLAC__uint64 lead_in
 
FLAC__bool is_cd
 
unsigned num_tracks
 
FLAC__StreamMetadata_CueSheet_Tracktracks
 
+

Detailed Description

+

FLAC CUESHEET structure. (See the format specification for the full description of each field.)

+

Member Data Documentation

+ +
+
+ + + + +
char FLAC__StreamMetadata_CueSheet::media_catalog_number[129]
+
+

Media catalog number, in ASCII printable characters 0x20-0x7e. In general, the media catalog number may be 0 to 128 bytes long; any unused characters should be right-padded with NUL characters.

+ +
+
+ +
+
+ + + + +
FLAC__uint64 FLAC__StreamMetadata_CueSheet::lead_in
+
+

The number of lead-in samples.

+ +
+
+ +
+
+ + + + +
FLAC__bool FLAC__StreamMetadata_CueSheet::is_cd
+
+

true if CUESHEET corresponds to a Compact Disc, else false.

+ +
+
+ +
+
+ + + + +
unsigned FLAC__StreamMetadata_CueSheet::num_tracks
+
+

The number of tracks.

+ +
+
+ +
+
+ + + + +
FLAC__StreamMetadata_CueSheet_Track* FLAC__StreamMetadata_CueSheet::tracks
+
+

NULL if num_tracks == 0, else pointer to array of tracks.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html new file mode 100644 index 000000000..04bc41e8a --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html @@ -0,0 +1,82 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_CueSheet_Index Member List
+
+
+ +

This is the complete list of members for FLAC__StreamMetadata_CueSheet_Index, including all inherited members.

+ + + +
numberFLAC__StreamMetadata_CueSheet_Index
offsetFLAC__StreamMetadata_CueSheet_Index
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index.html new file mode 100644 index 000000000..3621f1417 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Index.html @@ -0,0 +1,122 @@ + + + + + + +FLAC: FLAC__StreamMetadata_CueSheet_Index Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_CueSheet_Index Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + +

+Public Attributes

FLAC__uint64 offset
 
FLAC__byte number
 
+

Detailed Description

+

FLAC CUESHEET track index structure. (See the format specification for the full description of each field.)

+

Member Data Documentation

+ +
+
+ + + + +
FLAC__uint64 FLAC__StreamMetadata_CueSheet_Index::offset
+
+

Offset in samples, relative to the track offset, of the index point.

+ +
+
+ +
+
+ + + + +
FLAC__byte FLAC__StreamMetadata_CueSheet_Index::number
+
+

The index point number.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html new file mode 100644 index 000000000..4551246d2 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html @@ -0,0 +1,87 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_CueSheet_Track Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track.html new file mode 100644 index 000000000..f22c4a22c --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__CueSheet__Track.html @@ -0,0 +1,197 @@ + + + + + + +FLAC: FLAC__StreamMetadata_CueSheet_Track Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_CueSheet_Track Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + + + + + + + + + +

+Public Attributes

FLAC__uint64 offset
 
FLAC__byte number
 
char isrc [13]
 
unsigned type:1
 
unsigned pre_emphasis:1
 
FLAC__byte num_indices
 
FLAC__StreamMetadata_CueSheet_Indexindices
 
+

Detailed Description

+

FLAC CUESHEET track structure. (See the format specification for the full description of each field.)

+

Member Data Documentation

+ +
+
+ + + + +
FLAC__uint64 FLAC__StreamMetadata_CueSheet_Track::offset
+
+

Track offset in samples, relative to the beginning of the FLAC audio stream.

+ +
+
+ +
+
+ + + + +
FLAC__byte FLAC__StreamMetadata_CueSheet_Track::number
+
+

The track number.

+ +
+
+ +
+
+ + + + +
char FLAC__StreamMetadata_CueSheet_Track::isrc[13]
+
+

Track ISRC. This is a 12-digit alphanumeric code plus a trailing NUL byte

+ +
+
+ +
+
+ + + + +
unsigned FLAC__StreamMetadata_CueSheet_Track::type
+
+

The track type: 0 for audio, 1 for non-audio.

+ +
+
+ +
+
+ + + + +
unsigned FLAC__StreamMetadata_CueSheet_Track::pre_emphasis
+
+

The pre-emphasis flag: 0 for no pre-emphasis, 1 for pre-emphasis.

+ +
+
+ +
+
+ + + + +
FLAC__byte FLAC__StreamMetadata_CueSheet_Track::num_indices
+
+

The number of track index points.

+ +
+
+ +
+
+ + + + +
FLAC__StreamMetadata_CueSheet_Index* FLAC__StreamMetadata_CueSheet_Track::indices
+
+

NULL if num_indices == 0, else pointer to array of index points.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Padding-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Padding-members.html new file mode 100644 index 000000000..a591c2382 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Padding-members.html @@ -0,0 +1,81 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_Padding Member List
+
+
+ +

This is the complete list of members for FLAC__StreamMetadata_Padding, including all inherited members.

+ + +
dummyFLAC__StreamMetadata_Padding
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Padding.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Padding.html new file mode 100644 index 000000000..9905b1be6 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Padding.html @@ -0,0 +1,107 @@ + + + + + + +FLAC: FLAC__StreamMetadata_Padding Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_Padding Struct Reference
+
+
+ +

#include <format.h>

+ + + + +

+Public Attributes

int dummy
 
+

Detailed Description

+

FLAC PADDING structure. (c.f. format specification)

+

Member Data Documentation

+ +
+
+ + + + +
int FLAC__StreamMetadata_Padding::dummy
+
+

Conceptually this is an empty struct since we don't store the padding bytes. Empty structs are not allowed by some C compilers, hence the dummy.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Picture-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Picture-members.html new file mode 100644 index 000000000..cc11abb42 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Picture-members.html @@ -0,0 +1,89 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_Picture Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Picture.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Picture.html new file mode 100644 index 000000000..db9154b6e --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Picture.html @@ -0,0 +1,227 @@ + + + + + + +FLAC: FLAC__StreamMetadata_Picture Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_Picture Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + + + + + + + + + + + + + +

+Public Attributes

FLAC__StreamMetadata_Picture_Type type
 
char * mime_type
 
FLAC__byte * description
 
FLAC__uint32 width
 
FLAC__uint32 height
 
FLAC__uint32 depth
 
FLAC__uint32 colors
 
FLAC__uint32 data_length
 
FLAC__byte * data
 
+

Detailed Description

+

FLAC PICTURE structure. (See the format specification for the full description of each field.)

+

Member Data Documentation

+ +
+
+ + + + +
FLAC__StreamMetadata_Picture_Type FLAC__StreamMetadata_Picture::type
+
+

The kind of picture stored.

+ +
+
+ +
+
+ + + + +
char* FLAC__StreamMetadata_Picture::mime_type
+
+

Picture data's MIME type, in ASCII printable characters 0x20-0x7e, NUL terminated. For best compatibility with players, use picture data of MIME type image/jpeg or image/png. A MIME type of '–>' is also allowed, in which case the picture data should be a complete URL. In file storage, the MIME type is stored as a 32-bit length followed by the ASCII string with no NUL terminator, but is converted to a plain C string in this structure for convenience.

+ +
+
+ +
+
+ + + + +
FLAC__byte* FLAC__StreamMetadata_Picture::description
+
+

Picture's description in UTF-8, NUL terminated. In file storage, the description is stored as a 32-bit length followed by the UTF-8 string with no NUL terminator, but is converted to a plain C string in this structure for convenience.

+ +
+
+ +
+
+ + + + +
FLAC__uint32 FLAC__StreamMetadata_Picture::width
+
+

Picture's width in pixels.

+ +
+
+ +
+
+ + + + +
FLAC__uint32 FLAC__StreamMetadata_Picture::height
+
+

Picture's height in pixels.

+ +
+
+ +
+
+ + + + +
FLAC__uint32 FLAC__StreamMetadata_Picture::depth
+
+

Picture's color depth in bits-per-pixel.

+ +
+
+ +
+
+ + + + +
FLAC__uint32 FLAC__StreamMetadata_Picture::colors
+
+

For indexed palettes (like GIF), picture's number of colors (the number of palette entries), or 0 for non-indexed (i.e. 2^depth).

+ +
+
+ +
+
+ + + + +
FLAC__uint32 FLAC__StreamMetadata_Picture::data_length
+
+

Length of binary picture data in bytes.

+ +
+
+ +
+
+ + + + +
FLAC__byte* FLAC__StreamMetadata_Picture::data
+
+

Binary picture data.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint-members.html new file mode 100644 index 000000000..7b588cc22 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint-members.html @@ -0,0 +1,83 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_SeekPoint Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint.html new file mode 100644 index 000000000..838fcaa10 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekPoint.html @@ -0,0 +1,137 @@ + + + + + + +FLAC: FLAC__StreamMetadata_SeekPoint Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_SeekPoint Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + +

+Public Attributes

FLAC__uint64 sample_number
 
FLAC__uint64 stream_offset
 
unsigned frame_samples
 
+

Detailed Description

+

SeekPoint structure used in SEEKTABLE blocks. (c.f. format specification)

+

Member Data Documentation

+ +
+
+ + + + +
FLAC__uint64 FLAC__StreamMetadata_SeekPoint::sample_number
+
+

The sample number of the target frame.

+ +
+
+ +
+
+ + + + +
FLAC__uint64 FLAC__StreamMetadata_SeekPoint::stream_offset
+
+

The offset, in bytes, of the target frame with respect to beginning of the first frame.

+ +
+
+ +
+
+ + + + +
unsigned FLAC__StreamMetadata_SeekPoint::frame_samples
+
+

The number of samples in the target frame.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable-members.html new file mode 100644 index 000000000..8bad112d0 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable-members.html @@ -0,0 +1,82 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_SeekTable Member List
+
+
+ +

This is the complete list of members for FLAC__StreamMetadata_SeekTable, including all inherited members.

+ + + +
num_points (defined in FLAC__StreamMetadata_SeekTable)FLAC__StreamMetadata_SeekTable
points (defined in FLAC__StreamMetadata_SeekTable)FLAC__StreamMetadata_SeekTable
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable.html new file mode 100644 index 000000000..95181f8e5 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__SeekTable.html @@ -0,0 +1,105 @@ + + + + + + +FLAC: FLAC__StreamMetadata_SeekTable Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_SeekTable Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + +

+Public Attributes

+unsigned num_points
 
+FLAC__StreamMetadata_SeekPointpoints
 
+

Detailed Description

+

FLAC SEEKTABLE structure. (c.f. format specification)

+
Note
From the format specification:
    +
  • The seek points must be sorted by ascending sample number.
  • +
  • Each seek point's sample number must be the first sample of the target frame.
  • +
  • Each seek point's sample number must be unique within the table.
  • +
  • Existence of a SEEKTABLE block implies a correct setting of total_samples in the stream_info block.
  • +
  • Behavior is undefined when more than one SEEKTABLE block is present in a stream.
  • +
+
+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo-members.html new file mode 100644 index 000000000..8a2e4eb94 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo-members.html @@ -0,0 +1,89 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_StreamInfo Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo.html new file mode 100644 index 000000000..264e51058 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__StreamInfo.html @@ -0,0 +1,118 @@ + + + + + + +FLAC: FLAC__StreamMetadata_StreamInfo Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_StreamInfo Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + + + + + + + + + + + + + +

+Public Attributes

+unsigned min_blocksize
 
+unsigned max_blocksize
 
+unsigned min_framesize
 
+unsigned max_framesize
 
+unsigned sample_rate
 
+unsigned channels
 
+unsigned bits_per_sample
 
+FLAC__uint64 total_samples
 
+FLAC__byte md5sum [16]
 
+

Detailed Description

+

FLAC STREAMINFO structure. (c.f. format specification)

+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown-members.html new file mode 100644 index 000000000..61bef5f42 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown-members.html @@ -0,0 +1,81 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_Unknown Member List
+
+
+ +

This is the complete list of members for FLAC__StreamMetadata_Unknown, including all inherited members.

+ + +
data (defined in FLAC__StreamMetadata_Unknown)FLAC__StreamMetadata_Unknown
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown.html new file mode 100644 index 000000000..a315d5367 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__Unknown.html @@ -0,0 +1,94 @@ + + + + + + +FLAC: FLAC__StreamMetadata_Unknown Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_Unknown Struct Reference
+
+
+ +

#include <format.h>

+ + + + +

+Public Attributes

+FLAC__byte * data
 
+

Detailed Description

+

Structure that is used when a metadata block of unknown type is loaded. The contents are opaque. The structure is used only internally to correctly handle unknown metadata.

+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment-members.html new file mode 100644 index 000000000..f6f36fed0 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment-members.html @@ -0,0 +1,83 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_VorbisComment Member List
+
+
+ +

This is the complete list of members for FLAC__StreamMetadata_VorbisComment, including all inherited members.

+ + + + +
comments (defined in FLAC__StreamMetadata_VorbisComment)FLAC__StreamMetadata_VorbisComment
num_comments (defined in FLAC__StreamMetadata_VorbisComment)FLAC__StreamMetadata_VorbisComment
vendor_string (defined in FLAC__StreamMetadata_VorbisComment)FLAC__StreamMetadata_VorbisComment
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment.html new file mode 100644 index 000000000..7b8b9ea62 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment.html @@ -0,0 +1,100 @@ + + + + + + +FLAC: FLAC__StreamMetadata_VorbisComment Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_VorbisComment Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + +

+Public Attributes

+FLAC__StreamMetadata_VorbisComment_Entry vendor_string
 
+FLAC__uint32 num_comments
 
+FLAC__StreamMetadata_VorbisComment_Entrycomments
 
+

Detailed Description

+

FLAC VORBIS_COMMENT structure. (c.f. format specification)

+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html new file mode 100644 index 000000000..e4d3dc44c --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html @@ -0,0 +1,82 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__StreamMetadata_VorbisComment_Entry Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html new file mode 100644 index 000000000..6b4983af2 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html @@ -0,0 +1,98 @@ + + + + + + +FLAC: FLAC__StreamMetadata_VorbisComment_Entry Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__StreamMetadata_VorbisComment_Entry Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + +

+Public Attributes

+FLAC__uint32 length
 
+FLAC__byte * entry
 
+

Detailed Description

+

Vorbis comment entry structure used in VORBIS_COMMENT blocks. (c.f. format specification)

+

For convenience, the APIs maintain a trailing NUL character at the end of entry which is not counted toward length, i.e.

strlen(entry) == length
+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Subframe-members.html b/lib-src/libflac/doc/html/api/structFLAC____Subframe-members.html new file mode 100644 index 000000000..e879ddeec --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Subframe-members.html @@ -0,0 +1,87 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__Subframe Member List
+
+
+ +

This is the complete list of members for FLAC__Subframe, including all inherited members.

+ + + + + + + + +
constant (defined in FLAC__Subframe)FLAC__Subframe
data (defined in FLAC__Subframe)FLAC__Subframe
fixed (defined in FLAC__Subframe)FLAC__Subframe
lpc (defined in FLAC__Subframe)FLAC__Subframe
type (defined in FLAC__Subframe)FLAC__Subframe
verbatim (defined in FLAC__Subframe)FLAC__Subframe
wasted_bits (defined in FLAC__Subframe)FLAC__Subframe
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Subframe.html b/lib-src/libflac/doc/html/api/structFLAC____Subframe.html new file mode 100644 index 000000000..9c8a9243a --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Subframe.html @@ -0,0 +1,113 @@ + + + + + + +FLAC: FLAC__Subframe Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+ +
+ +

#include <format.h>

+ + + + + + + + + + + + + + + + + +

+Public Attributes

+FLAC__SubframeType type
 
+union {
+   FLAC__Subframe_Constant   constant
 
+   FLAC__Subframe_Fixed   fixed
 
+   FLAC__Subframe_LPC   lpc
 
+   FLAC__Subframe_Verbatim   verbatim
 
data
 
+unsigned wasted_bits
 
+

Detailed Description

+

FLAC subframe structure. (c.f. format specification)

+

The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Subframe__Constant-members.html b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Constant-members.html new file mode 100644 index 000000000..5073cd43a --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Constant-members.html @@ -0,0 +1,81 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__Subframe_Constant Member List
+
+
+ +

This is the complete list of members for FLAC__Subframe_Constant, including all inherited members.

+ + +
valueFLAC__Subframe_Constant
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Subframe__Constant.html b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Constant.html new file mode 100644 index 000000000..7f14bc134 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Constant.html @@ -0,0 +1,107 @@ + + + + + + +FLAC: FLAC__Subframe_Constant Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__Subframe_Constant Struct Reference
+
+
+ +

#include <format.h>

+ + + + +

+Public Attributes

FLAC__int32 value
 
+

Detailed Description

+

CONSTANT subframe. (c.f. format specification)

+

Member Data Documentation

+ +
+
+ + + + +
FLAC__int32 FLAC__Subframe_Constant::value
+
+

The constant signal value.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Subframe__Fixed-members.html b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Fixed-members.html new file mode 100644 index 000000000..bad53a824 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Fixed-members.html @@ -0,0 +1,84 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__Subframe_Fixed Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Subframe__Fixed.html b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Fixed.html new file mode 100644 index 000000000..1f0eed34c --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Fixed.html @@ -0,0 +1,152 @@ + + + + + + +FLAC: FLAC__Subframe_Fixed Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__Subframe_Fixed Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + + + +

+Public Attributes

FLAC__EntropyCodingMethod entropy_coding_method
 
unsigned order
 
FLAC__int32 warmup [FLAC__MAX_FIXED_ORDER]
 
const FLAC__int32 * residual
 
+

Detailed Description

+

FIXED subframe. (c.f. format specification)

+

Member Data Documentation

+ +
+
+ + + + +
FLAC__EntropyCodingMethod FLAC__Subframe_Fixed::entropy_coding_method
+
+

The residual coding method.

+ +
+
+ +
+
+ + + + +
unsigned FLAC__Subframe_Fixed::order
+
+

The polynomial order.

+ +
+
+ +
+
+ + + + +
FLAC__int32 FLAC__Subframe_Fixed::warmup[FLAC__MAX_FIXED_ORDER]
+
+

Warmup samples to prime the predictor, length == order.

+ +
+
+ +
+
+ + + + +
const FLAC__int32* FLAC__Subframe_Fixed::residual
+
+

The residual signal, length == (blocksize minus order) samples.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Subframe__LPC-members.html b/lib-src/libflac/doc/html/api/structFLAC____Subframe__LPC-members.html new file mode 100644 index 000000000..c25ce63b9 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Subframe__LPC-members.html @@ -0,0 +1,87 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__Subframe_LPC Member List
+
+ + +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Subframe__LPC.html b/lib-src/libflac/doc/html/api/structFLAC____Subframe__LPC.html new file mode 100644 index 000000000..e44e5b0cf --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Subframe__LPC.html @@ -0,0 +1,197 @@ + + + + + + +FLAC: FLAC__Subframe_LPC Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__Subframe_LPC Struct Reference
+
+
+ +

#include <format.h>

+ + + + + + + + + + + + + + + + +

+Public Attributes

FLAC__EntropyCodingMethod entropy_coding_method
 
unsigned order
 
unsigned qlp_coeff_precision
 
int quantization_level
 
FLAC__int32 qlp_coeff [FLAC__MAX_LPC_ORDER]
 
FLAC__int32 warmup [FLAC__MAX_LPC_ORDER]
 
const FLAC__int32 * residual
 
+

Detailed Description

+

LPC subframe. (c.f. format specification)

+

Member Data Documentation

+ +
+
+ + + + +
FLAC__EntropyCodingMethod FLAC__Subframe_LPC::entropy_coding_method
+
+

The residual coding method.

+ +
+
+ +
+
+ + + + +
unsigned FLAC__Subframe_LPC::order
+
+

The FIR order.

+ +
+
+ +
+
+ + + + +
unsigned FLAC__Subframe_LPC::qlp_coeff_precision
+
+

Quantized FIR filter coefficient precision in bits.

+ +
+
+ +
+
+ + + + +
int FLAC__Subframe_LPC::quantization_level
+
+

The qlp coeff shift needed.

+ +
+
+ +
+
+ + + + +
FLAC__int32 FLAC__Subframe_LPC::qlp_coeff[FLAC__MAX_LPC_ORDER]
+
+

FIR filter coefficients.

+ +
+
+ +
+
+ + + + +
FLAC__int32 FLAC__Subframe_LPC::warmup[FLAC__MAX_LPC_ORDER]
+
+

Warmup samples to prime the predictor, length == order.

+ +
+
+ +
+
+ + + + +
const FLAC__int32* FLAC__Subframe_LPC::residual
+
+

The residual signal, length == (blocksize minus order) samples.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Subframe__Verbatim-members.html b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Verbatim-members.html new file mode 100644 index 000000000..f5f0bd108 --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Verbatim-members.html @@ -0,0 +1,81 @@ + + + + + + +FLAC: Member List + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+
+
FLAC__Subframe_Verbatim Member List
+
+
+ +

This is the complete list of members for FLAC__Subframe_Verbatim, including all inherited members.

+ + +
dataFLAC__Subframe_Verbatim
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/structFLAC____Subframe__Verbatim.html b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Verbatim.html new file mode 100644 index 000000000..1a1266e2e --- /dev/null +++ b/lib-src/libflac/doc/html/api/structFLAC____Subframe__Verbatim.html @@ -0,0 +1,107 @@ + + + + + + +FLAC: FLAC__Subframe_Verbatim Struct Reference + + + + + + +
+
+ + + + + + +
+
FLAC +  1.3.1 +
+
+
+ + + + +
+
+ +
+
FLAC__Subframe_Verbatim Struct Reference
+
+
+ +

#include <format.h>

+ + + + +

+Public Attributes

const FLAC__int32 * data
 
+

Detailed Description

+

VERBATIM subframe. (c.f. format specification)

+

Member Data Documentation

+ +
+
+ + + + +
const FLAC__int32* FLAC__Subframe_Verbatim::data
+
+

A pointer to verbatim signal.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+ + + + + + + + + + diff --git a/lib-src/libflac/doc/html/api/sync_off.png b/lib-src/libflac/doc/html/api/sync_off.png new file mode 100644 index 000000000..3b443fc62 Binary files /dev/null and b/lib-src/libflac/doc/html/api/sync_off.png differ diff --git a/lib-src/libflac/doc/html/api/sync_on.png b/lib-src/libflac/doc/html/api/sync_on.png new file mode 100644 index 000000000..e08320fb6 Binary files /dev/null and b/lib-src/libflac/doc/html/api/sync_on.png differ diff --git a/lib-src/libflac/doc/html/api/tab_a.png b/lib-src/libflac/doc/html/api/tab_a.png new file mode 100644 index 000000000..3b725c41c Binary files /dev/null and b/lib-src/libflac/doc/html/api/tab_a.png differ diff --git a/lib-src/libflac/doc/html/api/tab_b.png b/lib-src/libflac/doc/html/api/tab_b.png new file mode 100644 index 000000000..e2b4a8638 Binary files /dev/null and b/lib-src/libflac/doc/html/api/tab_b.png differ diff --git a/lib-src/libflac/doc/html/api/tab_h.png b/lib-src/libflac/doc/html/api/tab_h.png new file mode 100644 index 000000000..fd5cb7054 Binary files /dev/null and b/lib-src/libflac/doc/html/api/tab_h.png differ diff --git a/lib-src/libflac/doc/html/api/tab_s.png b/lib-src/libflac/doc/html/api/tab_s.png new file mode 100644 index 000000000..ab478c95b Binary files /dev/null and b/lib-src/libflac/doc/html/api/tab_s.png differ diff --git a/lib-src/libflac/doc/html/api/tabs.css b/lib-src/libflac/doc/html/api/tabs.css new file mode 100644 index 000000000..9cf578f23 --- /dev/null +++ b/lib-src/libflac/doc/html/api/tabs.css @@ -0,0 +1,60 @@ +.tabs, .tabs2, .tabs3 { + background-image: url('tab_b.png'); + width: 100%; + z-index: 101; + font-size: 13px; + font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; +} + +.tabs2 { + font-size: 10px; +} +.tabs3 { + font-size: 9px; +} + +.tablist { + margin: 0; + padding: 0; + display: table; +} + +.tablist li { + float: left; + display: table-cell; + background-image: url('tab_b.png'); + line-height: 36px; + list-style: none; +} + +.tablist a { + display: block; + padding: 0 20px; + font-weight: bold; + background-image:url('tab_s.png'); + background-repeat:no-repeat; + background-position:right; + color: #283A5D; + text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); + text-decoration: none; + outline: none; +} + +.tabs3 .tablist a { + padding: 0 10px; +} + +.tablist a:hover { + background-image: url('tab_h.png'); + background-repeat:repeat-x; + color: #fff; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0); + text-decoration: none; +} + +.tablist li.current a { + background-image: url('tab_a.png'); + background-repeat:repeat-x; + color: #fff; + text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0); +} diff --git a/lib-src/libflac/doc/html/changelog.html b/lib-src/libflac/doc/html/changelog.html index 15dcb9c98..d993e5cc4 100644 --- a/lib-src/libflac/doc/html/changelog.html +++ b/lib-src/libflac/doc/html/changelog.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -20,7 +20,7 @@
@@ -28,18 +28,10 @@ - -
-  english  | -  russian  +  more
@@ -54,6 +46,94 @@
+ FLAC 1.3.1 (25-Nov-2014) + +
+ +
    +
  • + General: +
      +
    • Improved decoding efficiency of all bit depths but especially so for 24 bits for IA32 architecture (lvqcl and Miroslav Lichvar).
    • +
    • Faster encoding using SSE and AVX (lvqcl).
    • +
    • Fixed bartlett, bartlett_hann and triangle functions.
    • +
    • New apodization functions partial_tukey and punchout_tukey for improved compression (Martijn van Beurden).
    • +
    • Retuned compression presets to incorporate new apodization functions (Martijn van Beurden).
    • +
    • Fix -Wcast-align warnings on armhf architecture (Erik de Castro Lopo).
    • +
    +
  • +
  • + FLAC format: +
      +
    • (none)
    • +
    +
  • +
  • + Ogg FLAC format: +
      +
    • (none)
    • +
    +
  • +
  • + flac: +
      +
    • Help output documentation improvements.
    • +
    • I/O buffering improvements on Windows to reduce disk fragmentation when writing files.
    • +
    • Only write vorbis-comments if they are non-empty.
    • +
    +
  • +
  • + metaflac: +
      +
    • (none)
    • +
    +
  • +
  • + plugins: +
      +
    • Fix symbol visibility in XMMS plugin.
    • +
    +
  • +
  • + build system: +
      +
    • Many fixes and improvements across all the build systems.
    • +
    +
  • + +
  • + documentation: + +
  • +
  • + libraries: +
      +
    • Fix CVE-2014-9028 (heap write overflow) and CVE-2014-8962 (heap read overflow) (Erik de Castro Lopo).
    • +
    +
  • +
  • + Interface changes: +
      +
    • + libFLAC: +
        +
      • (none)
      • +
      +
    • +
    • + libFLAC++: +
        +
      • (none)
      • +
      +
    • +
    +
  • +
+ +
+ FLAC 1.3.0 (26-May-2013)
@@ -84,24 +164,24 @@
  • flac:
  • metaflac:
  • @@ -114,16 +194,17 @@
  • build system:
  • +
  • documentation:
      @@ -135,9 +216,9 @@
    • libraries:
        -
      • libFLAC encoder was defaulting to level 0 compression instead of 5 (SF #1816825).
      • -
      • Fix bug in bitreader handling of read callback returning a short count (SF #2490454).
      • -
      • Improve decoder's ability to distinguish between a FLAC sync code and an MPEG one (SF #2491433).
      • +
      • libFLAC encoder was defaulting to level 0 compression instead of 5 (SF #1816825).
      • +
      • Fix bug in bitreader handling of read callback returning a short count (SF #2490454).
      • +
      • Improve decoder's ability to distinguish between a FLAC sync code and an MPEG one (SF #2491433).
    • @@ -182,25 +263,25 @@
    • Ogg FLAC format:
        -
      • This is not a format change, but changed default extension for Ogg FLAC from .ogg to .oga, according to new Xiph specification (SF #1762492).
      • +
      • This is not a format change, but changed default extension for Ogg FLAC from .ogg to .oga, according to new Xiph specification (SF #1762492).
    • flac:
        -
      • Added a new option --no-utf8-convert which works like it does in metaflac (SF #973740).
      • -
      • Added a new option --keep-foreign-metadata which can save/restore RIFF and AIFF chunks to/from FLAC files (SF #363478).
      • -
      • Changed default extension for Ogg FLAC from .ogg to .oga, according to new Xiph specification (SF #1762492).
      • -
      • Fixed bug where using --replay-gain without any padding option caused only a small PADDING block to be created (SF #1760790).
      • -
      • Fixed bug where encoding from stdin on Windows could fail if WAVE/AIFF contained unknown chunks (SF #1776803).
      • -
      • Fixed bug where importing non-CDDA cuesheets would cause an invalid lead-out track number (SF #1764105).
      • +
      • Added a new option --no-utf8-convert which works like it does in metaflac (SF #973740).
      • +
      • Added a new option --keep-foreign-metadata which can save/restore RIFF and AIFF chunks to/from FLAC files (SF #363478).
      • +
      • Changed default extension for Ogg FLAC from .ogg to .oga, according to new Xiph specification (SF #1762492).
      • +
      • Fixed bug where using --replay-gain without any padding option caused only a small PADDING block to be created (SF #1760790).
      • +
      • Fixed bug where encoding from stdin on Windows could fail if WAVE/AIFF contained unknown chunks (SF #1776803).
      • +
      • Fixed bug where importing non-CDDA cuesheets would cause an invalid lead-out track number (SF #1764105).
    • metaflac:
        -
      • Changed default extension for Ogg FLAC from .ogg to .oga, according to new Xiph specification (SF #1762492).
      • -
      • Fixed bug where importing non-CDDA cuesheets would cause an invalid lead-out track number (SF #1764105).
      • +
      • Changed default extension for Ogg FLAC from .ogg to .oga, according to new Xiph specification (SF #1762492).
      • +
      • Fixed bug where importing non-CDDA cuesheets would cause an invalid lead-out track number (SF #1764105).
    • @@ -212,14 +293,14 @@
    • build system:
    • @@ -232,9 +313,9 @@
    • libraries:
        -
      • libFLAC: Fixed very rare seek bug (SF #1684049).
      • -
      • libFLAC: Fixed seek bug with Ogg FLAC and small streams (SF #1792172).
      • -
      • libFLAC: 64-bit fixes (SF #1790872).
      • +
      • libFLAC: Fixed very rare seek bug (SF #1684049).
      • +
      • libFLAC: Fixed seek bug with Ogg FLAC and small streams (SF #1792172).
      • +
      • libFLAC: 64-bit fixes (SF #1790872).
      • libFLAC: Fix assembler code to be position independent.
      • libFLAC: Optimization of a number of inner loop functions.
      • Added support for encoding the residual coding method introduced in libFLAC 1.2.0 (RESIDUAL_CODING_METHOD_PARTITIONED_RICE2) which will encode 24-bit files more efficiently.
      • @@ -281,7 +362,7 @@
      • FLAC format:
          -
        • One of the reserved bits in the FLAC frame header has been assigned for future use; make sure to refer to the porting guide if you parse FLAC streams manually.
        • +
        • One of the reserved bits in the FLAC frame header has been assigned for future use; make sure to refer to the porting guide if you parse FLAC streams manually.
      • @@ -324,7 +405,7 @@
    • - Interface changes (see also the porting guide for specific instructions on porting to FLAC 1.2.0): + Interface changes (see also the porting guide for specific instructions on porting to FLAC 1.2.0):
      • libFLAC: @@ -375,10 +456,10 @@
      • Encoding and decoding speedups for all modes. Encoding at -8 is twice as fast.
      • Added a new option -w,--warnings-as-errors for treating all warnings as errors.
      • Allow --picture option to take only a filename, and have all other attributes extracted from the file itself.
      • -
      • Fixed a bug that caused suboptimal default compression settings in some locales (SF #1608883).
      • -
      • Fixed a bug where FLAC-to-FLAC transcoding of a corrupted FLAC file would truncate the transcoded file at the first error (SF #1615019).
      • -
      • Fixed a bug where using -F with FLAC-to-FLAC transcoding of a corrupted FLAC would have no effect (SF #1615391).
      • -
      • Fixed a bug where new PICTURE metadata blocks specified with --picture would not be transferred during FLAC-to-FLAC transcoding (SF #1627993).
      • +
      • Fixed a bug that caused suboptimal default compression settings in some locales (SF #1608883).
      • +
      • Fixed a bug where FLAC-to-FLAC transcoding of a corrupted FLAC file would truncate the transcoded file at the first error (SF #1615019).
      • +
      • Fixed a bug where using -F with FLAC-to-FLAC transcoding of a corrupted FLAC would have no effect (SF #1615391).
      • +
      • Fixed a bug where new PICTURE metadata blocks specified with --picture would not be transferred during FLAC-to-FLAC transcoding (SF #1627993).
    • @@ -390,15 +471,15 @@
    • plugins:
        -
      • Fixed a bug in the XMMS plugin where Ctrl-3 (file info) would cause a crash if the file did not exist (SF #1634941).
      • +
      • Fixed a bug in the XMMS plugin where Ctrl-3 (file info) would cause a crash if the file did not exist (SF #1634941).
    • build system:
        -
      • Fixed a makefile linkage bug with libogg (SF #1611414).
      • -
      • Added pkg-config files for libFLAC and libFLAC++ (SF #1647881).
      • -
      • Added --disable-ogg option for building without Ogg support even if libogg is installed (SF #1196996).
      • +
      • Fixed a makefile linkage bug with libogg (SF #1611414).
      • +
      • Added pkg-config files for libFLAC and libFLAC++ (SF #1647881).
      • +
      • Added --disable-ogg option for building without Ogg support even if libogg is installed (SF #1196996).
    • @@ -408,7 +489,7 @@
    • Much faster Rice partition size estimation which greatly speeds encoding in higher modes.
    • Increased compression for all modes.
    • Reduced memory requirements for encoder and decoder.
    • -
    • Fixed a bug with default apodization settings that were erroneous in some locales (SF #1608883).
    • +
    • Fixed a bug with default apodization settings that were erroneous in some locales (SF #1608883).
  • @@ -476,20 +557,20 @@
  • Added a new option --tag-from-file for setting a tag from file (e.g. for importing a cuesheet as a tag).
  • Added a new option --picture for adding pictures.
  • Added a new option --apodization for specifying the window function(s) to be used in LPC analysis.
  • -
  • Added support for encoding from non-compressed AIFF-C (SF #1090933).
  • -
  • Importing of non-CDDA-compliant cuesheets now only issues a warning, not an error (see here).
  • -
  • MD5 comparison failures on decoding are now an error instead of a warning and will also return a non-zero exit code (SF #1493725).
  • +
  • Added support for encoding from non-compressed AIFF-C (SF #1090933).
  • +
  • Importing of non-CDDA-compliant cuesheets now only issues a warning, not an error (see here).
  • +
  • MD5 comparison failures on decoding are now an error instead of a warning and will also return a non-zero exit code (SF #1493725).
  • The default padding size is now 8K, or 64K if the input audio stream is more than 20 minutes long.
  • Fixed a bug in cuesheet parsing where it would return an error if the last line of the cuesheet did not end with a newline.
  • -
  • Fixed a bug that caused a crash when -a and -t were used together (SF #1229481).
  • -
  • Fixed a bug with --sector-align where appended samples were not always totally silent (SF #1237707).
  • +
  • Fixed a bug that caused a crash when -a and -t were used together (SF #1229481).
  • +
  • Fixed a bug with --sector-align where appended samples were not always totally silent (SF #1237707).
  • Fixed bugs with --sector-align and raw input files.
  • -
  • Fixed a bug printing out unknown AIFF subchunk names (SF #1267476).
  • -
  • Fixed a bug where WAVE files with "data" subchunks of size 0 where accepted (SF #1293830).
  • -
  • Fixed a bug where sync error at end-of-stream of truncated files was not being caught (SF #1244071).
  • -
  • Fixed a problem with filename parsing if file does not have extension but also has a . in the path (SF #1161916).
  • -
  • Fixed a problem with fractional-second parsing for --skip/--until in some locales (SF #1031043).
  • -
  • Increase progress report rate when -p and -e are used together (SF #1580122).
  • +
  • Fixed a bug printing out unknown AIFF subchunk names (SF #1267476).
  • +
  • Fixed a bug where WAVE files with "data" subchunks of size 0 where accepted (SF #1293830).
  • +
  • Fixed a bug where sync error at end-of-stream of truncated files was not being caught (SF #1244071).
  • +
  • Fixed a problem with filename parsing if file does not have extension but also has a . in the path (SF #1161916).
  • +
  • Fixed a problem with fractional-second parsing for --skip/--until in some locales (SF #1031043).
  • +
  • Increase progress report rate when -p and -e are used together (SF #1580122).
  • @@ -500,7 +581,7 @@
  • Added a new option --import-picture-from for importing pictures.
  • Added a new option --export-picture-to for exporting pictures.
  • Added shorthand operation --remove-replay-gain for removing ReplayGain tags.
  • -
  • --export-cuesheet-to now properly specifies the FLAC file name (SF #1272825).
  • +
  • --export-cuesheet-to now properly specifies the FLAC file name (SF #1272825).
  • Importing of non-CDDA-compliant cuesheets now issues a warning.
  • Removed the following deprecated tag editing options; you should use the new option names shown instead:
      @@ -514,7 +595,7 @@
    • Removed --export-vc-to; use --export-tags-to
  • -
  • Disallow multiple input FLAC files when --import-tags-from=- is used (SF #1082577).
  • +
  • Disallow multiple input FLAC files when --import-tags-from=- is used (SF #1082577).
  • @@ -528,11 +609,11 @@
  • build system:
      -
    • Added support for building on OS/2 with EMX (SF #1229495)
    • -
    • Added support for building with Borland C++ (SF #1599018)
    • -
    • Added a --disable-xmms-plugin option to configure to prevent building the XMMS plugin (SF #930494).
    • -
    • Added a --disable-doxygen-docs option to configure for disabling Doxygen-based API doc generation (SF #1365935).
    • -
    • Added a --disable-thorough-tests option to configure to do the basic library, stream, and tool tests in a reasonable time (SF #1077948).
    • +
    • Added support for building on OS/2 with EMX (SF #1229495)
    • +
    • Added support for building with Borland C++ (SF #1599018)
    • +
    • Added a --disable-xmms-plugin option to configure to prevent building the XMMS plugin (SF #930494).
    • +
    • Added a --disable-doxygen-docs option to configure for disabling Doxygen-based API doc generation (SF #1365935).
    • +
    • Added a --disable-thorough-tests option to configure to do the basic library, stream, and tool tests in a reasonable time (SF #1077948).
    • Added large file support with AC_SYS_LARGEFILE; use --disable-largefile with configure to disable.
  • @@ -543,14 +624,14 @@
  • Merged libOggFLAC++ into libFLAC++; both formats are now supporte through the same API.
  • libFLAC and libFLAC++: Simplified encoder setup with new FLAC__stream_encoder_set_compression_level() function.
  • libFLAC: Improved compression with no impact on FLAC format or decoding time by adding a windowing stage before LPC analysis.
  • -
  • libFLAC: Fixed a bug where missing STREAMINFO fields (min/max framesize, total samples, MD5 sum) and seek point offsets were not getting rewritten back to Ogg FLAC file (SF #1338969).
  • +
  • libFLAC: Fixed a bug where missing STREAMINFO fields (min/max framesize, total samples, MD5 sum) and seek point offsets were not getting rewritten back to Ogg FLAC file (SF #1338969).
  • libFLAC: Fixed a bug in cuesheet parsing where it would return an error if the last line of the cuesheet did not end with a newline.
  • libFLAC: Fixed UTF-8 decoder to disallow non-shortest-form and surrogate sequences (see here).
  • -
  • libFLAC: Fixed a bug in the return value for FLAC__stream_decoder_set_metadata_respond_application() and FLAC__stream_decoder_set_metadata_ignore_application() when there was a memory allocation error (SF #1235005).
  • +
  • libFLAC: Fixed a bug in the return value for FLAC__stream_decoder_set_metadata_respond_application() and FLAC__stream_decoder_set_metadata_ignore_application() when there was a memory allocation error (SF #1235005).
  • - Interface changes (see also the porting guide for specific instructions on porting to FLAC 1.1.3): + Interface changes (see also the porting guide for specific instructions on porting to FLAC 1.1.3):
    • all libraries; @@ -650,7 +731,7 @@
    • plugins:
        -
      • Added support for HTTP streaming in XMMS plugin. NOTE: there is a bug in the XMMS mpg123 plugin that hijacks FLAC streams; to fix it you will need to add the '.flac' extension to the list of exceptions in Input/mpg123/mpg123.c:is_our_file() in the XMMS sources and recompile.
      • +
      • Added support for HTTP streaming in XMMS plugin. NOTE: there is a bug in the XMMS mpg123 plugin that hijacks FLAC streams; to fix it you will need to add the '.flac' extension to the list of exceptions in Input/mpg123/mpg123.c:is_our_file() in the XMMS sources and recompile.
    • @@ -755,7 +836,7 @@
    • New option -f (--force) to force overwriting if the output file already exists.
    • New option --cue to select a specific section to decode using cuesheet track/index points.
    • New option --totally-silent to suppress all output.
    • -
    • New (but undocumented) option --apply-replaygain-which-is-not-lossless which applies ReplayGain to the decoded output. See this thread for usage and caveats.
    • +
    • New (but undocumented) option --apply-replaygain-which-is-not-lossless which applies ReplayGain to the decoded output. See this thread for usage and caveats.
    • When encoding to Ogg FLAC, use a random serial number (instead of 0 as was done before) when a serial number is not specified.
    • When encoding multiple Ogg FLAC streams, --serial-number or random serial number sets the first number, which is then incremented for subsequent streams (before, the same serial number was used for all streams).
    • Decoder no longer exits with an error when writing to stdout and the pipe is broken.
    • @@ -765,12 +846,12 @@
    • Bug fix: calculating ReplayGain on 48kHz streams.
    • Bug fix: check for supported block alignments in WAVE files.
    • Bug fix: "offset" field in AIFF SSND chunk properly handled.
    • -
    • Bug fix: #679166: flac doesn't respect RIFF subchunk padding byte.
    • -
    • Bug fix: #828391: --add-replay-gain segfaults.
    • -
    • Bug fix: #851155: Can't seek to position in flac file.
    • -
    • Bug fix: #851756: flac --skip --until reads entire file.
    • -
    • Bug fix: #877122: problem parsing cuesheet with CATALOG entry.
    • -
    • Bug fix: #896057: parsing ISRC number from cuesheet.
    • +
    • Bug fix: #679166: flac doesn't respect RIFF subchunk padding byte.
    • +
    • Bug fix: #828391: --add-replay-gain segfaults.
    • +
    • Bug fix: #851155: Can't seek to position in flac file.
    • +
    • Bug fix: #851756: flac --skip --until reads entire file.
    • +
    • Bug fix: #877122: problem parsing cuesheet with CATALOG entry.
    • +
    • Bug fix: #896057: parsing ISRC number from cuesheet.
  • @@ -801,7 +882,7 @@
  • Support for big-endian architectures in XMMS plugin.
  • Removed support for ID3 tags.
  • Bug fix: make hard limiter default to off in XMMS plugin.
  • -
  • Bug fix: stream length calculation bug in XMMS plugin, debian bug #200435; see also.
  • +
  • Bug fix: stream length calculation bug in XMMS plugin, debian bug #200435
  • Bug fix: small memory leak in XMMS plugin.
  • @@ -915,6 +996,360 @@ + +
    + + FLAC 1.1.0 (26-Jan-2003) + +
    + +
      +
    • + General: +
        +
      • All code is now Valgrind-clean!
      • +
      • New CUESHEET metadata block for storing CD TOC and index point information. Now a CD can be completely backed up to a single FLAC file for archival.
      • +
      • ReplayGain support.
      • +
      • Better compression of 24-bit files.
      • +
      • More complete AIFF support.
      • +
      • 3DNow! optimizations enabled by default.
      • +
      • Complete MSVC build system with .dsp projects for everything, which can build both static libs and DLLs, and in debug or release mode, all in the same source tree.
      • +
      + flac: +
        +
      • Can now decode FLAC to AIFF; new --force-aiff-format option.
      • +
      • New --cuesheet option for reading and storing a cuesheet when encoding a whole CD. Automatically creates seek points for track and index points unless --no-cued-seekpoints is used.
      • +
      • New --replay-gain option for calculating ReplayGain values and storing them as tags.
      • +
      • New --until option complements --skip to stop decoding at a specified point in the stream.
      • +
      • --skip and --until now also accept mm:ss.ss format.
      • +
      • New -S #s flavor to specify seekpoints every '#' number of seconds.
      • +
      • flac now defaults to -S 10s instead of -S 100x for the seek table.
      • +
      • flac now adds a 4k PADDING block by default (turn off with --no-padding).
      • +
      • Fixed a bug with --skip and AIFF-to-FLAC encoding.
      • +
      • Fixed a bug where decoding a FLAC file whose total_samples==0 in the STREAMINFO would corrupt the WAVE header.
      • +
      + metaflac: +
        +
      • New --import-cuesheet-from option for reading and storing a cuesheet to a FLAC-encoded CD. Automatically creates seek points for track and index points unless --no-cued-seekpoints is used.
      • +
      • New --export-cuesheet-to option for writing a cuesheet from a FLAC file for use with CD authoring software.
      • +
      • New --add-replay-gain option for calculating ReplayGain values and storing them as tags.
      • +
      • New --add-seekpoint option to add seekpoints to an existing FLAC file. Includes new --add-seekpoint=#s flavor to add seekpoints every '#' number of seconds.
      • +
      + XMMS plugin: +
        +
      • Configurable sample resolution conversion with dither.
      • +
      • ReplayGain support with customizable noise shaping, pre-amp, and optional hard limiter.
      • +
      • New Vorbis comment editor.
      • +
      • File info now works.
      • +
      • Bitrate now shows the smoothed instantaneous bitrate.
      • +
      • Uses the ARTIST tag if there is no PERFORMER tag.
      • +
      + Winamp2 plugin: +
        +
      • Configurable sample resolution conversion with dither.
      • +
      • ReplayGain support with customizable noise shaping, pre-amp, and optional hard limiter.
      • +
      • File info now works.
      • +
      • Uses the ARTIST tag if there is no PERFORMER tag.
      • +
      + Libraries (developers take note!): +
        +
      • All code and tests are instrumented for Valgrind. All tests run Valgrind-clean, meaning no memory leaks or buffer over/under-runs.
      • +
      • Separate 64-bit datapath through the filter in libFLAC for better compression of >16 bps files.
      • +
      • FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT) now sets the vendor string.
      • +
      • The documentation on the usage of FLAC::Iterator::get_block() in libFLAC++ has an important correction. If you use this class make sure to read this.
      • +
      +
    • +
    +
    + + FLAC 1.0.4 (24-Sep-2002) + +
    +
      +
    • + Plugins: +
        +
      • Support for Vorbis comments, ID3 v1 and v2 tags.
      • +
      • Configurable title formatting and charset conversion in XMMS plugin.
      • +
      • Support for 8- and 24-bit FLAC files. There is a compile-time option for raw 24-bit output or 24bps-to-16bps linear dithering (the default).
      • +
      + flac: +
        +
      • Improved option parser (now uses getopt).
      • +
      • AIFF input support (thanks to Brady Patterson).
      • +
      • Small decoder speedup.
      • +
      • --sector-align now supported for raw input files.
      • +
      • New -T, --tag options for adding Vorbis comments while encoding.
      • +
      • New --serial-number option for use with --ogg.
      • +
      • Automatically writes vendor string in Vorbis comments.
      • +
      • Drastically reduced memory requirements.
      • +
      • Fixed bug where extra fmt/data chunks that were supposed to be skipped were not getting skipped.
      • +
      • Fixed bug in granulepos setting for Ogg FLAC streams.
      • +
      • Fixed memory leak when encoding multiple files with -V.
      • +
      + metaflac: +
        +
      • UTF-8 support in Vorbis comments.
      • +
      • New --import-vc-from and --export-vc-to commands for importing/exporting Vorbis comments from/to a file. For example, the following can be used to copy tags back and forth:
        + + metaflac --export-vc-to=- --no-utf8-convert file.flac | vorbiscomment --raw -w file.ogg
        + vorbiscomment --raw -l file.ogg | metaflac --import-vc-from=- --no-utf8-convert file.flac
        +
        +
      • +
      • Fixed bug #606796 where metaflac was failing on read-only files.
      • +
      + Libraries: +
        +
      • All APIs now meticulously documented via Doxygen. See here.
      • +
      • New libOggFLAC and libOggFLAC++ libraries. These wrap around libFLAC to provide encoding and decoding of Ogg FLAC streams, providing interfaces similar to the ones of the native FLAC libraries. These are also documented via Doxygen.
      • +
      • New FLAC__SeekableStreamEncoder and FLAC__FileEncoder in libFLAC simplify common encoding tasks.
      • +
      • New verify mode in all encoders.
      • +
      • FLAC__stream_encoder_finish() now resets the defaults just like the stream decoders.
      • +
      • Drastically reduced memory requirements of encoders and decoders.
      • +
      • Encoder now automatically writes vendor string in VORBIS_COMMENT block.
      • +
      • Encoding speedup of fixed predictors and MD5 speedup for 16bps mono/stereo signals on x86 (thanks to Miroslav Lichvar).
      • +
      • Fixed bug in metadata interface where a bps in STREAMINFO > 16 was incorrectly parsed.
      • +
      • Fixed bug where aborting stream decoder could cause infinite loop.
      • +
      • Behavior change: simplified decoder *_process() commands.
      • +
      • Behavior change: calling FLAC__stream_encoder_init() calls write callback once for "fLaC" signature and once for each metadata block.
      • +
      • Behavior change: deprecated do_escape_coding and rice_parameter_search_distance in encoder.
      • +
      +
    • +
    + +
    + + FLAC 1.0.3 (03-Jul-2002) + +
    + +
      +
    • + New features: +
        +
      • 24-bit input support restored in flac.
      • +
      • Decoder speedup in libFLAC, which is directly passed on to the command-line decoder and plugins.
      • +
      • New -F option to flac to continue decoding in spite of errors.
      • +
      • Correctly set granulepos in Ogg packets so seeking Ogg FLAC streams will be easier.
      • +
      • New VORBIS_COMMENT metadata block for tagging with Vorbis-style comments.
      • +
      • Vastly improved metaflac, now with many editing and tagging options.
      • +
      • Partial id3v1 support in Winamp plugins.
      • +
      • Updated Winamp 3 plugin.
      • +
      • Note: new semantics for -P option in flac.
      • +
      • Note: removed -R option in flac.
      • +
      + New library features: +
        +
      • Previously mentioned decoder speedup in libFLAC.
      • +
      • New metadata interface to libFLAC for manipulating metadata in FLAC files.
      • +
      • New libFLAC++ API, an object wrapper around libFLAC.
      • +
      • New VORBIS_COMMENT metadata block for tagging with Vorbis-style comments.
      • +
      • Customizable metadata filtering by type in decoders.
      • +
      • Stream encoder can take an arbitrary list of metadata blocks, instead of just one SEEKTABLE and/or PADDING block.
      • +
      + Bugs fixed: +
        +
      • Fixed bug with using pipes under Windows.
      • +
      • Fixed several bugs in the plugins and made them more robust in general.
      • +
      • Fixed bug in flac where decoding to WAVE of a FLAC file with 0 for total_samples in the STREAMINFO block yielded a WAVE chunk of 0 size.
      • +
      • Fixed bug in Ogg packet numbering.
      • +
      +
    • +
    + +
    + + FLAC 1.0.2 (03-Dec-2001) + +
    +
      +
    • + This release is only to fix a bug that was causing some of the plugins to crash sporadically. It can also affect libFLAC users that reuse one file decoder instance for multiple files +
    • +
    +
    + + FLAC 1.0.1 (14-Nov-2001) + +
    +
      +
    • + New features for users: +
        +
      • Support for Ogg-FLAC, i.e. flac can now read and write FLAC streams using Ogg as the transport layer.
      • +
      • New Winamp 3 plugin based on the Wasabi Beta 1 SDK.
      • +
      • New utilities for adding FLAC support to the Monkey's Audio GUI (see how).
      • +
      • Mac OS X support. The download area now contains an OS X binary release.
      • +
      • Mingw32 support.
      • +
      • Better handling of MS-specific 'fmt' chunks in WAVE files.
      • +
      + New features for developers: +
        +
      • Added a SeekableStreamDecoder layer between StreamDecoder and FileDecoder. This makes it easier to use libFLAC in situations where files have been abstracted away. See the latest documentation for more. The interface for the StreamDecoder and FileDecoder remain the same and are still binary-compatible with libFLAC 1.0.
      • +
      • Drastically reduced the stack requirements of the encoder.
      • +
      + Bug fixes: +
        +
      • Fixed a serious bug with flac and raw input where the encoder was trying to rewind when it shouldn't, which would add 12 junk samples to the encoded file. This was not present in WAVE encoding.
      • +
      • Fixed a minor bug in libFLAC with setting the file name to stdin on a file decoder.
      • +
      • Fixed a minor bug in libFLAC where multiple calls to setting the file name on a file decoder caused leaked memory.
      • +
      • Fixed a minor bug in metaflac, now correctly skips an id3v2 tag if present.
      • +
      • Fixed a minor bug in metaflac, now correctly skips long metadata blocks.
      • +
      +
    • +
    + +
    + + FLAC 1.0 (20-Jul-2001) + +
    +
      +
    • + It's finally here. There are a few new features but mostly it is minor bug fixes since 0.10: +
        +
      • New '--sector-align' option to flac which aligns a group of encoded files on CD audio sector boundaries.
      • +
      • New '--output-prefix' option to flac to allow the user to prepend a prefix to all output filenames (useful, for example, for encoding/decoding to a different directory).
      • +
      • Better WAVE autodetection (doesn't rely on ungetc() anymore).
      • +
      • Cleaner one-line encoding/decoding stats.
      • +
      • Changes to the libFLAC interface and type names to make binary compatibility easier to maintain in the future.
      • +
      • New '--sse-os' option to 'configure' to enable faster SSE-based routines.
      • +
      • Another (hopefully last) fix to the Winamp 2 plugin.
      • +
      • Slightly improved Rice parameter estimation.
      • +
      • Bug fixes for some very rare corner cases when encoding.
      • +
      +
    • +
    +
    + + FLAC 0.10 (07-Jun-2001) + +
    +
      +
    • + This is probably the final beta. There have been many improvements in the last two months: +
        +
      • Both the encoder and decoder have been significantly sped up. Aside from C improvements, the code base now has an assembly infrastructure that allows assembly routines for different architectures to be easily integrated. Many key routines have now have faster IA-32 implementations (thanks to Miroslav).
      • +
      • A new metadata block SEEKTABLE has been defined to hold an arbitrary number of seek points, which speeds up seeking within a stream.
      • +
      • flac now has a command-line usage similar to 'gzip'; make sure to see the latest documentation for the new usage. It also attempts to preserve the input file's timestamp and permissions.
      • +
      • The -# options in flac have been tweaked to yield the best compression-to-encode-time ratios. The new default is -5.
      • +
      • flac can now usually autodetect WAVE files when encoding so that -fw is usually not needed when encoding from stdin.
      • +
      • The WAVE reader in flac now just ignores (with a warning) unsupported sub-chunks instead of aborting with an error.
      • +
      • Added an option '--delete-input-file' to flac which automatically deletes the input after a successful encode/decode.
      • +
      • Added an option '-o' to flac to force the output file name (the old usage of "flac - outputfilename" is no longer supported).
      • +
      • Changed the XMMS plugin to send smaller chunks of samples (now 512) so that visualization is not slow.
      • +
      • Fixed a bug in the stream decoder where the decoded samples counter got corrupted after a seek.
      • +
      + +
    • +
    +
    + + FLAC 0.9 (31-Mar-2001) + +
    +
      +
    • + Bug fixes and some new features: +
        +
      • FLAC's sync code has been lengthened to 14 bits from 9 bits. This should enable a faster and more robust synchronization mechanism.
      • +
      • Two reserved bits were added to the frame header.
      • +
      • A CRC-16 was added to the FLAC frame footer, and the decoder now does frame integrity checking based on the CRC.
      • +
      • The format now includes a new subframe field to indicate when a subblock has one or more 0 LSBs for all samples. This increases compression on some kinds of data.
      • +
      • Added two options to the analysis mode, one for including the residual signal in the analysis file, and one for generating gnuplot files of each subframe's residual distribution with some statistics. See the latest documentation.
      • +
      • XMMS plugin now supports 8-bit files.
      • +
      • Fixed a bug in the Winamp2 plugin where the audio sounded garbled.
      • +
      • Fixed a bug in the Winamp2 plugin where Winamp would hang sporadically at the end of a track (c.f. bug #231197).
      • +
      + +
    • +
    + +
    + + FLAC 0.8 (05-Mar-2001) + +
    +
      +
    • + Changes since 0.7: +
        +
      • Created a new utility called metaflac. It is a metadata editor for .flac files. Right now it just lists the contents of the metadata blocks but eventually it will allow update/insertion/deletion.
      • +
      • Added two new metadata blocks: PADDING which has an obvious function, and APPLICATION, which is meant to be open to third party applications. See the latest format docs for more info, or the new id registration page.
      • +
      • Added a -P option to flac to reserve a PADDING block when encoding.
      • +
      • Added support for 24-bit files to flac (the FLAC format always supported it).
      • +
      • Started the Winamp3 plugin.
      • +
      • Greatly expanded the test suite, adding more streams (24-bit streams, noise streams, non-audio streams, more patterns) and more option combinations to the encoder. The test suite runs about 30 streams and over 5000 encodings now.
      • +
      • Fixed a bug in libFLAC that happened when using an exhaustive LPC coefficient quantization search with 8 bps input.
      • +
      • Fixed a bug in libFLAC where the error estimation in the fixed predictor could overflow.
      • +
      • Fixed a bug in libFLAC where LPC was attempted even when the autocorrelation coefficients implied it wouldn't help.
      • +
      • Reworked the LPC coefficient quantizer, which also fixed another bug that might occur in rare cases.
      • +
      • Really fixed the '-V overflow' bug (c.f. bug #231976).
      • +
      • Fixed a bug in flac related to the decode buffer sizing.
      • +
      + FLAC is very close to being ready for an official release. The only known problems left are with the Winamp plugins, which should be fixed soon, and pipes with MSVC. +
    • +
    +
    + + FLAC 0.7 (12-Feb-2001) + +
    + +
      +
    • + Changes: +
        +
      • Fixed a bug that happened when both -fr and --seek were used at the same time.
      • +
      • Fixed a bug with -p (c.f. bug #230992).
      • +
      • Fixed a bug that happened when using large (>32K) blocksizes and -V (c.f. bug #231976).
      • +
      • Fixed a bug where encoder was double-closing a file.
      • +
      • Expanded the test suite.
      • +
      • Added more optimization flags for gcc, which should speed up flac.
      • +
      +
    • +
    +
    + + FLAC 0.6 (28-Jan-2001) + +
    +
      +
    • + The encoder is now much faster. The -m option has been sped up by 4x and -r improved, meaning that in the default compression mode (-6), encoding should be at least 3 times faster. Other changes: +
        +
      • Some bugs related to flac and pipes were fixed
      • +
      • A "loose mid-side" (-M) option to the encoder has been added, which adaptively switches between independent and mid-side coding, instead of the exhaustive search that -m does.
      • +
      • An analyze mode (-a) has been added to flac. This is useful mainly for developers; currently it will dump info about each frame and subframe to a file. It's a text file in a format that can be easily processed by scripts; a separate analysis program is in the works.
      • +
      • The source now has an autoconf/libtool-based build system. This should allow the source to build "out-of-the-box" on many more platforms.
      • +
      +
    • +
    +
    + + FLAC 0.5 (15-Jan-2001) + +
    +
      +
    • + This is the first beta version of FLAC. Being beta, there will be no changes to the format that will break older streams, unless a serious bug involving the format is found. What this means is that, barring such a bug, streams created with 0.5 will be decodable by future versions. This version also includes some new features: +
        +
      • An MD5 signature of the unencoded audio is computed during encoding, and stored in the Encoding metadata block in the stream header. When decoding, flac will now compute the MD5 signature of the decoded data and compare it against the signature in the stream header.
      • +
      • A test mode (-t) has been added to flac. It works like decode mode but doesn't write an output file.
      • +
      +
    • +
    +
    + + FLAC 0.4 (23-Dec-2000) + +
    +
      +
    • This version fixes a bug in the constant subframe detection. More importantly, a verify option (-V) has been added to flac that verifies the encoding process. With this option turned on, flac will create a parallel decoder while encoding to make sure that the encoded output decodes to exactly match the original input. In this way, any unknown bug in the encoder will be caught and flac will abort with an error message.
    • +
    + + + @@ -927,13 +1362,7 @@ Copyright (c) 2004-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/comparison.html b/lib-src/libflac/doc/html/comparison.html deleted file mode 100644 index 141c816e6..000000000 --- a/lib-src/libflac/doc/html/comparison.html +++ /dev/null @@ -1,433 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - Many lossless comparisons look at only compression ratio and speed. FLAC decoding is the fastest among lossless codecs and it has the fastest encoding mode. FLAC's compression is within 3% of even the most complex codecs. Note that the compression ratios of all lossless codecs fall in a quite narrow range; the difference between the very best and very worst is only around 7%, and only 4% for the practical codecs.
    -
    - So the evaluation of lossless codecs typically depends mainly on other features, which is what our first table shows; features like how well it is supported in devices and software, licensing, etc. Additionally, as archiving is one of the main applications for a lossless codec, of chief importance is the ability to use and recover data in the future. FLAC stands out as the most widely supported codec, and the only codec that at once is non-proprietary, is unencumbered by patents, has an open-source reference implementation, has a well documented format and API, and has several other independent implementations.
    -
    - The rest of the tables show in detail the compression ratios and speed of the codecs in different modes. FLAC's high decoding speed is due to very low complexity and is instrumental to its support by dozens of consumer electronic devices.
    -
    - (Note: this comparison leaves out some archaic or impractical codecs; see below for some other comparisons.)
    -
    - Reviewed encoders (besides flac of course): -
      -
    • - Apple Lossless - A proprietary codec by Apple. -
    • -
    • - Bonk - An open-source source codec. No player or library support yet. -
    • -
    • - La - A closed source symmetric adaptive codec. Highest compression ratio but extremely slow. -
    • -
    • - Monkey's Audio - A symmetric adaptive codec with good compression. Source is available under a non-OSI license. -
    • -
    • - Ogg Squish - An open source source codec that is no longer maintained. -
    • -
    • - optimFROG - A closed source, Windows/Linux codec, with Winamp and XMMS plugins. Slow but high compression ratios. -
    • -
    • - Shorten - A.J. Robinson's well-known codec; source is available here. -
    • -
    • - Tak - A new and efficient codec, but closed-source and Windows only. -
    • -
    • - WavPack - A fine open-source codec, released under the BSD license. -
    • -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - Codec - - Source Available? - - Player Support? - - Hardware Support? - - License Cost - - OS support -
    - flac v1.2.1 - - YES (OSI approved license) - - YES (XMMS, Winamp, AlsaPlayer, Y! Music Engine, MacAmp Lite, dBpowerAMP, Foobar2000, QCD, Apollo, many more) - - YES (Squeezebox, Sonos, PhatBox, Kenwood MusicKeg, iAudio, ReQuest, Olive, Escient, TrekStor, dozens more) - - NONE - - Linux, Windows, Mac OS X, *BSD, Solaris, OS/2, BeOS, Amiga OS, others -
    - WavPack v4.41 - - YES (OSI approved license) - - YES (Winamp, foobar2000, dBpowerAMP, more) - - maybe (some portables via Rockbox firmware replacement) - - NONE - - Linux, Windows, Mac OS X, *BSD, Solaris, others -
    - Shorten v3.2 - - YES (non-OSI license) - - YES (Winamp, XMMS) - - maybe (some portables via Rockbox firmware replacement) - - non-
    commercial only -
    - Linux, Windows, Mac OS 9, Mac OS X, *BSD, Solaris, others -
    - Monkey's Audio v3.99 - - YES (non-OSI license) - - YES (Winamp, MediaJukebox, dBpowerAMP, more) - - no - - ? - - Windows, Linux console source -
    - Apple Lossless - - no - - YES (iTunes) - - YES (iPod only) - - unavailable - - Windows, Mac OS X -
    - Ogg Squish 0.98 - - YES (OSI approved license) - - no (?) - - no - - NONE - - Linux, Windows, other UNIX -
    - Bonk 0.5 - - YES (OSI approved license) - - YES (XMMS) - - no - - ? - - Linux, Windows, other UNIX -
    - optimFROG 4.21 - - no - - YES (Winamp, XMMS) - - no - - ? - - Windows, Linux -
    - La 0.3c - - no - - YES (Winamp, XMMS) - - no - - ? - - Windows, Linux -
    - Tak 1.0 - - no - - no - - no - - free for non-commercial use - - Windows -
    -
    -
    - The machine used for encoding the test files is a PII-333 with 256 megs of RAM, running Windows NT 4.0 SP5. Unfortunately, though flac runs just about everywhere, Windows is the lowest-common-denominator platform for all the encoders. Apple Lossless was tested on a newer machine (P4-2.4GHz Windows 2000); only the overall encoding and decoding times are shown, and the times are scaled to the PII-333 by multiplying by the ratio of flac times on the PII to P4.
    -
    - By default when processing files, flac computes the MD5 sum while encoding and decoding. Since MD5 sums are not typically used in playback, and since most codecs either do not support MD5 sums or do not compute them by default, to make the comparison as accurate as possible MD5 checking was disabled for FLAC decoding. However since it is currently not possible to disable MD5 computation for FLAC encoding, the FLAC encoding times here are 4-15% longer than they would be without MD5 checking.
    -
    - The audio corpus currently consists entirely of CD music tracks. In the future it may include more kinds of input (like speech, other sample rates/resolutions, etc). There are 14 tracks whose genres range from rock to pop to death metal to classical to chant.
    -
    - Here is a summary table of results on the whole corpus, using just the most 'economic' modes (the ones that give the most compression for the least amount of encode/decode time) for each codec. The table is ordered by the average track compression ratio, which is the average of the ratios for each track; this keeps long tracks from having more influence than short ones. Clicking the column header links will take you to complete tables ordered by that column.
    -
    - Shown in white, flac in its default mode is right in the middle with respect to compression, relatively fast on the encoding range, and the fastest decoding. This is about what you would expect; FLAC is designed to put most of the processing on the encoding side, which is only done once, whereas the adaptive codecs take as long to decode as encode. FLAC is more suited in this way for playback on low-power devices, borne out by the many hardware devices which support it.
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Avg.ratio -
    Tak 1.01 (normal)11:42.598:12.006:36.473:38.14391.16 MB51.39%
    Monkey's Audio 3.99 (normal)13:20.159:56.4014:24.0211:33.71393.17 MB51.97%
    optimFROG 4.21 (mode 0 @ 4x)16:36.9812:51.5817:55.5514:58.99394.69 MB52.24%
    Tak 1.01 (turbo)7:25.213:51.026:16.823:10.87399.97 MB52.71%
    WavPack 4.41 (high)11:48.477:45.589:19.076:05.35399.90 MB52.73%
    Monkey's Audio 3.99 (fast)10:24.296:58.4611:32.078:37.81400.57 MB53.11%
    WavPack 4.41 (normal)9:48.595:46.917:37.264:30.11405.84 MB53.56%
    FLAC 1.2.1 (-5, default)10:07.416:35.685:23.162:22.41406.25 MB53.67%
    FLAC 1.2.1 (-3)7:23.773:47.425:31.152:19.07412.42 MB54.57%
    WavPack 4.41 (fast)8:52.274:47.746:33.733:28.19415.05 MB54.92%
    Apple Lossless (iTunes 4.5)19:53.2719:53.2710:01.8610:01.86414.45 MB54.96%
    Bonk 0.551:45.5848:32.1042:02.7639:05.43418.65 MB55.43%
    FLAC 1.2.1 (-1)6:24.512:42.935:26.872:17.49431.72 MB56.97%
    Shorten 3.2a (-p0 -b256, default)10:01.386:23.406:38.433:30.66433.56 MB57.29%
    RIFF WAVE73:44.9473:44.94780.56 MB100.00%
    -
    -
    - - Here are links to the full summary table (all codecs, all modes) and tables for each individual track. The individual track tables are sorted only by compression ratio since the relative encoding and decoding times are the same as for the whole corpus. -

    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__chopin_prelude_24.html b/lib-src/libflac/doc/html/comparison__chopin_prelude_24.html deleted file mode 100644 index 647fdfb66..000000000 --- a/lib-src/libflac/doc/html/comparison__chopin_prelude_24.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c5:12.995:05.905:02.304:58.199.84 MB35.82%
    Monkey's Audio 3.99 (insane)4:31.194:23.904:41.634:38.159.96 MB36.25%
    Monkey's Audio 3.99 (extra high)0:59.340:52.761:00.840:55.8010.16 MB36.99%
    Tak 1.01 (extra high max)2:21.932:15.970:16.040:10.9610.18 MB37.07%
    Tak 1.01 (extra high)0:54.020:47.210:15.790:10.6110.20 MB37.15%
    optimFROG 4.21 (mode 4 @ 1x)11:56.8011:49.4311:58.6711:52.3810.34 MB37.64%
    optimFROG 4.21 (mode 3 @ 4x)2:03.121:55.852:06.241:59.9310.35 MB37.68%
    optimFROG 4.21 (mode 2 @ 4x)1:07.641:00.031:10.961:04.3810.37 MB37.78%
    Monkey's Audio 3.99 (high)0:31.660:25.200:33.370:28.0110.40 MB37.88%
    optimFROG 4.21 (mode 1 @ 4x)0:50.930:43.240:54.650:47.5510.41 MB37.90%
    Monkey's Audio 3.99 (normal)0:27.250:20.660:29.580:23.6210.52 MB38.32%
    optimFROG 4.21 (mode 0 @ 4x)0:34.130:26.240:37.360:30.8110.53 MB38.33%
    Tak 1.01 (normal)0:24.270:17.590:13.770:07.5910.54 MB38.37%
    Tak 1.01 (turbo)0:14.480:07.790:11.540:05.8910.64 MB38.74%
    WavPack 4.41 (extra high -x)0:59.090:51.190:21.450:15.5610.66 MB38.83%
    WavPack 4.41 (high)0:23.700:16.060:18.580:12.1910.83 MB39.45%
    Monkey's Audio 3.99 (fast)0:21.210:14.610:23.150:17.5010.94 MB39.82%
    WavPack 4.41 (normal -x)0:28.330:20.540:14.770:08.8810.94 MB39.84%
    WavPack 4.41 (normal)0:19.710:11.860:14.610:08.7110.99 MB40.01%
    FLAC 1.2.1 (-8)0:52.850:46.140:10.990:04.5411.05 MB40.25%
    WavPack 4.41 (fast -x)0:23.340:15.660:12.540:06.6511.14 MB40.55%
    FLAC 1.2.1 (-5, default)0:20.100:13.480:10.410:04.3711.19 MB40.73%
    FLAC 1.2.1 (-3)0:14.730:08.010:09.950:04.1111.26 MB40.99%
    WavPack 4.41 (fast)0:17.610:09.900:12.730:06.7111.30 MB41.15%
    Apple Lossless (iTunes 4.5)????11.51 MB41.91%
    FLAC 1.2.1 (-1)0:12.290:05.320:10.140:04.4111.84 MB43.11%
    Shorten 3.2a (-p0 -b256, default)0:19.930:12.700:13.270:06.5212.05 MB43.86%
    Bonk 0.51:45.751:39.191:24.871:18.9112.86 MB46.84%
    Shorten 3.2a (-p8 -b2048)0:25.060:17.520:14.190:07.9214.40 MB52.42%
    RIFF WAVE0:55.770:55.7727.46 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__dream_theater_600.html b/lib-src/libflac/doc/html/comparison__dream_theater_600.html deleted file mode 100644 index 139615c1c..000000000 --- a/lib-src/libflac/doc/html/comparison__dream_theater_600.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c11:33.0911:19.0611:12.0311:00.2242.72 MB73.06%
    Monkey's Audio 3.99 (insane)9:54.949:41.0810:23.8410:11.9242.99 MB73.52%
    Monkey's Audio 3.99 (extra high)2:13.371:56.552:17.032:01.5443.06 MB73.64%
    Monkey's Audio 3.99 (high)1:14.010:57.541:17.441:01.8943.21 MB73.91%
    optimFROG 4.21 (mode 2 @ 4x)2:29.222:10.342:36.592:21.4243.24 MB73.95%
    optimFROG 4.21 (mode 3 @ 4x)4:28.014:09.994:33.404:18.9643.26 MB73.98%
    optimFROG 4.21 (mode 4 @ 1x)25:32.6725:17.3325:37.3325:22.0743.26 MB73.98%
    optimFROG 4.21 (mode 1 @ 4x)1:54.861:35.382:02.711:45.7543.26 MB73.98%
    Monkey's Audio 3.99 (normal)1:04.050:47.221:07.560:52.1343.30 MB74.05%
    Tak 1.01 (extra high max)5:17.865:02.220:33.300:17.3843.40 MB74.23%
    optimFROG 4.21 (mode 0 @ 4x)1:18.810:59.921:25.631:09.7043.42 MB74.26%
    Tak 1.01 (extra high)1:55.031:37.680:33.950:17.3143.45 MB74.31%
    Tak 1.01 (normal)0:55.220:38.010:31.570:15.7943.51 MB74.42%
    WavPack 4.41 (extra high -x)2:07.331:47.950:54.180:34.9243.55 MB74.49%
    WavPack 4.41 (high)0:55.990:35.380:45.020:27.4543.67 MB74.69%
    Tak 1.01 (turbo)0:37.120:19.030:30.360:13.6543.80 MB74.91%
    Monkey's Audio 3.99 (fast)0:50.450:33.450:55.140:39.0343.86 MB75.01%
    WavPack 4.41 (normal -x)1:07.850:48.390:37.250:20.3243.91 MB75.10%
    WavPack 4.41 (normal)0:46.860:27.060:37.570:20.3144.01 MB75.26%
    FLAC 1.2.1 (-8)2:08.571:51.560:26.910:11.0344.11 MB75.44%
    FLAC 1.2.1 (-5, default)0:48.660:31.460:26.540:10.6344.17 MB75.54%
    Bonk 0.54:12.593:56.453:26.613:11.0744.35 MB75.85%
    FLAC 1.2.1 (-3)0:36.620:19.230:27.010:09.7544.58 MB76.25%
    WavPack 4.41 (fast -x)0:57.500:37.910:32.460:15.7244.70 MB76.45%
    WavPack 4.41 (fast)0:42.950:22.860:32.450:15.6044.71 MB76.46%
    Apple Lossless (iTunes 4.5)????44.74 MB76.53%
    Shorten 3.2a (-p8 -b2048)1:00.050:42.060:37.310:20.8744.75 MB76.54%
    FLAC 1.2.1 (-1)0:32.130:14.160:27.550:10.7146.60 MB79.70%
    Shorten 3.2a (-p0 -b256, default)0:49.940:31.660:32.610:15.5146.68 MB79.84%
    RIFF WAVE4:02.174:02.1758.47 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__eddie_warner_titus.html b/lib-src/libflac/doc/html/comparison__eddie_warner_titus.html deleted file mode 100644 index 574f7ee19..000000000 --- a/lib-src/libflac/doc/html/comparison__eddie_warner_titus.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    Tak 1.01 (extra high max)2:33.662:26.560:13.830:08.0613.56 MB48.65%
    Tak 1.01 (extra high)0:54.330:46.940:14.630:08.7313.58 MB48.71%
    Tak 1.01 (normal)0:25.210:17.910:13.810:07.8313.64 MB48.94%
    WavPack 4.41 (extra high -x)0:59.690:50.920:23.370:16.6414.16 MB50.82%
    WavPack 4.41 (high)0:30.950:21.880:19.700:12.9414.18 MB50.89%
    WavPack 4.41 (normal -x)0:31.630:22.960:16.370:10.0714.41 MB51.72%
    Tak 1.01 (turbo)0:16.490:09.190:13.150:06.8714.52 MB52.10%
    WavPack 4.41 (normal)0:23.610:14.900:17.130:09.5314.56 MB52.23%
    FLAC 1.2.1 (-8)0:57.420:49.990:11.880:05.9114.77 MB52.98%
    La 0.3c5:22.085:14.865:11.455:06.8814.76 MB52.98%
    FLAC 1.2.1 (-5, default)0:22.060:14.610:12.780:05.2814.83 MB53.23%
    optimFROG 4.21 (mode 2 @ 4x)1:09.571:01.361:13.871:07.0915.01 MB53.85%
    optimFROG 4.21 (mode 1 @ 4x)0:53.690:45.310:55.970:49.6215.01 MB53.85%
    optimFROG 4.21 (mode 3 @ 4x)2:05.241:57.362:07.642:01.9215.01 MB53.87%
    WavPack 4.41 (fast -x)0:26.810:17.000:14.210:07.8215.01 MB53.87%
    optimFROG 4.21 (mode 4 @ 1x)12:01.6911:54.2812:03.3611:57.0615.02 MB53.90%
    FLAC 1.2.1 (-3)0:16.250:08.590:12.770:04.9515.08 MB54.12%
    optimFROG 4.21 (mode 0 @ 4x)0:36.480:28.050:38.760:32.4615.13 MB54.29%
    Monkey's Audio 3.99 (extra high)1:02.130:54.551:03.540:57.5615.15 MB54.36%
    WavPack 4.41 (fast)0:20.990:12.280:14.010:07.9415.17 MB54.45%
    Monkey's Audio 3.99 (insane)4:39.174:32.264:51.864:47.4715.18 MB54.47%
    Monkey's Audio 3.99 (high)0:33.690:26.380:35.470:29.4615.26 MB54.74%
    Monkey's Audio 3.99 (normal)0:29.040:21.710:30.210:24.3615.27 MB54.79%
    Monkey's Audio 3.99 (fast)0:23.070:15.050:24.990:18.8115.55 MB55.79%
    Shorten 3.2a (-p0 -b256, default)0:21.190:13.680:13.500:07.2815.78 MB56.62%
    Shorten 3.2a (-p8 -b2048)0:26.260:18.620:15.590:08.7816.21 MB58.18%
    FLAC 1.2.1 (-1)0:14.000:06.170:11.790:05.2216.35 MB58.67%
    Apple Lossless (iTunes 4.5)????16.36 MB58.71%
    Bonk 0.51:54.691:47.691:35.031:28.4716.73 MB60.03%
    RIFF WAVE1:16.861:16.8627.87 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__fanfare_de_l_eventail_de_jeanne.html b/lib-src/libflac/doc/html/comparison__fanfare_de_l_eventail_de_jeanne.html deleted file mode 100644 index ecf86190e..000000000 --- a/lib-src/libflac/doc/html/comparison__fanfare_de_l_eventail_de_jeanne.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c3:53.853:48.603:46.063:43.426.46 MB31.04%
    Tak 1.01 (extra high max)1:40.841:36.140:10.020:06.646.57 MB31.54%
    Tak 1.01 (extra high)0:36.930:31.820:10.220:06.786.58 MB31.62%
    Monkey's Audio 3.99 (extra high)0:42.130:37.160:43.260:39.926.75 MB32.43%
    Monkey's Audio 3.99 (insane)3:09.723:04.723:16.683:14.216.78 MB32.56%
    optimFROG 4.21 (mode 4 @ 1x)8:22.498:17.198:22.998:19.166.82 MB32.74%
    optimFROG 4.21 (mode 3 @ 4x)1:27.801:22.511:28.891:25.166.91 MB33.20%
    Tak 1.01 (normal)0:17.570:12.280:08.760:05.406.92 MB33.24%
    Monkey's Audio 3.99 (high)0:22.580:17.460:23.480:20.176.98 MB33.53%
    optimFROG 4.21 (mode 2 @ 4x)0:48.740:43.110:51.290:46.987.01 MB33.69%
    optimFROG 4.21 (mode 1 @ 4x)0:37.650:31.910:38.280:34.487.09 MB34.06%
    optimFROG 4.21 (mode 0 @ 4x)0:24.980:19.190:26.320:22.477.21 MB34.62%
    Monkey's Audio 3.99 (normal)0:19.630:14.440:20.770:17.117.28 MB34.95%
    Tak 1.01 (turbo)0:10.810:05.750:08.430:04.477.31 MB35.11%
    WavPack 4.41 (extra high -x)0:40.930:35.090:15.000:11.297.38 MB35.44%
    FLAC 1.2.1 (-8)0:38.780:33.610:07.050:03.527.46 MB35.82%
    WavPack 4.41 (high)0:17.840:11.830:13.070:09.227.49 MB35.98%
    Monkey's Audio 3.99 (fast)0:15.210:10.130:16.270:12.837.50 MB36.01%
    FLAC 1.2.1 (-5, default)0:14.840:09.520:07.390:03.367.51 MB36.08%
    WavPack 4.41 (normal -x)0:20.880:14.860:10.540:06.587.52 MB36.12%
    WavPack 4.41 (normal)0:14.750:08.790:10.880:06.667.58 MB36.41%
    FLAC 1.2.1 (-3)0:10.590:05.380:06.780:02.967.60 MB36.48%
    WavPack 4.41 (fast -x)0:17.360:11.370:09.090:05.067.69 MB36.92%
    WavPack 4.41 (fast)0:13.190:07.260:08.680:05.107.81 MB37.52%
    Apple Lossless (iTunes 4.5)????7.82 MB37.57%
    Bonk 0.51:16.801:12.071:00.910:57.067.83 MB37.62%
    FLAC 1.2.1 (-1)0:09.190:03.960:07.850:03.488.11 MB38.95%
    Shorten 3.2a (-p0 -b256, default)0:14.290:09.130:08.730:04.818.19 MB39.32%
    Shorten 3.2a (-p8 -b2048)0:17.660:12.410:10.010:06.258.29 MB39.83%
    RIFF WAVE0:36.640:36.6420.82 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__gloria_estefan_conga.html b/lib-src/libflac/doc/html/comparison__gloria_estefan_conga.html deleted file mode 100644 index 088721ce7..000000000 --- a/lib-src/libflac/doc/html/comparison__gloria_estefan_conga.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c8:50.138:38.358:31.048:22.6728.98 MB64.19%
    optimFROG 4.21 (mode 4 @ 1x)19:41.5519:29.0019:44.0419:32.9429.43 MB65.17%
    Monkey's Audio 3.99 (insane)7:37.657:26.837:59.147:50.7229.48 MB65.28%
    Monkey's Audio 3.99 (extra high)1:42.801:29.771:45.421:34.2729.49 MB65.30%
    optimFROG 4.21 (mode 3 @ 4x)3:26.623:12.393:30.883:19.4929.49 MB65.31%
    optimFROG 4.21 (mode 2 @ 4x)1:55.991:40.982:00.341:49.2129.54 MB65.42%
    optimFROG 4.21 (mode 1 @ 4x)1:28.641:13.821:32.591:20.9529.58 MB65.50%
    Monkey's Audio 3.99 (high)0:55.850:43.160:58.880:47.7629.69 MB65.76%
    Tak 1.01 (extra high max)4:14.194:03.060:25.550:14.3229.74 MB65.87%
    Tak 1.01 (extra high)1:31.551:18.820:25.920:14.5229.77 MB65.92%
    optimFROG 4.21 (mode 0 @ 4x)1:00.950:46.301:05.540:54.1029.78 MB65.95%
    Monkey's Audio 3.99 (normal)0:49.040:36.370:51.890:40.8429.83 MB66.05%
    Tak 1.01 (normal)0:42.970:29.860:23.540:12.2829.86 MB66.12%
    WavPack 4.41 (extra high -x)1:37.601:22.420:39.740:27.4629.92 MB66.27%
    WavPack 4.41 (high)0:41.970:26.810:33.680:21.4530.02 MB66.49%
    Monkey's Audio 3.99 (fast)0:37.950:25.200:41.850:30.3630.20 MB66.89%
    WavPack 4.41 (normal -x)0:52.600:37.670:27.550:15.5830.32 MB67.15%
    Tak 1.01 (turbo)0:27.640:13.980:22.580:11.2230.38 MB67.27%
    WavPack 4.41 (normal)0:35.400:20.450:28.550:15.4330.44 MB67.42%
    Bonk 0.53:09.652:57.692:35.012:23.8430.64 MB67.85%
    FLAC 1.2.1 (-8)1:37.621:24.840:23.650:09.1630.66 MB67.90%
    FLAC 1.2.1 (-5, default)0:36.820:23.610:20.770:08.7130.72 MB68.03%
    WavPack 4.41 (fast)0:31.000:17.170:24.180:12.3730.75 MB68.10%
    WavPack 4.41 (fast -x)0:43.650:29.080:23.780:12.1030.75 MB68.10%
    Apple Lossless (iTunes 4.5)????30.91 MB68.47%
    FLAC 1.2.1 (-3)0:28.350:14.220:22.350:08.5231.49 MB69.74%
    Shorten 3.2a (-p8 -b2048)0:45.470:31.570:27.670:15.9431.76 MB70.34%
    FLAC 1.2.1 (-1)0:24.040:10.050:19.460:08.0031.95 MB70.76%
    Shorten 3.2a (-p0 -b256, default)0:37.090:23.160:23.320:11.5032.47 MB71.91%
    RIFF WAVE2:44.302:44.3045.15 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__hand_in_my_pocket.html b/lib-src/libflac/doc/html/comparison__hand_in_my_pocket.html deleted file mode 100644 index f718c3cd9..000000000 --- a/lib-src/libflac/doc/html/comparison__hand_in_my_pocket.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c7:32.827:22.327:15.807:09.3220.77 MB53.12%
    Monkey's Audio 3.99 (insane)6:32.306:21.616:49.126:42.8221.22 MB54.27%
    optimFROG 4.21 (mode 4 @ 1x)16:52.1716:41.4816:54.9316:45.2521.24 MB54.33%
    optimFROG 4.21 (mode 3 @ 4x)2:55.932:44.652:59.072:50.8221.25 MB54.36%
    optimFROG 4.21 (mode 2 @ 4x)1:38.571:26.581:41.851:32.9321.33 MB54.55%
    optimFROG 4.21 (mode 1 @ 4x)1:14.991:02.511:17.801:09.1021.36 MB54.64%
    Monkey's Audio 3.99 (extra high)1:26.611:16.071:30.361:21.4421.40 MB54.75%
    Tak 1.01 (extra high max)3:26.433:17.090:23.190:13.4221.49 MB54.96%
    Tak 1.01 (extra high)1:15.741:05.080:23.060:14.1621.52 MB55.04%
    Monkey's Audio 3.99 (high)0:46.910:36.450:49.980:41.1621.66 MB55.40%
    Tak 1.01 (normal)0:35.390:24.390:20.800:12.1421.73 MB55.57%
    Monkey's Audio 3.99 (normal)0:41.220:30.240:42.700:34.0521.76 MB55.65%
    optimFROG 4.21 (mode 0 @ 4x)0:53.020:40.300:55.090:45.6621.89 MB55.98%
    WavPack 4.41 (extra high -x)1:22.521:09.690:33.630:23.7622.04 MB56.37%
    Monkey's Audio 3.99 (fast)0:31.610:20.950:34.930:26.0922.13 MB56.60%
    WavPack 4.41 (high)0:35.980:22.810:29.070:18.3322.34 MB57.14%
    WavPack 4.41 (normal -x)0:45.150:31.710:22.650:13.1122.96 MB58.74%
    Tak 1.01 (turbo)0:23.450:11.800:18.300:09.0923.06 MB58.97%
    FLAC 1.2.1 (-8)1:22.331:11.760:17.640:08.4823.19 MB59.31%
    WavPack 4.41 (normal)0:30.380:17.380:23.350:14.2223.26 MB59.50%
    FLAC 1.2.1 (-5, default)0:31.320:20.100:16.760:07.2223.30 MB59.61%
    Bonk 0.52:39.842:29.572:09.432:00.0523.35 MB59.72%
    Apple Lossless (iTunes 4.5)????23.64 MB60.47%
    WavPack 4.41 (fast -x)0:37.370:24.820:19.970:10.5423.81 MB60.91%
    WavPack 4.41 (fast)0:28.080:14.530:20.820:11.0223.93 MB61.21%
    FLAC 1.2.1 (-3)0:23.760:11.000:16.250:06.8224.04 MB61.48%
    Shorten 3.2a (-p8 -b2048)0:38.450:26.710:23.330:13.6724.72 MB63.23%
    FLAC 1.2.1 (-1)0:20.600:08.530:16.830:07.1724.78 MB63.40%
    Shorten 3.2a (-p0 -b256, default)0:31.140:19.240:21.190:11.2825.34 MB64.81%
    RIFF WAVE1:57.731:57.7339.09 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__l_sub_raga_sivapriya.html b/lib-src/libflac/doc/html/comparison__l_sub_raga_sivapriya.html deleted file mode 100644 index 8630c0365..000000000 --- a/lib-src/libflac/doc/html/comparison__l_sub_raga_sivapriya.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c40:54.7839:59.0439:22.2038:52.3687.51 MB40.97%
    Monkey's Audio 3.99 (insane)35:16.9934:30.8636:59.6336:29.4889.18 MB41.75%
    Tak 1.01 (extra high max)17:43.5816:55.922:14.141:27.3990.84 MB42.53%
    Tak 1.01 (extra high)6:59.206:04.852:14.621:29.2990.88 MB42.55%
    Monkey's Audio 3.99 (extra high)7:46.456:53.718:04.357:21.4490.95 MB42.58%
    optimFROG 4.21 (mode 4 @ 1x)93:03.5592:09.3893:14.0992:30.1292.05 MB43.10%
    optimFROG 4.21 (mode 3 @ 4x)15:57.6915:02.4316:17.4515:35.3892.09 MB43.11%
    optimFROG 4.21 (mode 2 @ 4x)8:48.937:50.699:07.338:24.9992.48 MB43.30%
    optimFROG 4.21 (mode 1 @ 4x)6:37.615:38.427:01.966:16.4192.76 MB43.43%
    Monkey's Audio 3.99 (high)4:10.523:16.404:28.743:43.2993.15 MB43.61%
    Monkey's Audio 3.99 (normal)3:36.142:42.033:55.633:10.3194.32 MB44.16%
    Tak 1.01 (normal)3:09.812:14.131:47.440:58.0894.45 MB44.22%
    optimFROG 4.21 (mode 0 @ 4x)4:29.253:31.364:51.564:05.6394.74 MB44.36%
    Monkey's Audio 3.99 (fast)2:47.971:53.553:05.922:19.0495.34 MB44.64%
    WavPack 4.41 (extra high -x)7:25.786:23.832:58.682:08.0696.11 MB45.00%
    Tak 1.01 (turbo)1:59.331:02.271:43.560:51.7296.13 MB45.01%
    FLAC 1.2.1 (-8)7:18.016:23.651:28.930:40.0096.68 MB45.26%
    WavPack 4.41 (high)3:10.072:05.532:30.661:39.3596.80 MB45.32%
    FLAC 1.2.1 (-5, default)2:43.851:47.041:26.330:39.0897.00 MB45.41%
    WavPack 4.41 (normal -x)3:48.912:43.721:56.401:09.6897.37 MB45.59%
    FLAC 1.2.1 (-3)1:58.631:00.671:28.480:39.7797.92 MB45.85%
    WavPack 4.41 (normal)2:38.391:32.772:03.211:13.2298.03 MB45.90%
    Apple Lossless (iTunes 4.5)????98.57 MB46.15%
    WavPack 4.41 (fast -x)3:11.512:05.471:46.710:54.2098.79 MB46.25%
    Bonk 0.513:47.9412:57.2511:07.4210:21.5298.94 MB46.33%
    WavPack 4.41 (fast)2:21.401:16.781:43.540:54.40100.00 MB46.82%
    Shorten 3.2a (-p8 -b2048)3:14.032:16.631:58.491:08.47102.60 MB48.04%
    Shorten 3.2a (-p0 -b256, default)2:41.541:43.741:48.330:56.56102.84 MB48.15%
    FLAC 1.2.1 (-1)1:44.160:43.351:30.390:36.69103.43 MB48.43%
    RIFF WAVE8:16.118:16.11213.56 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__laetatus_sum.html b/lib-src/libflac/doc/html/comparison__laetatus_sum.html deleted file mode 100644 index 1a33380b2..000000000 --- a/lib-src/libflac/doc/html/comparison__laetatus_sum.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c4:39.124:33.044:29.324:25.4811.94 MB49.22%
    Monkey's Audio 3.99 (insane)4:04.683:58.314:15.314:11.7412.05 MB49.68%
    Monkey's Audio 3.99 (extra high)0:54.040:47.410:55.760:50.8112.09 MB49.81%
    Tak 1.01 (extra high)0:46.420:39.870:14.100:08.7312.15 MB50.09%
    Tak 1.01 (extra high max)1:55.691:49.710:13.790:08.6612.15 MB50.09%
    optimFROG 4.21 (mode 4 @ 1x)10:35.0910:28.5610:36.3910:31.0712.17 MB50.15%
    optimFROG 4.21 (mode 3 @ 4x)1:49.811:42.941:51.851:46.8912.19 MB50.23%
    Monkey's Audio 3.99 (high)0:28.990:22.510:30.720:25.7112.23 MB50.42%
    Tak 1.01 (normal)0:21.770:15.120:11.850:06.6612.25 MB50.47%
    optimFROG 4.21 (mode 2 @ 4x)1:00.930:53.701:05.580:59.0612.27 MB50.58%
    Monkey's Audio 3.99 (normal)0:25.040:18.610:26.380:21.5712.42 MB51.18%
    optimFROG 4.21 (mode 1 @ 4x)0:45.860:38.630:48.380:43.2112.43 MB51.21%
    Tak 1.01 (turbo)0:13.730:07.030:11.470:06.4012.54 MB51.67%
    optimFROG 4.21 (mode 0 @ 4x)0:31.360:23.990:33.700:28.3612.63 MB52.07%
    WavPack 4.41 (extra high -x)0:51.140:43.720:20.370:14.6112.66 MB52.17%
    Bonk 0.51:35.751:29.851:17.291:12.0212.71 MB52.37%
    FLAC 1.2.1 (-8)0:50.660:44.240:11.600:06.0412.71 MB52.38%
    Monkey's Audio 3.99 (fast)0:19.480:13.100:22.330:16.4112.76 MB52.60%
    FLAC 1.2.1 (-5, default)0:19.150:12.460:09.230:04.1312.82 MB52.85%
    WavPack 4.41 (high)0:21.590:14.300:17.340:11.6412.87 MB53.02%
    FLAC 1.2.1 (-3)0:13.620:07.160:10.110:04.7312.90 MB53.17%
    WavPack 4.41 (normal -x)0:26.760:19.190:13.350:08.1512.92 MB53.25%
    WavPack 4.41 (normal)0:18.280:10.590:14.270:09.1712.95 MB53.38%
    Apple Lossless (iTunes 4.5)????13.04 MB53.77%
    WavPack 4.41 (fast -x)0:22.180:14.440:11.600:06.5213.05 MB53.80%
    WavPack 4.41 (fast)0:16.890:09.020:12.620:06.9613.31 MB54.85%
    Shorten 3.2a (-p0 -b256, default)0:18.240:11.630:11.420:06.1513.32 MB54.89%
    FLAC 1.2.1 (-1)0:11.560:04.940:09.740:04.1813.32 MB54.92%
    Shorten 3.2a (-p8 -b2048)0:22.490:15.870:13.710:08.3213.42 MB55.31%
    RIFF WAVE1:07.701:07.7024.26 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__mummified_in_barbed_wire.html b/lib-src/libflac/doc/html/comparison__mummified_in_barbed_wire.html deleted file mode 100644 index ddd142cdc..000000000 --- a/lib-src/libflac/doc/html/comparison__mummified_in_barbed_wire.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c6:34.386:24.876:21.266:14.5322.69 MB67.98%
    Monkey's Audio 3.99 (insane)5:40.585:30.735:55.615:49.3022.83 MB68.39%
    Monkey's Audio 3.99 (extra high)1:16.321:05.831:18.271:09.9222.85 MB68.47%
    optimFROG 4.21 (mode 4 @ 1x)14:35.3914:25.9814:37.3814:28.8922.95 MB68.77%
    optimFROG 4.21 (mode 3 @ 4x)2:32.722:22.242:35.632:27.7423.01 MB68.94%
    Tak 1.01 (extra high max)2:45.872:36.910:19.630:11.1723.04 MB69.04%
    Tak 1.01 (extra high)1:03.100:53.220:22.920:11.7823.06 MB69.08%
    Monkey's Audio 3.99 (high)0:41.330:31.840:43.870:35.6623.18 MB69.45%
    optimFROG 4.21 (mode 2 @ 4x)1:26.091:14.651:29.331:20.8723.21 MB69.54%
    Monkey's Audio 3.99 (normal)0:35.680:26.310:39.150:30.7723.24 MB69.63%
    Tak 1.01 (normal)0:31.430:21.180:18.740:09.9223.24 MB69.64%
    optimFROG 4.21 (mode 1 @ 4x)1:04.820:53.531:08.491:00.1123.31 MB69.84%
    WavPack 4.41 (extra high -x)1:11.611:00.900:28.810:19.6623.38 MB70.06%
    Tak 1.01 (turbo)0:21.430:10.210:17.250:07.9723.49 MB70.37%
    FLAC 1.2.1 (-8)1:12.781:03.110:16.260:07.2323.72 MB71.06%
    WavPack 4.41 (high)0:31.880:20.250:26.680:16.6923.83 MB71.41%
    WavPack 4.41 (normal -x)0:38.920:27.330:20.460:11.8323.91 MB71.63%
    optimFROG 4.21 (mode 0 @ 4x)0:44.750:33.750:48.790:40.1123.95 MB71.76%
    FLAC 1.2.1 (-5, default)0:28.410:17.730:16.000:06.3924.01 MB71.94%
    Monkey's Audio 3.99 (fast)0:28.670:18.670:32.520:23.9824.14 MB72.34%
    WavPack 4.41 (normal)0:26.910:15.010:22.340:13.3524.17 MB72.42%
    Bonk 0.52:22.132:13.041:58.241:49.1124.36 MB72.97%
    Apple Lossless (iTunes 4.5)????24.37 MB73.01%
    WavPack 4.41 (fast -x)0:32.790:21.370:19.240:10.1624.86 MB74.47%
    WavPack 4.41 (fast)0:25.340:12.540:18.760:09.3024.86 MB74.48%
    FLAC 1.2.1 (-3)0:21.480:10.460:15.500:06.6825.05 MB75.04%
    Shorten 3.2a (-p8 -b2048)0:34.780:23.740:22.600:13.5525.12 MB75.26%
    FLAC 1.2.1 (-1)0:18.750:07.500:16.250:07.2626.07 MB78.12%
    Shorten 3.2a (-p0 -b256, default)0:28.670:17.590:19.190:09.9726.61 MB79.72%
    RIFF WAVE2:08.632:08.6333.37 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__prokofiev_pcon3_3.html b/lib-src/libflac/doc/html/comparison__prokofiev_pcon3_3.html deleted file mode 100644 index c0ca7fbbf..000000000 --- a/lib-src/libflac/doc/html/comparison__prokofiev_pcon3_3.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c19:03.4718:38.1618:20.2018:07.7732.65 MB32.43%
    Tak 1.01 (extra high max)8:25.738:04.190:59.470:40.0233.30 MB33.06%
    Tak 1.01 (extra high)3:11.592:47.241:03.540:44.2133.32 MB33.09%
    Monkey's Audio 3.99 (insane)16:09.4315:46.0416:53.9216:41.2533.34 MB33.11%
    optimFROG 4.21 (mode 4 @ 1x)43:22.3042:57.3343:26.4943:07.0133.58 MB33.35%
    Monkey's Audio 3.99 (extra high)3:33.723:09.653:44.813:26.4633.60 MB33.37%
    optimFROG 4.21 (mode 3 @ 4x)7:21.406:59.217:29.737:12.1233.66 MB33.43%
    optimFROG 4.21 (mode 2 @ 4x)4:02.673:36.664:10.753:52.1433.73 MB33.50%
    optimFROG 4.21 (mode 1 @ 4x)3:00.862:34.683:07.842:49.2533.83 MB33.60%
    optimFROG 4.21 (mode 0 @ 4x)1:59.441:34.592:08.441:49.0534.14 MB33.90%
    Monkey's Audio 3.99 (high)1:54.151:29.892:06.521:47.7834.16 MB33.92%
    Tak 1.01 (normal)1:28.481:02.760:50.740:30.0634.41 MB34.17%
    Monkey's Audio 3.99 (normal)1:38.221:13.731:48.431:29.3134.58 MB34.34%
    WavPack 4.41 (extra high -x)3:30.153:00.661:24.081:03.8434.82 MB34.58%
    Tak 1.01 (turbo)0:53.570:28.130:48.050:27.9534.98 MB34.74%
    WavPack 4.41 (high)1:29.500:58.581:09.840:48.8335.24 MB34.99%
    WavPack 4.41 (normal -x)1:47.071:17.260:56.040:36.1835.34 MB35.09%
    Monkey's Audio 3.99 (fast)1:16.080:51.681:25.821:06.7535.53 MB35.28%
    WavPack 4.41 (normal)1:13.130:43.990:55.600:33.2735.69 MB35.44%
    FLAC 1.2.1 (-8)3:13.352:49.180:39.620:20.1735.99 MB35.74%
    FLAC 1.2.1 (-5, default)1:14.370:49.350:38.860:18.3936.28 MB36.03%
    WavPack 4.41 (fast -x)1:27.940:57.860:46.530:25.7636.37 MB36.12%
    FLAC 1.2.1 (-3)0:53.070:26.950:41.380:19.1636.65 MB36.40%
    WavPack 4.41 (fast)1:07.120:36.210:48.290:28.2537.18 MB36.92%
    Apple Lossless (iTunes 4.5)????37.32 MB37.06%
    FLAC 1.2.1 (-1)0:46.220:19.530:38.540:17.8639.23 MB38.96%
    Shorten 3.2a (-p0 -b256, default)1:13.080:46.860:49.720:28.8539.49 MB39.21%
    Bonk 0.56:18.905:55.405:07.274:46.8440.31 MB40.03%
    Shorten 3.2a (-p8 -b2048)1:27.831:01.220:57.700:34.3645.34 MB45.02%
    RIFF WAVE3:05.103:05.10100.68 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__ravel_sq4_4.html b/lib-src/libflac/doc/html/comparison__ravel_sq4_4.html deleted file mode 100644 index f722b5356..000000000 --- a/lib-src/libflac/doc/html/comparison__ravel_sq4_4.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c10:40.8810:27.2210:17.0710:09.6419.94 MB35.50%
    Monkey's Audio 3.99 (insane)9:08.888:56.229:37.009:29.3520.17 MB35.90%
    Monkey's Audio 3.99 (extra high)2:00.531:47.082:05.061:54.6420.29 MB36.11%
    Tak 1.01 (extra high max)4:39.264:27.170:33.470:22.4220.33 MB36.19%
    Tak 1.01 (extra high)1:48.731:34.920:35.500:24.1920.35 MB36.22%
    optimFROG 4.21 (mode 4 @ 1x)24:26.7424:12.4024:28.8024:17.9820.62 MB36.71%
    Monkey's Audio 3.99 (high)1:04.750:50.791:09.210:58.4920.68 MB36.81%
    optimFROG 4.21 (mode 3 @ 4x)4:10.493:56.434:13.884:03.9020.72 MB36.88%
    optimFROG 4.21 (mode 2 @ 4x)2:17.172:02.142:21.022:10.7820.83 MB37.07%
    optimFROG 4.21 (mode 1 @ 4x)1:42.601:27.341:47.211:36.5420.93 MB37.25%
    Tak 1.01 (normal)0:48.660:34.630:26.320:15.2020.95 MB37.28%
    Monkey's Audio 3.99 (normal)0:55.630:41.681:00.360:49.6621.05 MB37.47%
    optimFROG 4.21 (mode 0 @ 4x)1:08.870:53.421:13.721:02.9721.23 MB37.79%
    WavPack 4.41 (extra high -x)1:56.001:41.600:44.820:33.1921.42 MB38.13%
    Tak 1.01 (turbo)0:30.010:15.730:24.320:12.8921.49 MB38.25%
    Monkey's Audio 3.99 (fast)0:43.140:29.290:48.440:37.3921.52 MB38.30%
    WavPack 4.41 (high)0:49.040:32.840:37.710:25.3121.59 MB38.42%
    WavPack 4.41 (normal -x)0:59.890:43.470:29.430:18.5821.72 MB38.66%
    WavPack 4.41 (normal)0:40.760:24.680:30.440:19.0621.75 MB38.70%
    FLAC 1.2.1 (-8)1:51.951:38.330:21.080:10.1421.78 MB38.77%
    FLAC 1.2.1 (-5, default)0:41.470:27.540:21.210:09.9621.90 MB38.97%
    WavPack 4.41 (fast -x)0:49.790:33.440:26.250:14.4322.02 MB39.20%
    WavPack 4.41 (fast)0:36.560:20.280:25.550:14.0822.23 MB39.57%
    FLAC 1.2.1 (-3)0:29.860:15.760:20.280:09.1022.42 MB39.91%
    Apple Lossless (iTunes 4.5)????22.52 MB40.08%
    Bonk 0.53:32.503:19.492:50.962:39.4223.18 MB41.25%
    FLAC 1.2.1 (-1)0:25.230:10.810:21.380:09.8723.33 MB41.52%
    Shorten 3.2a (-p0 -b256, default)0:41.160:26.710:26.700:15.2723.71 MB42.21%
    Shorten 3.2a (-p8 -b2048)0:49.310:34.870:30.800:17.9625.59 MB45.54%
    RIFF WAVE1:53.061:53.0656.18 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__scarlatti_k42.html b/lib-src/libflac/doc/html/comparison__scarlatti_k42.html deleted file mode 100644 index b7c3f26a6..000000000 --- a/lib-src/libflac/doc/html/comparison__scarlatti_k42.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c3:07.283:03.363:00.592:58.146.62 MB40.36%
    Monkey's Audio 3.99 (insane)2:43.572:39.842:50.502:48.436.67 MB40.68%
    Monkey's Audio 3.99 (extra high)0:35.820:31.800:36.660:33.836.74 MB41.09%
    Tak 1.01 (extra high max)1:23.811:20.140:09.050:06.066.78 MB41.37%
    Tak 1.01 (extra high)0:32.020:27.950:08.950:05.906.80 MB41.48%
    optimFROG 4.21 (mode 4 @ 1x)7:08.277:04.287:09.327:06.006.87 MB41.90%
    optimFROG 4.21 (mode 3 @ 4x)1:13.311:09.331:15.161:12.056.88 MB41.96%
    Monkey's Audio 3.99 (high)0:19.090:15.100:20.200:17.456.91 MB42.13%
    optimFROG 4.21 (mode 2 @ 4x)0:40.290:36.010:41.990:38.606.91 MB42.16%
    Tak 1.01 (normal)0:14.620:10.550:07.620:04.676.97 MB42.54%
    optimFROG 4.21 (mode 1 @ 4x)0:30.050:25.840:33.760:29.486.98 MB42.55%
    Monkey's Audio 3.99 (normal)0:16.380:12.400:17.450:14.326.99 MB42.61%
    optimFROG 4.21 (mode 0 @ 4x)0:20.350:16.000:22.490:19.087.07 MB43.10%
    Tak 1.01 (turbo)0:08.800:04.680:06.870:03.777.11 MB43.34%
    WavPack 4.41 (extra high -x)0:34.070:29.660:13.060:09.607.13 MB43.47%
    Monkey's Audio 3.99 (fast)0:12.730:08.680:13.840:10.867.16 MB43.69%
    FLAC 1.2.1 (-8)0:33.100:29.010:07.010:03.367.23 MB44.10%
    WavPack 4.41 (high)0:13.920:09.610:11.170:07.237.24 MB44.16%
    FLAC 1.2.1 (-5, default)0:12.170:08.110:05.970:02.927.26 MB44.28%
    WavPack 4.41 (normal -x)0:17.340:12.760:08.720:05.347.27 MB44.34%
    FLAC 1.2.1 (-3)0:08.630:04.560:06.140:02.587.29 MB44.46%
    WavPack 4.41 (normal)0:11.550:07.090:08.770:05.467.32 MB44.67%
    WavPack 4.41 (fast -x)0:14.160:09.770:07.360:04.337.35 MB44.81%
    Apple Lossless (iTunes 4.5)????7.44 MB45.41%
    Bonk 0.51:02.990:59.100:50.900:47.487.46 MB45.48%
    Shorten 3.2a (-p0 -b256, default)0:11.690:07.620:07.490:04.447.48 MB45.64%
    FLAC 1.2.1 (-1)0:07.230:03.140:05.870:02.587.51 MB45.82%
    WavPack 4.41 (fast)0:10.410:05.970:07.980:04.347.73 MB47.14%
    Shorten 3.2a (-p8 -b2048)0:14.340:10.170:08.610:05.228.20 MB50.04%
    RIFF WAVE0:37.510:37.5116.39 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__tool_forty_six_and_2.html b/lib-src/libflac/doc/html/comparison__tool_forty_six_and_2.html deleted file mode 100644 index afc150050..000000000 --- a/lib-src/libflac/doc/html/comparison__tool_forty_six_and_2.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c12:28.2912:12.9312:02.2811:51.3937.42 MB58.24%
    optimFROG 4.21 (mode 4 @ 1x)27:57.0627:40.8428:01.2927:46.1637.96 MB59.07%
    optimFROG 4.21 (mode 3 @ 4x)4:50.124:32.534:57.454:43.2237.99 MB59.13%
    Monkey's Audio 3.99 (insane)10:46.5510:32.5811:19.5411:08.0538.00 MB59.14%
    Monkey's Audio 3.99 (extra high)2:22.002:05.732:29.802:14.7538.03 MB59.19%
    optimFROG 4.21 (mode 2 @ 4x)2:40.992:22.302:49.182:34.0038.08 MB59.27%
    optimFROG 4.21 (mode 1 @ 4x)2:01.341:42.412:11.181:55.1938.15 MB59.37%
    Monkey's Audio 3.99 (high)1:17.691:00.221:22.991:07.5938.21 MB59.47%
    Tak 1.01 (extra high max)5:45.295:29.360:36.160:20.9538.24 MB59.51%
    Tak 1.01 (extra high)2:03.191:45.490:36.250:20.6738.28 MB59.58%
    Monkey's Audio 3.99 (normal)1:06.860:49.481:13.250:58.0038.38 MB59.73%
    Tak 1.01 (normal)0:58.620:40.000:33.280:17.7538.45 MB59.84%
    optimFROG 4.21 (mode 0 @ 4x)1:23.431:04.391:31.901:15.6338.68 MB60.20%
    WavPack 4.41 (extra high -x)2:15.261:55.850:55.540:38.1838.80 MB60.38%
    WavPack 4.41 (high)0:58.090:38.420:46.360:29.4339.01 MB60.72%
    Monkey's Audio 3.99 (fast)0:52.400:34.800:57.820:42.7439.09 MB60.84%
    WavPack 4.41 (normal -x)1:10.800:51.660:38.470:22.1039.50 MB61.48%
    Tak 1.01 (turbo)0:37.400:19.460:33.330:15.8539.88 MB62.07%
    WavPack 4.41 (normal)0:48.400:28.640:38.310:22.6839.92 MB62.12%
    FLAC 1.2.1 (-8)2:16.291:58.230:31.690:14.5640.04 MB62.32%
    FLAC 1.2.1 (-5, default)0:50.890:33.030:28.200:12.6040.19 MB62.55%
    WavPack 4.41 (fast)0:43.920:23.940:35.660:17.2240.47 MB62.98%
    WavPack 4.41 (fast -x)1:00.670:40.170:35.000:17.8640.47 MB62.98%
    Apple Lossless (iTunes 4.5)????40.75 MB63.42%
    FLAC 1.2.1 (-3)0:37.480:19.570:30.660:11.1840.84 MB63.56%
    Bonk 0.54:25.624:08.653:37.563:21.5940.98 MB63.78%
    FLAC 1.2.1 (-1)0:32.210:13.870:27.890:11.4242.66 MB66.39%
    Shorten 3.2a (-p8 -b2048)1:02.290:43.530:41.480:23.5143.06 MB67.01%
    Shorten 3.2a (-p0 -b256, default)0:51.800:33.150:34.310:17.6443.18 MB67.21%
    RIFF WAVE3:32.163:32.1664.25 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison__white_room.html b/lib-src/libflac/doc/html/comparison__white_room.html deleted file mode 100644 index 18f0488b5..000000000 --- a/lib-src/libflac/doc/html/comparison__white_room.html +++ /dev/null @@ -1,171 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Ratio -
    La 0.3c10:19.1410:06.409:58.769:49.4033.44 MB63.09%
    optimFROG 4.21 (mode 3 @ 4x)3:59.683:44.764:06.853:53.6333.90 MB63.95%
    optimFROG 4.21 (mode 2 @ 4x)2:13.661:57.832:19.882:07.4433.91 MB63.97%
    optimFROG 4.21 (mode 4 @ 1x)22:58.3822:44.9923:03.4922:49.4533.93 MB63.99%
    Monkey's Audio 3.99 (insane)8:52.218:40.359:19.419:09.8233.95 MB64.04%
    optimFROG 4.21 (mode 1 @ 4x)1:41.141:24.941:48.081:35.1233.96 MB64.05%
    Monkey's Audio 3.99 (extra high)1:58.771:44.072:03.721:50.9634.00 MB64.13%
    Tak 1.01 (extra high max)4:38.014:24.470:31.770:18.5634.08 MB64.28%
    Tak 1.01 (extra high)1:42.151:27.360:31.010:17.9834.11 MB64.34%
    Monkey's Audio 3.99 (high)1:04.940:50.221:09.130:56.1734.11 MB64.35%
    Tak 1.01 (normal)0:48.570:33.590:28.230:14.7734.25 MB64.60%
    Monkey's Audio 3.99 (normal)0:55.970:41.521:00.660:47.6634.25 MB64.60%
    optimFROG 4.21 (mode 0 @ 4x)1:11.160:54.081:16.251:02.9634.29 MB64.68%
    WavPack 4.41 (extra high -x)1:52.391:35.780:46.170:31.5534.52 MB65.12%
    Tak 1.01 (turbo)0:30.950:15.970:27.610:13.1334.66 MB65.39%
    WavPack 4.41 (high)0:47.950:31.280:40.190:25.2934.78 MB65.61%
    FLAC 1.2.1 (-8)1:53.011:38.200:25.940:12.3334.85 MB65.73%
    Monkey's Audio 3.99 (fast)0:44.320:29.300:49.050:36.0234.85 MB65.74%
    Bonk 0.53:40.433:26.663:01.262:48.0534.96 MB65.95%
    WavPack 4.41 (normal -x)0:58.410:41.810:31.140:17.8634.99 MB66.01%
    FLAC 1.2.1 (-5, default)0:43.300:27.640:22.710:09.3735.07 MB66.16%
    WavPack 4.41 (normal)0:40.460:23.700:32.230:19.0435.18 MB66.36%
    FLAC 1.2.1 (-3)0:30.700:15.860:23.490:08.7635.30 MB66.59%
    Shorten 3.2a (-p8 -b2048)0:51.660:36.540:32.680:19.2735.40 MB66.77%
    Apple Lossless (iTunes 4.5)????35.46 MB66.89%
    WavPack 4.41 (fast -x)0:49.400:32.480:27.760:14.6235.50 MB66.97%
    WavPack 4.41 (fast)0:36.810:19.000:28.460:14.9035.61 MB67.18%
    Shorten 3.2a (-p0 -b256, default)0:41.620:26.530:28.650:14.8836.42 MB68.70%
    FLAC 1.2.1 (-1)0:26.900:11.600:23.190:08.6436.52 MB68.90%
    RIFF WAVE3:09.603:09.6053.01 MB100.00%
    -
    -
    - - Complete summary table
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison_all_cpudectime.html b/lib-src/libflac/doc/html/comparison_all_cpudectime.html deleted file mode 100644 index 3b5133d6c..000000000 --- a/lib-src/libflac/doc/html/comparison_all_cpudectime.html +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Avg.ratio -
    FLAC 1.2.1 (-1)6:24.512:42.935:26.872:17.49431.72 MB56.97%
    FLAC 1.2.1 (-3)7:23.773:47.425:31.152:19.07412.42 MB54.57%
    FLAC 1.2.1 (-5, default)10:07.416:35.685:23.162:22.41406.25 MB53.67%
    FLAC 1.2.1 (-8)26:46.7223:21.855:40.252:36.47404.23 MB53.36%
    Tak 1.01 (turbo)7:25.213:51.026:16.823:10.87399.97 MB52.71%
    WavPack 4.41 (fast -x)11:54.477:50.846:32.503:25.77411.52 MB54.39%
    WavPack 4.41 (fast)8:52.274:47.746:33.733:28.19415.05 MB54.92%
    Shorten 3.2a (-p0 -b256, default)10:01.386:23.406:38.433:30.66433.56 MB57.29%
    Tak 1.01 (normal)11:42.598:12.006:36.473:38.14391.16 MB51.39%
    Shorten 3.2a (-p8 -b2048)12:09.688:31.467:34.174:24.09438.86 MB58.11%
    WavPack 4.41 (normal -x)14:14.5410:13.337:23.144:24.26403.10 MB53.19%
    WavPack 4.41 (normal)9:48.595:46.917:37.264:30.11405.84 MB53.56%
    Tak 1.01 (extra high max)66:52.1563:48.917:39.414:46.01383.70 MB50.60%
    Tak 1.01 (extra high)25:14.0021:48.457:50.464:54.86384.06 MB50.66%
    WavPack 4.41 (high)11:48.477:45.589:19.076:05.35399.90 MB52.73%
    WavPack 4.41 (extra high -x)27:23.5623:29.2610:58.907:48.32396.56 MB52.22%
    Monkey's Audio 3.99 (fast)10:24.296:58.4611:32.078:37.81400.57 MB53.11%
    Apple Lossless (iTunes 4.5)19:53.2719:53.2710:01.8610:01.86414.45 MB54.96%
    Monkey's Audio 3.99 (normal)13:20.159:56.4014:24.0211:33.71393.17 MB51.97%
    Monkey's Audio 3.99 (high)15:26.1612:03.1616:30.0013:40.59389.83 MB51.53%
    optimFROG 4.21 (mode 0 @ 4x)16:36.9812:51.5817:55.5514:58.99394.69 MB52.24%
    optimFROG 4.21 (mode 1 @ 4x)24:25.0420:37.9625:48.9022:52.76389.04 MB51.52%
    Monkey's Audio 3.99 (extra high)28:34.0325:12.1429:38.8826:53.34384.55 MB50.87%
    optimFROG 4.21 (mode 2 @ 4x)32:20.4628:36.3833:39.9630:49.89387.93 MB51.33%
    Bonk 0.551:45.5848:32.1042:02.7639:05.43418.65 MB55.43%
    optimFROG 4.21 (mode 3 @ 4x)58:21.9454:52.6259:34.1256:51.21386.71 MB51.15%
    Monkey's Audio 3.99 (insane)129:07.86126:05.33135:13.19133:12.71381.79 MB50.65%
    La 0.3c150:12.30146:54.11144:50.36142:49.41375.76 MB49.86%
    optimFROG 4.21 (mode 4 @ 1x)338:34.15335:12.47339:18.57336:25.54386.22 MB51.06%
    RIFF WAVE73:44.9473:44.94780.56 MB100.00%
    -
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison_all_cpuenctime.html b/lib-src/libflac/doc/html/comparison_all_cpuenctime.html deleted file mode 100644 index 8b1ed0eae..000000000 --- a/lib-src/libflac/doc/html/comparison_all_cpuenctime.html +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Avg.ratio -
    FLAC 1.2.1 (-1)6:24.512:42.935:26.872:17.49431.72 MB56.97%
    FLAC 1.2.1 (-3)7:23.773:47.425:31.152:19.07412.42 MB54.57%
    Tak 1.01 (turbo)7:25.213:51.026:16.823:10.87399.97 MB52.71%
    WavPack 4.41 (fast)8:52.274:47.746:33.733:28.19415.05 MB54.92%
    WavPack 4.41 (normal)9:48.595:46.917:37.264:30.11405.84 MB53.56%
    Shorten 3.2a (-p0 -b256, default)10:01.386:23.406:38.433:30.66433.56 MB57.29%
    FLAC 1.2.1 (-5, default)10:07.416:35.685:23.162:22.41406.25 MB53.67%
    Monkey's Audio 3.99 (fast)10:24.296:58.4611:32.078:37.81400.57 MB53.11%
    WavPack 4.41 (high)11:48.477:45.589:19.076:05.35399.90 MB52.73%
    WavPack 4.41 (fast -x)11:54.477:50.846:32.503:25.77411.52 MB54.39%
    Tak 1.01 (normal)11:42.598:12.006:36.473:38.14391.16 MB51.39%
    Shorten 3.2a (-p8 -b2048)12:09.688:31.467:34.174:24.09438.86 MB58.11%
    Monkey's Audio 3.99 (normal)13:20.159:56.4014:24.0211:33.71393.17 MB51.97%
    WavPack 4.41 (normal -x)14:14.5410:13.337:23.144:24.26403.10 MB53.19%
    Monkey's Audio 3.99 (high)15:26.1612:03.1616:30.0013:40.59389.83 MB51.53%
    optimFROG 4.21 (mode 0 @ 4x)16:36.9812:51.5817:55.5514:58.99394.69 MB52.24%
    Apple Lossless (iTunes 4.5)19:53.2719:53.2710:01.8610:01.86414.45 MB54.96%
    optimFROG 4.21 (mode 1 @ 4x)24:25.0420:37.9625:48.9022:52.76389.04 MB51.52%
    Tak 1.01 (extra high)25:14.0021:48.457:50.464:54.86384.06 MB50.66%
    FLAC 1.2.1 (-8)26:46.7223:21.855:40.252:36.47404.23 MB53.36%
    WavPack 4.41 (extra high -x)27:23.5623:29.2610:58.907:48.32396.56 MB52.22%
    Monkey's Audio 3.99 (extra high)28:34.0325:12.1429:38.8826:53.34384.55 MB50.87%
    optimFROG 4.21 (mode 2 @ 4x)32:20.4628:36.3833:39.9630:49.89387.93 MB51.33%
    Bonk 0.551:45.5848:32.1042:02.7639:05.43418.65 MB55.43%
    optimFROG 4.21 (mode 3 @ 4x)58:21.9454:52.6259:34.1256:51.21386.71 MB51.15%
    Tak 1.01 (extra high max)66:52.1563:48.917:39.414:46.01383.70 MB50.60%
    Monkey's Audio 3.99 (insane)129:07.86126:05.33135:13.19133:12.71381.79 MB50.65%
    La 0.3c150:12.30146:54.11144:50.36142:49.41375.76 MB49.86%
    optimFROG 4.21 (mode 4 @ 1x)338:34.15335:12.47339:18.57336:25.54386.22 MB51.06%
    RIFF WAVE73:44.9473:44.94780.56 MB100.00%
    -
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison_all_procdectime.html b/lib-src/libflac/doc/html/comparison_all_procdectime.html deleted file mode 100644 index 527fe2dcd..000000000 --- a/lib-src/libflac/doc/html/comparison_all_procdectime.html +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Avg.ratio -
    FLAC 1.2.1 (-5, default)10:07.416:35.685:23.162:22.41406.25 MB53.67%
    FLAC 1.2.1 (-1)6:24.512:42.935:26.872:17.49431.72 MB56.97%
    FLAC 1.2.1 (-3)7:23.773:47.425:31.152:19.07412.42 MB54.57%
    FLAC 1.2.1 (-8)26:46.7223:21.855:40.252:36.47404.23 MB53.36%
    Tak 1.01 (turbo)7:25.213:51.026:16.823:10.87399.97 MB52.71%
    WavPack 4.41 (fast -x)11:54.477:50.846:32.503:25.77411.52 MB54.39%
    WavPack 4.41 (fast)8:52.274:47.746:33.733:28.19415.05 MB54.92%
    Tak 1.01 (normal)11:42.598:12.006:36.473:38.14391.16 MB51.39%
    Shorten 3.2a (-p0 -b256, default)10:01.386:23.406:38.433:30.66433.56 MB57.29%
    WavPack 4.41 (normal -x)14:14.5410:13.337:23.144:24.26403.10 MB53.19%
    Shorten 3.2a (-p8 -b2048)12:09.688:31.467:34.174:24.09438.86 MB58.11%
    WavPack 4.41 (normal)9:48.595:46.917:37.264:30.11405.84 MB53.56%
    Tak 1.01 (extra high max)66:52.1563:48.917:39.414:46.01383.70 MB50.60%
    Tak 1.01 (extra high)25:14.0021:48.457:50.464:54.86384.06 MB50.66%
    WavPack 4.41 (high)11:48.477:45.589:19.076:05.35399.90 MB52.73%
    Apple Lossless (iTunes 4.5)19:53.2719:53.2710:01.8610:01.86414.45 MB54.96%
    WavPack 4.41 (extra high -x)27:23.5623:29.2610:58.907:48.32396.56 MB52.22%
    Monkey's Audio 3.99 (fast)10:24.296:58.4611:32.078:37.81400.57 MB53.11%
    Monkey's Audio 3.99 (normal)13:20.159:56.4014:24.0211:33.71393.17 MB51.97%
    Monkey's Audio 3.99 (high)15:26.1612:03.1616:30.0013:40.59389.83 MB51.53%
    optimFROG 4.21 (mode 0 @ 4x)16:36.9812:51.5817:55.5514:58.99394.69 MB52.24%
    optimFROG 4.21 (mode 1 @ 4x)24:25.0420:37.9625:48.9022:52.76389.04 MB51.52%
    Monkey's Audio 3.99 (extra high)28:34.0325:12.1429:38.8826:53.34384.55 MB50.87%
    optimFROG 4.21 (mode 2 @ 4x)32:20.4628:36.3833:39.9630:49.89387.93 MB51.33%
    Bonk 0.551:45.5848:32.1042:02.7639:05.43418.65 MB55.43%
    optimFROG 4.21 (mode 3 @ 4x)58:21.9454:52.6259:34.1256:51.21386.71 MB51.15%
    Monkey's Audio 3.99 (insane)129:07.86126:05.33135:13.19133:12.71381.79 MB50.65%
    La 0.3c150:12.30146:54.11144:50.36142:49.41375.76 MB49.86%
    optimFROG 4.21 (mode 4 @ 1x)338:34.15335:12.47339:18.57336:25.54386.22 MB51.06%
    RIFF WAVE73:44.9473:44.94780.56 MB100.00%
    -
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison_all_procenctime.html b/lib-src/libflac/doc/html/comparison_all_procenctime.html deleted file mode 100644 index 1a13652e6..000000000 --- a/lib-src/libflac/doc/html/comparison_all_procenctime.html +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Avg.ratio -
    FLAC 1.2.1 (-1)6:24.512:42.935:26.872:17.49431.72 MB56.97%
    FLAC 1.2.1 (-3)7:23.773:47.425:31.152:19.07412.42 MB54.57%
    Tak 1.01 (turbo)7:25.213:51.026:16.823:10.87399.97 MB52.71%
    WavPack 4.41 (fast)8:52.274:47.746:33.733:28.19415.05 MB54.92%
    WavPack 4.41 (normal)9:48.595:46.917:37.264:30.11405.84 MB53.56%
    Shorten 3.2a (-p0 -b256, default)10:01.386:23.406:38.433:30.66433.56 MB57.29%
    FLAC 1.2.1 (-5, default)10:07.416:35.685:23.162:22.41406.25 MB53.67%
    Monkey's Audio 3.99 (fast)10:24.296:58.4611:32.078:37.81400.57 MB53.11%
    Tak 1.01 (normal)11:42.598:12.006:36.473:38.14391.16 MB51.39%
    WavPack 4.41 (high)11:48.477:45.589:19.076:05.35399.90 MB52.73%
    WavPack 4.41 (fast -x)11:54.477:50.846:32.503:25.77411.52 MB54.39%
    Shorten 3.2a (-p8 -b2048)12:09.688:31.467:34.174:24.09438.86 MB58.11%
    Monkey's Audio 3.99 (normal)13:20.159:56.4014:24.0211:33.71393.17 MB51.97%
    WavPack 4.41 (normal -x)14:14.5410:13.337:23.144:24.26403.10 MB53.19%
    Monkey's Audio 3.99 (high)15:26.1612:03.1616:30.0013:40.59389.83 MB51.53%
    optimFROG 4.21 (mode 0 @ 4x)16:36.9812:51.5817:55.5514:58.99394.69 MB52.24%
    Apple Lossless (iTunes 4.5)19:53.2719:53.2710:01.8610:01.86414.45 MB54.96%
    optimFROG 4.21 (mode 1 @ 4x)24:25.0420:37.9625:48.9022:52.76389.04 MB51.52%
    Tak 1.01 (extra high)25:14.0021:48.457:50.464:54.86384.06 MB50.66%
    FLAC 1.2.1 (-8)26:46.7223:21.855:40.252:36.47404.23 MB53.36%
    WavPack 4.41 (extra high -x)27:23.5623:29.2610:58.907:48.32396.56 MB52.22%
    Monkey's Audio 3.99 (extra high)28:34.0325:12.1429:38.8826:53.34384.55 MB50.87%
    optimFROG 4.21 (mode 2 @ 4x)32:20.4628:36.3833:39.9630:49.89387.93 MB51.33%
    Bonk 0.551:45.5848:32.1042:02.7639:05.43418.65 MB55.43%
    optimFROG 4.21 (mode 3 @ 4x)58:21.9454:52.6259:34.1256:51.21386.71 MB51.15%
    Tak 1.01 (extra high max)66:52.1563:48.917:39.414:46.01383.70 MB50.60%
    Monkey's Audio 3.99 (insane)129:07.86126:05.33135:13.19133:12.71381.79 MB50.65%
    La 0.3c150:12.30146:54.11144:50.36142:49.41375.76 MB49.86%
    optimFROG 4.21 (mode 4 @ 1x)338:34.15335:12.47339:18.57336:25.54386.22 MB51.06%
    RIFF WAVE73:44.9473:44.94780.56 MB100.00%
    -
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/comparison_all_ratio.html b/lib-src/libflac/doc/html/comparison_all_ratio.html deleted file mode 100644 index bbf13335f..000000000 --- a/lib-src/libflac/doc/html/comparison_all_ratio.html +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - comparison - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - comparison -
    -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Encode time - - Decode time - - Compression -
    - Codec - - Total - - CPU - - Total - - CPU - - Size - - Avg.ratio -
    La 0.3c150:12.30146:54.11144:50.36142:49.41375.76 MB49.86%
    Tak 1.01 (extra high max)66:52.1563:48.917:39.414:46.01383.70 MB50.60%
    Monkey's Audio 3.99 (insane)129:07.86126:05.33135:13.19133:12.71381.79 MB50.65%
    Tak 1.01 (extra high)25:14.0021:48.457:50.464:54.86384.06 MB50.66%
    Monkey's Audio 3.99 (extra high)28:34.0325:12.1429:38.8826:53.34384.55 MB50.87%
    optimFROG 4.21 (mode 4 @ 1x)338:34.15335:12.47339:18.57336:25.54386.22 MB51.06%
    optimFROG 4.21 (mode 3 @ 4x)58:21.9454:52.6259:34.1256:51.21386.71 MB51.15%
    optimFROG 4.21 (mode 2 @ 4x)32:20.4628:36.3833:39.9630:49.89387.93 MB51.33%
    Tak 1.01 (normal)11:42.598:12.006:36.473:38.14391.16 MB51.39%
    optimFROG 4.21 (mode 1 @ 4x)24:25.0420:37.9625:48.9022:52.76389.04 MB51.52%
    Monkey's Audio 3.99 (high)15:26.1612:03.1616:30.0013:40.59389.83 MB51.53%
    Monkey's Audio 3.99 (normal)13:20.159:56.4014:24.0211:33.71393.17 MB51.97%
    WavPack 4.41 (extra high -x)27:23.5623:29.2610:58.907:48.32396.56 MB52.22%
    optimFROG 4.21 (mode 0 @ 4x)16:36.9812:51.5817:55.5514:58.99394.69 MB52.24%
    Tak 1.01 (turbo)7:25.213:51.026:16.823:10.87399.97 MB52.71%
    WavPack 4.41 (high)11:48.477:45.589:19.076:05.35399.90 MB52.73%
    Monkey's Audio 3.99 (fast)10:24.296:58.4611:32.078:37.81400.57 MB53.11%
    WavPack 4.41 (normal -x)14:14.5410:13.337:23.144:24.26403.10 MB53.19%
    FLAC 1.2.1 (-8)26:46.7223:21.855:40.252:36.47404.23 MB53.36%
    WavPack 4.41 (normal)9:48.595:46.917:37.264:30.11405.84 MB53.56%
    FLAC 1.2.1 (-5, default)10:07.416:35.685:23.162:22.41406.25 MB53.67%
    WavPack 4.41 (fast -x)11:54.477:50.846:32.503:25.77411.52 MB54.39%
    FLAC 1.2.1 (-3)7:23.773:47.425:31.152:19.07412.42 MB54.57%
    WavPack 4.41 (fast)8:52.274:47.746:33.733:28.19415.05 MB54.92%
    Apple Lossless (iTunes 4.5)19:53.2719:53.2710:01.8610:01.86414.45 MB54.96%
    Bonk 0.551:45.5848:32.1042:02.7639:05.43418.65 MB55.43%
    FLAC 1.2.1 (-1)6:24.512:42.935:26.872:17.49431.72 MB56.97%
    Shorten 3.2a (-p0 -b256, default)10:01.386:23.406:38.433:30.66433.56 MB57.29%
    Shorten 3.2a (-p8 -b2048)12:09.688:31.467:34.174:24.09438.86 MB58.11%
    RIFF WAVE73:44.9473:44.94780.56 MB100.00%
    -
    -
    - Frederic Chopin Prelude No.24 in d minor
    - Dream Theater 6:00
    - Eddie Warner Titus
    - Maurice Ravel Fanfare from "L'eventail de Jeanne"
    - Gloria Estefan Conga
    - Alanis Morissette Hand In My Pocket
    - L. Subramaniam Raga Sivapriya
    - The Benedictine Monks of Santo Domingo de Silos Laetatus Sum
    - Cannibal Corpse Mummified In Barbed Wire
    - Sergei Prokofiev Piano Concerto No.3 (3rd movement)
    - Maurice Ravel String Quartet (4th movement)
    - Domenico Scarlatti Sonata K.42 (arr.Yepes for guitar)
    - Tool Forty-six & 2
    - Cream White Room
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/developers.html b/lib-src/libflac/doc/html/developers.html index 8347cff92..0c2733177 100644 --- a/lib-src/libflac/doc/html/developers.html +++ b/lib-src/libflac/doc/html/developers.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -52,7 +44,7 @@
    FLAC is an open source project and we are happy to enlist the help of anyone who wants to contribute, or to help with FLAC support in other programs and devices. The preferred method of communication is the developer mailing list (you must subscribe to post).

    - FLAC is open to third-party developers who want to add support for FLAC into their programs. All the necessary functionality is contained the libFLAC libraries which are licensed under Xiph.org's BSD license.
    + FLAC is open to third-party developers who want to add support for FLAC into their programs. All the necessary functionality is contained in the libFLAC libraries which are licensed under Xiph.org's BSD license.

    Some pointers to developer documentation and code:
    - More resources are available on the FLAC project page on Sourceforge.net.
    @@ -107,7 +98,7 @@ Anti-goals
    • - Lossy compression. There are already many suitable lossy formats (Ogg Vorbis, MP3, etc.). + Lossy compression. There are already many suitable lossy formats (Ogg Vorbis, MP3, etc.).
    • Copy prevention, DRM, etc. There is no intention to add any copy prevention methods. Of course, we can't stop someone from encrypting a FLAC stream in another container (e.g. the way Apple encrypts AAC in MP4 with FairPlay), that is the choice of the user. @@ -125,13 +116,7 @@ Copyright (c) 2000-2009 Josh Coalson
      - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
      + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/documentation.html b/lib-src/libflac/doc/html/documentation.html index f2b17e689..1e18bbf11 100644 --- a/lib-src/libflac/doc/html/documentation.html +++ b/lib-src/libflac/doc/html/documentation.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
      @@ -28,18 +28,10 @@ - -
      -  english  | -  russian  +  more
      @@ -53,17 +45,17 @@ FLAC is a general purpose audio format supported by many programs. Most of the documentation here is about the FLAC format itself and the tools we provide, but there is also information on using other programs that support FLAC.
      • Introduction - What is FLAC?
      • -
      • Getting FLAC - How to download what you need to play or make FLAC files.
      • -
      • Using FLAC - If you have some FLAC files and want to do something with them, or want to create FLAC files, look here.
      • +
      • Getting FLAC - How to download what you need to play or make FLAC files.
      • +
      • Using FLAC - If you have some FLAC files and want to do something with them, or want to create FLAC files, look here.
      • FAQ - Frequently Asked Questions
      In more detail: For developers who want to add FLAC support to their programs: @@ -74,7 +66,7 @@
    • libFLAC and libFLAC++ APIs - Complete library documentation.
    • Example Code - Some simple example programs demonstrating the use of libFLAC and libFLAC++.
    • License - The license under which the official tools are distributed.
    • -
    • (see also the developer page)
    • +
    • (see also the developer page)
    Keep in mind that the online version of the documentation will always apply to the latest release. For older releases, check the documentation included with the release package. @@ -89,13 +81,7 @@ Copyright (c) 2000-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/documentation_bugs.html b/lib-src/libflac/doc/html/documentation_bugs.html index fae9dfd0e..c9a44cf6a 100644 --- a/lib-src/libflac/doc/html/documentation_bugs.html +++ b/lib-src/libflac/doc/html/documentation_bugs.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -50,10 +42,10 @@
    - The following are major known bugs in the current (1.1.4) release: + The following are major known bugs in the current (1.3.1) release:
    • - When encoding to Ogg FLAC, if there are too many seek points (>240), the seek table will not have the offsets written back properly after encoding. + When encoding to Ogg FLAC, the number of seek points is limited to 240.
    @@ -68,11 +60,9 @@
    - To report a bug, please go to the FLAC bug tracker (or appropriately the feature request tracker, patch page, or support page).
    + To report a bug, please go to the FLAC bug tracker (or appropriately the feature request tracker, patch page, or support page).

    - First check that there is not already an existing request. If you do submit a new request, make sure and provide an email contact and use the Monitor feature.
    -
    - Note that we get many false bug reports from people with faulty hardware or who overclock their machines that FLAC is not working. Please do due diligence if you are getting FLAC encoding or decoding errors that it is not the fault of the hardware. FLAC encoding tends to highlight problems with bad RAM, corrupted files, and excessive overclocking. + First check that there is not already an existing request. If you do submit a new request, make sure and provide an email contact and use the Monitor feature.
    @@ -85,13 +75,7 @@ Copyright (c) 2000-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/documentation_example_code.html b/lib-src/libflac/doc/html/documentation_example_code.html index dd64c14ce..daf57c994 100644 --- a/lib-src/libflac/doc/html/documentation_example_code.html +++ b/lib-src/libflac/doc/html/documentation_example_code.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -50,7 +42,7 @@
    - The FLAC source code has several small example programs that demonstrate how to use the libraries. The source is available on the download page, or can be checked out from CVS or browsed online. The examples complement the API documentation.
    + The FLAC source code has several small example programs that demonstrate how to use the libraries. The source is available on the download page, or can be checked out from git. The examples complement the API documentation.

    Currently the examples show how to encode WAV files to FLAC and vice-versa using both libFLAC and libFLAC++. Over time we'll be adding more examples.
    @@ -65,13 +57,7 @@ Copyright (c) 2000-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/documentation_format_overview.html b/lib-src/libflac/doc/html/documentation_format_overview.html index 596517ea5..ffdbc4e9f 100644 --- a/lib-src/libflac/doc/html/documentation_format_overview.html +++ b/lib-src/libflac/doc/html/documentation_format_overview.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -114,13 +106,7 @@ Copyright (c) 2000-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/documentation_tasks.html b/lib-src/libflac/doc/html/documentation_tasks.html deleted file mode 100644 index fb30cf1ba..000000000 --- a/lib-src/libflac/doc/html/documentation_tasks.html +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - documentation - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - using flac -
    -
    -
    - Since FLAC is supported by so many different programs, it can be a daunting task for the new user to choose a suitable program. This page will walk you through the steps. First, choose your operating system: - -
    - -
    - -
    - -
    -
    - windows -
    -
    -
    -
    - Using iTunes? Sorry, due to iTunes' design we can't add FLAC support; ask Apple to support FLAC!
    -
    - If you want to play FLAC files, here is how with some popular players: - - If you want to rip CDs to FLAC, here is a short list of the most popular programs. Experts generally prefer EAC for the most accurate ripping. dbPowerAMP also does a fine job and is easier to set up. - - If you want to burn FLAC files to CD, here is a short list of the most popular programs: -
      -
    • Windows Media Player (WMP) - Sorry, Microsoft has made it impossible to burn FLAC to CD in WMP; hopefully this will change eventually.
    • - -
    • dbPowerAMP CD Writer - Install the FLAC plugin.
    • -
    • Burrrn - Supports burning from FLAC out of the box.
    • -
    • (more)
    • -
    - If you want to convert audio files to/from FLAC, there are quite a few programs: - - If you want to edit the tags in FLAC files: -
      -
    • mp3tag - A free tag editor which supports editing tags, autotagging from online databases, cover art, and more.
    • -
    -
    - -
    - -
    - -
    -
    - mac os x -
    -
    -
    -
    - Using iTunes? Sorry, due to iTunes' design we can't add FLAC support; ask Apple to support FLAC!
    -
    - If you want to play FLAC files, here is how with some popular players: - - If you want to rip CDs to FLAC, there are a few options: - - If you want to burn FLAC files to CD: - - If you want to convert audio files to/from FLAC: - -
    - -
    - -
    - -
    -
    - *nix -
    -
    -
    - In the Unix world, FLAC support is quite widespread and it's usually only a matter of installing packages, so here are a few pointers. See the software links section for many more.
    -
    - To play FLAC files: - - To rip CDs to FLAC: -
      -
    • Grip is a great ripping and encoding front end and can be easily configured to use flac. See this thread on how to configure Grip for FLAC.
    • -
    • xmcd is a CD ripper with CDDB support as well as a player.
    • -
    • (more)
    • -
    - To burn FLAC files to CD, here is a short list of the most popular programs: -
      -
    • Arson: KDE ripper/burner
    • -
    • K3B: CD/DVD creator for Linux
    • -
    • (more)
    • -
    - To convert audio files to/from FLAC, there are quite a few programs: - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/documentation_tools.html b/lib-src/libflac/doc/html/documentation_tools.html index 9fd05b36f..e513ac86c 100644 --- a/lib-src/libflac/doc/html/documentation_tools.html +++ b/lib-src/libflac/doc/html/documentation_tools.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -54,16 +46,15 @@
    • flac - The command-line encoder and decoder.
    • metaflac - The command-line metadata editor.
    • -
    • plugins - Setting up the Winamp and XMMS plugins.
    Other resources:
    - See Getting FLAC for instructions on downloading and installing the official FLAC tools, or Using FLAC for instructions and guides on playing FLAC files, ripping CDs to FLAC, etc. + See Getting FLAC for instructions on downloading and installing the official FLAC tools, or Using FLAC for instructions and guides on playing FLAC files, ripping CDs to FLAC, etc. @@ -76,13 +67,7 @@ Copyright (c) 2000-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/documentation_tools_flac.html b/lib-src/libflac/doc/html/documentation_tools_flac.html index e37d8b625..4280a5cbd 100644 --- a/lib-src/libflac/doc/html/documentation_tools_flac.html +++ b/lib-src/libflac/doc/html/documentation_tools_flac.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -363,29 +355,35 @@ - --skip={#|mm:ss.ss} + --skip={#|mm:ss.ss}
    --skip={#|mm:ss,ss}
    Skip over the first # of samples of the input. This works for both encoding and decoding, but not testing. The alternative form mm:ss.ss can be used to specify minutes, seconds, and fractions of a second.

    + Note that the use of either a dot or a comma depends on the locale used for the system.
    +
    Examples:

    --skip=123 : skip the first 123 samples of the input
    - --skip=1:23.45 : skip the first 1 minute and 23.45 seconds of the input + --skip=1:23.45 : skip the first 1 minute and 23.45 seconds of the input, with a locale using the point as decimal separator
    + --skip=1:23,45 : skip the first 1 minute and 23.45 seconds of the input, with a locale using the comma as decimal separator
    - --until={#|[+|-]mm:ss.ss} + --until={#|[+|-]mm:ss.ss}
    --until={#|[+|-]mm:ss,ss}
    Stop at the given sample number for each input file. This works for both encoding and decoding, but not testing. The given sample number is not included in the decoded output. The alternative form mm:ss.ss can be used to specify minutes, seconds, and fractions of a second. If a + sign is at the beginning, the --until point is relative to the --skip point. If a - sign is at the beginning, the --until point is relative to end of the audio.

    + Note that the use of either a dot or a comma depends on the locale used for the system.
    +
    Examples:

    --until=123 : decode only the first 123 samples of the input (samples 0-122, stopping at 123)
    --until=1:23.45 : decode only the first 1 minute and 23.45 seconds of the input
    + --until=1:23,45 : decode only the first 1 minute and 23.45 seconds of the input, if your locale setting uses a comma as decimal separator
    --skip=1:00 --until=+1:23.45 : decode 1:00.00 to 2:23.45
    --until=-1:23.45 : decode everything except the last 1 minute and 23.45 seconds
    --until=-0:00 : decode until the end of the input (the same as not specifying --until) @@ -558,7 +556,7 @@ --replay-gain - Calculate
    ReplayGain values and store them as FLAC tags, similar to VorbisGain. Title gains/peaks will be computed for each input file, and an album gain/peak will be computed for all files. All input files must have the same resolution, sample rate, and number of channels. Only mono and stereo files are allowed, and the sample rate must be one of 8, 11.025, 12, 16, 22.05, 24, 32, 44.1, or 48 kHz. Also note that this option may leave a few extra bytes in a PADDING block as the exact size of the tags is not known until all files are processed.
    + Calculate ReplayGain values and store them as FLAC tags, similar to VorbisGain. Title gains/peaks will be computed for each input file, and an album gain/peak will be computed for all files. All input files must have the same resolution, sample rate, and number of channels. Only mono and stereo files are allowed, and the sample rate must be one of 8, 11.025, 12, 16, 22.05, 24, 32, 44.1, or 48 kHz. Also note that this option may leave a few extra bytes in a PADDING block as the exact size of the tags is not known until all files are processed.

    Note that this option cannot be used when encoding to standard output (stdout). @@ -800,7 +798,7 @@ -6, --compression-level-6 - Synonymous with -l 8 -b 4096 -m -r 6 + Synonymous with -l 8 -b 4096 -m -r 6 -A tukey(0.5);partial_tukey(2) @@ -809,7 +807,7 @@ -7, --compression-level-7 - Synonymous with -l 8 -b 4096 -m -e -r 6 + Synonymous with -l 12 -b 4096 -m -r 6 -A tukey(0.5);partial_tukey(2) @@ -818,7 +816,7 @@ -8, --compression-level-8 - Synonymous with -l 12 -b 4096 -m -e -r 6 + Synonymous with -l 12 -b 4096 -m -r 6 -A tukey(0.5);partial_tukey(2);punchout_tukey(3) @@ -854,9 +852,11 @@ -A "function", --apodization="function" - Window audio data with given the apodization function. The functions are: bartlett, bartlett_hann, blackman, blackman_harris_4term_92db, connes, flattop, gauss(STDDEV), hamming, hann, kaiser_bessel, nuttall, rectangle, triangle, tukey(P), welch.
    + Window audio data with given the apodization function. The functions are: bartlett, bartlett_hann, blackman, blackman_harris_4term_92db, connes, flattop, gauss(STDDEV), hamming, hann, kaiser_bessel, nuttall, rectangle, triangle, tukey(P), partial_tukey(n[/ov[/P]]), punchout_tukey(n[/ov[/P]]), welch.
    For gauss(STDDEV), STDDEV is the standard deviation (0<STDDEV<=0.5).
    For tukey(P), P specifies the fraction of the window that is tapered (0<=P<=1; P=0 corresponds to "rectangle" and P=1 corresponds to "hann").
    + For partial_tukey(n) and punchout_tukey(n), n apodization functions are added that span different parts of each block. Values of 2 to 6 seem to yield sane results. If necessary, an overlap can be specified, as can be the taper parameter, for example partial_tukey(2/0.2) or partial_tukey(2/0.2/0.5). ov should be smaller than 1 and can be negative.
    + Please note that P, STDDEV and ov are locale specific, so a comma as decimal separator might be required instead of a dot.
    More than one -A option (up to 32) may be used. Any function that is specified erroneously is silently dropped. The encoder chooses suitable defaults in the absence of any -A options; any -A option specified replaces the default(s).
    When more than one function is specified, then for every subframe the encoder will try each of them separately and choose the window that results in the smallest compressed subframe. Multiple functions can greatly increase the encoding time.
    @@ -896,7 +896,7 @@ Set the [min,]max residual partition order. The min value defaults to 0 if unspecified.

    - By default the encoder uses a single Rice parameter for the subframe's entire residual. With this option, the residual is iteratively partitioned into 2^min# .. 2^max# pieces, each with its own Rice parameter. Higher values of max# yield diminishing returns. The most bang for the buck is usually with -r 2,2 (more for higher block sizes). This usually shaves off about 1.5%. The technique tends to peak out about when blocksize/(2^n)=128. Use -r 0,16 to force the highest degree of optimization. + By default the encoder uses a single Rice parameter for the subframe's entire residual. With this option, the residual is iteratively partitioned into 2^min# .. 2^max# pieces, each with its own Rice parameter. Higher values of max# yield diminishing returns. The most bang for the buck is usually with -r 2,2 (more for higher block sizes). This usually shaves off about 1.5%. The technique tends to peak out about when blocksize/(2^n)=128. Use -r 0,15 to force the highest degree of optimization. @@ -1026,6 +1026,7 @@ --no-mid-side
    --no-ogg
    --no-padding
    + --no-preserve-modtime
    --no-qlp-coeff-prec-search
    --no-residual-gnuplot
    --no-residual-text
    @@ -1178,13 +1179,7 @@ Copyright (c) 2000-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/documentation_tools_metaflac.html b/lib-src/libflac/doc/html/documentation_tools_metaflac.html index d567698ef..c4ed7526c 100644 --- a/lib-src/libflac/doc/html/documentation_tools_metaflac.html +++ b/lib-src/libflac/doc/html/documentation_tools_metaflac.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -554,13 +546,7 @@ Copyright (c) 2000-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/documentation_tools_plugins.html b/lib-src/libflac/doc/html/documentation_tools_plugins.html deleted file mode 100644 index 632b4fa5f..000000000 --- a/lib-src/libflac/doc/html/documentation_tools_plugins.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - documentation - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    - -
    -
    - Normally the FLAC plugin for XMMS is installed with a package, but some of the binary builds have a compiled plugin. All that is necessary is to copy libxmms-flac.so to the directory where XMMS looks for input plugins (usually /usr/lib/xmms/Input or $HOME/.xmms/Input). There is nothing else to configure. Make sure to restart XMMS before trying to play any .flac files. -
    - -
    - -
    - -
    - -
    -
    - Since Winamp 5.31, Nullsoft has supplied a FLAC plugin with their Full install; nothing else is needed to get FLAC to play in Wnamp.
    -
    - Before Winamp 5.31 it was necessary to use our FLAC plugin. If you have an older version of Winamp, our plugin is still available in the FLAC Installer for Windows. The Winamp plugin should work for both Winamp2 and Winamp5. All that is necessary is to copy in_flac.dll to the Plugins/ directory of your Winamp installation. There is nothing else to configure. Make sure to restart Winamp before trying to play any .flac files. -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/download.html b/lib-src/libflac/doc/html/download.html deleted file mode 100644 index f890e16d3..000000000 --- a/lib-src/libflac/doc/html/download.html +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - download - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - download -
    -
    -
    - Many different programs support FLAC. If you are not sure what to download, see Using FLAC for instructions and guides on playing FLAC files, ripping CDs to FLAC, etc.
    -
    - This section is for the official FLAC tools. See the extras section below for other third-party tools.
    -
    - All source code and binaries are freely available and distributed under Open Source licenses. The codec libraries are distributed under Xiph.org's BSD license, and the plugins and command-line utilites (flac and metaflac) are distributed under the GPL. If you would like to redistribute parts or all of FLAC under different terms, contact Josh Coalson. (For more information, see the license page.) - -
    - -
    - -
    - -
    -
    - extras -
    -
    -
    - NOTE: these extras are not part of the FLAC project. Most (except those marked [$]) are freely available but distributed under their authors' own terms.
    -
    - NOTE: make sure to check out the links page for a large list of open-source software supporting FLAC.
    -
    - GUI encoding/decoding front-ends: -
      -
    • - Windows -
        -
      • AutoFLAC for automated ripping and encoding to FLAC with EAC (ExactAudioCopy); also has a write mode for burning back to CD for an exact copy
      • -
      • dBpowerAMP, a swiss army knife that can convert and play many formats, including FLAC.
      • -
      • Flacattack: an all-in-one tool that works with ExactAudioCopy to encode a CD image to FLAC, embed the cuesheet, add ReplayGain, create lossy files, etc. all in a customizable directory structure.
      • -
      • FLACdrop, an Oggdrop-like frontend for Windows.
      • -
      • FLAC frontend, a Windows GUI, or the even more versatile Multi frontend.
      • -
      • FLACTester, can test a whole tree of FLAC files for errors and generate a report.
      • -
      • Frontah, a new frontend to many codecs, including FLAC. Still in beta but has good reviews.
      • -
      • GX::Transcoder
      • -
      • MAREO is a "virtual" encoder that can be used with ExactAudioCopy to encode to multiple formats (including FLAC) at once while ripping.
      • -
      • MediaCoder converts between many audio and video formats.
      • -
      • MediaMonkey can organize, encode, decode, edit tags, and rip to FLAC and other formats.
      • -
      • Yahoo! Music Engine
      • -
      -
    • -
    • - Mac OS X -
        -
      • iTunes-to-FLAC, an AppleScript for converting between FLAC and WAVE/AIFF with tagging via iTunes.
      • -
      • MacFLAC, a FLAC distribution which also includes nice graphical front-end.
      • -
      • Max, a CD ripper and encoder that supports several formats including FLAC.
      • -
      • MediaRage, for editing FLAC metadata (also supports Vorbis and other formats).
      • -
      • RipBeak is a nice GUI encoding frond-end that supports FLAC as well as Vorbis and MP3.
      • -
      • xACT, another FLAC distribution with a graphical front-end to FLAC and other formats.
      • -
      -
    • -
    • - Unix -
        -
      • Grip is a great ripping and encoding front end and can be easily configured to use flac. See this thread on how to configure Grip for FLAC.
      • -
      • xmcd is a CD ripper with CDDB support as well as a player.
      • -
      • (many more)
      • -
      -
    • -
    • - Pocket PC - -
    • -
    - CD burning: - - Players and plugins: - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/faq.html b/lib-src/libflac/doc/html/faq.html index 166b43c27..84a315913 100644 --- a/lib-src/libflac/doc/html/faq.html +++ b/lib-src/libflac/doc/html/faq.html @@ -1,6 +1,6 @@ - - + + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -53,127 +45,127 @@ General Tools API Project @@ -183,14 +175,14 @@ What is FLAC?

    - FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo, see supported devices) just like you would an MP3 file.
    + FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo, see supported devices) just like you would an MP3 file.

    For more details, see What is FLAC?

    I have a FLAC file, how do I play it?
    How can I create FLAC files?

    - See Using FLAC.
    + See Using FLAC or a list of hardware that supports FLAC.

    What licensing applies to the FLAC format and software?

    @@ -204,15 +196,15 @@
    What software support FLAC?

    - This list is so large now it is difficult to maintain and keep up-to-date. For a partial list of open-source software that supports FLAC, see the software section of the links page. For a partial list of the most popular software used to encode, decode, play, tag, and rip FLAC files, see the download page.
    + This list is so large now it is difficult to maintain and keep up-to-date. For a partial list of open-source software that supports FLAC, see the software section of the links page. For a partial list of the most popular software used to encode, decode, play, tag, and rip FLAC files, see the download page.

    How can I play FLAC in Windows Media Player?

    - See this guide.
    + The easiest way is to use the Xiph.org Directshow Filters, download them here

    What hardware products support FLAC?

    - See the hardware section of the links page.
    + See the hardware section of the links page.

    What is the difference between (native) FLAC and Ogg FLAC?

    @@ -220,7 +212,7 @@
    "Native" FLAC is the compressed FLAC data stored in a very minimalist container, designed to be very efficient at storing single audio streams.

    - Ogg FLAC is the compressed FLAC data stored in an Ogg container. Ogg is a much more powerful transport layer that enables mixing several kinds of different streams (audio, data, metadata, etc). The overhead is slightly higher than with native FLAC.
    + Ogg FLAC is the compressed FLAC data stored in an Ogg container. Ogg is a much more powerful transport layer that enables mixing several kinds of different streams (audio, data, metadata, etc). The overhead is slightly higher than with native FLAC.

    In either case, the compressed FLAC data is the same and one can be converted to the other without re-encoding.

    @@ -249,7 +241,7 @@
    Why do some lossless comparisons say FLAC does not support RIFF chunks?

    - This is a limitation that no longer exists with FLAC (see above).
    + This is a limitation that no longer exists with FLAC (see above).

    Why do the encoder settings have a big effect on the encoding time but not the decoding time?

    @@ -263,7 +255,7 @@
    FLAC already encodes pretty fast. It is faster than real-time even on weak systems and is not much slower than even the fastest codecs. And it is faster than the CD ripping process with which it is usually paired, meaning even if it went faster, it would not speed up the ripping-encoding process anyway.

    - Part of the reason is that FLAC is asymmetric (see also). That means that it is optimized for decoding speed at the expense of encoding speed, because it makes it easier to decode on low-powered hardware, and because you only encode once but you decode many times.
    + Part of the reason is that FLAC is asymmetric (see also). That means that it is optimized for decoding speed at the expense of encoding speed, because it makes it easier to decode on low-powered hardware, and because you only encode once but you decode many times.

    How can I be sure FLAC is lossless?
    How much testing has been done on FLAC?
    @@ -286,7 +278,13 @@
    FLAC supports linear PCM samples with a resolution between 4 and 32 bits per sample. FLAC does not support floating point samples. In some cases it is possible to losslessly transform samples from an incompatible range to a FLAC-compatible range before encoding.

    - FLAC supports linear sample rates from 1Hz - 655350Hz in 1Hz increments. + FLAC supports linear sample rates from 1Hz - 655350Hz in 1Hz increments.
    +
    + Will FLAC ever support floating-point samples?
    +
    + It's unlikely FLAC will ever support floating-point samples natively. The main application for floating-point is audio engineering, which demands easy editing and very high speed for both encoding and decoding above everything else.
    +
    + FLAC is designed as a consumer audio format. It trades ease of editing for a featureful, robust transport layer more suited for playback, and encoding speed for more compression and faster decompression.

    Tools @@ -294,11 +292,11 @@ How do I set up EAC to rip directly to FLAC?

    - See Case's excellent EAC configuration page. Or use AutoFLAC, Omni Encoder, or MAREO to rip to FLAC or multiple formats at once.
    + See Case's excellent EAC configuration page. Or use AutoFLAC or MAREO to rip to FLAC or multiple formats at once.

    Why am I getting "Run-time error '75': Path/File access error" with FLAC Frontend?

    - Depending on how FLAC Frontend is installed, it could be one of two things: 1) you are trying to encode to file to a directory where you do not have write permission; 2) the FLAC Frontend program must be set to run as Administrator by opening Windows Explorer, navigating to C:\Program Files\FLAC (or wherever FLAC was installed), then right-clicking on FLAC Frontend.exe and checking "Run this program as an administrator".
    + You are probably using an old version of FLAC Frontend. Try downloading a new version from this sourceforge page

    How do I encode a file that starts with a dash?

    @@ -310,13 +308,9 @@
    Since metadata is stored at the beginning of a FLAC file, changing the length of it can sometimes cause the whole file to be rewritten. You can avoid this by adding padding with flac when you encode, or with metaflac after encoding. By default, flac adds 8k of padding; you can change this amount if you need more or less.

    - Why don't Unicode file names work with flac/metaflac on Windows?
    -
    - Windows implements Unicode filenames differently than all other operating systems, and can only be supported via Windows APIs (non-portable). Also the method is different for different versions of Windows. It's so hard to get right that most programs that have to work for other operating systems also do not support it. A workaround can be found here.
    -
    Why don't wildcards for file names like *.flac or *.wav work with flac/metaflac on Windows?

    - The Windows command shells (cmd.exe, command.com) implement wildcard handling differently than most other shells, leaving it up to the program to do everything including difficult and ambiguous cases. For an explanation of why wildcards on cmd.exe/command.com are dangerous, see here. Better command shells for Windows exist, e.g. from Cygwin. A workaround with the Windows shells is to do something like:
    + The Windows command shells (cmd.exe, command.com) implement wildcard handling differently than most other shells, leaving it up to the program to do everything including difficult and ambiguous cases. For an explanation of why wildcards on cmd.exe/command.com are dangerous, see here. Better command shells for Windows exist, e.g. from Cygwin. A workaround with the Windows shells is to do something like:

    for %F in (*.wav) do flac "%F"

    @@ -326,20 +320,20 @@
    The only known cause of verify errors is faulty hardware. The dead giveaway is that if you repeat the exact same command, the error occurs in a different place or not at all. This can also happen when decoding or testing a FLAC file. If this is happening it is your hardware and not a FLAC bug.

    - The problem is usually caused by overclocking/overheating the CPU or bad RAM. Try one of the many free programs available for testing hardware (e.g. Memtest86+). We have had reports of a few cases where a system is passing with flying colors and still getting unrepeatable FLAC errors, and the one thing many (all?) of these systems have in common is an ASUS motherboard (A7V133 or P3V4X) which we suspect is buggy in some way. (See also)
    + The problem is usually caused by overclocking/overheating the CPU or bad RAM. Try one of the many free programs available for testing hardware (e.g. Memtest).

    - If you ever have a verify error that fails at the same place every time, please file a bug, uploading a sample according to the instructions found at the bottom of this bug report.
    + If you ever have a verify error that fails at the same place every time, please file a bug, uploading a sample according to the instructions found at the bottom of this bug report.

    I compressed a WAVE file to FLAC, then decompressed to WAVE, and the two weren't identical. Why?
    I compressed a WAVE file to FLAC and it said "warning: skipping unknown sub-chunk LIST". Why?

    - WAVE is a complicated standard; many kinds of data besides audio data can be put in it. Most likely what has happened is that the application that created the original WAVE file also added some extra information for it's own use, which FLAC does not store or recreate by default (but can with the --keep-foreign-metadata option) (see also). The audio data in the two WAVE files will be identical. There are other tools to compare just the audio content of two WAVE files; ExactAudioCopy has such a feature.
    + WAVE is a complicated standard; many kinds of data besides audio data can be put in it. Most likely what has happened is that the application that created the original WAVE file also added some extra information for it's own use, which FLAC does not store or recreate by default (but can with the --keep-foreign-metadata option) (see also). The audio data in the two WAVE files will be identical. There are other tools to compare just the audio content of two WAVE files; ExactAudioCopy has such a feature.

    - For the more technically inclined, by default FLAC only stores what is in the 'fmt ' and 'data' sub-chunks of a WAVE file. (see also)
    + For the more technically inclined, by default FLAC only stores what is in the 'fmt ' and 'data' sub-chunks of a WAVE file. (see also)

    I decoded a FLAC file and the WAVE is 2 bytes shorter than the original. Why?

    - The difference is probably that between an 18-byte 'fmt ' subchunk in the original WAVE vs. a 16-byte one in the decoded WAVE. With WAVE there is more than one way to write identical formatting information, but FLAC always writes the most common legal form. (see also)
    + The difference is probably that between an 18-byte 'fmt ' subchunk in the original WAVE vs. a 16-byte one in the decoded WAVE. With WAVE there is more than one way to write identical formatting information, but FLAC always writes the most common legal form. (see also)

    Why did I get "ERROR initializing encoder, state = FLAC__STREAM_ENCODER_NOT_STREAMABLE"?

    @@ -369,11 +363,11 @@ Where are the mailing lists, forums, discussion areas, etc.?

    - There are a few places. The main discussions happen on the official FLAC mailing lists (you must subscribe to post). Also, there is a lot of discussion relating to FLAC on Hydrogen Audio.
    + There are a few places. The main discussions happen on the official FLAC mailing lists (you must subscribe to post). Also, there is a lot of discussion relating to FLAC on Hydrogen Audio.

    How do I submit a bug report?

    - First, visit the bug tracking page and do a little searching of both open and closed bugs to see if yours is already there. If you have something truly new, submit a new bug. Make sure to monitor the bug or include your email address in the description. Include as much information as possible: the version of FLAC that you are running, the name and version of any frontend you are running, your operating system and version, your CPU type and speed, the amount of memory you have, where you downloaded FLAC from, the exact error message (if any) copied from the console, and anything else you may think will help. + First, visit the bug tracking page and do a little searching of both open and closed bugs to see if yours is already there. If you have something truly new submit a new bug there. Make sure to monitor the bug or include your email address in the description. Include as much information as possible: the version of FLAC that you are running, the name and version of any frontend you are running, your operating system and version, your CPU type and speed, the amount of memory you have, where you downloaded FLAC from, the exact error message (if any) copied from the console, and anything else you may think will help. @@ -386,13 +380,7 @@ Copyright (c) 2000-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/features.html b/lib-src/libflac/doc/html/features.html index a2e2a2490..1c9c6337a 100644 --- a/lib-src/libflac/doc/html/features.html +++ b/lib-src/libflac/doc/html/features.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -50,13 +42,13 @@
    - FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo, see supported devices) just like you would an MP3 file.
    + FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo, see supported devices) just like you would an MP3 file.

    - FLAC stands out as the fastest and most widely supported lossless audio codec, and the only one that at once is non-proprietary, is unencumbered by patents, has an open-source reference implementation, has a well documented format and API, and has several other independent implementations.
    + FLAC stands out as the fastest and most widely supported lossless audio codec, and the only one that at once is non-proprietary, is unencumbered by patents, has an open-source reference implementation, has a well documented format and API, and has several other independent implementations.

    FLAC supports tagging, cover art, and fast seeking. FLAC is freely available and supported on most operating systems, including Windows, "unix" (Linux, *BSD, Solaris, OS X, IRIX), BeOS, OS/2, and Amiga.

    - There are many programs and devices that support FLAC, but the core FLAC project here maintains the format and provides programs and libraries for working with FLAC files. See Getting FLAC for instructions on downloading and installing the official FLAC tools, or Using FLAC for instructions and guides on playing FLAC files, ripping CDs to FLAC, etc.
    + There are many programs and devices that support FLAC, but the core FLAC project here maintains the format and provides programs and libraries for working with FLAC files. See Getting FLAC for instructions on downloading and installing the official FLAC tools, or Using FLAC for instructions and guides on playing FLAC files, ripping CDs to FLAC, etc.

    When we say that FLAC is "Free" it means more than just that it is available at no cost. It means that the specification of the format is fully open to the public to be used for any purpose (the FLAC project reserves the right to set the FLAC specification and certify compliance), and that neither the FLAC format nor any of the implemented encoding/decoding methods are covered by any known patent. It also means that all the source code is available under open-source licenses. It is the first truly open and free lossless audio format. (For more information, see the license page.)

    @@ -69,7 +61,7 @@ Fast: FLAC is asymmetric in favor of decode speed. Decoding requires only integer arithmetic, and is much less compute-intensive than for most perceptual codecs. Real-time decode performance is easily achievable on even modest hardware.
  • - Hardware support: FLAC is supported by dozens of consumer electronic devices, from portable players, to home stereo equipment, to car stereo. + Hardware support: FLAC is supported by dozens of consumer electronic devices, from portable players, to home stereo equipment, to car stereo.
  • Flexible metadata: FLAC's metadata system supports tags, cover art, seek tables, and cue sheets. Applications can write their own APPLICATION metadata once they register an ID. New metadata blocks can be defined and implemented in future versions of FLAC without breaking older streams or decoders. @@ -93,7 +85,7 @@ What FLAC is not:
    • - Lossy. FLAC is intended for lossless compression only, as there are many good lossy formats already, such as Vorbis, MPC, and MP3 (see LAME for an excellent open-source implementation). + Lossy. FLAC is intended for lossless compression only, as there are many good lossy formats already, such as Vorbis, MPC, and MP3 (see LAME for an excellent open-source implementation).
    • DRM. There is no intention to add any copy prevention methods. Of course, we can't stop someone from encrypting a FLAC stream in another container (e.g. the way Apple encrypts AAC in MP4 with FairPlay), that is the choice of the user. @@ -111,13 +103,7 @@ Copyright (c) 2000-2009 Josh Coalson
      - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
      + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/flac.css b/lib-src/libflac/doc/html/flac.css index d68391b4e..4e3e498c5 100644 --- a/lib-src/libflac/doc/html/flac.css +++ b/lib-src/libflac/doc/html/flac.css @@ -1,6 +1,5 @@ /* - * Copyright (c) 2005-2009 Josh Coalson - * Copyright (c) 2011-2013 Xiph.Org Foundation + * Copyright (c) 2005,2006,2007 Josh Coalson * Permission is granted to copy, distribute and/or modify this document * under the terms of the GNU Free Documentation License, Version 1.1 * or any later version published by the Free Software Foundation; @@ -10,18 +9,19 @@ body { - background-color: #99CC99; + background-color: #9a9; color: black; - margin: 0px; + margin: 0 auto; padding: 0px; + max-width: 1200px; } -div +/*div { background-color: #99CC99; margin: 0px; padding: 0px; -} +}*/ div.logo { @@ -40,15 +40,6 @@ div.navbar text-align: center; } -div.langbar -{ - border-width: 0px 0px 2px 0px; - border-style: solid; - border-color: black; - background-color: #EEEED4; - padding: 3px; - text-align: center; -} div.above_nav { @@ -68,7 +59,7 @@ div.body_with_sidebar div.box { text-align: left; - margin: 0px 8px 0px 8px; + margin: 0; background-color: #EEEED4; } @@ -78,7 +69,7 @@ div.box_title border-style: solid; border-color: black; background-color: #D3D4C5; - padding: 3px; + padding: 3px 6px; font-family: lucida, verdana, helvetica, arial, sans-serif; font-weight: bold; font-size: 150%; @@ -105,16 +96,27 @@ div.box_footer div.box_body { background-color: #EEEED4; - padding: 0px 3px 0px 3px; + padding: 0px 6px; font-family: lucida, verdana, helvetica, arial, sans-serif; font-weight: normal; font-size: 100%; } +#newsbox h3 +{ + margin: 5px 0 0 0; + font-size: 0.9em; +} + +#newsbox p +{ + margin: 0; +} + div.smallbox { text-align: left; - margin: 0px 8px 0px 0px; + margin: 0 0 0 8px; background-color: #EEEED4; } diff --git a/lib-src/libflac/doc/html/format.html b/lib-src/libflac/doc/html/format.html index 4494dbea4..8598941c2 100644 --- a/lib-src/libflac/doc/html/format.html +++ b/lib-src/libflac/doc/html/format.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
      @@ -28,18 +28,10 @@ - -
      -  english  | -  russian  +  more
      @@ -144,10 +136,10 @@ FLAC owes much to the many people who have advanced the audio compression field so freely. For instance:
      • - A. J. Robinson for his work on Shorten; his paper is a good starting point on some of the basic methods used by FLAC. FLAC trivially extends and improves the fixed predictors, LPC coefficient quantization, and Rice coding used in Shorten. + A. J. Robinson for his work on Shorten; his paper is a good starting point on some of the basic methods used by FLAC. FLAC trivially extends and improves the fixed predictors, LPC coefficient quantization, and Rice coding used in Shorten.
      • - S. W. Golomb and Robert F. Rice; their universal codes are used by FLAC's entropy coder. + S. W. Golomb and Robert F. Rice; their universal codes are used by FLAC's entropy coder.
      • N. Levinson and J. Durbin; the reference encoder uses an algorithm developed and refined by them for determining the LPC coefficients from the autocorrelation coefficients. @@ -239,10 +231,10 @@ Constant. This predictor is used whenever the subblock is pure DC ("digital silence"), i.e. a constant value throughout. The signal is run-length encoded and added to the stream.
      • - Fixed linear predictor. FLAC uses a class of computationally-efficient fixed linear predictors (for a good description, see audiopak and shorten). FLAC adds a fourth-order predictor to the zero-to-third-order predictors used by Shorten. Since the predictors are fixed, the predictor order is the only parameter that needs to be stored in the compressed stream. The error signal is then passed to the residual coder. + Fixed linear predictor. FLAC uses a class of computationally-efficient fixed linear predictors (for a good description, see audiopak and shorten). FLAC adds a fourth-order predictor to the zero-to-third-order predictors used by Shorten. Since the predictors are fixed, the predictor order is the only parameter that needs to be stored in the compressed stream. The error signal is then passed to the residual coder.
      • - FIR Linear prediction. For more accurate modeling (at a cost of slower encoding), FLAC supports up to 32nd order FIR linear prediction (again, for information on linear prediction, see audiopak and shorten). The reference encoder uses the Levinson-Durbin method for calculating the LPC coefficients from the autocorrelation coefficients, and the coefficients are quantized before computing the residual. Whereas encoders such as Shorten used a fixed quantization for the entire input, FLAC allows the quantized coefficient precision to vary from subframe to subframe. The FLAC reference encoder estimates the optimal precision to use based on the block size and dynamic range of the original signal. + FIR Linear prediction. For more accurate modeling (at a cost of slower encoding), FLAC supports up to 32nd order FIR linear prediction (again, for information on linear prediction, see audiopak and shorten). The reference encoder uses the Levinson-Durbin method for calculating the LPC coefficients from the autocorrelation coefficients, and the coefficients are quantized before computing the residual. Whereas encoders such as Shorten used a fixed quantization for the entire input, FLAC allows the quantized coefficient precision to vary from subframe to subframe. The FLAC reference encoder estimates the optimal precision to use based on the block size and dynamic range of the original signal.
      Residual Coding
      @@ -271,7 +263,7 @@
    • SEEKTABLE: This is an optional block for storing seek points. It is possible to seek to any given sample in a FLAC stream without a seek table, but the delay can be unpredictable since the bitrate may vary widely within a stream. By adding seek points to a stream, this delay can be significantly reduced. Each seek point takes 18 bytes, so 1% resolution within a stream adds less than 2k. There can be only one SEEKTABLE in a stream, but the table can have any number of seek points. There is also a special 'placeholder' seekpoint which will be ignored by decoders but which can be used to reserve space for future seek point insertion.
    • VORBIS_COMMENT: This block is for storing a list of human-readable name/value pairs. Values are encoded using UTF-8. It is an implementation of the Vorbis comment specification (without the framing bit). This is the only officially supported tagging mechanism in FLAC. There may be only one VORBIS_COMMENT block in a stream. In some external documentation, Vorbis comments are called FLAC tags to lessen confusion.
    • CUESHEET: This block is for storing various information that can be used in a cue sheet. It supports track and index points, compatible with Red Book CD digital audio discs, as well as other CD-DA metadata such as media catalog number and track ISRCs. The CUESHEET block is especially useful for backing up CD-DA discs, but it can be used as a general purpose cueing mechanism for playback.
    • -
    • PICTURE: This block is for storing pictures associated with the file, most commonly cover art from CDs. There may be more than one PICTURE block in a file. The picture format is similar to the APIC frame in ID3v2. The PICTURE block has a type, MIME type, and UTF-8 description like ID3v2, and supports external linking via URL (though this is discouraged). The differences are that there is no uniqueness constraint on the description field, and the MIME type is mandatory. The FLAC PICTURE block also includes the resolution, color depth, and palette size so that the client can search for a suitable picture without having to scan them all.
    • +
    • PICTURE: This block is for storing pictures associated with the file, most commonly cover art from CDs. There may be more than one PICTURE block in a file. The picture format is similar to the APIC frame in ID3v2. The PICTURE block has a type, MIME type, and UTF-8 description like ID3v2, and supports external linking via URL (though this is discouraged). The differences are that there is no uniqueness constraint on the description field, and the MIME type is mandatory. The FLAC PICTURE block also includes the resolution, color depth, and palette size so that the client can search for a suitable picture without having to scan them all.
  • @@ -842,7 +834,7 @@ <12*8> - Track ISRC. This is a 12-digit alphanumeric code; see here and here. A value of 12 ASCII NUL characters may be used to denote absence of an ISRC. + Track ISRC. This is a 12-digit alphanumeric code; see here and here. A value of 12 ASCII NUL characters may be used to denote absence of an ISRC. @@ -1800,7 +1792,7 @@ Encoding parameter:
    • - 0000-11110 : Rice parameter. + 00000-11110 : Rice parameter.
    • 11111 : Escape code, meaning the partition is in unencoded binary form using n bits per sample; n follows as a 5-bit number. @@ -1839,13 +1831,7 @@ Copyright (c) 2000-2009 Josh Coalson
      - Copyright (c) 2011-2013 Xiph.Org Foundation - - - SourceForge.net Logo - - - CAFE Logo
      + Copyright (c) 2011-2014 Xiph.Org Foundation Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/id.html b/lib-src/libflac/doc/html/id.html index 1a66a8bb3..64f57f099 100644 --- a/lib-src/libflac/doc/html/id.html +++ b/lib-src/libflac/doc/html/id.html @@ -1,6 +1,6 @@ - - + + @@ -20,7 +20,7 @@
      @@ -28,18 +28,10 @@ - -
      -  english  | -  russian  +  more
      @@ -50,45 +42,11 @@
  • - FLAC allows third-party applications to register an ID for use with FLAC APPLICATION metadata blocks. Use the following form to request an ID, or to submit a change to an existing ID.
    + FLAC allows third-party applications to register an ID for use with FLAC APPLICATION metadata blocks. Contact the FLAC-dev mailinglist to register an ID or to change an existing ID. Your request should at least contain the application ID, application name and a contact e-mail address. An application URL and specification URL should be mentioned too, if applicable.

    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    * Application ID:
    * Application name:
    * Contact e-mail:
    Application URL:
    Specification URL:
    Comment:
    (* = mandatory)
    -
    -
    - The ID request should be 8 hexadecimal digits and not conflict with any existing IDs (see the table below for all currently registered IDs). This 32-bit number will be stored big-endian in the block.
    -
    - Information about your application (but not your e-mail address) will show up on this page in the ID directory. You can also provide a URL to your application and a URL reference to the specification of your application's APPLICATION block.
    -
    - You will be notified via e-mail about your submission. -
    -
    + The ID request should be 8 hexadecimal digits and not conflict with any existing IDs (see the table below for all currently registered IDs). This 32-bit number will be stored big-endian in the block.
    +
    + Information about your application (but not your e-mail address) will show up on this page in the ID directory. You can also provide a URL to your application and a URL reference to the specification of your application's APPLICATION block.
    @@ -123,18 +81,26 @@ - 43756573 - "Cues" + 42534F4C - "BSOL" - GoldWave cue points (specification) + beSolo - 4D754D4C - "MuML" + 42554753 - "BUGS" - MusicML: Music Metadata Language + Bugs Player + + + + + 43756573 - "Cues" + + + GoldWave cue points (specification) @@ -153,6 +119,14 @@ flac-tools + + + 4D4F5442 - "MOTB" + + + MOTB MetaCzar + + 4D505345 - "MPSE" @@ -161,6 +135,14 @@ MP3 Stream Editor + + + 4D754D4C - "MuML" + + + MusicML: Music Metadata Language + + 52494646 - "RIFF" @@ -193,6 +175,22 @@ flacsqueeze + + + 54745776 - "TtWv" + + + TwistedWave + + + + + 55495453 - "UITS" + + + UITS Embedding tools + + 61696666 - "aiff" @@ -201,6 +199,14 @@ FLAC AIFF chunk storage + + + 696D6167 - "imag" + + + flac-image application for storing arbitrary files in APPLICATION metadata blocks + + 7065656D - "peem" @@ -233,14 +239,6 @@ TagTuner - - - 77363420 - "w64 " - - - FLAC Wave64 chunk storage - - 78626174 - "xbat" @@ -254,7 +252,7 @@ 786D6364 - "xmcd" - xmcd + xmcd + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib-src/libflac/doc/html/images/logo100.gif b/lib-src/libflac/doc/html/images/logo100.gif deleted file mode 100644 index a078a4bc5..000000000 Binary files a/lib-src/libflac/doc/html/images/logo100.gif and /dev/null differ diff --git a/lib-src/libflac/doc/html/images/logo130.gif b/lib-src/libflac/doc/html/images/logo130.gif index 5d0da8b6a..3200df347 100644 Binary files a/lib-src/libflac/doc/html/images/logo130.gif and b/lib-src/libflac/doc/html/images/logo130.gif differ diff --git a/lib-src/libflac/doc/html/index.html b/lib-src/libflac/doc/html/index.html index 7e1654436..7de46be91 100644 --- a/lib-src/libflac/doc/html/index.html +++ b/lib-src/libflac/doc/html/index.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,25 +28,17 @@ - -
    -  english  | -  russian  +  more
    - - @@ -121,13 +86,7 @@ - - - - - - -
  • Ptarmigan àíàëèçàòîð ìåäèàôàéëîâ äëÿ XML
  • -
  • rawrec/rawplay óòèëèòû äëÿ çàïèñè è âîñïðîèçâåäåíèÿ
  • -
  • rip êîíñîëüíàÿ óòèëèòà äëÿ ïîëó÷åíèÿ äàííûõ ñ àóäèîäèñêîâ è ñæàòèÿ ôàéëîâ
  • -
  • SDL_sound àóäèî ìîäóëü äëÿ SDL
  • -
  • shntool
  • -
  • Soepkip TNG ïëåéåð, óïðàâëÿåìûé ÷åðåç web-èíòåðôåéñ
  • -
  • sonice: ïðåîáðàçîâàíèå FLAC â Vorbis
  • -
  • Split_wav WAV+CUE splitter
  • -
  • Tag ðåäàêòîð òåãîâ (äîñòóïíà ãðàôè÷åñêàÿ îáîëî÷êà)
  • -

    - -

    Ñîîáùåñòâà, èñïîëüçóþùèå FLAC:

    -

    - - -

     Copyright (c) 2001-2009 Josh Coalson -

     Copyright (c) 2011-2013 Xiph.Org Foundation

    - - - diff --git a/lib-src/libflac/doc/html/ru/news.html b/lib-src/libflac/doc/html/ru/news.html deleted file mode 100644 index 7e464abcb..000000000 --- a/lib-src/libflac/doc/html/ru/news.html +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - -FLAC: íîâîñòè - - - -
    +
    @@ -54,25 +46,13 @@
    - FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo, see supported devices) just like you would an MP3 file.
    + Please note: This is the source-code documentation, for more general information on FLAC, please visit the on-line FLAC homepage

    - FLAC stands out as the fastest and most widely supported lossless audio codec, and the only one that at once is non-proprietary, is unencumbered by patents, has an open-source reference implementation, has a well documented format and API, and has several other independent implementations.
    + FLAC stands for Free Lossless Audio Codec, an audio format similar to MP3, but lossless, meaning that audio is compressed in FLAC without any loss in quality. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio, and you can play back compressed FLAC files in your favorite player (or your car or home stereo, see supported devices) just like you would an MP3 file.

    - See About FLAC for more, or Using FLAC for how to play FLAC files, rip CDs to FLAC, etc. -
    - -
    - -
    - -
    - -
    -
    - FLAC 1.3.0 released  :Changelog here
    - last updated 2013-May-04 + FLAC stands out as the fastest and most widely supported lossless audio codec, and the only one that at once is non-proprietary, is unencumbered by patents, has an open-source reference implementation, has a well documented format and API, and has several other independent implementations.
    +
    + See About FLAC for more, or Using FLAC for how to play FLAC files, rip CDs to FLAC, etc.
    @@ -80,33 +60,18 @@
    + -
    -
    - news +
    + -
    -
    - 17-Sep-2007 :
    FLAC 1.2.1 released

    - 16-Aug-2007 :
    Sound Forge 9.0b supports FLAC

    - 03-Aug-2007 :
    Czech Radio releases free FLAC recordings

    - 23-Jul-2007 :
    FLAC 1.2.0 released

    - 13-Feb-2007 :
    FLAC 1.1.4 released

    - 27-Nov-2006 :
    FLAC 1.1.3 released

    - 25-Oct-2006 :
    Winamp 5.31 ships with FLAC support

    - 20-Dec-2005 :
    Volvo's Digital Jukebox plays FLAC

    - 21-Sep-2005 :
    Live2496 now records directly to FLAC

    - 10-Aug-2005 :
    Olive's new Symphony component supports FLAC

    - 11-May-2005 :
    YME supports FLAC and Vorbis

    - 10-May-2005 :
    PONTIS' MS330 supports FLAC and Vorbis

    - 02-May-2005 :
    Sonos now supports FLAC and Vorbis

    - 23-Apr-2005 :
    iAUDIO X5 portable supports FLAC and Vorbis

    - 09-Mar-2005 :
    Squeezebox2 supports FLAC on the box

    - 05-Feb-2005 :
    Version 1.1.2 released

    - (all news) +
    +
    + FLAC 1.3.1 released  :Changelog here
    + last updated 2014-Nov-25
    - +
    Copyright (c) 2000-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation -
    - SourceForge.net Logo - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation
    Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/itunes.html b/lib-src/libflac/doc/html/itunes.html deleted file mode 100644 index 02204666f..000000000 --- a/lib-src/libflac/doc/html/itunes.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - itunes - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - flac + itunes -
    -
    -
    - Would you like iTunes to support FLAC? So would we!
    -
    - Due to the design of iTunes, only Apple can add support for FLAC [1]. And why wouldn't they? FLAC usage is accelerating, many bands like Pearl Jam, Phish, Dave Matthews Band, Metallica -- the same hip, influential people whose fans Apple courts -- are already distributing music in FLAC format, and users are clamoring for it in the iTunes forums:
    -
      -
    • [2] "I have seen a lot of people on live music message boards turn away from the iPod because there are other music players that support FLAC. I am on the verge... and I am an Apple die-hard!"
    • -
    • [3] "If your source material is FLAC (as many bands have gone this way to distribute online music) your choice is to use another music player ..."
    • -
    • [4] (many more requests)
    • -
    - Make your voice heard! Fill out the iTunes feedback form (politely!) and let them know. Feel free to also direct them to this page. We at the FLAC project stand ready to help as well.
    -
    -
    -
    - [1] XiphQT, through tremendous effort by developers, goes as far as possible in allowing some playback capability via QuickTime. But proper iTunes support -- tag handling, no import delays, etc. -- is not possible without Apple.
    -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/license.html b/lib-src/libflac/doc/html/license.html index 654e62c32..b0fb09590 100644 --- a/lib-src/libflac/doc/html/license.html +++ b/lib-src/libflac/doc/html/license.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -54,17 +46,17 @@
    The FLAC and Ogg FLAC formats themselves, and their specifications, are fully open to the public to be used for any purpose (the FLAC project reserves the right to set the FLAC specification and certify compliance). They are free for commercial or noncommercial use. That means that commercial developers may independently write FLAC or Ogg FLAC software which is compatible with the specifications for no charge and without restrictions of any kind. There are no licensing fees or royalties of any kind for use of the formats or their specifications, or for distributing, selling, or streaming media in the FLAC or Ogg FLAC formats.

    - The FLAC project also makes available software that implements the formats, which is distributed according to Open Source licenses as follows:
    + The FLAC project also makes available software that implements the formats, which is distributed according to Open Source licenses as follows:

    - The reference implementation libraries are licensed under the New BSD License. In simple terms, these libraries may be used by any application, Open or proprietary, linked or incorporated in whole, so long as acknowledgement is made to Xiph.org Foundation when using the source code in whole or in derived works. The Xiph License is free enough that the libraries have been used in commercial products to implement FLAC, including in the firmware of hardware devices where other Open Source licenses can be problematic. In the source code these libraries are called libFLAC and libFLAC++.
    + The reference implementation libraries are licensed under the New BSD License. In simple terms, these libraries may be used by any application, Open or proprietary, linked or incorporated in whole, so long as acknowledgement is made to Xiph.org Foundation when using the source code in whole or in derived works. The Xiph License is free enough that the libraries have been used in commercial products to implement FLAC, including in the firmware of hardware devices where other Open Source licenses can be problematic. In the source code these libraries are called libFLAC and libFLAC++.

    The rest of the software that the FLAC project provides is licensed under the GNU General Public License (GPL). This software includes various utilities for converting files to and from FLAC format, plugins for audio players, et cetera. In general, the GPL allows redistribution as long as derived works are also made available in source code form according to compatible terms.

    Neither the FLAC nor Ogg FLAC formats nor any of the implemented encoding/decoding methods are covered by any known patent.

    - FLAC is one of a family of codecs of the Xiph.org Foundation, all created according to the same free ideals. For some other codecs' descriptions of the Xiph License see the Speex and Vorbis license pages.
    + FLAC is one of a family of codecs of the Xiph.org Foundation, all created according to the same free ideals. For some other codecs' descriptions of the Xiph License see the Speex and Vorbis license pages.

    - If you would like to redistribute parts or all of FLAC under different terms, contact Josh Coalson. + If you would like to redistribute parts or all of FLAC under different terms, contact the FLAC-dev mailinglist. @@ -77,13 +69,7 @@
    Copyright (c) 2004-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation -
    - SourceForge.net Logo - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation
    Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/links.html b/lib-src/libflac/doc/html/links.html deleted file mode 100644 index c8c8b7cf8..000000000 --- a/lib-src/libflac/doc/html/links.html +++ /dev/null @@ -1,490 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - links - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - links -
    -
    -
    - The links page is the place for all things FLAC. The hardware section lists the home stereo, car stereo, and portable devices that support the FLAC format. The music section has links to artists, labels, and legal trading/sharing sites that offer works encoded in FLAC. The software section is a loosely categorized list of open-source software that supports the FLAC format. Some of the most popular (some non-free) software can be found on the download page in the extras section. -
    - -
    - -
    - -
    -
    - hardware -
    -
    -
    - Below are some devices that support the FLAC format. For the ones we have hands-on experience with, there is a linked review (see all reviews). Manufacturers, if you would like your product reviewed here, please contact us.
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Home stereo:
    Pi SqueezboxPi TransporterSonos
    Squeezebox
    (our review)
    Transporter
    (our review)
    Sonos
    (our review)
    dividerdividerdivider
    Escient.comHiFidelioOlive.us
    EscientHifidelioOlive
    dividerdividerdivider
    Pontis.deDigital Techniquesmcintoshlabs
    Arcus DAR300BlackbirdMcIntosh MS300
    dividerdividerdivider
    neodigits.comnetgearrequest.com
    Helios X5000Netgear EVA8000ReQuest
    dividerdividerdivider
    MediaREADY MCZensonic Z500Ziova
    dividerdividerdivider
    SooloosHD MediaBoxTViX 4/5000 Series
    -
    - Other home stereo: - -
    -
    - Car stereo: - -
    Portable/Handheld:
    Cowon iAUDIOi-Station mini DXIwod G10
    dividerdividerdivider
    KNC HR-2800Meizu M6 MiniplayerOnda VX737
    dividerdividerdivider
    Rio KarmaTeclast TL-29TrekStor Vibez
    dividerdividerdivider
    Bluedot BMP-1430
    -
    - Other Portable/Handheld: - -
    -
    - Other: -
      -
    • Numark's DJ equipment like the HDX and CDX turntables with integrated hard drive and CD player, and the HDMIX mixer
    • -
    • The Pico CD/DVD Duplicator
    • -
    -
    - Reviews:
    - The main purpose of these reviews is to give an idea of how well particular devices support FLAC. Other subjective comments here are based on our general impressions and are not meant to be thorough or authoritative. We only review devices we have tested directly ourselves.
    -
    -
    Sonos: A very slick networked audio system. Each ZonePlayer connects to an amplifier or speakers, accessing music over the network. ZonePlayers are controlled by a wireless remote with color LCD and clickwheel; they can network together wired or wireless and play in sync or independently. FLAC support is excellent; nearly the full subset (i.e. mono and stereo files, sample rates from 16kHz-48kHz, 16-bits per sample) including all standard encoding modes are supported. Also supported: gapless playback, FLAC tags, and ReplayGain.
    -
    -
    Squeezebox: A fantastic networked audio player from Slim Devices with analog and digital outputs for connecting to an amplifier/receiver. Has an easy-to-read vacuum fluorescent display, wired or wireless networking, multi-room synchronization, and a bunch of other features. The server-side software, SlimServer, is open-source, runs on Windows, Mac OS X, Linux, etc. and has an active community. FLAC support is excellent; nearly the full subset (i.e. mono and stereo files, sample rates from 8kHz-48kHz, 16- and 24-bits per sample) including all standard encoding modes are supported. Also supported: gapless playback, FLAC tags, ReplayGain, automatic transcoding on the server of many audio formats to FLAC for transmission to the box, and external cuesheet support (internal cuesheet support is in the works).
    -
    - Transporter: Top-of-the-line networked audio player from Slim Devices. Offers all the features of the Squeezebox (see just above), but loaded with pro-grade connectors (including balanced analog outputs and optical/coax/BNC/XLR digital ins and outs), top-end components, and a larger display. FLAC support is also excellent; all standard FLAC encoding modes and tags are supported, as are gapless playback, ReplayGain, cuesheets ... everything the Squeezebox supports, plus support for sample rates up to 96kHz.
    -
    - - - - - -
    Compression
    modes
    ChannelsSample
    rates
    Sample
    resolution
    GaplessFLAC tagsCover artReplayGainCuesheets
    Sonos0-8stereo,mono16kHz-48kHz16bpsYYNYN
    Squeezebox0-8stereo,mono8kHz-48kHz16bps, 24bpsYYNYY (external)
    Transporter0-8stereo,mono8kHz-96kHz16bps, 24bpsYYNYY (external)
    -
    - -
    - -
    - -
    -
    - music -
    -
    -
    - Several labels and artists have adopted FLAC as a distribution format for their works, offering them for sale or free download online. And many online trading communities that share legal, band-sanctioned recordings of live shows distribute them in FLAC format. These are just some of them.
    -
    - Artists - - Labels and Stores - - Venues: - - Communities: - -
    - -
    - -
    - -
    -
    - software -
    -
    -
    - A large and growing list of software supports the FLAC format. This list is a sample of open-source software supporting FLAC. Some of the most popular non-free software can be found on the download page in the extras section.
    -
    - Audio encoders/decoders/converters/taggers: -
      -
    • BonkEnc: Windows CD ripper, audio encoder and converter
    • -
    • EasyTAG versatile tagger
    • -
    • Entagged, a Java audio file tagger
    • -
    • etree-scripts: command-line tools for verifying, tagging, converting, and burning lossless audio files
    • -
    • FLAC frontend (Windows GUI)
    • -
    • Flac-Jacket: a set of scripts for creating FLAC files and an HTML index
    • -
    • FLACTAG: tags single album FLAC files with embedded CUE sheets using data from the MusicBrainz service
    • - -
    • MacFLAC Mac OS X FLAC distribution
    • -
    • MediaCoder converts between many audio and video formats.
    • -
    • MP3FS, a read-only FUSE filesystem which can transcode FLAC to MP3 on the fly
    • -
    • rawrec/rawplay recording/playback tools
    • -
    • sonice FLAC to Vorbis transcoder
    • -
    • Split_wav WAV+CUE splitter
    • -
    • Tag comprehensive tagger (frontend available)
    • -
    • XLD (X Lossless Decoder), a Universal Binary command-line decoder for Mac OS X
    • -
    - Audio editors: - - Audio players/servers: - - CD ripping/burning: -
      -
    • Arson: KDE ripper/burner
    • -
    • AutoFLAC: automated ripping and encoding to FLAC with EAC (ExactAudioCopy); also has a write mode for burning back to CD for an exact copy
    • -
    • CDex: ripper for Windows can rip to FLAC via external command
    • -
    • crip: console ripper/encoder/tagger
    • -
    • Flacattack: an all-in-one tool that works with EAC (ExactAudioCopy) to encode a CD image to FLAC, embed the cuesheet, add ReplayGain, create lossy files, etc. all in a customizable directory structure
    • -
    • grip: ripper for Linux can rip to FLAC via external command
    • -
    • K3B: CD/DVD creator for Linux
    • -
    • MAREO multi-format encoder for EAC
    • -
    • Max, a CD ripper and encoder for OS X
    • -
    • Omni Encoder, a graphical multi-format encoder for EAC
    • -
    • rip command-line ripper/encoder
    • -
    • RipIT, a console-based front-end to several ripping and encoding tools
    • -
    • Wack, the successor to Flacattack which can encode to multiple formats at once
    • -
    - Organizers: -
      -
    • Ampache, a PHP-based tool for managing, updating and playing files via a web interface
    • -
    • GNUpod includes on-the-fly FLAC conversion to iPod
    • -
    • MPEG Audio Collection
    • -
    • prokyon3, a Qt-based music manager and tag editor
    • -
    • Rhythmbox, music management application for GNOME
    • -
    - Plugins, developer tools and libraries: - - Scientific, Audio Analysis: -
      - -
    • HASAS HydroAcoustical Signal Analysis System
    • -
    - -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/news.html b/lib-src/libflac/doc/html/news.html deleted file mode 100644 index 718eaa339..000000000 --- a/lib-src/libflac/doc/html/news.html +++ /dev/null @@ -1,700 +0,0 @@ - - - - - - - - - - - - - - - - - FLAC - news - - - - - - -
    - - - -
    -  english  | -  russian  -
    - -
    - -
    -
    - news -
    -
    -
    - - 17-Sep-2007: -
      -
    • - FLAC 1.2.1 released  New in this release is support for all RIFF/AIFF metadata, including Broadcast Wave Format (BWF). There are many other small improvements and bug fixes; see the changelog entry for complete details. -
    • -
    - - 16-Aug-2007: - - - 03-Aug-2007: - - - 23-Jul-2007: -
      -
    • - FLAC 1.2.0 released  New in this release are small speed improvements, and some new options and bug fixes. Also the decoder has been updated to pave the way for some format improvements, so if your software supports FLAC be sure to check it out. See the changelog entry for complete details. -
    • -
    - - 13-Feb-2007: -
      -
    • - FLAC 1.1.4 released  Increased compression and dramatic speedups for both encoding and decoding are the big improvements in FLAC 1.1.4. There are also several new options and bugfixes. See the changelog entry for complete details. -
    • -
    - - 27-Nov-2006: -
      -
    • - FLAC 1.1.3 released  Almost 2 years in the making, FLAC 1.1.3 is a major release with improved compression, improved cover art and multichannel support, better recovery for corrupted files, many new features and options in the command-line tools, and several bug fixes. For developers, the decoder and encoder APIs have also been simplified and there is a new porting guide. See the changelog entry for complete details. -
    • -
    - - 25-Oct-2006: -
      -
    • - Winamp 5.31 ships with FLAC support
      -
      - Winamp 5.31 now includes Nullsoft FLAC plugins for encoding and decoding. The decoder is based on our reference decoder plugin. However the current encoder plugin is based on a pre-release of flake and we recommend to not use it for archival yet. -
    • -
    - - 20-Dec-2005: -
      -
    • - Volvo's Digital Jukebox plays FLAC
      -
      - Want some FLAC with your Volvo? Volvo's Digital Jukebox, developed with PhatNoise, is fully integrated with the car's audio system and available for the S60, V70, XC70, and S80. PhatNoise's PhatBox in 2002 was the first device to support FLAC natively and has gained a loyal following. The Digital Jukebox and PhatBox also support Ogg Vorbis. -
    • -
    - - 21-Sep-2005: -
      -
    • - Live2496 now records directly to FLAC
      -
      - Live2496, a program that can record 24-bit audio up to 96kHz on a Pocket PC (using Core Sound's PDAudio interface) now supports recording directly to FLAC. -
    • -
    - - 10-Aug-2005: -
      -
    • - Olive's new Symphony component supports FLAC
      -
      - The new Symphony wireless digital music center by Olive supports FLAC. -
    • -
    - - 11-May-2005: -
      -
    • - YME supports FLAC and Vorbis
      -
      - Yahoo! Music Engine supports FLAC and Ogg Vorbis, for playback and ripping/encoding. -
    • -
    - - 10-May-2005: -
      -
    • - PONTIS' MS330 supports FLAC and Vorbis
      -
      - The new MS330 Media Server from PONTIS supports FLAC and Ogg Vorbis. In addition to playing from the internal hard disk, CD drive, and 6-in-1 flash card slot, it can also be connected to a network, and even a TV for graphical navigation, cover art, photo viewing, etc. -
    • -
    - - 02-May-2005: - - - 23-Apr-2005: -
      -
    • - iAUDIO X5 portable supports FLAC and Vorbis
      -
      - The new portable iAUDIO X5 from COWON supports FLAC and Ogg Vorbis. -
    • -
    - - 09-Mar-2005: -
      -
    • - Squeezebox2 supports FLAC on the box
      -
      - Slim Devices' new Squeezebox2 supports FLAC decoding on the box, reducing the amount of precious wireless bandwidth required for FLAC playback. -
    • -
    - - 05-Feb-2005: -
      -
    • - FLAC 1.1.2 released  New in this release are small decoding speedups for all platforms, small encoding speedups in fast (non-LPC) mode, streaming support in the XMMS plugin, and several bug fixes. For developers there are also a few additions and changes to the metadata API to make working with tags easier. See the changelog entry for complete details. This release actually wasn't supposed to happen so soon, but needed to be made to fix library naming and build problems in FLAC 1.1.1 that caused trouble for package maintainers, so unless you are having trouble with one of the particular bugs that got fixed in 1.1.2 then there is not much of a need to upgrade. -
    • -
    - - 17-Jan-2005: - - - 12-Nov-2004: -
      -
    • - Escient's new FireBall E2-300 supports FLAC
      -
      - Escient has a new home stereo component that supports FLAC, the FireBall E2-300. -
    • -
    - - 02-Nov-2004: -
      -
    • - New Mindawn music store offers FLAC and Vorbis
      -
      - Mindawn, a new online music service offering FLAC and Ogg Vorbis, is now open. They also have a multi-platform (Windows, Linux, Mac OS X) CD ripper/encoder and are finishing up a multi-platform player. -
    • -
    - - 01-Oct-2004: -
      -
    • - FLAC 1.1.1 released  There is a new changelog with a complete list of changes/fixes/improvements, but here is a summary of some of the main ones: -
        -
      • Better Ogg FLAC support including seeking and an official Ogg FLAC mapping.
      • -
      • Significant decoding speedup (almost 2x) on PowerPC (includes Macs with G4/G5).
      • -
      • Speedups in the plugins.
      • -
      • Several new options to flac and metaflac by popular demand.
      • -
      • Several API additions requested by developers.
      • -
      • Many bugfixes.
      • -
      -
    • -
    - - 27-Jul-2004: - - - 21-Jun-2004: - - - 03-Mar-2004: - - - 03-Feb-2004: - - - 19-Nov-2003: -
      -
    • - PhatNoise's new Home Digital Media Player supports FLAC
      -
      - PhatNoise (makers of the PhatBox, which also plays FLAC) just released their Home Digital Media Player. It includes a DMS cartridge slot so you can pop out your FLAC tunes and pop 'em in your car. -
    • -
    - - 18-Nov-2003: -
      -
    • - Slim's new 'Squeezebox' supports FLAC
      -
      - Slim Devices' new Squeezebox, the wireless follow-on to the SliMP3 networked audio player, is available and supports FLAC and Ogg Vorbis. -
    • -
    - - 11-Nov-2003: -
      -
    • - Primus offers live shows in FLAC
      -
      - Primus is offering soundboard recordings from 2003 Tour de Fromage in FLAC and MP3 on primuslive.com. More info here and here. -
    • -
    - - 13-Oct-2003: - - - 11-Aug-2003: -
      -
    • - New Rio Karma supports FLAC
      -
      - Rio has announced a new portable, the Rio Karma, which supports FLAC and Ogg Vorbis. -
    • -
    - - 23-Jun-2003: -
      -
    • - livephish.com offers FLAC shows
      -
      - livephish.com is now offering soundboard recordings of live shows in FLAC format in addition to MP3. -
    • -
    - - 09-Feb-2003: - - - 29-Jan-2003: -
      -
    • - FLAC has joined the Xiph project  See here for the press release.
      -
      - Xiph.org is behind other free codecs such as Vorbis, Theora, and Speex. Our merger with Xiph will bring FLAC into the ranks and lead to better integration with the Ogg multimedia framework.
      -
      - Note that the FLAC format is not changing, native FLAC will continue to exist, and the command-line tools and plugins will continue to work as before. The codec libraries will now be available under Xiph's BSD-like license.
      -
      - Over the next few days we will be transitioning normal operations off SourceForge and over to Xiph.org; first will be CVS and the web pages, followed by the mailing lists, bug tracker, and file release area. We will keep a mirror here until the transition is complete. It's OK to send patches to the flac-dev list but they won't be able to be integrated until CVS is fully moved over. -
    • -
    - - 26-Jan-2003: -
      -
    • - FLAC 1.1.0 released  I didn't get everything in that I wanted, but it's high time for a release.
      -
      - Note that the minor version has incremented, meaning forward compatibility was broken (forward compatibility means an earlier decoder can play all streams made by a later decoder). This is only because of a bug in 1.0.4 and prior where the decoder could not properly skip unknown metadata. The stream format itself has not changed and FLAC is still fully backward-compatible. All it means is that a FLAC file containing cue sheet metadata will not decode in older decoders. This bug is fixed in 1.1.0.
      -
      - Here's what's new:
      -
      - General: -
        -
      • All code is now Valgrind-clean!
      • -
      • New CUESHEET metadata block for storing CD TOC and index point information. Now a CD can be completely backed up to a single FLAC file for archival.
      • -
      • ReplayGain support.
      • -
      • Better compression of 24-bit files.
      • -
      • More complete AIFF support.
      • -
      • 3DNow! optimizations enabled by default.
      • -
      • Complete MSVC build system with .dsp projects for everything, which can build both static libs and DLLs, and in debug or release mode, all in the same source tree.
      • -
      - flac: -
        -
      • Can now decode FLAC to AIFF; new --force-aiff-format option.
      • -
      • New --cuesheet option for reading and storing a cuesheet when encoding a whole CD. Automatically creates seek points for track and index points unless --no-cued-seekpoints is used.
      • -
      • New --replay-gain option for calculating ReplayGain values and storing them as tags.
      • -
      • New --until option complements --skip to stop decoding at a specified point in the stream.
      • -
      • --skip and --until now also accept mm:ss.ss format.
      • -
      • New -S #s flavor to specify seekpoints every '#' number of seconds.
      • -
      • flac now defaults to -S 10s instead of -S 100x for the seek table.
      • -
      • flac now adds a 4k PADDING block by default (turn off with --no-padding).
      • -
      • Fixed a bug with --skip and AIFF-to-FLAC encoding.
      • -
      • Fixed a bug where decoding a FLAC file whose total_samples==0 in the STREAMINFO would corrupt the WAVE header.
      • -
      - metaflac: -
        -
      • New --import-cuesheet-from option for reading and storing a cuesheet to a FLAC-encoded CD. Automatically creates seek points for track and index points unless --no-cued-seekpoints is used.
      • -
      • New --export-cuesheet-to option for writing a cuesheet from a FLAC file for use with CD authoring software.
      • -
      • New --add-replay-gain option for calculating ReplayGain values and storing them as tags.
      • -
      • New --add-seekpoint option to add seekpoints to an existing FLAC file. Includes new --add-seekpoint=#s flavor to add seekpoints every '#' number of seconds.
      • -
      - XMMS plugin: -
        -
      • Configurable sample resolution conversion with dither.
      • -
      • ReplayGain support with customizable noise shaping, pre-amp, and optional hard limiter.
      • -
      • New Vorbis comment editor.
      • -
      • File info now works.
      • -
      • Bitrate now shows the smoothed instantaneous bitrate.
      • -
      • Uses the ARTIST tag if there is no PERFORMER tag.
      • -
      - Winamp2 plugin: -
        -
      • Configurable sample resolution conversion with dither.
      • -
      • ReplayGain support with customizable noise shaping, pre-amp, and optional hard limiter.
      • -
      • File info now works.
      • -
      • Uses the ARTIST tag if there is no PERFORMER tag.
      • -
      - Libraries (developers take note!): -
        -
      • All code and tests are instrumented for Valgrind. All tests run Valgrind-clean, meaning no memory leaks or buffer over/under-runs.
      • -
      • Separate 64-bit datapath through the filter in libFLAC for better compression of >16 bps files.
      • -
      • FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT) now sets the vendor string.
      • -
      • The documentation on the usage of FLAC::Iterator::get_block() in libFLAC++ has an important correction. If you use this class make sure to read this.
      • -
      -
    • -
    - - 24-Sep-2002: -
      -
    • - FLAC 1.0.4 released  There are a lot of improvements since 1.0.3; let's get right to it:
      -
      - Plugins: -
        -
      • Support for Vorbis comments, ID3 v1 and v2 tags.
      • -
      • Configurable title formatting and charset conversion in XMMS plugin.
      • -
      • Support for 8- and 24-bit FLAC files. There is a compile-time option for raw 24-bit output or 24bps-to-16bps linear dithering (the default).
      • -
      - flac: -
        -
      • Improved option parser (now uses getopt).
      • -
      • AIFF input support (thanks to Brady Patterson).
      • -
      • Small decoder speedup.
      • -
      • --sector-align now supported for raw input files.
      • -
      • New -T, --tag options for adding Vorbis comments while encoding.
      • -
      • New --serial-number option for use with --ogg.
      • -
      • Automatically writes vendor string in Vorbis comments.
      • -
      • Drastically reduced memory requirements.
      • -
      • Fixed bug where extra fmt/data chunks that were supposed to be skipped were not getting skipped.
      • -
      • Fixed bug in granulepos setting for Ogg FLAC streams.
      • -
      • Fixed memory leak when encoding multiple files with -V.
      • -
      - metaflac: -
        -
      • UTF-8 support in Vorbis comments.
      • -
      • New --import-vc-from and --export-vc-to commands for importing/exporting Vorbis comments from/to a file. For example, the following can be used to copy tags back and forth:
        - - metaflac --export-vc-to=- --no-utf8-convert file.flac | vorbiscomment --raw -w file.ogg
        - vorbiscomment --raw -l file.ogg | metaflac --import-vc-from=- --no-utf8-convert file.flac
        -
        -
      • -
      • Fixed bug #606796 where metaflac was failing on read-only files.
      • -
      - Libraries: -
        -
      • All APIs now meticulously documented via Doxygen. See here.
      • -
      • New libOggFLAC and libOggFLAC++ libraries. These wrap around libFLAC to provide encoding and decoding of Ogg FLAC streams, providing interfaces similar to the ones of the native FLAC libraries. These are also documented via Doxygen.
      • -
      • New FLAC__SeekableStreamEncoder and FLAC__FileEncoder in libFLAC simplify common encoding tasks.
      • -
      • New verify mode in all encoders.
      • -
      • FLAC__stream_encoder_finish() now resets the defaults just like the stream decoders.
      • -
      • Drastically reduced memory requirements of encoders and decoders.
      • -
      • Encoder now automatically writes vendor string in VORBIS_COMMENT block.
      • -
      • Encoding speedup of fixed predictors and MD5 speedup for 16bps mono/stereo signals on x86 (thanks to Miroslav Lichvar).
      • -
      • Fixed bug in metadata interface where a bps in STREAMINFO > 16 was incorrectly parsed.
      • -
      • Fixed bug where aborting stream decoder could cause infinite loop.
      • -
      • Behavior change: simplified decoder *_process() commands.
      • -
      • Behavior change: calling FLAC__stream_encoder_init() calls write callback once for "fLaC" signature and once for each metadata block.
      • -
      • Behavior change: deprecated do_escape_coding and rice_parameter_search_distance in encoder.
      • -
      -
    • -
    - - 22-Aug-2002: -
      -
    • - Rio Receiver  FLAC support has been added to the Rio Receiver and Dell Digital Audio Receiver via David Flowerday's RioPlay client. See here for the announcement. -
    • -
    - - 03-Jul-2002: -
      -
    • - FLAC 1.0.3 released  Although by version number only a 0.0.1 increment, this release is significant. Remember, micro-revisions mean the FLAC format remains both forward and backward compatible, however, the libFLAC API has changed for the better.
      -
      - New features: -
        -
      • 24-bit input support restored in flac.
      • -
      • Decoder speedup in libFLAC, which is directly passed on to the command-line decoder and plugins.
      • -
      • New -F option to flac to continue decoding in spite of errors.
      • -
      • Correctly set granulepos in Ogg packets so seeking Ogg FLAC streams will be easier.
      • -
      • New VORBIS_COMMENT metadata block for tagging with Vorbis-style comments.
      • -
      • Vastly improved metaflac, now with many editing and tagging options.
      • -
      • Partial id3v1 support in Winamp plugins.
      • -
      • Updated Winamp 3 plugin.
      • -
      • Note: new semantics for -P option in flac.
      • -
      • Note: removed -R option in flac.
      • -
      - New library features: -
        -
      • Previously mentioned decoder speedup in libFLAC.
      • -
      • New metadata interface to libFLAC for manipulating metadata in FLAC files.
      • -
      • New libFLAC++ API, an object wrapper around libFLAC.
      • -
      • New VORBIS_COMMENT metadata block for tagging with Vorbis-style comments.
      • -
      • Customizable metadata filtering by type in decoders.
      • -
      • Stream encoder can take an arbitrary list of metadata blocks, instead of just one SEEKTABLE and/or PADDING block.
      • -
      - Bugs fixed: -
        -
      • Fixed bug with using pipes under Windows.
      • -
      • Fixed several bugs in the plugins and made them more robust in general.
      • -
      • Fixed bug in flac where decoding to WAVE of a FLAC file with 0 for total_samples in the STREAMINFO block yielded a WAVE chunk of 0 size.
      • -
      • Fixed bug in Ogg packet numbering.
      • -
      -
    • -
    - - 13-Feb-2002: -
      -
    • - FLAC goes hardware!  PhatNoise has become the first commercial hardware platform to support FLAC. Firmware is now available for the Phatbox player to play FLAC files. See here for details. -
    • -
    - - 03-Dec-2001: -
      -
    • - FLAC 1.0.2 released  This release is only to fix a bug that was causing some of the plugins to crash sporadically. It can also affect libFLAC users that reuse one file decoder instance for multiple files; see here for more. -
    • -
    - - 14-Nov-2001: -
      -
    • - FLAC 1.0.1 released  The core codec is unchanged but there have been some features added and some bugs fixed:
      -
      - New features for users: -
        -
      • Support for Ogg-FLAC, i.e. flac can now read and write FLAC streams using Ogg as the transport layer.
      • -
      • New Winamp 3 plugin based on the Wasabi Beta 1 SDK.
      • -
      • New utilities for adding FLAC support to the Monkey's Audio GUI (see how).
      • -
      • Mac OS X support. The download area now contains an OS X binary release.
      • -
      • Mingw32 support.
      • -
      • Better handling of MS-specific 'fmt' chunks in WAVE files.
      • -
      - New features for developers: -
        -
      • Added a SeekableStreamDecoder layer between StreamDecoder and FileDecoder. This makes it easier to use libFLAC in situations where files have been abstracted away. See the latest documentation for more. The interface for the StreamDecoder and FileDecoder remain the same and are still binary-compatible with libFLAC 1.0.
      • -
      • Drastically reduced the stack requirements of the encoder.
      • -
      - Bug fixes: -
        -
      • Fixed a serious bug with flac and raw input where the encoder was trying to rewind when it shouldn't, which would add 12 junk samples to the encoded file. This was not present in WAVE encoding.
      • -
      • Fixed a minor bug in libFLAC with setting the file name to stdin on a file decoder.
      • -
      • Fixed a minor bug in libFLAC where multiple calls to setting the file name on a file decoder caused leaked memory.
      • -
      • Fixed a minor bug in metaflac, now correctly skips an id3v2 tag if present.
      • -
      • Fixed a minor bug in metaflac, now correctly skips long metadata blocks.
      • -
      -
    • -
    - - 20-Jul-2001: -
      -
    • - FLAC 1.0 is out!  It's finally here. There are a few new features but mostly it is minor bug fixes since 0.10: -
        -
      • New '--sector-align' option to flac which aligns a group of encoded files on CD audio sector boundaries.
      • -
      • New '--output-prefix' option to flac to allow the user to prepend a prefix to all output filenames (useful, for example, for encoding/decoding to a different directory).
      • -
      • Better WAVE autodetection (doesn't rely on ungetc() anymore).
      • -
      • Cleaner one-line encoding/decoding stats.
      • -
      • Changes to the libFLAC interface and type names to make binary compatibility easier to maintain in the future.
      • -
      • New '--sse-os' option to 'configure' to enable faster SSE-based routines.
      • -
      • Another (hopefully last) fix to the Winamp 2 plugin.
      • -
      • Slightly improved Rice parameter estimation.
      • -
      • Bug fixes for some very rare corner cases when encoding.
      • -
      -
    • -
    - - 07-Jun-2001: -
      -
    • - FLAC 0.10 released.  This is probably the final beta. There have been many improvements in the last two months: -
        -
      • Both the encoder and decoder have been significantly sped up. Aside from C improvements, the code base now has an assembly infrastructure that allows assembly routines for different architectures to be easily integrated. Many key routines have now have faster IA-32 implementations (thanks to Miroslav).
      • -
      • A new metadata block SEEKTABLE has been defined to hold an arbitrary number of seek points, which speeds up seeking within a stream.
      • -
      • flac now has a command-line usage similar to 'gzip'; make sure to see the latest documentation for the new usage. It also attempts to preserve the input file's timestamp and permissions.
      • -
      • The -# options in flac have been tweaked to yield the best compression-to-encode-time ratios. The new default is -5.
      • -
      • flac can now usually autodetect WAVE files when encoding so that -fw is usually not needed when encoding from stdin.
      • -
      • The WAVE reader in flac now just ignores (with a warning) unsupported sub-chunks instead of aborting with an error.
      • -
      • Added an option '--delete-input-file' to flac which automatically deletes the input after a successful encode/decode.
      • -
      • Added an option '-o' to flac to force the output file name (the old usage of "flac - outputfilename" is no longer supported).
      • -
      • Changed the XMMS plugin to send smaller chunks of samples (now 512) so that visualization is not slow.
      • -
      • Fixed a bug in the stream decoder where the decoded samples counter got corrupted after a seek.
      • -
      - It should be a short hop to 1.0. -
    • -
    - - 31-Mar-2001: -
      -
    • - FLAC 0.9 released.  There were some format changes that broke backwards compatibility but these should be the last (see below). Also, there have been several bug fixes and some new features: -
        -
      • FLAC's sync code has been lengthened to 14 bits from 9 bits. This should enable a faster and more robust synchronization mechanism.
      • -
      • Two reserved bits were added to the frame header.
      • -
      • A CRC-16 was added to the FLAC frame footer, and the decoder now does frame integrity checking based on the CRC.
      • -
      • The format now includes a new subframe field to indicate when a subblock has one or more 0 LSBs for all samples. This increases compression on some kinds of data.
      • -
      • Added two options to the analysis mode, one for including the residual signal in the analysis file, and one for generating gnuplot files of each subframe's residual distribution with some statistics. See the latest documentation.
      • -
      • XMMS plugin now supports 8-bit files.
      • -
      • Fixed a bug in the Winamp2 plugin where the audio sounded garbled.
      • -
      • Fixed a bug in the Winamp2 plugin where Winamp would hang sporadically at the end of a track (c.f. bug #231197).
      • -
      - FLAC is on track for an official 1.0 release soon. -
    • -
    - - 05-Mar-2001: -
      -
    • - FLAC 0.8 released.  This release is a result of extensive testing and fixes several bugs encountered when pushing the encoder to the limit. I'm pretty confident in the stability of the encoder/decoder now for all kinds of input. There have also been several features added. Here is a complete list of the changes since 0.7: -
        -
      • Created a new utility called metaflac. It is a metadata editor for .flac files. Right now it just lists the contents of the metadata blocks but eventually it will allow update/insertion/deletion.
      • -
      • Added two new metadata blocks: PADDING which has an obvious function, and APPLICATION, which is meant to be open to third party applications. See the latest format docs for more info, or the new id registration page.
      • -
      • Added a -P option to flac to reserve a PADDING block when encoding.
      • -
      • Added support for 24-bit files to flac (the FLAC format always supported it).
      • -
      • Started the Winamp3 plugin.
      • -
      • Greatly expanded the test suite, adding more streams (24-bit streams, noise streams, non-audio streams, more patterns) and more option combinations to the encoder. The test suite runs about 30 streams and over 5000 encodings now.
      • -
      • Fixed a bug in libFLAC that happened when using an exhaustive LPC coefficient quantization search with 8 bps input.
      • -
      • Fixed a bug in libFLAC where the error estimation in the fixed predictor could overflow.
      • -
      • Fixed a bug in libFLAC where LPC was attempted even when the autocorrelation coefficients implied it wouldn't help.
      • -
      • Reworked the LPC coefficient quantizer, which also fixed another bug that might occur in rare cases.
      • -
      • Really fixed the '-V overflow' bug (c.f. bug #231976).
      • -
      • Fixed a bug in flac related to the decode buffer sizing.
      • -
      - FLAC is very close to being ready for an official release. The only known problems left are with the Winamp plugins, which should be fixed soon, and pipes with MSVC. -
    • -
    - - 12-Feb-2001: -
      -
    • - FLAC 0.7 released.  This is mainly a bug fix release, specifically: -
        -
      • Fixed a bug that happened when both -fr and --seek were used at the same time.
      • -
      • Fixed a bug with -p (c.f. bug #230992).
      • -
      • Fixed a bug that happened when using large (>32K) blocksizes and -V (c.f. bug #231976).
      • -
      • Fixed a bug where encoder was double-closing a file.
      • -
      • Expanded the test suite.
      • -
      • Added more optimization flags for gcc, which should speed up flac.
      • -
      -
    • -
    - - 28-Jan-2001: -
      -
    • - FLAC 0.6 released.  The encoder is now much faster. The -m option has been sped up by 4x and -r improved, meaning that in the default compression mode (-6), encoding should be at least 3 times faster. Other changes: -
        -
      • Some bugs related to flac and pipes were fixed (see here for the discussion).
      • -
      • A "loose mid-side" (-M) option to the encoder has been added, which adaptively switches between independent and mid-side coding, instead of the exhaustive search that -m does.
      • -
      • An analyze mode (-a) has been added to flac. This is useful mainly for developers; currently it will dump info about each frame and subframe to a file. It's a text file in a format that can be easily processed by scripts; a separate analysis program is in the works.
      • -
      • The source now has an autoconf/libtool-based build system. This should allow the source to build "out-of-the-box" on many more platforms.
      • -
      -
    • -
    - - 15-Jan-2001: -
      -
    • - FLAC 0.5 released.  This is the first beta version of FLAC. Being beta, there will be no changes to the format that will break older streams, unless a serious bug involving the format is found. What this means is that, barring such a bug, streams created with 0.5 will be decodable by future versions. This version also includes some new features: -
        -
      • An MD5 signature of the unencoded audio is computed during encoding, and stored in the Encoding metadata block in the stream header. When decoding, flac will now compute the MD5 signature of the decoded data and compare it against the signature in the stream header.
      • -
      • A test mode (-t) has been added to flac. It works like decode mode but doesn't write an output file.
      • -
      -
    • -
    - - 23-Dec-2000: -
      -
    • FLAC 0.4 released.  This version fixes a bug in the constant subframe detection. More importantly, a verify option (-V) has been added to flac that verifies the encoding process. With this option turned on, flac will create a parallel decoder while encoding to make sure that the encoded output decodes to exactly match the original input. In this way, any unknown bug in the encoder will be caught and flac will abort with an error message.
    • -
    - - 10-Dec-2000: -
      -
    • FLAC debuts on SourceForge.  The FLAC project is now being hosted on SourceForge. Visit the FLAC project page to join the mailing list or sign up as a developer.
    • -
    -
    - -
    - - - - - - diff --git a/lib-src/libflac/doc/html/ogg_mapping.html b/lib-src/libflac/doc/html/ogg_mapping.html index e72ae98f7..fcea94908 100644 --- a/lib-src/libflac/doc/html/ogg_mapping.html +++ b/lib-src/libflac/doc/html/ogg_mapping.html @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@
    @@ -28,18 +28,10 @@ - -
    -  english  | -  russian  +  more
    @@ -50,7 +42,7 @@
    - This page specifies the way in which compressed FLAC data is encapsulated in an Ogg transport layer. It assumes basic knowledge of the FLAC format and Ogg structure and framing.
    + This page specifies the way in which compressed FLAC data is encapsulated in an Ogg transport layer. It assumes basic knowledge of the FLAC format and Ogg structure and framing.

    The original FLAC format includes a very thin transport system. This system of compressed FLAC audio data mixed with a thin transport has come to be known as 'native FLAC'. The transport consists of audio frame headers and footers which contain synchronization patterns, timecodes, and checksums (but notably not frame lengths), and a metadata system. It is very lightweight and does not support more elaborate transport mechanisms such as multiple logical streams, but it has served its purpose well.

    @@ -101,7 +93,7 @@ FLAC packets may span page boundaries.
  • - The granule position of pages containing FLAC audio follows the same semantics as that for Ogg-encapsulated Vorbis as described here. + The granule position of pages containing FLAC audio follows the same semantics as that for Ogg-encapsulated Vorbis as described here.
  • Redundant fields in the STREAMINFO packet may be set to zero (indicating "unknown" in native FLAC), which also facilitates single-pass encoding. These fields are: the minimum and maximum frame sizes, the total samples count, and the MD5 signature. "Unknown" values for these fields will not prevent a compliant native FLAC or Ogg FLAC decoder from decoding the stream. @@ -122,13 +114,7 @@
  • Copyright (c) 2004-2009 Josh Coalson
    - Copyright (c) 2011-2013 Xiph.Org Foundation -
    - SourceForge.net Logo - - CAFE Logo
    + Copyright (c) 2011-2014 Xiph.Org Foundation
    Valid XHTML 1.0! diff --git a/lib-src/libflac/doc/html/ru/Makefile.am b/lib-src/libflac/doc/html/ru/Makefile.am deleted file mode 100644 index 9483583d0..000000000 --- a/lib-src/libflac/doc/html/ru/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -# FLAC - Free Lossless Audio Codec -# Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# This file is part the FLAC project. FLAC is comprised of several -# components distributed under different licenses. The codec libraries -# are distributed under Xiph.Org's BSD-like license (see the file -# COPYING.Xiph in this distribution). All other programs, libraries, and -# plugins are distributed under the GPL (see COPYING.GPL). The documentation -# is distributed under the Gnu FDL (see COPYING.FDL). Each file in the -# FLAC distribution contains at the top the terms under which it may be -# distributed. -# -# Since this particular file is relevant to all components of FLAC, -# it may be distributed under the Xiph.Org license, which is the least -# restrictive of those mentioned above. See the file COPYING.Xiph in this -# distribution. - -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru - -doc_DATA = \ - authors.html \ - comparison.html \ - developers.html \ - documentation.html \ - download.html \ - features.html \ - format.html \ - goals.html \ - id.html \ - index.html \ - links.html \ - news.html - -EXTRA_DIST = $(doc_DATA) diff --git a/lib-src/libflac/doc/html/ru/Makefile.in b/lib-src/libflac/doc/html/ru/Makefile.in deleted file mode 100644 index 656195953..000000000 --- a/lib-src/libflac/doc/html/ru/Makefile.in +++ /dev/null @@ -1,516 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# FLAC - Free Lossless Audio Codec -# Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# This file is part the FLAC project. FLAC is comprised of several -# components distributed under different licenses. The codec libraries -# are distributed under Xiph.Org's BSD-like license (see the file -# COPYING.Xiph in this distribution). All other programs, libraries, and -# plugins are distributed under the GPL (see COPYING.GPL). The documentation -# is distributed under the Gnu FDL (see COPYING.FDL). Each file in the -# FLAC distribution contains at the top the terms under which it may be -# distributed. -# -# Since this particular file is relevant to all components of FLAC, -# it may be distributed under the Xiph.Org license, which is the least -# restrictive of those mentioned above. See the file COPYING.Xiph in this -# distribution. - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = doc/html/ru -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(docdir)" -DATA = $(doc_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ -FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NASM = @NASM@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OBJ_FORMAT = @OBJ_FORMAT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OGG_PACKAGE = @OGG_PACKAGE@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -XMMS_CFLAGS = @XMMS_CFLAGS@ -XMMS_CONFIG = @XMMS_CONFIG@ -XMMS_DATA_DIR = @XMMS_DATA_DIR@ -XMMS_EFFECT_PLUGIN_DIR = @XMMS_EFFECT_PLUGIN_DIR@ -XMMS_GENERAL_PLUGIN_DIR = @XMMS_GENERAL_PLUGIN_DIR@ -XMMS_INPUT_PLUGIN_DIR = @XMMS_INPUT_PLUGIN_DIR@ -XMMS_LIBS = @XMMS_LIBS@ -XMMS_OUTPUT_PLUGIN_DIR = @XMMS_OUTPUT_PLUGIN_DIR@ -XMMS_PLUGIN_DIR = @XMMS_PLUGIN_DIR@ -XMMS_VERSION = @XMMS_VERSION@ -XMMS_VISUALIZATION_PLUGIN_DIR = @XMMS_VISUALIZATION_PLUGIN_DIR@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -doc_DATA = \ - authors.html \ - comparison.html \ - developers.html \ - documentation.html \ - download.html \ - features.html \ - format.html \ - goals.html \ - id.html \ - index.html \ - links.html \ - news.html - -EXTRA_DIST = $(doc_DATA) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/html/ru/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc/html/ru/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-docDATA: $(doc_DATA) - @$(NORMAL_INSTALL) - @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ - done - -uninstall-docDATA: - @$(NORMAL_UNINSTALL) - @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(docdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-docDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-docDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-docDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-docDATA - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libflac/doc/html/ru/authors.html b/lib-src/libflac/doc/html/ru/authors.html deleted file mode 100644 index 00d7e1956..000000000 --- a/lib-src/libflac/doc/html/ru/authors.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - -FLAC: àâòîðû - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    |íà÷àëî |íîâîñòè |ôàéëû |õàðàêòåðèñòèêè |öåëè |ôîðìàò |
    |id |ñðàâíåíèå |ðàçðàáîòêà |äîêóìåíòàöèÿ |ññûëêè | - àâòîðû |
    - -

    - - - - - -
    |english | - ðóññêèé |

    - - -

    FLAC: àâòîðû

    - -

    FLAC (http://flac.sourceforge.net/) - ñâîáîäíûé àóäèî êîäåê, ñæèìàþùèé áåç ïîòåðü, ðàçðàáîòàííûé Äæîøåì Êîëñîíîì (Josh Coalson).

    - -

    Äðóãèå ó÷àñòíèêè ïðîåêòà:

    - -
    - -

    Ìèðîñëàâ Ëè÷âàð (Miroslav Lichvar) -

    -
  • Íåñêîëüêî âåðñèé ïðîöåäóð èç áèáëèîòåêè libFLAC íà àññåìáëåðå äëÿ àðõèòåêòóðû IA-32.
  • -

    - -

    Ìýò Öèììåðìàíí (Matt Zimmerman) -

    -
  • Ñèñòåìà ñáîðêè libtool/autoconf/automake.
  • -

    - -

    Àíäðåé Àñòàôüåâ (Andrey Astafiev) -

    -
  • Ïåðåâîä äîêóìåíòàöèè íà ðóññêèé ÿçûê.
  • -

    - -

    Áðýäè Ïàòòåðñîí (Brady Patterson) -

    -
  • Ïîääåðæêà ôîðìàòà AIFF.
  • -

    - -

    Äàéñóêå Øèìàìóðà (Daisuke Shimamura) -

    -
  • Ïîääåðæêà id3 v1/v2 è i18n â ïëàãèíå XMMS.
  • -

    - -

    X-Fixer

    -
    -
  • Ñèñòåìà íàñòðîéêè, ðåäàêòèðîâàíèå òåãîâ è èíôîðìàöèÿ î ôàéëå â ïëàãèíå äëÿ Winamp2.

    -
  • -
    - -

     Copyright (c) 2000-2009 Josh Coalson -

     Copyright (c) 2011-2013 Xiph.Org Foundation

    - - - diff --git a/lib-src/libflac/doc/html/ru/comparison.html b/lib-src/libflac/doc/html/ru/comparison.html deleted file mode 100644 index 606399ccf..000000000 --- a/lib-src/libflac/doc/html/ru/comparison.html +++ /dev/null @@ -1,866 +0,0 @@ - - - - - - - - - - - -FLAC: ñðàâíåíèå - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    |íà÷àëî |íîâîñòè |ôàéëû |õàðàêòåðèñòèêè |öåëè |ôîðìàò |
    |id | - ñðàâíåíèå |ðàçðàáîòêà |äîêóìåíòàöèÿ |ññûëêè |àâòîðû |
    - -

    - - - - - -
    |english | - ðóññêèé |

    - - -

    FLAC: ñðàâíåíèå

    - -

    Öåëüþ ýòîé ñòðàíèöû ÿâëÿåòñÿ ñðàâíåíèå FLAC ñ äðóãèìè àíàëîãè÷íûìè êîäåêàìè. Èññëåäîâàíèå çàòðàãèâàåò íå òîëüêî óðîâåíü è âðåìÿ êîäèðîâàíèÿ/äåêîäèðîâàíèÿ, íî è äðóãèå âàæíûå äëÿ ïîëüçîâàòåëÿ âîçìîæíîñòè êîäåêîâ. Âûáèðàÿ äëÿ ñåáÿ êîäåê, ïîìíèòå î ñëåäóþùåì:

    - -

    -
  • Íàñêîëüêî ÿ çíàþ, òîëüêî äâà êîäåêà (FLAC è WavPack) ïîëíîñòüþ ñâîáîäíû è àêòèâíî ïîääåðæèâàþòñÿ (èñõîäíûå òåêñòû Shorten è Monket's Audio äîñòóïíû, íî ëèöåíçèÿ áîëåå îãðàíè÷åíà). Áîëüøèíñòâî ïðåäîñòàâëÿþò áåñïëàòíûå ñêîìïèëèðîâàííûå ïðîãðàììû áåç äîñòóïà ê èñõîäíûì êîäàì, ñëåäîâàòåëüíî, âûáèðàÿ èõ, âû ïîïàäàåòå â çàâèñèìîñòü îò ïðîèçâîäèòåëÿ. Ó âàñ óæå íå áóäåò øàíñà ïîðòèðîâàòü ïðîãðàììó íà äðóãóþ îïåðàöèîííóþ ñèñòåìó èëè èñïðàâèòü îøèáêó, åñëè îíà ïîÿâèòñÿ è ýòîãî íå çàõî÷åò ñäåëàòü àâòîð. Ýòî ìîæåò îêàçàòüñÿ ñåðüåçíûì íåäîñòàòêîì, åñëè ôîðìàò íå ÿâëÿåòñÿ âñåìèðíî ïðèçíàíûì.
  • - -
  • Óðîâåíü è âðåìÿ ñæàòèÿ äëÿ flac õàðàêòåðèçóþò òîëüêî êîíêðåòíóþ âåðñèþ êîäåðà. Îíè íå âûÿâëÿþò ïðåäåëà äëÿ âñåõ êîäåðîâ è ôîðìàòà FLAC, òàê êàê ôîðìàò îòêðûòûé è ðàñøèðÿåìûé è êàæäûé ìîæåò íàïèñàòü óëó÷øåííóþ âåðñèþ. Ìîæíî ñ áîëüøîé äîëåé óâåðåííîñòè ñêàçàòü, ÷òî êîäåê áóäåò óëó÷øàòüñÿ.
  • - -
  • Ïîääåðæêà ïîòîêîâîãî ôîðìàòà ó FLAC äàåò åìó äîïîëíèòåëüíîå ïðåèìóùåñòâî íàä òåìè êîäåêàìè, êîòîðûå òàêîé âîçìîæíîñòè íå èìåþò.
  • -

    - -

    ß ïîñòàðàþñü îáíîâëÿòü èíôîðìàöèþ íà ýòîé ñòðàíèöå êàê ìîæíî ÷àùå, îäíàêî, åñëè âû çàìåòèòå êàêóþ-ëèáî íåòî÷íîñòü, ñîîáùèòå ìíå è ÿ èñïðàâëþ åå.

    - -

    Ðàññìàòðèâàåìûå êîäåðû (êðîìå flac):

    - -

    -
  • Bonk - îòêðûòûé êîäåê. Íåò îòäåëüíîé áèáëèîòåêè è ïîääåðæêè ïëåéåðà.
  • - -
  • Kexis - îòêðûòûé êîäåê. Ïîõîæå, ÷òî ïðîåêò ïðåêðàòèëñÿ íà íà÷àëüíîé ñòàäèè ðàçðàáîòêè. Íåò ïîääåðæêè ïëåéåðà.
  • - -
  • La - çàêðûòûé ñèììåòðè÷åñêèé, àäàïòèâíûé êîäåê. Ïðåäîñòàâëÿþòñÿ ñêîìïèëèðîâàííûå âåðñèè äëÿ Windows è Linux. Äàåò ìàêñèìàëüíûé óðîâåíü ñæàòèÿ, íî ðàáîòàåò î÷åíü ìåäëåííî.
  • - -
  • LPAC - ïîñòàâëÿåòñÿ òîëüêî ñêîìïèëèðîâàííûì. Äîñòóïíû âåðñèè íå òîëüêî äëÿ Windows, õîòÿ ïëàãèí åñòü òîëüêî äëÿ Winamp.
  • - -
  • Monkey's Audio - ñèììåòðè÷åñêèé, àäàïòèâíûé êîäåê ñ õîðîøèì óðîâíåì ñæàòèÿ. Èñõîäíûå òåêñòû äîñòóïíû ïî îãðàíè÷åííîé ëèöåçèè. Äîñòóïíû äâå âåðñèè: îò ñîçäàòåëÿ ïðîåêòà Ìýòòà Îøëåíäà è îò Ôðàíêà Êëåììà.  òåñòàõ èñïîëüçîâàëàñü îðèãèíàëüíàÿ âåðñèÿ.
  • - -
  • Ogg Squish - îòêðûòûé êîäåê, íî áîëåå íåïîääåðæèâàåìûé. Òåñòèðóåìàÿ âåðñèÿ 0.98 áûëà ïîñëåäíåé, êîòîðóþ ìîæíî íàéòè. Âåðñèè äëÿ Windows íå áûëî, íî ñóäÿ ïî ðåçóëüòàòàì, ïîëó÷åííûì ïîä Unix, ýòî "áûñòðûé" êîäåê.
  • - -
  • optimFROG - çàêðûòûé êîäåê äëÿ Windows è Linux ñ ïëàãèíàìè äëÿ Winamp è XMMS. Ìåäëåííûé, íî èìååò âûñîêèé óðîâåíü ñæàòèÿ.
  • - -
  • Pegasus-SPS - çàêðûòûé êîäåê òîëüêî äëÿ Windows.
  • - -
  • RKAU - çàêðûòûé êîäåê òîëüêî äëÿ Windows. Íå îáíîâëÿëñÿ â òå÷åíèå 2 ëåò.
  • - -
  • Shorten - íàèáîëåå ðàñïðîñòðàíåííûé êîäåê ñ äîñòóïíûìè èñõîäíûìè òåêñòàìè.
  • - -
  • WaveZIP - çàêðûòûé àðõèâàòîð òîëüêî äëÿ Windows. Èñïîëüçóåò äâèæîê MUSICompress[tm], êîòîðûé, ïðåäïîëîæèòåëüíî, çàïàòåíòîâàí. ß õîòåë ñäåëàòü ññûëêó íà êîìïàíèþ, íàïèñàâøóþ WaveZIP (GadgetLabs), íî îíè çàâåðøèëè ñâîþ äåÿòåëüíîñòü (ìîæåò, ïîòîìó ÷òî ïûòàëèñü ïðîäàòü òî, íå äîëæíî íè÷åãî ñòîèòü).
  • - -
  • WavPack - îòêðûòûé êîäåê òîëüêî äëÿ Windows, âûïóùåííûé ïîä ëèöåíçèåé BSD. Èìååò õîðîøåå ñîîòíîøåíèå ìåæäó óðîâíåì è âðåìåíåì ñæàòèÿ.
  • -

    - -

    ß íå ñìîã äîñòàòü êîïèè êîäåêîâ AudioPack è WavARC.

    - -

    Åñëè íå ïðèíèìàòü âî âíèìàíèå óðîâåíü è ñêîðîñòü ñæàòèÿ (êàê âû óâèäèòå ïîçæå, áîëüøèíñòâî êîäåêîâ èìåþò ñõîäíóþ ïðîèçâîäèòåëüíîñòü), òî ñóáúåêòèâíàÿ êàðòèíà, îñíîâàííàÿ íà áàçîâûõ âîçìîæíîñòÿõ áóäåò âûãëÿäåòü ñëåäóþùèì îáðàçîì. Îñíîâíîå ïðåèìóùåñòâî èìåþò ñâîáîäíûå êîäåêè, òàê êàê ýòî ïðåäîñòàâëÿåò Âàì âîçìîæíîñòü äîáàâëÿòü âñå, ÷òî íåîáõîäèìî. Êðîìå òîãî, ïðîåêòû ñ îòêðûòûìè èñõîäíèêàìè îáû÷íî ðàçâèâàþòñÿ è óëó÷øàþòñÿ áûñòðåå. Âòîðîé âàæíûé äëÿ ïîëüçîâàòåëÿ ôàêòîð - ýòî ïîääåðæêà ðàçíûõ îïåðàöèîííûõ ñèñòåì è/èëè âîçìîæíîñòü èñïîëüçîâàíèÿ ïëàãèíîâ äëÿ ïëåéåðîâ.

    - -

    Òàáëèöà 1. Ñðàâíåíèå âîçìîæíîñòåé êîäåêîâ.

    -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -Êîäåê -Äîñòóïíû òåêñòû? -Äîñòóïíû ïëàãèíû? -Àïïàðàòíàÿ ïîääåðæêà? -Ïîòî÷íîñòü? -Ïîèñê? -Öåíà -Ïîääåðæêà ÎÑ
    flac v1.1.0äà (OSI)äà (XMMS, AlsaPlayer, Winamp, MacAmp Lite, dBpowerAMP, Foobar2000, Apollo)äà (PhatBox, Kenwood MusicKeg, Rio Receiver, Dell Digital Audio Receiver, Turtle Beach AudioTron)äàäàñâîá.Linux, Windows, Mac OS X, *BSD, Solaris, OS/2, BeOS è äðóãèå
    Shorten v3.2äà (îãðàíè÷.)äà (Winamp, XMMS)íåòíåòäà (òîëüêî v3)ñâîá.Linux, Windows, Mac OS 9, Mac OS X, *BSD, Solaris è äðóãèå
    WavPack v3.97aäàäà (Winamp)íåòíåòäàñâîá.Windows
    Monkey's Audio v3.96äà (îãðàíè÷.)äà (Winamp, MediaJukebox, dBpowerAMP)íåòíåòäàáåñïë.Windows, Linux
    Ogg Squish 0.98äàíåò?íåòäàäàñâîá.Linux, Windows, äðóãèå UNIX
    Bonk 0.5äàäà (XMMS)íåòíåòíåòñâîá.Linux, Windows, äðóãèå UNIX
    La 0.3cíåòäà (Winamp, XMMS)íåòíåòäàáåñïë.Windows, Linux
    optimFrog 4.21íåòäà (Winamp, XMMS)íåòíåòäàáåñïë.Windows, Linux
    LPAC v1.31 (codec 3.0)íåòäà (Winamp)íåòíåò?äàáåñïë.Windows, Linux, Solaris
    RKAU v1.07íåòäà (Winamp)íåòíåòäàáåñïë.Windows
    Kexis 0.2.2äàíåòíåòíåòíåòñâîá.Linux, Windows, äðóãèå UNIX
    WaveZIP v2íåòíåòíåòíåòíåòáåñïë. (24-áèò çà $)Windows
    Pegasus-SPSíåòíåòíåòíåòíåò$39 (trial)Windows

    - -

    Äëÿ òåñòèðîâàíèÿ èñïîëüçîâàëñÿ PII-333 ñ 256Má è ÎÑ Windows NT SP5. Ê ñîæàëåíèþ, èìåííî Windows ÿâëåòñÿ åäèíñòâåííîé îïåðàöèîííîé ñèñòåìîé, ïîä êîòîðîé ìîãóò ðàáîòàòü âñå êîäåêè è ãäå ìîæíî äîáèòüñÿ ðàâíûõ óñëîâèé ðàáîòû.

    - -

    Âõîäíûìè äàííûìè ÿâëÿþòñÿ òîëüêî ôàéëû, çàïèñàííûå ñ àóäèî-CD.  áóäóùåì ìîãóò ïîÿâèòüñÿ òåñòû äëÿ äðóãèõ âèäîâ èíôîðìàöèè (íàïðèìåð, ðå÷ü, äðóãèå ÷àñòîòû äèñêðåòèçàöèè è ò.ä.). Ïðåäñòàâëåíû 14 òðåêîâ ðàçëè÷íûõ ñòèëåé.

    - -

     ïåðâîé òàáëèöå ïðèâåäåíû îáùèå ðåçóëüòàòû ïî âñåì òðåêàì.  îñòàëüíûõ òàáëèöàõ ïðèâåäåíû ðåçóëüòàòû äëÿ êàæäîãî òðåêà.  îáùåé òàáëèöå ïðèâåäåíî áîëüøîå êîëè÷åñòâî ðåæèìîâ, à íà îñòàëüûõ ëèøü ñàìûå èíòåðåñíûå

    - -

     îáùåé òàáëèöå ðåçóëüòàòû îòñîðòèðîâàíû ïî óðîâíþ ñæàòèÿ, êîòîðîå âû÷èñëÿåòñÿ êàê ñðåäíåå èç óðîâíåé äëÿ âñåõ òðåêîâ, ÷òîáû äëèííûå òðåêè íå èìåëè áîëüøåãî âåñà ïðè òåñòèðîâàíèè.  òàáëèöàõ äëÿ îòäåëüíûõ òðåêîâ ïðèâåäåí óðîâåíü ñæàòèÿ ( = ðàçìåð ñæàòîãî ôàéëà / ðàçìåð íåñæàòîãî ôàéëà).

    - -

    Íåîáõîäèìî ñäåëàòü íåñêîëüêî çàìå÷àíèé:

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    |íà÷àëî | - íîâîñòè |ôàéëû |õàðàêòåðèñòèêè |öåëè |ôîðìàò |
    |id |ñðàâíåíèå |ðàçðàáîòêà |äîêóìåíòàöèÿ |ññûëêè |àâòîðû |
    - -

    - - - - - -
    |english | - ðóññêèé |

    - -

    FLAC: íîâîñòè

    - -

  • 26.01.2003
    -Âûøëà âåðñèÿ FLAC 1.1.0, â êîòîðîé ñäåëàíî íå âñå, ÷òî õîòåëîñü, íî âðåìÿ ðåëèçà ïîäîøëî.

    - -

    Îáðàòèòå âíèìàíèå íà òî, ÷òî áûë óâåëè÷åí ìëàäøèé íîìåð âåðñèè, à çíà÷èò ñîâìåñòèìîñòü ñíèçó ââåðõ áûëà íàðóøåíà (ò.å. áîëåå ðàííèå âåðñèè äåêîäåðîâ íå ñìîãóò âîñïðîèçâîäèòü ôàéëû ñîçäàííûå áîëåå ïîçäíèìè âåðñèÿìè êîäåðà). Ýòî ïðîèçîøëî èç-çà îøèáêè â äåêîäåðàõ â âåðñèÿõ äî 1.0.4 âêëþ÷èòåëüíî, èç-çà êîòîðîé äåêîäåðû íåïðàâèëüíî ïðîïóñêàëè íåèçâåñòíûå áëîêè ìåòàäàííûõ. Ïîòîêîâûé ôîðìàò íå èçìåíèëñÿ, ïîýòîìó îáðàòíàÿ ñîâìåñòèìîñòü íå íàðóøåíà. Ýòî çíà÷èò, ÷òî ôàéë FLAC ñî ñïèñêîì ðàçáèåíèÿ àóäèîäèñêà íå áóäåò äåêîäèðîâàòüñÿ âåðñèÿìè äî 1.1.0, â êîòîðîé áûëà èñïðàâëåíà óïîìÿíóòàÿ âûøå îøèáêà.

    - -

    Ñïèñîê èçìåíåíèé:

    - -

      -
    • Îñíîâíîå:
    • - -
        -
      • Âåñü êîä ïðîâåðåí ïðîãðàììîé Valgrind!
      • -
      • Íîâûé áëîê ìåòàäàííûõ CUESHEET äëÿ õðàíåíèÿ ñîäåðæàíèÿ CD è èíôîðìàöèè îá èíäåêñíûõ òî÷êàõ. Òåïåðü àóäèîäèñê ìîæåò áûòü ïîëíîñòüþ ñîõðàíåí â îäèí ôàéë.
      • -
      • Ïîääåðæêà ReplayGain.
      • -
      • Óëó÷øåí óðîâåíü ñæàòèÿ äëÿ 24-áèòíûõ ôàéëîâ.
      • -
      • Áîëåå ïîëíàÿ ïîääåðæêà ôîðìàòà AIFF.
      • -
      • Îïòèìèçàöèÿ äëÿ 3DNow! òåïåðü âêëþ÷åíà ïî óìîë÷àíèþ.
      • -
      • Ïîëíàÿ ñèñòåìà ñáîðêè äëÿ MSVC ñ ôàéëîì ïðîåêòà .dsp, ñ ïîìîùüþ êîòîðîé ìîæíî ñîçäàòü ñòàòèòåñêèå è äèíàìè÷åñêèå áèáëèîòåêè â ðåæèìå îòëàäêè èëè ðåëèçà.
      • -
      - -
    • flac:
    • -
        -
      • Ìîæåò äåêîäèðîâàòü FLAC â AIFF; íîâûé êëþ÷ --force-aiff-format.
      • -
      • Íîâàÿ âîçìîæíîñòü --cuesheet ïîçâîëÿåò ÷èòàòü è ñîõðàíÿòü ñïèñêè ðàçáèåíèÿ àóäèîäèñêà ïðè êîäèðîâàíèÿ äèñêà ïîëíîñòüþ. Àâòîìàòè÷åñêè ñîçäàþòñÿ òî÷êè ïîèñêà äëÿ òðåêîâ è èíäåêñíûå òî÷êè, êðîìå òåõ ñëó÷àåâ, êîãäà èñïîëüçóåòñÿ êëþ÷ --no-cued-seekpoints.
      • -
      • Íîâàÿ îïöèÿ --replay-gain äëÿ âû÷èñëåíèÿ è ñîõðàíåíèÿ çíà÷åíèé ReplayGain.
      • -
      • Íîâàÿ îïöèÿ --until äîïîëíÿåò --skip äëÿ îñòàíîâêè äåêîäèðîâàíèÿ â îïðåäåëåííîì ìåñòå ïîòîêà.
      • -
      • --skip è --until ìîãóò ïîëó÷àòü çíà÷åíèÿ â ôîðìàòå ìì:ññ.ññ.
      • -
      • Íîâûé êëþ÷ -S #s óêàçûâàåò, ÷òî òî÷êè äëÿ ïîèñêà íóæíî ðàññòàâëÿòü ñ èíòåðâàëîì â '#' ñåêóíä.
      • -
      • flac ñîçäàåò òàáëèöó ïîèñêà ïî óìîë÷àíèþ ïàðàìåòðîì -S 10s âìåñòî -S 100x.
      • -
      • flac äîáàâëÿåò áëîê PADDING ðàçìåðîì 4Êá ïî óìîë÷àíèþ (îòêëþ÷àåòñÿ îïöèåé --no-padding).
      • -
      • Èñïðàâëåíà îøèáêà ñ êëþ÷îì --skip è êîäèðîâàíèåì èç AIFF â FLAC.
      • -
      • Èñïðàâëåíà îøèáêà, ïðèâîäÿùàÿ ê ïîð÷å çàãîëîâêà WAVE ôàéëà, ñîçäàâàåìîãî ïðè äåêîäèðîâàíèè ôàéëà FLAC, ó êîòîðîãî â áëîêå STREAMINFO áûëî çíà÷åíèå total_samples==0.
      • -
      - -
    • metaflac:
    • -
        -
      • Íîâûé êëþ÷ --import-cuesheet-from äëÿ ÷òåíèÿ è ñîõðàíåíèÿ ñïèñêà ðàçìåòêè àóäèîäèñêà ïðè êîäèðîâàíèÿ äèñêà ïîëíîñòüþ. Òàêæå àâòîìàòè÷åñêè ñîçäàþòñÿ òî÷êè ïîèñêà äëÿ òðåêà è èíäåêñíûå òî÷êè, êðîìå òåõ ñëó÷àåâ, êîãäà èñïîëüçóåòñÿ êëþ÷ --no-cued-seekpoints.
      • -
      • Íîâûé êëþ÷ --export-cuesheet-to äëÿ çàïèñè ñïèñêà ðàçìåòêè àóäèîäèñêà èç ôàéëà FLAC.
      • -
      • Íîâûé êëþ÷ --add-replay-gain äëÿ âû÷èñëåíèÿ çíà÷åíèé ReplayGain è ñîõðàíåíèÿ èõ â âèäå òåãîâ.
      • -
      • Íîâûé êëþ÷ --add-seekpoint äëÿ äîáàâëåíèÿ òî÷åê ïîèñêà â ñóùåñòâóþùèé ôàéë FLAC.
      • -
      - -
    • Ïëàãèí äëÿ XMMS:
    • -
        -
      • Íàñòðàèâàåìîå ïðîåáðàçîâàíèå ÷àñòîòû äèñêðåòèçàöèè ñî ñãëàæèâàíèåì ñèãíàëà.
      • -
      • Ïîääåðæêà ReplayGain äëÿ íàñòðîéêè îãðàíè÷åíèÿ øóìà, ïðåäâàðèòåëüíîãî óñèëåíèÿ è îïöèîíàëüíîãî æåñòêîãî îãðàíè÷èòåëÿ.
      • -
      • Íîâûé ðåäàêòîð êîììåíòàðèåâ Vorbis.
      • -
      • Ðàáîòàåò îêíî èíôîðìàöèè î ôàéëå.
      • -
      • Èñïîëüçóåòñÿ òåã ARTIST, åñëè íåò òåãà PERFORMER.
      • -
      - -
    • Áèáëèîòåêè (äëÿ ðàçðàáîò÷èêîâ):
    • -
        -
      • Âåñü êîä è òåñòû îòëàæåíû äëÿ Valgrind. Âñå òåñòû ïðîøëè ïðîâåðêó Valgrind, à ýòî çíà÷èò, ÷òî â ïðîãðàììå íåò óòå÷åê ïàìÿòè èëè ïåðåïîëíåíèé áóôåðà.
      • -
      • Ïðîöåäóðà FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT) òåïåðü çàïèñûâàåò èíôîðìàöèþ î êîäåðå.
      • -
      -

    - -

  • 24.09.2002
    -Âûøëà âåðñèÿ FLAC 1.0.4, â êîòîðîé ñäåëàíî áîëüøîå êîëè÷åñòâî óëó÷øåíèé:

    - -

      -
    • Ïëàãèíû:
    • - -
        - -
      • Ïîääåðæêà êîììåíòàðèåâ Vorbis, ID3 v1 è v2.
      • -
      • Êîíôèãóðóåìîå ôîðìàòèðîâàíèå çàãîëîâêà è ïðåîáðàçîâàíèå êîäèðîâîê â ïëàãèíå äëÿ XMMS.
      • -
      • Ïîääåðæêà 8- è 24-áèòíûõ ôàéëîâ. Íà ñòàäèè êîìïèëÿöèè ìîæíî âûáðàòü ëèáî 24-áèòíûé âûâîä, ëèáî ëèíåéíîå ïðåîáðàçîâàíèå ê 16-áèòíîìó âûâîäó (ïî óìîë÷àíèþ).
      • -
      - -
    • flac
    • - -
        -
      • Óëó÷øåí àíàëèç îïöèé êîìàíäíîé ñòðîêè (ñ ïîìîùüþ getopt).
      • -
      • Ïîääåðæêà ôîðìàòà AIFF (ñïàñèáî Áðýäè Ïàòòåðñîíó).
      • -
      • Íåáîëüøîå óâåëè÷åíèå ñêîðîñòè ðàáîòû äåêîäåðà.
      • -
      • --sector-align òåïåðü ïîääåðæèâàåò â êà÷åñòâå ââîäà ôàéëû áåç çàãîëîâêà.
      • -
      • Íîâàÿ îïöèÿ -T, --tag äëÿ äîáàâëåíèÿ êîììåíòàðèåâ Vorbis ïðè êîäèðîâàíèè.
      • -
      • Íîâàÿ îïöèÿ --serial-number, êîòîðàÿ ìîæåò èñïîëüçîâàòüñÿ âìåñòå ñ êëþ÷îì --ogg.
      • -
      • Àâòîìàòè÷åñêè çàïèñûâàåòñÿ èíôîðìàöèÿ î êîäåðå â êîììåíòàðèè Vorbis.
      • -
      • Çíà÷èòåëüíî óìåíüøåíû òðåáîâàíèÿ ê ïàìÿòè.
      • -
      • Èñïðàâëåíà îøèáêà, èç-çà êîòîðîé íåïîääåðæèâàåìûå äîïîëíèòåëüíûå òåãè ôîðìàòà RIFF WAVE íå ïðîïóñêàëèñü.
      • -
      • Èñïðàâëåíà îøèáêà ñ îïðåäåëåíèåì çíà÷åíèÿ granulepos â ïîòîêàõ Ogg FLAC.
      • -
      • Èñïðàâëåíà óòå÷êà ïàìÿòè ïðè êîäèðîâàíèè íåñêîëüêèõ ôàéëîâ ñ îïöèåé -V.
      • -
      - -
    • metaflac
    • -
        -
      • Ïîääåðæêà UTF-8 â êîììåíòàðèÿõ Vorbis.
      • -
      • Íîâûå êîìàíäû --import-vc-from è --export-vc-to commands äëÿ èìïîðòà/ýêñïîðòà êîììåíòàðèåâ Vorbis. Íàïðèìåð, òàê ìîæíî ñêîïèðîâàòü òåã èç ôàéëà è çàïèñàòü â íåãî:
        - $ metaflac --export-vc-to=- --no-utf8-convert file.flac | vorbiscomment --raw -w file.ogg -
        $ vorbiscomment --raw -l file.ogg | metaflac --import-vc-from=- --no-utf8-convert file.flac
      • -
      • Èñïðàâëåíà îøèáêà, âîçíèêàâøàÿ ïðè îáðàáîòêå ôàéëîâ, äîñòóïíûõ òîëüêî äëÿ ÷òåíèÿ
      • -
      - -
    • Áèáëèîòåêè:
    • - -
        -
      • Âñå API òåïåðü äîêóìåòèðóþòñÿ ñ ïîìîùüþ cbcntvs Doxygen. Ñì. çäåñü.
      • -
      • Íîâûå áèáëèîòåêè libOggFLAC è libOggFLAC++, êîòîðûå ÿâëÿþòñÿ îáîëî÷êàìè äëÿ libFLAC è libFLAC++, äëÿ êîäèðîâàíèÿ è äåêîäèðîâàíèÿ ïîòîêîâ Ogg FLAC.
      • -
      • Íîâûå FLAC__SeekableStreamEncoder è FLAC__FileEncoder èç áèáëèîòåêè libFLAC óïðîùàþò îñíîâíûå çàäà÷è, âîçíèêàþùèå ïðè êîäèðîâàíèè.
      • -
      • Íîâûé ðåæèì ïðîâåðêè âî âñåõ êîäåðàõ.
      • -
      • Çíà÷èòåëüíî óìåíüøåíî êîëè÷åñòâî ïàìÿòè, òðåáóåìîé äëÿ êîäåðîâ è äåêîäåðîâ.
      • -
      • Êîäåð àâòîìàòè÷åñêè çàïèñûâàåò èíôîðìàöèþ â áëîê VORBIS_COMMENT.
      • -
      • Óâåëè÷åíà ñêîðîñòü êîäèðîâàíèÿ ñ ïîñòîÿííûìè ïðåäèêòîðàìè, à òàêæå ñêîðîñòü âû÷èñëåíèÿ MD5 äëÿ 16-áèòíûõ ìîíî- è ñòåðåîñèãíàëîâ íà àðõèòåêòóðå x86 (ñïàñèáî Ìèðîñëàâó Ëè÷âàðó).
      • -
      • Èñïðàâëåíà îøèáêà â èíòåðôåéñå ìåòàäàííûõ, èç-çà êîòîðîé èíôîðìàöèÿ î êîëè÷åñòâå áèòîâ íà ñýìïë â áëîêå STREAMINFO ñ÷èòûâàëàñü íåâåðíî.
      • -
      • Èñïðàâëåíà îøèáêà, èç-çà êîòîðîé äåêîäåð ìîã âîéòè â áåñêîíå÷íûé öèêë ïðè îáðûâå ïîòîêà.
      • -
      - -

    - -

  • 22.08.2002
    -Ïîääåðæêà FLAC áûëà äîáàâëåíà â Rio Receiver è Dell Digital Audio Receiver ñ ïîìîùüþ êëèåíòà RioPlay Äýâèäà Ôëàóåðäýÿ. Ñì. àíîíñ ïîëíîñòüþ.

    - -

  • 13.02.2002
    -Ïåðâàÿ àïïàðàòíàÿ ðåàëèçàöèÿ FLAC. Phatnoise ñòàëà ïåðâîé êîììåð÷åñêîé àïïàðàòíîé ïëàòôîðìîé, ïîääåðæèâàþùåé FLAC. Äëÿ âîñïðîèçâåäåíèÿ FLAC ôàéëîâ ïëåéåðîì Phatbox âûïóùåíà ïðîøèâêà. Ïîäðîáíåå îá ýòîì ñìîòðèòå çäåñü.

    - -

  • 03.12.2001
    -Âûøëà âåðñèÿ FLAC 1.0.2. Ðåëèç ñäåëàí äëÿ èñïðàâëåíèÿ ïðîáëåìû, ïðèâîäÿùåé ê "ïàäåíèþ" ïëàãèíîâ. Îøèáêà òàêæå ìîãëà êàñàòüñÿ ïîëüçîâàòåëåé libFLAC, êîòîðûå èñïîëüçîâàëè îäèí ýêçåìïëÿð äåêîäåðà ôàéëîâ äëÿ íåñêîëüêèõ ôàéëîâ. Ïîäðîáíåå ñì. çäåñü.

    - -

  • 14.11.2001
    -Âûøëà âåðñèÿ FLAC 1.0.1. Îñíîâíîé êîäåê íå áûë èçìåíåí, íî áûëè äîáàâëåíû íåñêîëüêî íîâûõ âîçìîæíîñòåé è èñïðàâëåíî íåñêîëüêî îøèáîê.

    - -

      - -
    • Íîâûå âîçìîæíîñòè äëÿ ïîëüçîâàòåëåé:
    • - -
        -
      • Ïîääåðæêà Ogg-FLAC, ò.å. flac òåïåðü ìîæåò ÷èòàòü è ñîçäàâàòü ïîòîêè ñ èñïîëüçîâàíèåì òðàíñïîðòíîãî óðîâíÿ Ogg.
      • - -
      • Íîâûé ïëàãèí äëÿ Winamp 3, îñíîâàííûé íà Wasabi Beta 1 SDK.
      • - -
      • Íîâûå óòèëèòû äëÿ ïîääåðæêè FLAC â Monkey Audio GUI; ñì. îïèñàíèå.
      • - -
      • Ïîääåðæêà Mac OS X. Â ðàçäåëå ôàéëû òåïåðü åñòü ñêîìïèëèðîâàííàÿ âåðñèÿ äëÿ OS X.
      • - -
      • Ïîääåðæêà Mingw32.
      • - -
      • Óëó÷øåíà îáðàáîòêà ñïåöèôè÷íûõ äëÿ MS 'fmt' çàãîëîâêîâ ôàéëîâ WAVE.
      • -
      - -
    • Íîâûå âîçìîæíîñòè äëÿ ðàçðàáîò÷èêîâ:
    • - -
        -
      • -Äîáàâëåí óðîâåíü SeekableStreamDecoder ìåæäó StreamDecoder è FileDecoder. Ñ åãî ïîìîùüþ óäîáíåå èñïîëüçîâàòü áèáëèîòåêó libFLAC â ñèòóàöèÿõ, êîãäà íåîäîñòà÷íî èíôîðìàöèè î äåêîäèðóåìîì ôàéëå. Áîëëå ïîäðîáíî âñå îïèñàíî â ðàçäåëå äîêóìåíòàöèÿ. Èíòåðôåéñ äëÿ StreamDecoder è FileDecoder îñòàëñÿ ïðåæíèì è, ñîîòâåòñòâåííî, ñîõðàíèëàñü áèíàðíàÿ ñîâìåñòèìîñòü ñ libFLAC 1.0.
      • - -
      • Óìåíüøåí ðàçìåð ñòåêà íåîáõîäèìûé êîäåðó.
      • -
      - -
    • Èñïðàâëåííûå îøèáêè:
    • - -
        -
      • Ñóùåñòâåííàÿ îøèáêà ïðè êîäèðîâàíèè raw ââîäà, ïðèâîäÿùàÿ ê äîáàâëåíèþ 12 ëèøíèõ ñýìïëîâ ê ïîëó÷àåìîìó ôàéëó. Êîäèðîâàíèå èç WAVE ôàéëîâ ðàáîòàëî ïðàâèëüíî.
      • - -
      • Îøèáêà â libFLAC, ñâÿçàííàÿ ñ óñòàíîâêîé èìåíè ôàéëà â stdin â äåêîäåðå ôàéëîâ.
      • - -
      • Îøèáêà â libFLAC, âîçíèêàþùàÿ ïðè ìíîæåñòâåííûõ âûçîâàõ äëÿ óñòàíîâêè èìåíè ôàéëà è ïðèâîäÿùàÿ ê óòå÷êå ïàìÿòè.
      • - -
      • metaflac ïðàâèëüíî ïðîïóñêàåò òåã id3v2.
      • - -
      • metaflac ïðàâèëüíî ïðîïóñêàåò áîëüøèå áëîêè ìåòàäàííûõ.
      • -
      - -

    - - -

  • 20.07.2001
    -Âûøëà âåðñèÿ FLAC 1.0! Äîáàâëåíî íåñêîëüêî íîâûõ âîçìîæíîñòåé, íî â îñíîâíîì èñïðàâëåíèÿ îøèáîê.

    - -

      - -
    • Íîâàÿ îïöèÿ '--sector-align' ïîçâîëÿåò âûðàâíèâàòü ãðóïïó êîäèðóåìûõ àóäèîôàéëîâ íà ãðàíèöó ñåêòîðà â ôîðìàòå Audio-CD.
    • - -
    • Íîâàÿ îïöèÿ '--output-prefix' äîáàâëÿåò ïðåôèêñ êî âñåì âûõîäíûì èìåíàì ôàéëîâ (ïîëåçíî, íàïðèìåð, äëÿ ñîõðàíåíèÿ ðåçóëüòàòîâ ðàáîòû â äðóãîé êàòàëîã).
    • - -
    • Óëó÷øåííîå àâòîîïðåäåëåíèå WAVE (áîëüøå íå ïîëàãàåòñÿ íà ungetc()).
    • - -
    • Áîëåå ïîíÿòíàÿ ñòàòèñòèêà ïðè êîäèðîâàíèè/äåêîäèðîâàíèè.
    • - -
    • Èçìåíåíèÿ â èíòåðåôåéñå áèáëèîòåêè libFLAC äëÿ áîëåå ïðîñòîé ïîääåðæêè áèíàðíîé ñîâìåñòèìîñòè â áóäóùåì.
    • - -
    • Íîâàÿ îïöèÿ '
    • --sse-os
    • ' â êîíôèãóðàöèîííîì ñêðèïòå äëÿ èñïîëüçîâàíèÿ áîëåå áûñòðûõ ïðîöåäóð, îñíîâàííûõ íà SSE. - -
    • Åùå îäíî (íàäåþñü ïîñëåäíåå) èñïðàâëåíèå â ïëàãèíå äëÿ Winamp 2.
    • - -
    • Íåìíîãî óëó÷øåíà îöåíêà ïàðàìåòðà Ðàéñà.
    • - -
    • Èñïðàâëåíèå îøèáîê, âîçíèêàþùèõ â î÷åíü ðåäêèõ ñèòóàöèÿõ ïðè êîäèðîâàíèè.
    • -

    - - -

  • 07.06.2001

  • -Âûøëà âåðñèÿ FLAC 0.10. Ñêîðåå âñåãî ýòî ïîñëåäíÿÿ áåòà âåðñèÿ. Çà ïîñëåäíèå äâà ìåñÿöà áûëî ñäåëàíî ìíîãî óëó÷øåíèé.

    - -

      -
    • Ñêîðîñòü ðàáîòû êîäåðà è äåêîäåðà çíà÷èòåëüíî âîçðîñëà. Îñíîâíûå ïðîöåäóðû íàïèñàíû íà àññåìáëåðå äëÿ IA-32.
    • - -
    • Äîáàâëåí áëîê ìåòàäàííûõ SEEKTABLE, ñîäåðæàùèé èíôîðìàöèþ, ïîçâîëÿþùóþ óñêîðèòü çíà÷èòåëüíî óñêîðèòü ïîèñê â ïîòîêå.
    • - -
    • Ìîäåëü ïîâåäåíèÿ flac òåïåðü àíàëîãè÷íà gzip.
    • - -
    • Îïöèè -# íàñòðîåíû äëÿ ïîëó÷åíèÿ íàèëó÷øåãî ñîîòíîøåíèÿ óðîâåíü/âðåìÿ ñæàòèÿ. Ïî óìîë÷åíèþ óñòàíîâëåíî çíà÷åíèå -5.
    • - -
    • Íåïîääåðæèâàåìûå áëîêè â WAVE-ôàéëå òåïåðü ïðîïóñêàþòñÿ ñ ïðåäóïðåæäåíèåì.
    • - -
    • Äîáàâëåíà îïöèÿ --delete-input-file, ïîçâîëÿþùàÿ óäàëÿòü âõîäíîé ôàéë ïîñëå óäà÷íîãî êîäèðîâàíèÿ/äåêîäèðîâàíèÿ.
    • - -
    • Èçìåíåí ïëàãèí äëÿ XMMS, ÷òîáû íîðìàëüíî ðàáîòàëà âèçóàëèçàöèÿ.
    • - -
    • Èñïðàâëåíà îøèáêà, âîçíèêàþùàÿ â ïîòîêîâîì äåêîäåðå ïîñëå ïîèñêà.
    • -

    - - -

  • 31.03.2001

  • -Âûøëà âåðñèÿ 0.9. Èñïðàâëåíû ïëàãèíû äëÿ Winamp è XMMS. Èçìåíåí ôîðìàò (íàäåþñü, ïîñëåäíèé ðàç). Ïîòåðÿíà ñîâìåñòèìîñòü ñî âñåìè ïðåäûäóùèìè âåðñèÿìè.

    - - -

  • 24.03.2001

  • -Áëèçèòñÿ âûõîä âåðñèè 0.9, â êîòîðîé äîëæåí áûòü èñïðàâëåí ïëàãèí äëÿ Winamp. Äæîø îáðàòèëñÿ ÷åðåç ñïèñîê ðàññûëêè, ÷òîáû ïîñëå âûõîäà ýòîé âåðñèè ê íåìó îáðàòèëèñü ñ ïîæåëàíèÿìè (îñîáåííî ðàäèêàëüíûìè, êîòîðûå ìîãóò êîñíóòüñÿ ôîðìàòà).

    - - -

  • 21.03.2001

  • -Òåêóùàÿ âåðñèÿ FLAC - 0.8. Íà÷àò ïåðåâîä äîêóìåíòàöèè.

    - - -

  • 10.12.2000

  • -FLAC âûëîæåí íà SourceForge. Ïîñåòèòå ñòðàíèöó ïðîåêòà, ÷òîáû ïîäïèñàòüñÿ íà ñïèñîê ðàñûëêè èëè ñòàòü ðàçðàáîò÷èêîì.

    - -

     Copyright (c) 2000-2009 Josh Coalson -

     Copyright (c) 2011-2013 Xiph.Org Foundation

    - - - diff --git a/lib-src/libflac/examples/Makefile.am b/lib-src/libflac/examples/Makefile.am index 57ece1391..10cf035a5 100644 --- a/lib-src/libflac/examples/Makefile.am +++ b/lib-src/libflac/examples/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/examples/Makefile.in b/lib-src/libflac/examples/Makefile.in index fd0a07897..3e2945992 100644 --- a/lib-src/libflac/examples/Makefile.in +++ b/lib-src/libflac/examples/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = examples -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +144,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = c cpp @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -300,7 +353,7 @@ EXTRA_DIST = \ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -325,9 +378,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -338,22 +391,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -368,57 +424,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -434,12 +445,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -451,15 +457,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -468,6 +470,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -628,22 +645,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/Makefile.lite b/lib-src/libflac/examples/Makefile.lite index 3c62a9607..777914f55 100644 --- a/lib-src/libflac/examples/Makefile.lite +++ b/lib-src/libflac/examples/Makefile.lite @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/examples/c/Makefile.am b/lib-src/libflac/examples/c/Makefile.am index 318570c73..e728a3983 100644 --- a/lib-src/libflac/examples/c/Makefile.am +++ b/lib-src/libflac/examples/c/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/examples/c/Makefile.in b/lib-src/libflac/examples/c/Makefile.in index a4d1ef1e6..b7e037e27 100644 --- a/lib-src/libflac/examples/c/Makefile.in +++ b/lib-src/libflac/examples/c/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = examples/c -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +144,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -295,7 +348,7 @@ SUBDIRS = decode encode all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -320,9 +373,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -333,22 +386,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -363,57 +419,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -429,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -446,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -463,6 +465,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -623,22 +640,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/c/decode/Makefile.am b/lib-src/libflac/examples/c/decode/Makefile.am index 917ead4c1..0a127a6d1 100644 --- a/lib-src/libflac/examples/c/decode/Makefile.am +++ b/lib-src/libflac/examples/c/decode/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/examples/c/decode/Makefile.in b/lib-src/libflac/examples/c/decode/Makefile.in index f4cb383ca..109c3635e 100644 --- a/lib-src/libflac/examples/c/decode/Makefile.in +++ b/lib-src/libflac/examples/c/decode/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = examples/c/decode -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +144,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -295,7 +348,7 @@ SUBDIRS = file all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -320,9 +373,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -333,22 +386,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -363,57 +419,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -429,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -446,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -463,6 +465,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -623,22 +640,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/c/decode/file/Makefile.am b/lib-src/libflac/examples/c/decode/file/Makefile.am index 37f161230..52be3abb0 100644 --- a/lib-src/libflac/examples/c/decode/file/Makefile.am +++ b/lib-src/libflac/examples/c/decode/file/Makefile.am @@ -1,6 +1,6 @@ # example_c_decode_file - Simple FLAC file decoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - example_c_decode_file.vcproj + example_c_decode_file.vcproj \ + example_c_decode_file.vcxproj \ + example_c_decode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = example_c_decode_file @@ -26,3 +28,5 @@ example_c_decode_file_LDADD = \ $(top_builddir)/src/libFLAC/libFLAC.la example_c_decode_file_SOURCES = main.c + +CLEANFILES = example_c_decode_file.exe diff --git a/lib-src/libflac/examples/c/decode/file/Makefile.in b/lib-src/libflac/examples/c/decode/file/Makefile.in index 4fbde98d3..00c5a8c21 100644 --- a/lib-src/libflac/examples/c/decode/file/Makefile.in +++ b/lib-src/libflac/examples/c/decode/file/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # example_c_decode_file - Simple FLAC file decoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = example_c_decode_file$(EXEEXT) subdir = examples/c/decode/file -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -96,6 +126,19 @@ example_c_decode_file_DEPENDENCIES = \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -108,20 +151,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(example_c_decode_file_SOURCES) DIST_SOURCES = $(example_c_decode_file_SOURCES) am__can_run_installinfo = \ @@ -129,6 +168,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -169,7 +225,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -189,8 +244,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -285,18 +338,21 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ - example_c_decode_file.vcproj + example_c_decode_file.vcproj \ + example_c_decode_file.vcxproj \ + example_c_decode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include example_c_decode_file_LDADD = \ $(top_builddir)/src/libFLAC/libFLAC.la example_c_decode_file_SOURCES = main.c +CLEANFILES = example_c_decode_file.exe all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -321,9 +377,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -335,6 +391,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + example_c_decode_file$(EXEEXT): $(example_c_decode_file_OBJECTS) $(example_c_decode_file_DEPENDENCIES) $(EXTRA_example_c_decode_file_DEPENDENCIES) @rm -f example_c_decode_file$(EXEEXT) $(AM_V_CCLD)$(LINK) $(example_c_decode_file_OBJECTS) $(example_c_decode_file_LDADD) $(LIBS) @@ -377,26 +434,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -408,15 +454,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -425,6 +467,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -485,6 +542,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -566,18 +624,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/c/decode/file/Makefile.lite b/lib-src/libflac/examples/c/decode/file/Makefile.lite index 2cb32ae6f..6371c6042 100644 --- a/lib-src/libflac/examples/c/decode/file/Makefile.lite +++ b/lib-src/libflac/examples/c/decode/file/Makefile.lite @@ -1,6 +1,6 @@ # example_c_decode_file - Simple FLAC file decoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_C = main.c diff --git a/lib-src/libflac/examples/c/decode/file/example_c_decode_file.vcproj b/lib-src/libflac/examples/c/decode/file/example_c_decode_file.vcproj index 2498c8167..15f108cc6 100644 --- a/lib-src/libflac/examples/c/decode/file/example_c_decode_file.vcproj +++ b/lib-src/libflac/examples/c/decode/file/example_c_decode_file.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbd00-c215-11db-8314-0800200c9a66} + example_c_decode_file + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/examples/c/decode/file/example_c_decode_file.vcxproj.filters b/lib-src/libflac/examples/c/decode/file/example_c_decode_file.vcxproj.filters new file mode 100644 index 000000000..a700a4f83 --- /dev/null +++ b/lib-src/libflac/examples/c/decode/file/example_c_decode_file.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {39992580-89DB-4b41-8E8B-625F9E28BEBF} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC727F1-C7A5-1376-A061-2AF2D742A2F0} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/examples/c/decode/file/main.c b/lib-src/libflac/examples/c/decode/file/main.c index 60e6cd915..1cd96094f 100644 --- a/lib-src/libflac/examples/c/decode/file/main.c +++ b/lib-src/libflac/examples/c/decode/file/main.c @@ -1,6 +1,6 @@ /* example_c_decode_file - Simple FLAC file decoder using libFLAC * Copyright (C) 2007-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,10 +22,10 @@ * file. It only supports 16-bit stereo files. * * Complete API documentation can be found at: - * http://flac.sourceforge.net/api/ + * http://xiph.org/flac/api/ */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -125,6 +125,18 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder fprintf(stderr, "ERROR: this example only supports 16bit stereo streams\n"); return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; } + if(frame->header.channels != 2) { + fprintf(stderr, "ERROR: This frame contains %d channels (should be 2)\n", frame->header.channels); + return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; + } + if(buffer [0] == NULL) { + fprintf(stderr, "ERROR: buffer [0] is NULL\n"); + return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; + } + if(buffer [1] == NULL) { + fprintf(stderr, "ERROR: buffer [1] is NULL\n"); + return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT; + } /* write WAVE header before we write the first frame */ if(frame->header.number.sample_number == 0) { diff --git a/lib-src/libflac/examples/c/encode/Makefile.am b/lib-src/libflac/examples/c/encode/Makefile.am index 917ead4c1..0a127a6d1 100644 --- a/lib-src/libflac/examples/c/encode/Makefile.am +++ b/lib-src/libflac/examples/c/encode/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/examples/c/encode/Makefile.in b/lib-src/libflac/examples/c/encode/Makefile.in index a22b3f2bd..d3740457e 100644 --- a/lib-src/libflac/examples/c/encode/Makefile.in +++ b/lib-src/libflac/examples/c/encode/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = examples/c/encode -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +144,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -295,7 +348,7 @@ SUBDIRS = file all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -320,9 +373,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -333,22 +386,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -363,57 +419,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -429,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -446,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -463,6 +465,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -623,22 +640,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/c/encode/file/Makefile.am b/lib-src/libflac/examples/c/encode/file/Makefile.am index c2b3f5da2..82217150c 100644 --- a/lib-src/libflac/examples/c/encode/file/Makefile.am +++ b/lib-src/libflac/examples/c/encode/file/Makefile.am @@ -1,6 +1,6 @@ # example_c_encode_file - Simple FLAC file encoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - example_c_encode_file.vcproj + example_c_encode_file.vcproj \ + example_c_encode_file.vcxproj \ + example_c_encode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = example_c_encode_file @@ -28,3 +30,5 @@ example_c_encode_file_LDADD = \ -lm example_c_encode_file_SOURCES = main.c + +CLEANFILES = example_c_encode_file.exe diff --git a/lib-src/libflac/examples/c/encode/file/Makefile.in b/lib-src/libflac/examples/c/encode/file/Makefile.in index bd1b8d5bf..7a93ae975 100644 --- a/lib-src/libflac/examples/c/encode/file/Makefile.in +++ b/lib-src/libflac/examples/c/encode/file/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # example_c_encode_file - Simple FLAC file encoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = example_c_encode_file$(EXEEXT) subdir = examples/c/encode/file -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -96,6 +126,19 @@ example_c_encode_file_DEPENDENCIES = \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -108,20 +151,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(example_c_encode_file_SOURCES) DIST_SOURCES = $(example_c_encode_file_SOURCES) am__can_run_installinfo = \ @@ -129,6 +168,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -169,7 +225,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -189,8 +244,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -285,7 +338,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ - example_c_encode_file.vcproj + example_c_encode_file.vcproj \ + example_c_encode_file.vcxproj \ + example_c_encode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include example_c_encode_file_LDADD = \ @@ -294,11 +349,12 @@ example_c_encode_file_LDADD = \ -lm example_c_encode_file_SOURCES = main.c +CLEANFILES = example_c_encode_file.exe all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -323,9 +379,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -337,6 +393,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + example_c_encode_file$(EXEEXT): $(example_c_encode_file_OBJECTS) $(example_c_encode_file_DEPENDENCIES) $(EXTRA_example_c_encode_file_DEPENDENCIES) @rm -f example_c_encode_file$(EXEEXT) $(AM_V_CCLD)$(LINK) $(example_c_encode_file_OBJECTS) $(example_c_encode_file_LDADD) $(LIBS) @@ -379,26 +436,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -410,15 +456,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -427,6 +469,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -487,6 +544,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -568,18 +626,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/c/encode/file/Makefile.lite b/lib-src/libflac/examples/c/encode/file/Makefile.lite index eb8526b6e..1ed44e570 100644 --- a/lib-src/libflac/examples/c/encode/file/Makefile.lite +++ b/lib-src/libflac/examples/c/encode/file/Makefile.lite @@ -1,6 +1,6 @@ # example_c_encode_file - Simple FLAC file encoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_C = main.c diff --git a/lib-src/libflac/examples/c/encode/file/example_c_encode_file.vcproj b/lib-src/libflac/examples/c/encode/file/example_c_encode_file.vcproj index 4d10ac553..fb08db0cd 100644 --- a/lib-src/libflac/examples/c/encode/file/example_c_encode_file.vcproj +++ b/lib-src/libflac/examples/c/encode/file/example_c_encode_file.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbd01-c215-11db-8314-0800200c9a66} + example_c_encode_file + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/examples/c/encode/file/example_c_encode_file.vcxproj.filters b/lib-src/libflac/examples/c/encode/file/example_c_encode_file.vcxproj.filters new file mode 100644 index 000000000..a700a4f83 --- /dev/null +++ b/lib-src/libflac/examples/c/encode/file/example_c_encode_file.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {39992580-89DB-4b41-8E8B-625F9E28BEBF} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC727F1-C7A5-1376-A061-2AF2D742A2F0} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/examples/c/encode/file/main.c b/lib-src/libflac/examples/c/encode/file/main.c index dab772606..f0af481c2 100644 --- a/lib-src/libflac/examples/c/encode/file/main.c +++ b/lib-src/libflac/examples/c/encode/file/main.c @@ -1,6 +1,6 @@ /* example_c_encode_file - Simple FLAC file encoder using libFLAC * Copyright (C) 2007-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,10 +22,10 @@ * file. It only supports 16-bit stereo files in canonical WAVE format. * * Complete API documentation can be found at: - * http://flac.sourceforge.net/api/ + * http://xiph.org/flac/api/ */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/examples/cpp/Makefile.am b/lib-src/libflac/examples/cpp/Makefile.am index 318570c73..e728a3983 100644 --- a/lib-src/libflac/examples/cpp/Makefile.am +++ b/lib-src/libflac/examples/cpp/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/examples/cpp/Makefile.in b/lib-src/libflac/examples/cpp/Makefile.in index 7c7a868e9..773d25184 100644 --- a/lib-src/libflac/examples/cpp/Makefile.in +++ b/lib-src/libflac/examples/cpp/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = examples/cpp -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +144,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -295,7 +348,7 @@ SUBDIRS = decode encode all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -320,9 +373,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -333,22 +386,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -363,57 +419,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -429,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -446,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -463,6 +465,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -623,22 +640,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/cpp/decode/Makefile.am b/lib-src/libflac/examples/cpp/decode/Makefile.am index 917ead4c1..0a127a6d1 100644 --- a/lib-src/libflac/examples/cpp/decode/Makefile.am +++ b/lib-src/libflac/examples/cpp/decode/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/examples/cpp/decode/Makefile.in b/lib-src/libflac/examples/cpp/decode/Makefile.in index 581b29f8c..a24116025 100644 --- a/lib-src/libflac/examples/cpp/decode/Makefile.in +++ b/lib-src/libflac/examples/cpp/decode/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = examples/cpp/decode -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +144,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -295,7 +348,7 @@ SUBDIRS = file all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -320,9 +373,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -333,22 +386,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -363,57 +419,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -429,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -446,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -463,6 +465,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -623,22 +640,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/cpp/decode/file/Makefile.am b/lib-src/libflac/examples/cpp/decode/file/Makefile.am index 330d42244..0c058c725 100644 --- a/lib-src/libflac/examples/cpp/decode/file/Makefile.am +++ b/lib-src/libflac/examples/cpp/decode/file/Makefile.am @@ -1,6 +1,6 @@ # example_cpp_decode_file - Simple FLAC file decoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - example_cpp_decode_file.vcproj + example_cpp_decode_file.vcproj \ + example_cpp_decode_file.vcxproj \ + example_cpp_decode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = example_cpp_decode_file @@ -29,3 +31,5 @@ example_cpp_decode_file_LDADD = \ -lm example_cpp_decode_file_SOURCES = main.cpp + +CLEANFILES = example_cpp_decode_file.exe diff --git a/lib-src/libflac/examples/cpp/decode/file/Makefile.in b/lib-src/libflac/examples/cpp/decode/file/Makefile.in index d4e08ec39..53670ebbe 100644 --- a/lib-src/libflac/examples/cpp/decode/file/Makefile.in +++ b/lib-src/libflac/examples/cpp/decode/file/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # example_cpp_decode_file - Simple FLAC file decoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = example_cpp_decode_file$(EXEEXT) subdir = examples/cpp/decode/file -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -98,6 +128,19 @@ example_cpp_decode_file_DEPENDENCIES = \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -110,20 +153,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) AM_V_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(example_cpp_decode_file_SOURCES) DIST_SOURCES = $(example_cpp_decode_file_SOURCES) am__can_run_installinfo = \ @@ -131,6 +170,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -171,7 +227,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -191,8 +246,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -287,7 +340,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ - example_cpp_decode_file.vcproj + example_cpp_decode_file.vcproj \ + example_cpp_decode_file.vcxproj \ + example_cpp_decode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include example_cpp_decode_file_LDADD = \ @@ -297,11 +352,12 @@ example_cpp_decode_file_LDADD = \ -lm example_cpp_decode_file_SOURCES = main.cpp +CLEANFILES = example_cpp_decode_file.exe all: all-am .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -326,9 +382,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -340,6 +396,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + example_cpp_decode_file$(EXEEXT): $(example_cpp_decode_file_OBJECTS) $(example_cpp_decode_file_DEPENDENCIES) $(EXTRA_example_cpp_decode_file_DEPENDENCIES) @rm -f example_cpp_decode_file$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(example_cpp_decode_file_OBJECTS) $(example_cpp_decode_file_LDADD) $(LIBS) @@ -382,26 +439,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -413,15 +459,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -430,6 +472,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -490,6 +547,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -571,18 +629,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/cpp/decode/file/Makefile.lite b/lib-src/libflac/examples/cpp/decode/file/Makefile.lite index ea6c5e23b..d4821acb6 100644 --- a/lib-src/libflac/examples/cpp/decode/file/Makefile.lite +++ b/lib-src/libflac/examples/cpp/decode/file/Makefile.lite @@ -1,6 +1,6 @@ # example_cpp_decode_file - Simple FLAC file decoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lFLAC++ -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_CPP = main.cpp diff --git a/lib-src/libflac/examples/cpp/decode/file/example_cpp_decode_file.vcproj b/lib-src/libflac/examples/cpp/decode/file/example_cpp_decode_file.vcproj index b09bc0fe1..7463bca8f 100644 --- a/lib-src/libflac/examples/cpp/decode/file/example_cpp_decode_file.vcproj +++ b/lib-src/libflac/examples/cpp/decode/file/example_cpp_decode_file.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbe00-c215-11db-8314-0800200c9a66} + example_cpp_decode_file + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + {4cefbc86-c215-11db-8314-0800200c9a66} + false + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/examples/cpp/decode/file/example_cpp_decode_file.vcxproj.filters b/lib-src/libflac/examples/cpp/decode/file/example_cpp_decode_file.vcxproj.filters new file mode 100644 index 000000000..6ff808d0e --- /dev/null +++ b/lib-src/libflac/examples/cpp/decode/file/example_cpp_decode_file.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {93292580-829B-b441-E8B8-65A95828BEB0} + h;hpp;hxx;hm;inl;inc;xsd + + + {9C7247F1-CA27-1761-A016-0F27452AD2F0} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/examples/cpp/decode/file/main.cpp b/lib-src/libflac/examples/cpp/decode/file/main.cpp index 64f403862..cbdd88459 100644 --- a/lib-src/libflac/examples/cpp/decode/file/main.cpp +++ b/lib-src/libflac/examples/cpp/decode/file/main.cpp @@ -1,6 +1,6 @@ /* example_cpp_decode_file - Simple FLAC file decoder using libFLAC * Copyright (C) 2007-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,10 +22,10 @@ * file. It only supports 16-bit stereo files. * * Complete API documentation can be found at: - * http://flac.sourceforge.net/api/ + * http://xiph.org/flac/api/ */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -72,6 +72,9 @@ protected: virtual ::FLAC__StreamDecoderWriteStatus write_callback(const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[]); virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata); virtual void error_callback(::FLAC__StreamDecoderErrorStatus status); +private: + OurDecoder(const OurDecoder&); + OurDecoder&operator=(const OurDecoder&); }; int main(int argc, char *argv[]) diff --git a/lib-src/libflac/examples/cpp/encode/Makefile.am b/lib-src/libflac/examples/cpp/encode/Makefile.am index 917ead4c1..0a127a6d1 100644 --- a/lib-src/libflac/examples/cpp/encode/Makefile.am +++ b/lib-src/libflac/examples/cpp/encode/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/examples/cpp/encode/Makefile.in b/lib-src/libflac/examples/cpp/encode/Makefile.in index 8bc857c93..e01745469 100644 --- a/lib-src/libflac/examples/cpp/encode/Makefile.in +++ b/lib-src/libflac/examples/cpp/encode/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = examples/cpp/encode -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +144,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -295,7 +348,7 @@ SUBDIRS = file all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -320,9 +373,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -333,22 +386,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -363,57 +419,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -429,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -446,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -463,6 +465,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -623,22 +640,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/cpp/encode/file/Makefile.am b/lib-src/libflac/examples/cpp/encode/file/Makefile.am index 5c9183f17..c057fa509 100644 --- a/lib-src/libflac/examples/cpp/encode/file/Makefile.am +++ b/lib-src/libflac/examples/cpp/encode/file/Makefile.am @@ -1,6 +1,6 @@ # example_cpp_encode_file - Simple FLAC file encoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - example_cpp_encode_file.vcproj + example_cpp_encode_file.vcproj \ + example_cpp_encode_file.vcxproj \ + example_cpp_encode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = example_cpp_encode_file @@ -29,3 +31,5 @@ example_cpp_encode_file_LDADD = \ -lm example_cpp_encode_file_SOURCES = main.cpp + +CLEANFILES = example_cpp_encode_file.exe diff --git a/lib-src/libflac/examples/cpp/encode/file/Makefile.in b/lib-src/libflac/examples/cpp/encode/file/Makefile.in index 1a4a7f914..58a0c53d1 100644 --- a/lib-src/libflac/examples/cpp/encode/file/Makefile.in +++ b/lib-src/libflac/examples/cpp/encode/file/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # example_cpp_encode_file - Simple FLAC file encoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = example_cpp_encode_file$(EXEEXT) subdir = examples/cpp/encode/file -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -98,6 +128,19 @@ example_cpp_encode_file_DEPENDENCIES = \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -110,20 +153,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) AM_V_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(example_cpp_encode_file_SOURCES) DIST_SOURCES = $(example_cpp_encode_file_SOURCES) am__can_run_installinfo = \ @@ -131,6 +170,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -171,7 +227,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -191,8 +246,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -287,7 +340,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ - example_cpp_encode_file.vcproj + example_cpp_encode_file.vcproj \ + example_cpp_encode_file.vcxproj \ + example_cpp_encode_file.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include example_cpp_encode_file_LDADD = \ @@ -297,11 +352,12 @@ example_cpp_encode_file_LDADD = \ -lm example_cpp_encode_file_SOURCES = main.cpp +CLEANFILES = example_cpp_encode_file.exe all: all-am .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -326,9 +382,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -340,6 +396,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + example_cpp_encode_file$(EXEEXT): $(example_cpp_encode_file_OBJECTS) $(example_cpp_encode_file_DEPENDENCIES) $(EXTRA_example_cpp_encode_file_DEPENDENCIES) @rm -f example_cpp_encode_file$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(example_cpp_encode_file_OBJECTS) $(example_cpp_encode_file_LDADD) $(LIBS) @@ -382,26 +439,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -413,15 +459,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -430,6 +472,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -490,6 +547,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -571,18 +629,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/examples/cpp/encode/file/Makefile.lite b/lib-src/libflac/examples/cpp/encode/file/Makefile.lite index 17238a1e4..3333df7d7 100644 --- a/lib-src/libflac/examples/cpp/encode/file/Makefile.lite +++ b/lib-src/libflac/examples/cpp/encode/file/Makefile.lite @@ -1,6 +1,6 @@ # example_cpp_encode_file - Simple FLAC file encoder using libFLAC # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lFLAC++ -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_CPP = main.cpp diff --git a/lib-src/libflac/examples/cpp/encode/file/example_cpp_encode_file.vcproj b/lib-src/libflac/examples/cpp/encode/file/example_cpp_encode_file.vcproj index 38a3e26d2..333b2033f 100644 --- a/lib-src/libflac/examples/cpp/encode/file/example_cpp_encode_file.vcproj +++ b/lib-src/libflac/examples/cpp/encode/file/example_cpp_encode_file.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbe01-c215-11db-8314-0800200c9a66} + example_cpp_encode_file + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + {4cefbc86-c215-11db-8314-0800200c9a66} + false + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/examples/cpp/encode/file/example_cpp_encode_file.vcxproj.filters b/lib-src/libflac/examples/cpp/encode/file/example_cpp_encode_file.vcxproj.filters new file mode 100644 index 000000000..6ff808d0e --- /dev/null +++ b/lib-src/libflac/examples/cpp/encode/file/example_cpp_encode_file.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {93292580-829B-b441-E8B8-65A95828BEB0} + h;hpp;hxx;hm;inl;inc;xsd + + + {9C7247F1-CA27-1761-A016-0F27452AD2F0} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/examples/cpp/encode/file/main.cpp b/lib-src/libflac/examples/cpp/encode/file/main.cpp index 58c625b9d..047db9e99 100644 --- a/lib-src/libflac/examples/cpp/encode/file/main.cpp +++ b/lib-src/libflac/examples/cpp/encode/file/main.cpp @@ -1,6 +1,6 @@ /* example_cpp_encode_file - Simple FLAC file encoder using libFLAC * Copyright (C) 2007-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -22,10 +22,10 @@ * file. It only supports 16-bit stereo files in canonical WAVE format. * * Complete API documentation can be found at: - * http://flac.sourceforge.net/api/ + * http://xiph.org/flac/api/ */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/include/FLAC++/Makefile.am b/lib-src/libflac/include/FLAC++/Makefile.am index b7cd83e34..8c70031dc 100644 --- a/lib-src/libflac/include/FLAC++/Makefile.am +++ b/lib-src/libflac/include/FLAC++/Makefile.am @@ -1,6 +1,6 @@ # libFLAC++ - Free Lossless Audio Codec library # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/FLAC++/Makefile.in b/lib-src/libflac/include/FLAC++/Makefile.in index 80ebb518b..f0c9a6026 100644 --- a/lib-src/libflac/include/FLAC++/Makefile.in +++ b/lib-src/libflac/include/FLAC++/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # libFLAC++ - Free Lossless Audio Codec library # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -47,23 +46,51 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -83,30 +110,38 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = include/FLAC++ -DIST_COMMON = $(flaccppinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(flaccppinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -143,6 +178,23 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(flaccppincludedir)" HEADERS = $(flaccppinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -183,7 +235,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -203,8 +254,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -309,7 +358,7 @@ flaccppinclude_HEADERS = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -334,9 +383,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -367,26 +416,15 @@ uninstall-flaccppincludeHEADERS: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(flaccppincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -398,15 +436,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -415,6 +449,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -554,18 +603,19 @@ uninstall-am: uninstall-flaccppincludeHEADERS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-flaccppincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-flaccppincludeHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-flaccppincludeHEADERS \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-flaccppincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/include/FLAC++/all.h b/lib-src/libflac/include/FLAC++/all.h index efd732bc7..857381c5f 100644 --- a/lib-src/libflac/include/FLAC++/all.h +++ b/lib-src/libflac/include/FLAC++/all.h @@ -1,6 +1,6 @@ /* libFLAC++ - Free Lossless Audio Codec library * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/FLAC++/decoder.h b/lib-src/libflac/include/FLAC++/decoder.h index 490ccf319..77951e747 100644 --- a/lib-src/libflac/include/FLAC++/decoder.h +++ b/lib-src/libflac/include/FLAC++/decoder.h @@ -1,6 +1,6 @@ /* libFLAC++ - Free Lossless Audio Codec library * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/FLAC++/encoder.h b/lib-src/libflac/include/FLAC++/encoder.h index ca4449a0b..6134e6fde 100644 --- a/lib-src/libflac/include/FLAC++/encoder.h +++ b/lib-src/libflac/include/FLAC++/encoder.h @@ -1,6 +1,6 @@ /* libFLAC++ - Free Lossless Audio Codec library * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/FLAC++/export.h b/lib-src/libflac/include/FLAC++/export.h index 11c09e624..80b8b8f1c 100644 --- a/lib-src/libflac/include/FLAC++/export.h +++ b/lib-src/libflac/include/FLAC++/export.h @@ -1,6 +1,6 @@ /* libFLAC++ - Free Lossless Audio Codec library * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -61,9 +61,9 @@ #elif defined(_MSC_VER) #ifdef FLACPP_API_EXPORTS -#define FLACPP_API _declspec(dllexport) +#define FLACPP_API __declspec(dllexport) #else -#define FLACPP_API _declspec(dllimport) +#define FLACPP_API __declspec(dllimport) #endif #elif defined(FLAC__USE_VISIBILITY_ATTR) diff --git a/lib-src/libflac/include/FLAC++/metadata.h b/lib-src/libflac/include/FLAC++/metadata.h index d0c5c7720..46a7b157c 100644 --- a/lib-src/libflac/include/FLAC++/metadata.h +++ b/lib-src/libflac/include/FLAC++/metadata.h @@ -1,6 +1,6 @@ /* libFLAC++ - Free Lossless Audio Codec library * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -241,8 +241,7 @@ namespace FLAC { { return (bool)::FLAC__metadata_object_is_equal(object_, object); } #ifdef _MSC_VER -// @@@ how to re-enable? the following doesn't work -// #pragma warning ( enable : 4800 ) +#pragma warning ( default : 4800 ) #endif inline bool Prototype::operator!=(const Prototype &object) const @@ -1090,6 +1089,10 @@ namespace FLAC { protected: ::FLAC__Metadata_SimpleIterator *iterator_; void clear(); + + private: // Do not use. + SimpleIterator(const SimpleIterator&); + SimpleIterator&operator=(const SimpleIterator&); }; /* \} */ @@ -1174,6 +1177,10 @@ namespace FLAC { protected: ::FLAC__Metadata_Chain *chain_; virtual void clear(); + + private: // Do not use. + Chain(const Chain&); + Chain&operator=(const Chain&); }; /** This class is a wrapper around the FLAC__metadata_iterator @@ -1204,6 +1211,10 @@ namespace FLAC { protected: ::FLAC__Metadata_Iterator *iterator_; virtual void clear(); + + private: // Do not use. + Iterator(const Iterator&); + Iterator&operator=(const Iterator&); }; /* \} */ diff --git a/lib-src/libflac/include/FLAC/Makefile.am b/lib-src/libflac/include/FLAC/Makefile.am index ecb208b15..991e67882 100644 --- a/lib-src/libflac/include/FLAC/Makefile.am +++ b/lib-src/libflac/include/FLAC/Makefile.am @@ -1,6 +1,6 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/FLAC/Makefile.in b/lib-src/libflac/include/FLAC/Makefile.in index 3479cd0ac..9b88da5dc 100644 --- a/lib-src/libflac/include/FLAC/Makefile.in +++ b/lib-src/libflac/include/FLAC/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -47,23 +46,51 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -83,30 +110,38 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = include/FLAC -DIST_COMMON = $(flaccinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(flaccinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -143,6 +178,23 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(flaccincludedir)" HEADERS = $(flaccinclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -183,7 +235,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -203,8 +254,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -312,7 +361,7 @@ flaccinclude_HEADERS = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -337,9 +386,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -370,26 +419,15 @@ uninstall-flaccincludeHEADERS: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(flaccincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -401,15 +439,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -418,6 +452,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -557,18 +606,19 @@ uninstall-am: uninstall-flaccincludeHEADERS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-flaccincludeHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-flaccincludeHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-flaccincludeHEADERS \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-flaccincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/include/FLAC/all.h b/lib-src/libflac/include/FLAC/all.h index 9e288528b..2851cf59c 100644 --- a/lib-src/libflac/include/FLAC/all.h +++ b/lib-src/libflac/include/FLAC/all.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/FLAC/assert.h b/lib-src/libflac/include/FLAC/assert.h index 787cea913..dc9bcef4d 100644 --- a/lib-src/libflac/include/FLAC/assert.h +++ b/lib-src/libflac/include/FLAC/assert.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/FLAC/callback.h b/lib-src/libflac/include/FLAC/callback.h index 71bbaec6d..ce8787ff4 100644 --- a/lib-src/libflac/include/FLAC/callback.h +++ b/lib-src/libflac/include/FLAC/callback.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/FLAC/export.h b/lib-src/libflac/include/FLAC/export.h index 2232b410b..9cc9e137f 100644 --- a/lib-src/libflac/include/FLAC/export.h +++ b/lib-src/libflac/include/FLAC/export.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -61,9 +61,9 @@ #elif defined(_MSC_VER) #ifdef FLAC_API_EXPORTS -#define FLAC_API _declspec(dllexport) +#define FLAC_API __declspec(dllexport) #else -#define FLAC_API _declspec(dllimport) +#define FLAC_API __declspec(dllimport) #endif #elif defined(FLAC__USE_VISIBILITY_ATTR) diff --git a/lib-src/libflac/include/FLAC/format.h b/lib-src/libflac/include/FLAC/format.h index e4c1c1a61..7424565b3 100644 --- a/lib-src/libflac/include/FLAC/format.h +++ b/lib-src/libflac/include/FLAC/format.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -509,9 +509,11 @@ typedef enum { FLAC__METADATA_TYPE_PICTURE = 6, /**< PICTURE block */ - FLAC__METADATA_TYPE_UNDEFINED = 7 + FLAC__METADATA_TYPE_UNDEFINED = 7, /**< marker to denote beginning of undefined type range; this number will increase as new metadata types are added */ + FLAC__MAX_METADATA_TYPE = FLAC__MAX_METADATA_TYPE_CODE, + /**< No type will ever be greater than this. There is not enough room in the protocol block. */ } FLAC__MetadataType; /** Maps a FLAC__MetadataType to a C string. diff --git a/lib-src/libflac/include/FLAC/metadata.h b/lib-src/libflac/include/FLAC/metadata.h index fcc8ed95c..89515329f 100644 --- a/lib-src/libflac/include/FLAC/metadata.h +++ b/lib-src/libflac/include/FLAC/metadata.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -500,7 +500,7 @@ FLAC_API FLAC__MetadataType FLAC__metadata_simple_iterator_get_block_type(const * \retval unsigned * The length of the metadata block at the current iterator position. * The is same length as that in the - * metadata block header, + * metadata block header, * i.e. the length of the metadata body that follows the header. */ FLAC_API unsigned FLAC__metadata_simple_iterator_get_block_length(const FLAC__Metadata_SimpleIterator *iterator); diff --git a/lib-src/libflac/include/FLAC/ordinals.h b/lib-src/libflac/include/FLAC/ordinals.h index a05729973..b1e1acfce 100644 --- a/lib-src/libflac/include/FLAC/ordinals.h +++ b/lib-src/libflac/include/FLAC/ordinals.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/FLAC/stream_decoder.h b/lib-src/libflac/include/FLAC/stream_decoder.h index 152643fcb..9bfdd1f5f 100644 --- a/lib-src/libflac/include/FLAC/stream_decoder.h +++ b/lib-src/libflac/include/FLAC/stream_decoder.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/FLAC/stream_encoder.h b/lib-src/libflac/include/FLAC/stream_encoder.h index 6f7796bb3..efc213aee 100644 --- a/lib-src/libflac/include/FLAC/stream_encoder.h +++ b/lib-src/libflac/include/FLAC/stream_encoder.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -830,28 +830,28 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *en * The actual values set for each level are: * * - * + * + * + * + * + * + * + * + * + * + * + * * - * - * - * - * - * - * - * - * - * + * + * + * + * + * + * + * + * + * *
    level - * do mid-side stereo - * loose mid-side stereo - * apodization - * max lpc order - * qlp coeff precision - * qlp coeff prec search - * escape coding - * exhaustive model search - * min residual partition order - * max residual partition order - * rice parameter search dist + * leveldo mid-side stereoloose mid-side stereoapodizationmax lpc orderqlp coeff precisionqlp coeff prec searchescape codingexhaustive model searchmin residual partition ordermax residual partition orderrice parameter search dist
    0 false false tukey(0.5) 0 0 false false false 0 3 0
    1 true true tukey(0.5) 0 0 false false false 0 3 0
    2 true false tukey(0.5) 0 0 false false false 0 3 0
    3 false false tukey(0.5) 6 0 false false false 0 4 0
    4 true true tukey(0.5) 8 0 false false false 0 4 0
    5 true false tukey(0.5) 8 0 false false false 0 5 0
    6 true false tukey(0.5) 8 0 false false false 0 6 0
    7 true false tukey(0.5) 8 0 false false true 0 6 0
    8 true false tukey(0.5) 12 0 false false true 0 6 0
    0 false false tukey(0.5) 0 0 false false false 0 3 0
    1 true true tukey(0.5) 0 0 false false false 0 3 0
    2 true false tukey(0.5) 0 0 false false false 0 3 0
    3 false false tukey(0.5) 6 0 false false false 0 4 0
    4 true true tukey(0.5) 8 0 false false false 0 4 0
    5 true false tukey(0.5) 8 0 false false false 0 5 0
    6 true false tukey(0.5);partial_tukey(2) 8 0 false false false 0 6 0
    7 true false tukey(0.5);partial_tukey(2) 12 0 false false false 0 6 0
    8 true false tukey(0.5);partial_tukey(2);punchout_tukey(3) 12 0 false false false 0 6 0
    * * \default \c 5 @@ -920,7 +920,8 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE * The available functions are \c bartlett, \c bartlett_hann, * \c blackman, \c blackman_harris_4term_92db, \c connes, \c flattop, * \c gauss(STDDEV), \c hamming, \c hann, \c kaiser_bessel, \c nuttall, - * \c rectangle, \c triangle, \c tukey(P), \c welch. + * \c rectangle, \c triangle, \c tukey(P), \c partial_tukey(n[/ov[/P]]), + * \c punchout_tukey(n[/ov[/P]]), \c welch. * * For \c gauss(STDDEV), STDDEV specifies the standard deviation * (0&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = include -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +144,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = FLAC FLAC++ share test_libs_common @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -296,7 +349,7 @@ SUBDIRS = FLAC $(CPPLIBS_DIRS) share test_libs_common all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -321,9 +374,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -334,22 +387,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -364,57 +420,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -430,12 +441,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -447,15 +453,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -464,6 +466,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -624,22 +641,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/include/share/Makefile.in b/lib-src/libflac/include/share/Makefile.in index 38062bb49..f1d0cd4ba 100644 --- a/lib-src/libflac/include/share/Makefile.in +++ b/lib-src/libflac/include/share/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,38 +78,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = include/share -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -90,9 +126,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -159,7 +215,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -179,8 +234,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -291,7 +344,7 @@ EXTRA_DIST = \ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -316,9 +369,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -329,22 +382,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -359,57 +415,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -425,12 +436,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -442,15 +448,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -459,6 +461,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -619,22 +636,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/include/share/alloc.h b/lib-src/libflac/include/share/alloc.h index ac861743b..5e1f1e26f 100644 --- a/lib-src/libflac/include/share/alloc.h +++ b/lib-src/libflac/include/share/alloc.h @@ -1,6 +1,6 @@ /* alloc - Convenience routines for safely allocating memory * Copyright (C) 2007-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,7 +33,7 @@ #ifndef FLAC__SHARE__ALLOC_H #define FLAC__SHARE__ALLOC_H -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/include/share/compat.h b/lib-src/libflac/include/share/compat.h index 222de6588..0dc5673d7 100644 --- a/lib-src/libflac/include/share/compat.h +++ b/lib-src/libflac/include/share/compat.h @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2012 Xiph.org Foundation + * Copyright (C) 2012-2014 Xiph.org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -73,23 +73,25 @@ #endif #if defined(_MSC_VER) -#if _MSC_VER < 1500 -/* Visual Studio 2008 has restrict. */ -#define restrict __restrict -#endif #define inline __inline #endif -/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */ -#ifdef _MSC_VER -#define FLAC__U64L(x) x +#if defined __INTEL_COMPILER || (defined _MSC_VER && defined _WIN64) +/* MSVS generates VERY slow 32-bit code with __restrict */ +#define flac_restrict __restrict +#elif defined __GNUC__ +#define flac_restrict __restrict__ #else -#define FLAC__U64L(x) x##LLU +#define flac_restrict #endif +#define FLAC__U64L(x) x##ULL + #if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ +#define FLAC__STRCASECMP stricmp #define FLAC__STRNCASECMP strnicmp #else +#define FLAC__STRCASECMP strcasecmp #define FLAC__STRNCASECMP strncasecmp #endif @@ -161,12 +163,7 @@ #define flac_utime utime #define flac_unlink unlink #define flac_rename rename - -#ifdef _WIN32 -#define flac_stat _stat64 -#else #define flac_stat stat -#endif #endif @@ -178,17 +175,25 @@ #define flac_fstat fstat #endif +#ifndef M_LN2 +#define M_LN2 0.69314718055994530942 +#endif +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif -/* FLAC needs to compile and work correctly on systems with a norrmal ISO C99 +/* FLAC needs to compile and work correctly on systems with a normal ISO C99 * snprintf as well as Microsoft Visual Studio which has an non-standards * conformant snprint_s function. * * This function wraps the MS version to behave more like the the ISO version. */ +#include #ifdef __cplusplus extern "C" { #endif int flac_snprintf(char *str, size_t size, const char *fmt, ...); +int flac_vsnprintf(char *str, size_t size, const char *fmt, va_list va); #ifdef __cplusplus }; #endif diff --git a/lib-src/libflac/include/share/endswap.h b/lib-src/libflac/include/share/endswap.h index e71f0f6c8..4fde4c156 100644 --- a/lib-src/libflac/include/share/endswap.h +++ b/lib-src/libflac/include/share/endswap.h @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2012 Xiph.org Foundation + * Copyright (C) 2012-2014 Xiph.org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,21 +33,46 @@ #if HAVE_BSWAP32 /* GCC and Clang */ +/* GCC prior to 4.8 didn't provide bswap16 on x86_64 */ +#if ! HAVE_BSWAP16 +static inline unsigned short __builtin_bswap16(unsigned short a) +{ + return (a<<8)|(a>>8); +} +#endif + +#define ENDSWAP_16(x) (__builtin_bswap16 (x)) #define ENDSWAP_32(x) (__builtin_bswap32 (x)) #elif defined _MSC_VER /* Windows. Apparently in . */ +#define ENDSWAP_16(x) (_byteswap_ushort (x)) #define ENDSWAP_32(x) (_byteswap_ulong (x)) #elif defined HAVE_BYTESWAP_H /* Linux */ #include +#define ENDSWAP_16(x) (bswap_16 (x)) #define ENDSWAP_32(x) (bswap_32 (x)) #else -#define ENDSWAP_32(x) ((((x) >> 24) & 0xFF) + (((x) >> 8) & 0xFF00) + (((x) & 0xFF00) << 8) + (((x) & 0xFF) << 24)) +#define ENDSWAP_16(x) ((((x) >> 8) & 0xFF) | (((x) & 0xFF) << 8)) +#define ENDSWAP_32(x) ((((x) >> 24) & 0xFF) | (((x) >> 8) & 0xFF00) | (((x) & 0xFF00) << 8) | (((x) & 0xFF) << 24)) #endif + +/* Host to little-endian byte swapping. */ +#if CPU_IS_BIG_ENDIAN + +#define H2LE_16(x) ENDSWAP_16 (x) +#define H2LE_32(x) ENDSWAP_32 (x) + +#else + +#define H2LE_16(x) (x) +#define H2LE_32(x) (x) + +#endif diff --git a/lib-src/libflac/include/share/getopt.h b/lib-src/libflac/include/share/getopt.h index 3e382d3ef..66aced0f4 100644 --- a/lib-src/libflac/include/share/getopt.h +++ b/lib-src/libflac/include/share/getopt.h @@ -6,7 +6,7 @@ of code with the ELIDE_CODE #define is not accurate enough on systems that are POSIX but not glibc. If someone has a patch that works on GNU/Linux, Darwin, AND Solaris please submit it on the project page: - http://sourceforge.net/projects/flac + https://sourceforge.net/p/flac/patches/ In the meantime I have munged the global symbols and removed gates around code, while at the same time trying to touch the original as diff --git a/lib-src/libflac/include/share/grabbag.h b/lib-src/libflac/include/share/grabbag.h index 619f5edc9..0ef4e9dd3 100644 --- a/lib-src/libflac/include/share/grabbag.h +++ b/lib-src/libflac/include/share/grabbag.h @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/lib-src/libflac/include/share/grabbag/Makefile.in b/lib-src/libflac/include/share/grabbag/Makefile.in index e16efe9bb..d9359fb7e 100644 --- a/lib-src/libflac/include/share/grabbag/Makefile.in +++ b/lib-src/libflac/include/share/grabbag/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,29 +78,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = include/share/grabbag -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -81,6 +116,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -119,7 +155,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -139,8 +174,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -243,7 +276,7 @@ EXTRA_DIST = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -268,9 +301,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -279,11 +312,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -419,15 +452,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/include/share/grabbag/cuesheet.h b/lib-src/libflac/include/share/grabbag/cuesheet.h index 4c8fdf8fd..bd5c59b4b 100644 --- a/lib-src/libflac/include/share/grabbag/cuesheet.h +++ b/lib-src/libflac/include/share/grabbag/cuesheet.h @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/lib-src/libflac/include/share/grabbag/file.h b/lib-src/libflac/include/share/grabbag/file.h index b0b593808..df72ea0d5 100644 --- a/lib-src/libflac/include/share/grabbag/file.h +++ b/lib-src/libflac/include/share/grabbag/file.h @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,7 +25,7 @@ #define GRABAG__FILE_H /* needed because of off_t */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/include/share/grabbag/picture.h b/lib-src/libflac/include/share/grabbag/picture.h index db469ca26..a83221241 100644 --- a/lib-src/libflac/include/share/grabbag/picture.h +++ b/lib-src/libflac/include/share/grabbag/picture.h @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2006-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/include/share/grabbag/replaygain.h b/lib-src/libflac/include/share/grabbag/replaygain.h index 4bdff3b17..96746b0b5 100644 --- a/lib-src/libflac/include/share/grabbag/replaygain.h +++ b/lib-src/libflac/include/share/grabbag/replaygain.h @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/lib-src/libflac/include/share/grabbag/seektable.h b/lib-src/libflac/include/share/grabbag/seektable.h index 9bd3aa829..62c530749 100644 --- a/lib-src/libflac/include/share/grabbag/seektable.h +++ b/lib-src/libflac/include/share/grabbag/seektable.h @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/lib-src/libflac/include/share/macros.h b/lib-src/libflac/include/share/macros.h index 5be07a163..b4254b9fc 100644 --- a/lib-src/libflac/include/share/macros.h +++ b/lib-src/libflac/include/share/macros.h @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2013 Xiph.org Foundation + * Copyright (C) 2013-2014 Xiph.org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/share/private.h b/lib-src/libflac/include/share/private.h index 4cae73f52..3a500d3ca 100644 --- a/lib-src/libflac/include/share/private.h +++ b/lib-src/libflac/include/share/private.h @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2013 Xiph.org Foundation + * Copyright (C) 2013-2014 Xiph.org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/share/replaygain_analysis.h b/lib-src/libflac/include/share/replaygain_analysis.h index 36c14e04d..f06a9b29f 100644 --- a/lib-src/libflac/include/share/replaygain_analysis.h +++ b/lib-src/libflac/include/share/replaygain_analysis.h @@ -42,15 +42,15 @@ extern "C" { #endif -typedef float Float_t; /* Type used for filtering */ +typedef float flac_float_t; /* Type used for filtering */ -extern Float_t ReplayGainReferenceLoudness; /* in dB SPL, currently == 89.0 */ +extern flac_float_t ReplayGainReferenceLoudness; /* in dB SPL, currently == 89.0 */ int InitGainAnalysis ( long samplefreq ); int ValidGainFrequency ( long samplefreq ); -int AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels ); -Float_t GetTitleGain ( void ); -Float_t GetAlbumGain ( void ); +int AnalyzeSamples ( const flac_float_t* left_samples, const flac_float_t* right_samples, size_t num_samples, int num_channels ); +flac_float_t GetTitleGain ( void ); +flac_float_t GetAlbumGain ( void ); #ifdef __cplusplus } diff --git a/lib-src/libflac/include/share/replaygain_synthesis.h b/lib-src/libflac/include/share/replaygain_synthesis.h index bb8885c5c..9d9c93451 100644 --- a/lib-src/libflac/include/share/replaygain_synthesis.h +++ b/lib-src/libflac/include/share/replaygain_synthesis.h @@ -1,6 +1,6 @@ /* replaygain_synthesis - Routines for applying ReplayGain to a signal * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,9 +21,9 @@ #define FLAC__SHARE__REPLAYGAIN_SYNTHESIS_H #include /* for size_t */ -#include "FLAC/ordinals.h" +#include "FLAC/format.h" -#define FLAC_SHARE__MAX_SUPPORTED_CHANNELS 2 +#define FLAC_SHARE__MAX_SUPPORTED_CHANNELS FLAC__MAX_CHANNELS typedef enum { NOISE_SHAPING_NONE = 0, diff --git a/lib-src/libflac/include/share/safe_str.h b/lib-src/libflac/include/share/safe_str.h index 09089d9c8..dd1e4ed91 100644 --- a/lib-src/libflac/include/share/safe_str.h +++ b/lib-src/libflac/include/share/safe_str.h @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2013 Xiph.org Foundation + * Copyright (C) 2013-2014 Xiph.org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/include/share/win_utf8_io.h b/lib-src/libflac/include/share/win_utf8_io.h index abf9c4150..1d153392a 100644 --- a/lib-src/libflac/include/share/win_utf8_io.h +++ b/lib-src/libflac/include/share/win_utf8_io.h @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2013 Xiph.Org Foundation + * Copyright (C) 2013-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -58,7 +58,7 @@ int unlink_utf8(const char *filename); int rename_utf8(const char *oldname, const char *newname); size_t strlen_utf8(const char *str); int win_get_console_width(void); -int print_console(FILE *stream, const wchar_t *text, uint32_t len); +int print_console(FILE *stream, const wchar_t *text, size_t len); HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile); #ifdef __cplusplus diff --git a/lib-src/libflac/include/test_libs_common/Makefile.in b/lib-src/libflac/include/test_libs_common/Makefile.in index f0778c1f1..8e8516962 100644 --- a/lib-src/libflac/include/test_libs_common/Makefile.in +++ b/lib-src/libflac/include/test_libs_common/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,29 +78,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = include/test_libs_common -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -81,6 +116,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -119,7 +155,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -139,8 +174,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -240,7 +273,7 @@ EXTRA_DIST = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -265,9 +298,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -276,11 +309,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -416,15 +449,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/include/test_libs_common/file_utils_flac.h b/lib-src/libflac/include/test_libs_common/file_utils_flac.h index 5280b3db2..e9cacdd7f 100644 --- a/lib-src/libflac/include/test_libs_common/file_utils_flac.h +++ b/lib-src/libflac/include/test_libs_common/file_utils_flac.h @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +21,7 @@ #define FLAC__TEST_LIBFLAC_FILE_UTILS_H /* needed because of off_t */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/include/test_libs_common/metadata_utils.h b/lib-src/libflac/include/test_libs_common/metadata_utils.h index 8b47e907e..16f65d229 100644 --- a/lib-src/libflac/include/test_libs_common/metadata_utils.h +++ b/lib-src/libflac/include/test_libs_common/metadata_utils.h @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/install-sh b/lib-src/libflac/install-sh old mode 100644 new mode 100755 diff --git a/lib-src/libflac/ltmain.sh b/lib-src/libflac/ltmain.sh index 3825a2aa4..bffda5418 100644 --- a/lib-src/libflac/ltmain.sh +++ b/lib-src/libflac/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.11" TIMESTAMP="" package_revision=1.3337 diff --git a/lib-src/libflac/m4/Makefile.am b/lib-src/libflac/m4/Makefile.am index b9d24dbd6..16d166d17 100644 --- a/lib-src/libflac/m4/Makefile.am +++ b/lib-src/libflac/m4/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/m4/Makefile.in b/lib-src/libflac/m4/Makefile.in index d4e8ed421..dc09e1039 100644 --- a/lib-src/libflac/m4/Makefile.in +++ b/lib-src/libflac/m4/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,29 +96,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -99,6 +134,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -137,7 +173,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -157,8 +192,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -264,7 +297,7 @@ EXTRA_DIST = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -289,9 +322,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -300,11 +333,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -440,15 +473,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/m4/bswap.m4 b/lib-src/libflac/m4/bswap.m4 index 926f820e8..e6793d69b 100644 --- a/lib-src/libflac/m4/bswap.m4 +++ b/lib-src/libflac/m4/bswap.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2012 Xiph.org Foundation +dnl Copyright (C) 2012-2014 Xiph.org Foundation dnl dnl Redistribution and use in source and binary forms, with or without dnl modification, are permitted provided that the following conditions @@ -36,20 +36,47 @@ dnl Dtermine whether the compiler has the __builtin_bswap32() intrinsic which dnl is likely to be present for most versions of GCC as well as Clang. AC_DEFUN([XIPH_C_BSWAP32], -[AC_CACHE_CHECK(has bswap32 instrinsic, - ac_cv_c_bswap, +[AC_CACHE_CHECK(for bswap32 instrinsic, + ac_cv_c_bswap32, - # Initialize to no - ac_cv_c_bswap=no - HAVE_BSWAP32=0 + # Initialize to no + ac_cv_c_bswap32=no + HAVE_BSWAP32=0 - [AC_TRY_LINK([], - return __builtin_bswap32 (0) ;, - ac_cv_c_bswap=yes - HAVE_BSWAP32=1 - )] - AC_DEFINE_UNQUOTED(HAVE_BSWAP32, ${HAVE_BSWAP32}, - [Compiler has the __builtin_bswap32 intrinsic]) + [AC_TRY_LINK([], + return __builtin_bswap32 (0) ;, + ac_cv_c_bswap32=yes + HAVE_BSWAP32=1 + )] + AC_DEFINE_UNQUOTED(HAVE_BSWAP32, ${HAVE_BSWAP32}, + [Compiler has the __builtin_bswap32 intrinsic]) - )] + )] )# XIPH_C_BSWAP32 + + +dnl @synopsis XIPH_C_BSWAP16 +dnl +dnl @author Erik de Castro Lopo +dnl +dnl Dtermine whether the compiler has the __builtin_bswap16() intrinsic which +dnl is likely to be present for most versions of GCC as well as Clang. + +AC_DEFUN([XIPH_C_BSWAP16], +[AC_CACHE_CHECK(for bswap16 instrinsic, + ac_cv_c_bswap16, + + # Initialize to no + ac_cv_c_bswap16=no + HAVE_BSWAP16=0 + + [AC_TRY_LINK([], + return __builtin_bswap16 (0) ;, + ac_cv_c_bswap16=yes + HAVE_BSWAP16=1 + )] + AC_DEFINE_UNQUOTED(HAVE_BSWAP16, ${HAVE_BSWAP16}, + [Compiler has the __builtin_bswap16 intrinsic]) + + )] +)# XIPH_C_BSWAP16 diff --git a/lib-src/libflac/m4/clang.m4 b/lib-src/libflac/m4/clang.m4 new file mode 100644 index 000000000..036f0e684 --- /dev/null +++ b/lib-src/libflac/m4/clang.m4 @@ -0,0 +1,31 @@ +dnl @synopsis XIPH_C_COMPILER_IS_CLANG +dnl +dnl Find out if a compiler claiming to be gcc really is gcc (clang lies). +dnl @version 1.0 Oct 31 2013 +dnl @author Erik de Castro Lopo +dnl +dnl Permission to use, copy, modify, distribute, and sell this file for any +dnl purpose is hereby granted without fee, provided that the above copyright +dnl and this permission notice appear in all copies. No representations are +dnl made about the suitability of this software for any purpose. It is +dnl provided "as is" without express or implied warranty. +dnl + + +AC_DEFUN([XIPH_C_COMPILER_IS_CLANG], +[AC_CACHE_CHECK(whether we are using the CLANG C compiler, + xiph_cv_c_compiler_clang, + [ AC_LANG_ASSERT(C) + AC_TRY_LINK([ + #include + ], + [ + #ifndef __clang__ + This is not clang! + #endif + ], + xiph_cv_c_compiler_clang=yes, + xiph_cv_c_compiler_clang=no + ]) + )] +) diff --git a/lib-src/libflac/m4/endian.m4 b/lib-src/libflac/m4/endian.m4 index 87c1f4937..b10ac5d00 100644 --- a/lib-src/libflac/m4/endian.m4 +++ b/lib-src/libflac/m4/endian.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2012 Xiph.org Foundation +dnl Copyright (C) 2012-2014 Xiph.org Foundation dnl dnl Redistribution and use in source and binary forms, with or without dnl modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/m4/libtool.m4 b/lib-src/libflac/m4/libtool.m4 index 02b4bbec5..d7c043f4f 100644 --- a/lib-src/libflac/m4/libtool.m4 +++ b/lib-src/libflac/m4/libtool.m4 @@ -1312,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff --git a/lib-src/libflac/m4/really_gcc.m4 b/lib-src/libflac/m4/really_gcc.m4 new file mode 100644 index 000000000..cba53ab3a --- /dev/null +++ b/lib-src/libflac/m4/really_gcc.m4 @@ -0,0 +1,32 @@ +dnl @synopsis XIPH_GCC_REALLY_IS_GCC +dnl +dnl Find out if a compiler claiming to be gcc really is gcc (clang lies). +dnl @version 1.0 Oct 31 2013 +dnl @author Erik de Castro Lopo +dnl +dnl Permission to use, copy, modify, distribute, and sell this file for any +dnl purpose is hereby granted without fee, provided that the above copyright +dnl and this permission notice appear in all copies. No representations are +dnl made about the suitability of this software for any purpose. It is +dnl provided "as is" without express or implied warranty. +dnl + +# If the configure script has already detected GNU GCC, then make sure it +# isn't CLANG masquerading as GCC. + +AC_DEFUN([XIPH_GCC_REALLY_IS_GCC], +[ AC_LANG_ASSERT(C) + if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then + AC_TRY_LINK([ + #include + ], + [ + #ifdef __clang__ + This is clang! + #endif + ], + ac_cv_c_compiler_gnu=yes, + ac_cv_c_compiler_gnu=no + ) + fi +]) diff --git a/lib-src/libflac/m4/stack_protect.m4 b/lib-src/libflac/m4/stack_protect.m4 index bf27e6e74..286692445 100644 --- a/lib-src/libflac/m4/stack_protect.m4 +++ b/lib-src/libflac/m4/stack_protect.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2013 Xiph.org Foundation +dnl Copyright (C) 2013-2014 Xiph.org Foundation dnl dnl Redistribution and use in source and binary forms, with or without dnl modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/man/Makefile.am b/lib-src/libflac/man/Makefile.am index a89f6de0b..fe28304fa 100644 --- a/lib-src/libflac/man/Makefile.am +++ b/lib-src/libflac/man/Makefile.am @@ -1,6 +1,6 @@ # flac - Command-line FLAC encoder/decoder # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/man/Makefile.in b/lib-src/libflac/man/Makefile.in index 23c0fdac1..8d0f7f227 100644 --- a/lib-src/libflac/man/Makefile.in +++ b/lib-src/libflac/man/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # flac - Command-line FLAC encoder/decoder # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -33,23 +32,51 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,29 +96,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = man -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -130,6 +165,7 @@ man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -168,7 +204,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -188,8 +223,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -287,7 +320,7 @@ EXTRA_DIST = $(man_MANS) flac.sgml metaflac.sgml all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -312,9 +345,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -366,27 +399,14 @@ uninstall-man1: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -524,16 +544,17 @@ uninstall-man: uninstall-man1 .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man1 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man1 @FLaC__HAS_DOCBOOK_TO_MAN_TRUE@flac.1: flac.sgml diff --git a/lib-src/libflac/man/flac.1 b/lib-src/libflac/man/flac.1 index b9ec99075..83c649ee0 100644 --- a/lib-src/libflac/man/flac.1 +++ b/lib-src/libflac/man/flac.1 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "FLAC" "1" "2013/04/30" "" "" +.TH "FLAC" "1" "2013/09/18" "" "" .SH NAME flac \- Free Lossless Audio Codec @@ -261,13 +261,13 @@ Synonymous with -l 8 -b 4096 -M -r 4 Synonymous with -l 8 -b 4096 -m -r 5 .TP \fB-6, --compression-level-6\fR -Synonymous with -l 8 -b 4096 -m -r 6 +Synonymous with -l 8 -b 4096 -m -r 6 -A tukey(0.5) -A partial_tukey(2) .TP \fB-7, --compression-level-7\fR -Synonymous with -l 8 -b 4096 -m -e -r 6 +Synonymous with -l 8 -b 4096 -m -e -r 6 -A tukey(0.5) -A partial_tukey(2) .TP \fB-8, --compression-level-8\fR -Synonymous with -l 12 -b 4096 -m -e -r 6 +Synonymous with -l 12 -b 4096 -m -e -r 6 -A tukey(0.5) -A partial_tukey(2) -A punchout_tukey(3) .RE .TP \fB--fast\fR @@ -280,12 +280,16 @@ Highest compression. Currently synonymous with -8. Do exhaustive model search (expensive!) .TP \fB-A \fIfunction\fB, --apodization=\fIfunction\fB\fR -Window audio data with given the apodization function. The functions are: bartlett, bartlett_hann, blackman, blackman_harris_4term_92db, connes, flattop, gauss(STDDEV), hamming, hann, kaiser_bessel, nuttall, rectangle, triangle, tukey(P), welch. +Window audio data with given the apodization function. The functions are: bartlett, bartlett_hann, blackman, blackman_harris_4term_92db, connes, flattop, gauss(STDDEV), hamming, hann, kaiser_bessel, nuttall, rectangle, triangle, tukey(P), partial_tukey(n[/ov[/P]]), punchout_tukey(n[/ov[/P]]), welch. For gauss(STDDEV), STDDEV is the standard deviation (0 let encoder decide (min is 5, default is 0) .TP \fB-r [\fI#\fB,]\fI#\fB, --rice-partition-order=[\fI#\fB,]\fI#\fB\fR -Set the [min,]max residual partition order (0..16). min defaults to 0 if unspecified. Default is -r 5. +Set the [min,]max residual partition order (0..15). min defaults to 0 if unspecified. Default is -r 5. .SS "FORMAT OPTIONS" .TP \fB--endian={\fIbig\fB|\fIlittle\fB}\fR @@ -378,9 +382,9 @@ Force the decoder to output Wave64 format. This option is not needed if the out These flags can be used to invert the sense of the corresponding normal option. .SH "SEE ALSO" .PP -metaflac(1). +metaflac(1) .PP The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/libflac-doc/html\fR on Debian GNU/Linux systems. .SH "AUTHOR" .PP -This manual page was written by Matt Zimmerman for the Debian GNU/Linux system (but may be used by others). +This manual page was initially written by Matt Zimmerman for the Debian GNU/Linux system (but may be used by others). It has been kept up-to-date by the Xiph.org Foundation. diff --git a/lib-src/libflac/man/flac.sgml b/lib-src/libflac/man/flac.sgml index b76722b02..6dc19f311 100644 --- a/lib-src/libflac/man/flac.sgml +++ b/lib-src/libflac/man/flac.sgml @@ -4,7 +4,7 @@ Matt"> Zimmerman"> - 2013/04/30"> + 2013/09/18"> 1"> @@ -559,7 +559,7 @@ , - Synonymous with -l 8 -b 4096 -m -r 6 + Synonymous with -l 8 -b 4096 -m -r 6 -A tukey(0.5) -A partial_tukey(2) @@ -567,7 +567,7 @@ , - Synonymous with -l 8 -b 4096 -m -e -r 6 + Synonymous with -l 8 -b 4096 -m -e -r 6 -A tukey(0.5) -A partial_tukey(2) @@ -575,7 +575,7 @@ , - Synonymous with -l 12 -b 4096 -m -e -r 6 + Synonymous with -l 12 -b 4096 -m -e -r 6 -A tukey(0.5) -A partial_tukey(2) -A punchout_tukey(3) @@ -612,9 +612,11 @@ function, =function - Window audio data with given the apodization function. The functions are: bartlett, bartlett_hann, blackman, blackman_harris_4term_92db, connes, flattop, gauss(STDDEV), hamming, hann, kaiser_bessel, nuttall, rectangle, triangle, tukey(P), welch. + Window audio data with given the apodization function. The functions are: bartlett, bartlett_hann, blackman, blackman_harris_4term_92db, connes, flattop, gauss(STDDEV), hamming, hann, kaiser_bessel, nuttall, rectangle, triangle, tukey(P), partial_tukey(n[/ov[/P]]), punchout_tukey(n[/ov[/P]]), welch. For gauss(STDDEV), STDDEV is the standard deviation (0<STDDEV<=0.5). For tukey(P), P specifies the fraction of the window that is tapered (0<=P<=1; P=0 corresponds to "rectangle" and P=1 corresponds to "hann"). + For partial_tukey(n) and punchout_tukey(n), n apodization functions are added that span different parts of each block. Values of 2 to 6 seem to yield sane results. If necessary, an overlap can be specified, as can be the taper parameter, for example partial_tukey(2/0.2) or partial_tukey(2/0.2/0.5). ov should be smaller than 1 and can be negative. + Please note that P, STDDEV and ov are locale specific, so a comma as decimal separator might be required instead of a dot. More than one -A option (up to 32) may be used. Any function that is specified erroneously is silently dropped. The encoder chooses suitable defaults in the absence of any -A options; any -A option specified replaces the default(s). When more than one function is specified, then for every subframe the encoder will try each of them separately and choose the window that results in the smallest compressed subframe. Multiple functions can greatly increase the encoding time. @@ -648,7 +650,7 @@ [#,]#, =[#,]# - Set the [min,]max residual partition order (0..16). min defaults to 0 if unspecified. Default is -r 5. + Set the [min,]max residual partition order (0..15). min defaults to 0 if unspecified. Default is -r 5. @@ -780,14 +782,14 @@ SEE ALSO - metaflac(1). + metaflac(1) The programs are documented fully by HTML format documentation, available in /usr/share/doc/libflac-doc/html on &debian; systems. AUTHOR - This manual page was written by &dhusername; &dhemail; for the &debian; system (but may be used by others). + This manual page was initially written by &dhusername; &dhemail; for the &debian; system (but may be used by others). It has been kept up-to-date by the Xiph.org Foundation. diff --git a/lib-src/libflac/missing b/lib-src/libflac/missing old mode 100644 new mode 100755 index cdea51493..db98974ff --- a/lib-src/libflac/missing +++ b/lib-src/libflac/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. @@ -160,7 +160,7 @@ give_advice () ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff --git a/lib-src/libflac/objs/Makefile.in b/lib-src/libflac/objs/Makefile.in index 0260d96c1..346818a88 100644 --- a/lib-src/libflac/objs/Makefile.in +++ b/lib-src/libflac/objs/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -32,23 +31,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -68,38 +95,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = objs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -107,9 +143,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -176,7 +232,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -196,8 +251,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -297,7 +350,7 @@ SUBDIRS = \ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -322,9 +375,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -335,22 +388,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -365,57 +421,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -431,12 +442,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -448,15 +454,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -465,6 +467,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -625,22 +642,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/objs/debug/Makefile.in b/lib-src/libflac/objs/debug/Makefile.in index 5971f01e7..001f9f921 100644 --- a/lib-src/libflac/objs/debug/Makefile.in +++ b/lib-src/libflac/objs/debug/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -32,23 +31,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -68,38 +95,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = objs/debug -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -107,9 +143,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -176,7 +232,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -196,8 +251,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -297,7 +350,7 @@ SUBDIRS = \ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -322,9 +375,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -335,22 +388,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -365,57 +421,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -431,12 +442,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -448,15 +454,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -465,6 +467,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -625,22 +642,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/objs/debug/bin/Makefile.in b/lib-src/libflac/objs/debug/bin/Makefile.in index 240b00ab1..ae87f04f7 100644 --- a/lib-src/libflac/objs/debug/bin/Makefile.in +++ b/lib-src/libflac/objs/debug/bin/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,29 +78,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = objs/debug/bin -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -81,6 +116,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -119,7 +155,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -139,8 +174,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -236,7 +269,7 @@ top_srcdir = @top_srcdir@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -261,9 +294,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -272,11 +305,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -412,15 +445,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # FLAC - Free Lossless Audio Codec diff --git a/lib-src/libflac/objs/debug/lib/Makefile.in b/lib-src/libflac/objs/debug/lib/Makefile.in index 28db37bc7..c1c849d8b 100644 --- a/lib-src/libflac/objs/debug/lib/Makefile.in +++ b/lib-src/libflac/objs/debug/lib/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,29 +78,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = objs/debug/lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -81,6 +116,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -119,7 +155,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -139,8 +174,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -236,7 +269,7 @@ top_srcdir = @top_srcdir@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -261,9 +294,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -272,11 +305,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -412,15 +445,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # FLAC - Free Lossless Audio Codec diff --git a/lib-src/libflac/objs/release/Makefile.in b/lib-src/libflac/objs/release/Makefile.in index c25728ff3..b41f0ff79 100644 --- a/lib-src/libflac/objs/release/Makefile.in +++ b/lib-src/libflac/objs/release/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -32,23 +31,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -68,38 +95,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = objs/release -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -107,9 +143,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -176,7 +232,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -196,8 +251,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -297,7 +350,7 @@ SUBDIRS = \ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -322,9 +375,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -335,22 +388,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -365,57 +421,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -431,12 +442,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -448,15 +454,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -465,6 +467,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -625,22 +642,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/objs/release/bin/Makefile.in b/lib-src/libflac/objs/release/bin/Makefile.in index d4771c48c..4a19f4c5a 100644 --- a/lib-src/libflac/objs/release/bin/Makefile.in +++ b/lib-src/libflac/objs/release/bin/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,29 +78,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = objs/release/bin -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -81,6 +116,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -119,7 +155,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -139,8 +174,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -236,7 +269,7 @@ top_srcdir = @top_srcdir@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -261,9 +294,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -272,11 +305,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -412,15 +445,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # FLAC - Free Lossless Audio Codec diff --git a/lib-src/libflac/objs/release/lib/Makefile.in b/lib-src/libflac/objs/release/lib/Makefile.in index bc005938c..7153ace37 100644 --- a/lib-src/libflac/objs/release/lib/Makefile.in +++ b/lib-src/libflac/objs/release/lib/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,29 +78,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = objs/release/lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -81,6 +116,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -119,7 +155,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -139,8 +174,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -236,7 +269,7 @@ top_srcdir = @top_srcdir@ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -261,9 +294,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -272,11 +305,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -412,15 +445,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # FLAC - Free Lossless Audio Codec diff --git a/lib-src/libflac/src/Makefile.am b/lib-src/libflac/src/Makefile.am index 2bd7981e5..5941738c8 100644 --- a/lib-src/libflac/src/Makefile.am +++ b/lib-src/libflac/src/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -29,7 +29,6 @@ SUBDIRS = \ libFLAC \ flac \ metaflac \ - monkeys_audio_utilities \ $(XMMS_DIRS) \ test_grabbag \ test_libs_common \ diff --git a/lib-src/libflac/src/Makefile.in b/lib-src/libflac/src/Makefile.in index 8b2259fd3..38e845cbc 100644 --- a/lib-src/libflac/src/Makefile.in +++ b/lib-src/libflac/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,15 +144,34 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = share libFLAC flac metaflac monkeys_audio_utilities \ - plugin_common plugin_xmms test_grabbag test_libs_common \ - test_libFLAC test_seeking test_streams utils libFLAC++ \ - test_libFLAC++ +DIST_SUBDIRS = share libFLAC flac metaflac plugin_common plugin_xmms \ + test_grabbag test_libs_common test_libFLAC test_seeking \ + test_streams utils libFLAC++ test_libFLAC++ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -180,7 +235,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -200,8 +254,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -301,7 +353,6 @@ SUBDIRS = \ libFLAC \ flac \ metaflac \ - monkeys_audio_utilities \ $(XMMS_DIRS) \ test_grabbag \ test_libs_common \ @@ -317,7 +368,7 @@ EXTRA_DIST = \ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -342,9 +393,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -355,22 +406,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -385,57 +439,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -451,12 +460,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -468,15 +472,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -485,6 +485,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -645,22 +660,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/Makefile.lite b/lib-src/libflac/src/Makefile.lite index 3027e6f95..8b9281650 100644 --- a/lib-src/libflac/src/Makefile.lite +++ b/lib-src/libflac/src/Makefile.lite @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -26,12 +26,17 @@ else ifeq ($(PROC),x86_64) EXTRA_TARGETS = else - EXTRA_TARGETS = plugin_xmms + # Can add plugin_xmms here if desired. + EXTRA_TARGETS = endif endif -.PHONY: all flac libFLAC libFLAC++ metaflac plugin_common plugin_xmms share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams utils flacdiff flactimer -all: flac libFLAC libFLAC++ metaflac plugin_common $(EXTRA_TARGETS) share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams utils +ifeq ($(findstring Windows,$(OS)),Windows) + EXTRA_TARGETS += share/win_utf8_io +endif + +.PHONY: all flac libFLAC libFLAC++ metaflac plugin_common plugin_xmms share/win_utf8_io share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams flacdiff flactimer +all: flac libFLAC libFLAC++ metaflac plugin_common $(EXTRA_TARGETS) share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams DEFAULT_CONFIG = release @@ -45,9 +50,7 @@ debug : all valgrind: all release : all -all: flac libFLAC libFLAC++ metaflac plugin_common plugin_xmms share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams utils - -flac libFLAC libFLAC++ metaflac plugin_common plugin_xmms share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams: +flac libFLAC libFLAC++ metaflac plugin_common plugin_xmms share/win_utf8_io share test_grabbag test_libs_common test_libFLAC test_libFLAC++ test_seeking test_streams: (cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG)) flacdiff flactimer: diff --git a/lib-src/libflac/src/flac/Makefile.am b/lib-src/libflac/src/flac/Makefile.am index 389215e2f..7103d9d70 100644 --- a/lib-src/libflac/src/flac/Makefile.am +++ b/lib-src/libflac/src/flac/Makefile.am @@ -1,6 +1,6 @@ # flac - Command-line FLAC encoder/decoder # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -24,8 +24,12 @@ EXTRA_DIST = \ Makefile.lite \ Makefile.lite.iffscan \ flac.vcproj \ + flac.vcxproj \ + flac.vcxproj.filters \ iffscan.c \ - iffscan.vcproj + iffscan.vcproj \ + iffscan.vcxproj \ + iffscan.vcxproj.filters flac_SOURCES = \ analyze.c \ diff --git a/lib-src/libflac/src/flac/Makefile.in b/lib-src/libflac/src/flac/Makefile.in index 3ef9e7da0..f0e2894e0 100644 --- a/lib-src/libflac/src/flac/Makefile.in +++ b/lib-src/libflac/src/flac/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # flac - Command-line FLAC encoder/decoder # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = flac$(EXEEXT) subdir = src/flac -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -104,6 +134,19 @@ flac_DEPENDENCIES = $(top_builddir)/src/share/utf8/libutf8.la \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -116,20 +159,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(flac_SOURCES) DIST_SOURCES = $(flac_SOURCES) am__can_run_installinfo = \ @@ -137,6 +176,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -297,8 +350,12 @@ EXTRA_DIST = \ Makefile.lite \ Makefile.lite.iffscan \ flac.vcproj \ + flac.vcxproj \ + flac.vcxproj.filters \ iffscan.c \ - iffscan.vcproj + iffscan.vcproj \ + iffscan.vcxproj \ + iffscan.vcxproj.filters flac_SOURCES = \ analyze.c \ @@ -332,7 +389,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -357,9 +414,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @@ -371,10 +428,12 @@ install-binPROGRAMS: $(bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -395,7 +454,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -408,6 +468,7 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + flac$(EXEEXT): $(flac_OBJECTS) $(flac_DEPENDENCIES) $(EXTRA_flac_DEPENDENCIES) @rm -f flac$(EXEEXT) $(AM_V_CCLD)$(LINK) $(flac_OBJECTS) $(flac_LDADD) $(LIBS) @@ -457,26 +518,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -488,15 +538,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -505,6 +551,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -649,19 +710,19 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/flac/Makefile.lite b/lib-src/libflac/src/flac/Makefile.lite index 5c8391ab4..e13c8649b 100644 --- a/lib-src/libflac/src/flac/Makefile.lite +++ b/lib-src/libflac/src/flac/Makefile.lite @@ -1,6 +1,6 @@ # flac - Command-line FLAC encoder/decoder # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES) ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lgrabbag -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lreplaygain_synthesis -lgetopt -lutf8 -lgrabbag $(OGG_LIBS) -lm endif +endif SRCS_C = \ analyze.c \ diff --git a/lib-src/libflac/src/flac/Makefile.lite.iffscan b/lib-src/libflac/src/flac/Makefile.lite.iffscan index ab49e8ca0..90bf3cc92 100644 --- a/lib-src/libflac/src/flac/Makefile.lite.iffscan +++ b/lib-src/libflac/src/flac/Makefile.lite.iffscan @@ -1,6 +1,6 @@ # flac - Command-line FLAC encoder/decoder # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES) ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_C = \ foreign_metadata.c \ diff --git a/lib-src/libflac/src/flac/analyze.c b/lib-src/libflac/src/flac/analyze.c index d42208e42..241d637a1 100644 --- a/lib-src/libflac/src/flac/analyze.c +++ b/lib-src/libflac/src/flac/analyze.c @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/flac/analyze.h b/lib-src/libflac/src/flac/analyze.h index 79b7f549b..88e21a49e 100644 --- a/lib-src/libflac/src/flac/analyze.h +++ b/lib-src/libflac/src/flac/analyze.h @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/flac/decode.c b/lib-src/libflac/src/flac/decode.c index bb93d47e4..dfdc3469d 100644 --- a/lib-src/libflac/src/flac/decode.c +++ b/lib-src/libflac/src/flac/decode.c @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -263,6 +263,23 @@ FLAC__bool DecoderSession_construct(DecoderSession *d, FLAC__bool is_ogg, FLAC__ void DecoderSession_destroy(DecoderSession *d, FLAC__bool error_occurred) { if(0 != d->fout && d->fout != stdout) { +#ifdef _WIN32 + if(!error_occurred) { + FLAC__off_t written_size = ftello(d->fout); + if(written_size > 0) { + HANDLE fh = CreateFile_utf8(d->outfilename, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(fh != INVALID_HANDLE_VALUE) { + if(GetFileType(fh) == FILE_TYPE_DISK) { + LARGE_INTEGER size; + size.QuadPart = written_size; + if(SetFilePointerEx(fh, size, NULL, FILE_CURRENT)) /* correct the file size */ + SetEndOfFile(fh); + } + CloseHandle(fh); + } + } + } +#endif fclose(d->fout); if(error_occurred) flac_unlink(d->outfilename); @@ -294,7 +311,7 @@ FLAC__bool DecoderSession_init_decoder(DecoderSession *decoder_session, const ch FLAC__stream_decoder_set_md5_checking(decoder_session->decoder, true); if (0 != decoder_session->cue_specification) FLAC__stream_decoder_set_metadata_respond(decoder_session->decoder, FLAC__METADATA_TYPE_CUESHEET); - if (decoder_session->replaygain.spec.apply) + if (decoder_session->replaygain.spec.apply || !decoder_session->channel_map_none) FLAC__stream_decoder_set_metadata_respond(decoder_session->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); #if FLAC__HAS_OGG @@ -339,7 +356,7 @@ FLAC__bool DecoderSession_process(DecoderSession *d) /* only the channel mask must be set if it was not already picked up from the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag */ if(!d->channel_map_none && d->channel_mask == 0) { if(d->channels == 1) { - d->channel_mask = 0x0001; + d->channel_mask = 0x0004; } else if(d->channels == 2) { d->channel_mask = 0x0003; @@ -364,6 +381,32 @@ FLAC__bool DecoderSession_process(DecoderSession *d) } } +#ifdef _WIN32 + if(!d->analysis_mode && !d->test_only && d->total_samples > 0 && d->fout != stdout) { + HANDLE fh = CreateFile_utf8(d->outfilename, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(fh != INVALID_HANDLE_VALUE) { + if (GetFileType(fh) == FILE_TYPE_DISK) { + LARGE_INTEGER size; + size.QuadPart = d->total_samples * d->channels * ((d->bps+7)/8); + if(d->format != FORMAT_RAW) { + size.QuadPart += 512; + if(d->foreign_metadata) { + size_t i; + for(i = d->format==FORMAT_RF64?2:1; i < d->foreign_metadata->num_blocks; i++) { + if(i != d->foreign_metadata->format_block && i != d->foreign_metadata->audio_block) + size.QuadPart += d->foreign_metadata->blocks[i].size; + } + } + } + + if(SetFilePointerEx(fh, size, NULL, FILE_CURRENT)) /* tell filesystem the expected filesize to eliminate fragmentation */ + SetEndOfFile(fh); + } + CloseHandle(fh); + } + } +#endif + /* write the WAVE/AIFF headers if necessary */ if(!d->analysis_mode && !d->test_only && d->format != FORMAT_RAW) { if(!write_iff_headers(d->fout, d, d->total_samples)) { @@ -966,12 +1009,17 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder )); unsigned wide_samples = frame->header.blocksize, wide_sample, sample, channel; unsigned frame_bytes = 0; - static FLAC__int8 s8buffer[FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS * sizeof(FLAC__int32)]; /* WATCHOUT: can be up to 2 megs */ - FLAC__uint8 *u8buffer = (FLAC__uint8 *)s8buffer; - FLAC__int16 *s16buffer = (FLAC__int16 *)s8buffer; - FLAC__uint16 *u16buffer = (FLAC__uint16 *)s8buffer; - FLAC__int32 *s32buffer = (FLAC__int32 *)s8buffer; - FLAC__uint32 *u32buffer = (FLAC__uint32 *)s8buffer; + + static union + { /* The arrays defined within this union are all the same size. */ + FLAC__int8 s8buffer [FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS * sizeof(FLAC__int32)]; /* WATCHOUT: can be up to 2 megs */ + FLAC__uint8 u8buffer [FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS * sizeof(FLAC__int32)]; + FLAC__int16 s16buffer [FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS * sizeof(FLAC__int16)]; + FLAC__uint16 u16buffer [FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS * sizeof(FLAC__int16)]; + FLAC__int32 s32buffer [FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS]; + FLAC__uint32 u32buffer [FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS]; + } ubuf; + size_t bytes_to_write = 0; (void)decoder; @@ -1078,7 +1126,7 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder decoder_session->samples_processed += wide_samples; decoder_session->frame_counter++; - if(!(decoder_session->frame_counter & 0x3f)) + if(!(decoder_session->frame_counter & 0x1ff)) print_stats(decoder_session); if(decoder_session->analysis_mode) { @@ -1092,7 +1140,7 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder } if(decoder_session->replaygain.apply) { bytes_to_write = FLAC__replaygain_synthesis__apply_gain( - u8buffer, + ubuf.u8buffer, !is_big_endian, is_unsigned_samples, buffer, @@ -1108,17 +1156,17 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder } /* first some special code for common cases */ else if(is_big_endian == is_big_endian_host_ && !is_unsigned_samples && channels == 2 && bps+shift == 16) { - FLAC__int16 *buf1_ = s16buffer + 1; + FLAC__int16 *buf1_ = ubuf.s16buffer + 1; if(is_big_endian) - memcpy(s16buffer, ((FLAC__byte*)(buffer[0]))+2, sizeof(FLAC__int32) * wide_samples - 2); + memcpy(ubuf.s16buffer, ((FLAC__byte*)(buffer[0]))+2, sizeof(FLAC__int32) * wide_samples - 2); else - memcpy(s16buffer, buffer[0], sizeof(FLAC__int32) * wide_samples); + memcpy(ubuf.s16buffer, buffer[0], sizeof(FLAC__int32) * wide_samples); for(sample = 0; sample < wide_samples; sample++, buf1_+=2) *buf1_ = (FLAC__int16)buffer[1][sample]; bytes_to_write = 4 * sample; } else if(is_big_endian == is_big_endian_host_ && !is_unsigned_samples && channels == 1 && bps+shift == 16) { - FLAC__int16 *buf1_ = s16buffer; + FLAC__int16 *buf1_ = ubuf.s16buffer; for(sample = 0; sample < wide_samples; sample++) *buf1_++ = (FLAC__int16)buffer[0][sample]; bytes_to_write = 2 * sample; @@ -1128,35 +1176,35 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder if(is_unsigned_samples) { if(channels == 2) { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) { - u16buffer[sample++] = (FLAC__uint16)(buffer[0][wide_sample] + 0x8000); - u16buffer[sample++] = (FLAC__uint16)(buffer[1][wide_sample] + 0x8000); + ubuf.u16buffer[sample++] = (FLAC__uint16)(buffer[0][wide_sample] + 0x8000); + ubuf.u16buffer[sample++] = (FLAC__uint16)(buffer[1][wide_sample] + 0x8000); } } else if(channels == 1) { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) - u16buffer[sample++] = (FLAC__uint16)(buffer[0][wide_sample] + 0x8000); + ubuf.u16buffer[sample++] = (FLAC__uint16)(buffer[0][wide_sample] + 0x8000); } else { /* works for any 'channels' but above flavors are faster for 1 and 2 */ for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) - u16buffer[sample] = (FLAC__uint16)(buffer[channel][wide_sample] + 0x8000); + ubuf.u16buffer[sample] = (FLAC__uint16)(buffer[channel][wide_sample] + 0x8000); } } else { if(channels == 2) { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) { - s16buffer[sample++] = (FLAC__int16)(buffer[0][wide_sample]); - s16buffer[sample++] = (FLAC__int16)(buffer[1][wide_sample]); + ubuf.s16buffer[sample++] = (FLAC__int16)(buffer[0][wide_sample]); + ubuf.s16buffer[sample++] = (FLAC__int16)(buffer[1][wide_sample]); } } else if(channels == 1) { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) - s16buffer[sample++] = (FLAC__int16)(buffer[0][wide_sample]); + ubuf.s16buffer[sample++] = (FLAC__int16)(buffer[0][wide_sample]); } else { /* works for any 'channels' but above flavors are faster for 1 and 2 */ for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) - s16buffer[sample] = (FLAC__int16)(buffer[channel][wide_sample]); + ubuf.s16buffer[sample] = (FLAC__int16)(buffer[channel][wide_sample]); } } if(is_big_endian != is_big_endian_host_) { @@ -1164,9 +1212,9 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder const unsigned bytes = sample * 2; unsigned b; for(b = 0; b < bytes; b += 2) { - tmp = u8buffer[b]; - u8buffer[b] = u8buffer[b+1]; - u8buffer[b+1] = tmp; + tmp = ubuf.u8buffer[b]; + ubuf.u8buffer[b] = ubuf.u8buffer[b+1]; + ubuf.u8buffer[b+1] = tmp; } } bytes_to_write = 2 * sample; @@ -1175,24 +1223,24 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder if(is_unsigned_samples) { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) - u32buffer[sample] = buffer[channel][wide_sample] + 0x800000; + ubuf.u32buffer[sample] = buffer[channel][wide_sample] + 0x800000; } else { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) - s32buffer[sample] = buffer[channel][wide_sample]; + ubuf.s32buffer[sample] = buffer[channel][wide_sample]; } if(is_big_endian != is_big_endian_host_) { unsigned char tmp; const unsigned bytes = sample * 4; unsigned b; for(b = 0; b < bytes; b += 4) { - tmp = u8buffer[b]; - u8buffer[b] = u8buffer[b+3]; - u8buffer[b+3] = tmp; - tmp = u8buffer[b+1]; - u8buffer[b+1] = u8buffer[b+2]; - u8buffer[b+2] = tmp; + tmp = ubuf.u8buffer[b]; + ubuf.u8buffer[b] = ubuf.u8buffer[b+3]; + ubuf.u8buffer[b+3] = tmp; + tmp = ubuf.u8buffer[b+1]; + ubuf.u8buffer[b+1] = ubuf.u8buffer[b+2]; + ubuf.u8buffer[b+2] = tmp; } } if(is_big_endian) { @@ -1200,18 +1248,18 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder const unsigned bytes = sample * 4; for(lbyte = b = 0; b < bytes; ) { b++; - u8buffer[lbyte++] = u8buffer[b++]; - u8buffer[lbyte++] = u8buffer[b++]; - u8buffer[lbyte++] = u8buffer[b++]; + ubuf.u8buffer[lbyte++] = ubuf.u8buffer[b++]; + ubuf.u8buffer[lbyte++] = ubuf.u8buffer[b++]; + ubuf.u8buffer[lbyte++] = ubuf.u8buffer[b++]; } } else { unsigned b, lbyte; const unsigned bytes = sample * 4; for(lbyte = b = 0; b < bytes; ) { - u8buffer[lbyte++] = u8buffer[b++]; - u8buffer[lbyte++] = u8buffer[b++]; - u8buffer[lbyte++] = u8buffer[b++]; + ubuf.u8buffer[lbyte++] = ubuf.u8buffer[b++]; + ubuf.u8buffer[lbyte++] = ubuf.u8buffer[b++]; + ubuf.u8buffer[lbyte++] = ubuf.u8buffer[b++]; b++; } } @@ -1221,12 +1269,12 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder if(is_unsigned_samples) { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) - u8buffer[sample] = (FLAC__uint8)(buffer[channel][wide_sample] + 0x80); + ubuf.u8buffer[sample] = (FLAC__uint8)(buffer[channel][wide_sample] + 0x80); } else { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) - s8buffer[sample] = (FLAC__int8)(buffer[channel][wide_sample]); + ubuf.s8buffer[sample] = (FLAC__int8)(buffer[channel][wide_sample]); } bytes_to_write = sample; } @@ -1239,7 +1287,7 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder } } if(bytes_to_write > 0) { - if(flac__utils_fwrite(u8buffer, 1, bytes_to_write, fout) != bytes_to_write) { + if(flac__utils_fwrite(ubuf.u8buffer, 1, bytes_to_write, fout) != bytes_to_write) { /* if a pipe closed when writing to stdout, we let it go without an error message */ if(errno == EPIPE && decoder_session->fout == stdout) decoder_session->aborting_due_to_until = true; @@ -1414,7 +1462,7 @@ void print_error_with_state(const DecoderSession *d, const char *message) "not able to decode the file. If the version number is not, the file\n" "may be corrupted, or you may have found a bug. In this case please\n" "submit a bug report to\n" - " http://sourceforge.net/bugs/?func=addbug&group_id=13478\n" + " https://sourceforge.net/p/flac/bugs/\n" "Make sure to use the \"Monitor\" feature to monitor the bug status.\n", d->inbasefilename, FLAC__VERSION_STRING ); @@ -1424,12 +1472,7 @@ void print_error_with_state(const DecoderSession *d, const char *message) void print_stats(const DecoderSession *decoder_session) { if(flac__utils_verbosity_ >= 2) { -#if defined _MSC_VER || defined __MINGW32__ - /* with MSVC you have to spoon feed it the casting */ - const double progress = (double)(FLAC__int64)decoder_session->samples_processed / (double)(FLAC__int64)decoder_session->total_samples * 100.0; -#else const double progress = (double)decoder_session->samples_processed / (double)decoder_session->total_samples * 100.0; -#endif if(decoder_session->total_samples > 0) { if ((unsigned)floor(progress + 0.5) == 100) diff --git a/lib-src/libflac/src/flac/decode.h b/lib-src/libflac/src/flac/decode.h index 3ef861da0..3c5c27c70 100644 --- a/lib-src/libflac/src/flac/decode.h +++ b/lib-src/libflac/src/flac/decode.h @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,7 +20,7 @@ #ifndef flac__decode_h #define flac__decode_h -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/flac/encode.c b/lib-src/libflac/src/flac/encode.c index 6f4aed056..4512a72c9 100644 --- a/lib-src/libflac/src/flac/encode.c +++ b/lib-src/libflac/src/flac/encode.c @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -89,7 +89,8 @@ typedef struct { FLAC__uint64 unencoded_size; /* an estimate of the input size, only used in the progress indicator */ FLAC__uint64 bytes_written; FLAC__uint64 samples_written; - unsigned stats_mask; + unsigned stats_frames_interval; + unsigned old_frames_written; SampleInfo info; @@ -108,16 +109,22 @@ typedef struct { FILE *fin; FLAC__StreamMetadata *seek_table_template; + double progress, compression_ratio; } EncoderSession; const int FLAC_ENCODE__DEFAULT_PADDING = 8192; static FLAC__bool is_big_endian_host_; -static unsigned char ucbuffer_[CHUNK_OF_SAMPLES*FLAC__MAX_CHANNELS*((FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE+7)/8)]; -static signed char *scbuffer_ = (signed char *)ucbuffer_; -static FLAC__uint16 *usbuffer_ = (FLAC__uint16 *)ucbuffer_; -static FLAC__int16 *ssbuffer_ = (FLAC__int16 *)ucbuffer_; +static FLAC__int8 static_buffer[CHUNK_OF_SAMPLES*FLAC__MAX_CHANNELS*((FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE+7)/8)]; + +static union { + FLAC__int8 *s8; + FLAC__uint8 *u8; + FLAC__int16 *s16; + FLAC__uint16 *u16; +} ubuffer = { static_buffer }; + static FLAC__int32 in_[FLAC__MAX_CHANNELS][CHUNK_OF_SAMPLES]; static FLAC__int32 *input_[FLAC__MAX_CHANNELS]; @@ -128,7 +135,7 @@ static FLAC__int32 *input_[FLAC__MAX_CHANNELS]; */ static FLAC__bool EncoderSession_construct(EncoderSession *e, encode_options_t options, FLAC__off_t infilesize, FILE *infile, const char *infilename, const char *outfilename, const FLAC__byte *lookahead, unsigned lookahead_length); static void EncoderSession_destroy(EncoderSession *e); -static int EncoderSession_finish_ok(EncoderSession *e, int info_align_carry, int info_align_zero, foreign_metadata_t *foreign_metadata); +static int EncoderSession_finish_ok(EncoderSession *e, int info_align_carry, int info_align_zero, foreign_metadata_t *foreign_metadata, FLAC__bool error_on_compression_fail); static int EncoderSession_finish_error(EncoderSession *e); static FLAC__bool EncoderSession_init_encoder(EncoderSession *e, encode_options_t options); static FLAC__bool EncoderSession_process(EncoderSession *e, const FLAC__int32 * const buffer[], unsigned samples); @@ -426,14 +433,14 @@ static FLAC__bool get_sample_info_wave(EncoderSession *e, encode_options_t optio /* for mono/stereo and unassigned channels, we fake the mask */ if(channel_mask == 0) { if(channels == 1) - channel_mask = 0x0001; + channel_mask = 0x0004; else if(channels == 2) channel_mask = 0x0003; } /* set channel mapping */ /* FLAC order follows SMPTE and WAVEFORMATEXTENSIBLE but with fewer channels, which are: */ - /* front left, front right, center, LFE, back left, back right, surround left, surround right */ - /* the default mapping is sufficient for 1-6 channels and 7-8 are currently unspecified anyway */ + /* front left, front right, front center, LFE, back left, back right, back center, side left, side right */ + /* the default mapping is sufficient for 1-8 channels */ #if 0 /* @@@ example for dolby/vorbis order, for reference later in case it becomes important */ if( @@ -470,7 +477,9 @@ static FLAC__bool get_sample_info_wave(EncoderSession *e, encode_options_t optio #else if( options.channel_map_none || - channel_mask == 0x0001 || /* 1 channel: (mono) */ + channel_mask == 0x0001 || /* 1 channel: front left */ + channel_mask == 0x0002 || /* 1 channel: front right */ + channel_mask == 0x0004 || /* 1 channel: mono or front center */ channel_mask == 0x0003 || /* 2 channels: front left, front right */ channel_mask == 0x0007 || /* 3 channels: front left, front right, front center */ channel_mask == 0x0033 || /* 4 channels: front left, front right, back left, back right */ @@ -486,7 +495,7 @@ static FLAC__bool get_sample_info_wave(EncoderSession *e, encode_options_t optio } #endif else { - flac__utils_printf(stderr, 1, "%s: ERROR: WAVEFORMATEXTENSIBLE chunk with unsupported channel mask=0x%04X\n\nUse --channel-map=none option to store channels in current order; FLAC files\nmust also be decoded with --channel-map=none to restore correct order.\n", e->inbasefilename, (unsigned)channel_mask); + flac__utils_printf(stderr, 1, "%s: ERROR: WAVEFORMATEXTENSIBLE chunk with unsupported channel mask=0x%04X\n\nUse --channel-map=none option to encode the input\n", e->inbasefilename, (unsigned)channel_mask); return false; } if(!options.channel_map_none) { @@ -1102,7 +1111,6 @@ int flac__encode_file(FILE *infile, FLAC__off_t infilesize, const char *infilena encoder_session.fmt.iff.data_bytes -= skip * encoder_session.info.bytes_per_wide_sample; if(options.ignore_chunk_sizes) { encoder_session.total_samples_to_encode = 0; - flac__utils_printf(stderr, 2, "(No runtime statistics possible; please wait for encoding to finish...)\n"); FLAC__ASSERT(0 == until); } else { @@ -1175,8 +1183,10 @@ int flac__encode_file(FILE *infile, FLAC__off_t infilesize, const char *infilena return EncoderSession_finish_error(&encoder_session); } - if(encoder_session.total_samples_to_encode == 0) + if(encoder_session.total_samples_to_encode == 0) { + encoder_session.unencoded_size = 0; flac__utils_printf(stderr, 2, "(No runtime statistics possible; please wait for encoding to finish...)\n"); + } if(options.format == FORMAT_FLAC || options.format == FORMAT_OGGFLAC) encoder_session.fmt.flac.client_data.samples_left_to_process = encoder_session.total_samples_to_encode; @@ -1277,8 +1287,8 @@ int flac__encode_file(FILE *infile, FLAC__off_t infilesize, const char *infilena while(!feof(infile)) { if(lookahead_length > 0) { FLAC__ASSERT(lookahead_length < CHUNK_OF_SAMPLES * encoder_session.info.bytes_per_wide_sample); - memcpy(ucbuffer_, lookahead, lookahead_length); - bytes_read = fread(ucbuffer_+lookahead_length, sizeof(unsigned char), CHUNK_OF_SAMPLES * encoder_session.info.bytes_per_wide_sample - lookahead_length, infile) + lookahead_length; + memcpy(ubuffer.u8, lookahead, lookahead_length); + bytes_read = fread(ubuffer.u8+lookahead_length, sizeof(unsigned char), CHUNK_OF_SAMPLES * encoder_session.info.bytes_per_wide_sample - lookahead_length, infile) + lookahead_length; if(ferror(infile)) { flac__utils_printf(stderr, 1, "%s: ERROR during read\n", encoder_session.inbasefilename); return EncoderSession_finish_error(&encoder_session); @@ -1286,7 +1296,7 @@ int flac__encode_file(FILE *infile, FLAC__off_t infilesize, const char *infilena lookahead_length = 0; } else - bytes_read = fread(ucbuffer_, sizeof(unsigned char), CHUNK_OF_SAMPLES * encoder_session.info.bytes_per_wide_sample, infile); + bytes_read = fread(ubuffer.u8, sizeof(unsigned char), CHUNK_OF_SAMPLES * encoder_session.info.bytes_per_wide_sample, infile); if(bytes_read == 0) { if(ferror(infile)) { @@ -1321,11 +1331,11 @@ int flac__encode_file(FILE *infile, FLAC__off_t infilesize, const char *infilena if(lookahead_length > 0) { FLAC__ASSERT(lookahead_length <= wanted); - memcpy(ucbuffer_, lookahead, lookahead_length); + memcpy(ubuffer.u8, lookahead, lookahead_length); wanted -= lookahead_length; bytes_read = lookahead_length; if(wanted > 0) { - bytes_read += fread(ucbuffer_+lookahead_length, sizeof(unsigned char), wanted, infile); + bytes_read += fread(ubuffer.u8+lookahead_length, sizeof(unsigned char), wanted, infile); if(ferror(infile)) { flac__utils_printf(stderr, 1, "%s: ERROR during read\n", encoder_session.inbasefilename); return EncoderSession_finish_error(&encoder_session); @@ -1334,7 +1344,7 @@ int flac__encode_file(FILE *infile, FLAC__off_t infilesize, const char *infilena lookahead_length = 0; } else - bytes_read = fread(ucbuffer_, sizeof(unsigned char), wanted, infile); + bytes_read = fread(ubuffer.u8, sizeof(unsigned char), wanted, infile); } if(bytes_read == 0) { @@ -1379,7 +1389,7 @@ int flac__encode_file(FILE *infile, FLAC__off_t infilesize, const char *infilena encoder_session.fmt.iff.data_bytes, (FLAC__uint64)CHUNK_OF_SAMPLES * (FLAC__uint64)encoder_session.info.bytes_per_wide_sample ); - size_t bytes_read = fread(ucbuffer_, sizeof(unsigned char), bytes_to_read, infile); + size_t bytes_read = fread(ubuffer.u8, sizeof(unsigned char), bytes_to_read, infile); if(bytes_read == 0) { if(ferror(infile)) { flac__utils_printf(stderr, 1, "%s: ERROR during read\n", encoder_session.inbasefilename); @@ -1464,7 +1474,7 @@ int flac__encode_file(FILE *infile, FLAC__off_t infilesize, const char *infilena if(*options.align_reservoir_samples > 0) { size_t bytes_read; FLAC__ASSERT(CHUNK_OF_SAMPLES >= 588); - bytes_read = fread(ucbuffer_, sizeof(unsigned char), (*options.align_reservoir_samples) * encoder_session.info.bytes_per_wide_sample, infile); + bytes_read = fread(ubuffer.u8, sizeof(unsigned char), (*options.align_reservoir_samples) * encoder_session.info.bytes_per_wide_sample, infile); if(bytes_read == 0 && ferror(infile)) { flac__utils_printf(stderr, 1, "%s: ERROR during read\n", encoder_session.inbasefilename); return EncoderSession_finish_error(&encoder_session); @@ -1488,7 +1498,8 @@ int flac__encode_file(FILE *infile, FLAC__off_t infilesize, const char *infilena &encoder_session, info_align_carry, info_align_zero, - EncoderSession_format_is_iff(&encoder_session)? options.format_options.iff.foreign_metadata : 0 + EncoderSession_format_is_iff(&encoder_session)? options.format_options.iff.foreign_metadata : 0, + options.error_on_compression_fail ); } @@ -1529,7 +1540,8 @@ FLAC__bool EncoderSession_construct(EncoderSession *e, encode_options_t options, e->unencoded_size = 0; e->bytes_written = 0; e->samples_written = 0; - e->stats_mask = 0; + e->stats_frames_interval = 0; + e->old_frames_written = 0; memset(&e->info, 0, sizeof(e->info)); @@ -1607,7 +1619,7 @@ void EncoderSession_destroy(EncoderSession *e) } } -int EncoderSession_finish_ok(EncoderSession *e, int info_align_carry, int info_align_zero, foreign_metadata_t *foreign_metadata) +int EncoderSession_finish_ok(EncoderSession *e, int info_align_carry, int info_align_zero, foreign_metadata_t *foreign_metadata, FLAC__bool error_on_compression_fail) { FLAC__StreamEncoderState fse_state = FLAC__STREAM_ENCODER_OK; int ret = 0; @@ -1651,6 +1663,18 @@ int EncoderSession_finish_ok(EncoderSession *e, int info_align_carry, int info_a } } + if (e->compression_ratio >= 1.0) { + flac__utils_printf(stderr, 1, + "FAILURE: Compression failed (ratio %0.3f, should be < 1.0).\n" + "This happens for some files for one or more of the following reasons:\n" + " * Recompressing an existing FLAC from a higher to a lower compression setting.\n" + " * Insufficient input data (eg, very short files, < 10000 frames).\n" + " * The audio data is not compressable (eg a full range white noise signal).\n" + , e->compression_ratio); + if (error_on_compression_fail) + ret = 1; + } + EncoderSession_destroy(e); return ret; @@ -1973,6 +1997,8 @@ FLAC__bool EncoderSession_init_encoder(EncoderSession *e, encode_options_t optio p = options.padding; if(p < 0) p = e->total_samples_to_encode / sample_rate < 20*60? FLAC_ENCODE__DEFAULT_PADDING : FLAC_ENCODE__DEFAULT_PADDING*8; + if(p > 0) + p += (e->replay_gain ? GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED : 0); if(options.padding != 0) { if(p > 0 && flac_decoder_data->num_metadata_blocks < sizeof(flac_decoder_data->metadata_blocks)/sizeof(flac_decoder_data->metadata_blocks[0])) { flac_decoder_data->metadata_blocks[flac_decoder_data->num_metadata_blocks] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING); @@ -2029,7 +2055,7 @@ FLAC__bool EncoderSession_init_encoder(EncoderSession *e, encode_options_t optio if(options.padding != 0) { padding.is_last = false; /* the encoder will set this for us */ padding.type = FLAC__METADATA_TYPE_PADDING; - padding.length = (unsigned)(options.padding>0? options.padding : (e->total_samples_to_encode / sample_rate < 20*60? FLAC_ENCODE__DEFAULT_PADDING : FLAC_ENCODE__DEFAULT_PADDING*8)); + padding.length = (unsigned)(options.padding>0? options.padding : (e->total_samples_to_encode / sample_rate < 20*60? FLAC_ENCODE__DEFAULT_PADDING : FLAC_ENCODE__DEFAULT_PADDING*8)) + (e->replay_gain ? GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED : 0); static_metadata_append(&static_metadata, &padding, /*needs_delete=*/false); } metadata = static_metadata.metadata; @@ -2142,10 +2168,10 @@ FLAC__bool EncoderSession_init_encoder(EncoderSession *e, encode_options_t optio else e->outputfile_opened = true; - e->stats_mask = - (FLAC__stream_encoder_get_do_exhaustive_model_search(e->encoder) && FLAC__stream_encoder_get_do_qlp_coeff_prec_search(e->encoder))? 0x07 : - (FLAC__stream_encoder_get_do_exhaustive_model_search(e->encoder) || FLAC__stream_encoder_get_do_qlp_coeff_prec_search(e->encoder))? 0x0f : - 0x3f; + e->stats_frames_interval = + (FLAC__stream_encoder_get_do_exhaustive_model_search(e->encoder) && FLAC__stream_encoder_get_do_qlp_coeff_prec_search(e->encoder))? 0x1f : + (FLAC__stream_encoder_get_do_exhaustive_model_search(e->encoder) || FLAC__stream_encoder_get_do_qlp_coeff_prec_search(e->encoder))? 0x3f : + 0xff; static_metadata_clear(&static_metadata); @@ -2336,12 +2362,12 @@ FLAC__bool format_input(FLAC__int32 *dest[], unsigned wide_samples, FLAC__bool i if(is_unsigned_samples) { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) - out[channel][wide_sample] = (FLAC__int32)ucbuffer_[sample] - 0x80; + out[channel][wide_sample] = (FLAC__int32)ubuffer.u8[sample] - 0x80; } else { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) - out[channel][wide_sample] = (FLAC__int32)scbuffer_[sample]; + out[channel][wide_sample] = (FLAC__int32)ubuffer.s8[sample]; } } else if(bps == 16) { @@ -2350,20 +2376,20 @@ FLAC__bool format_input(FLAC__int32 *dest[], unsigned wide_samples, FLAC__bool i const unsigned bytes = wide_samples * channels * (bps >> 3); unsigned b; for(b = 0; b < bytes; b += 2) { - tmp = ucbuffer_[b]; - ucbuffer_[b] = ucbuffer_[b+1]; - ucbuffer_[b+1] = tmp; + tmp = ubuffer.u8[b]; + ubuffer.u8[b] = ubuffer.u8[b+1]; + ubuffer.u8[b+1] = tmp; } } if(is_unsigned_samples) { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) - out[channel][wide_sample] = (FLAC__int32)usbuffer_[sample] - 0x8000; + out[channel][wide_sample] = ubuffer.u16[sample] - 0x8000; } else { for(sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) - out[channel][wide_sample] = (FLAC__int32)ssbuffer_[sample]; + out[channel][wide_sample] = ubuffer.s16[sample]; } } else if(bps == 24) { @@ -2372,28 +2398,32 @@ FLAC__bool format_input(FLAC__int32 *dest[], unsigned wide_samples, FLAC__bool i const unsigned bytes = wide_samples * channels * (bps >> 3); unsigned b; for(b = 0; b < bytes; b += 3) { - tmp = ucbuffer_[b]; - ucbuffer_[b] = ucbuffer_[b+2]; - ucbuffer_[b+2] = tmp; + tmp = ubuffer.u8[b]; + ubuffer.u8[b] = ubuffer.u8[b+2]; + ubuffer.u8[b+2] = tmp; } } if(is_unsigned_samples) { unsigned b; for(b = sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) { - out[channel][wide_sample] = ucbuffer_[b++]; out[channel][wide_sample] <<= 8; - out[channel][wide_sample] |= ucbuffer_[b++]; out[channel][wide_sample] <<= 8; - out[channel][wide_sample] |= ucbuffer_[b++]; - out[channel][wide_sample] -= 0x800000; + FLAC__int32 t; + t = ubuffer.u8[b++]; t <<= 8; + t |= ubuffer.u8[b++]; t <<= 8; + t |= ubuffer.u8[b++]; + t -= 0x800000; + out[channel][wide_sample] = t; } } else { unsigned b; for(b = sample = wide_sample = 0; wide_sample < wide_samples; wide_sample++) for(channel = 0; channel < channels; channel++, sample++) { - out[channel][wide_sample] = scbuffer_[b++]; out[channel][wide_sample] <<= 8; - out[channel][wide_sample] |= ucbuffer_[b++]; out[channel][wide_sample] <<= 8; - out[channel][wide_sample] |= ucbuffer_[b++]; + FLAC__int32 t; + t = ubuffer.s8[b++]; t <<= 8; + t |= ubuffer.u8[b++]; t <<= 8; + t |= ubuffer.u8[b++]; + out[channel][wide_sample] = t; } } } @@ -2418,13 +2448,20 @@ void encoder_progress_callback(const FLAC__StreamEncoder *encoder, FLAC__uint64 { EncoderSession *e = (EncoderSession*)client_data; + const FLAC__uint64 uesize = e->unencoded_size; + + e->progress = e->total_samples_to_encode ? (double)samples_written / (double)e->total_samples_to_encode : 0; + e->compression_ratio = (e->progress && uesize) ? (double)e->bytes_written / ((double)uesize * min(1.0, e->progress)) : 0; + (void)encoder, (void)total_frames_estimate; e->bytes_written = bytes_written; e->samples_written = samples_written; - if(e->total_samples_to_encode > 0 && !((frames_written-1) & e->stats_mask)) + if(e->total_samples_to_encode > 0 && frames_written - e->old_frames_written > e->stats_frames_interval) { print_stats(e); + e->old_frames_written = frames_written; + } } FLAC__StreamDecoderReadStatus flac_decoder_read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) @@ -2599,26 +2636,19 @@ FLAC__bool parse_cuesheet(FLAC__StreamMetadata **cuesheet, const char *cuesheet_ return true; } -void print_stats(const EncoderSession *encoder_session) +static void print_stats(const EncoderSession *encoder_session) { if(flac__utils_verbosity_ >= 2) { - const FLAC__uint64 samples_written = min(encoder_session->total_samples_to_encode, encoder_session->samples_written); - const FLAC__uint64 uesize = encoder_session->unencoded_size; -#if defined _MSC_VER || defined __MINGW32__ - /* with MSVC you have to spoon feed it the casting */ - const double progress = (double)(FLAC__int64)samples_written / (double)(FLAC__int64)encoder_session->total_samples_to_encode; - const double ratio = (double)(FLAC__int64)encoder_session->bytes_written / ((double)(FLAC__int64)(uesize? uesize:1) * min(1.0, progress)); -#else - const double progress = (double)samples_written / (double)encoder_session->total_samples_to_encode; - const double ratio = (double)encoder_session->bytes_written / ((double)(uesize? uesize:1) * min(1.0, progress)); -#endif char ratiostr[16]; FLAC__ASSERT(encoder_session->total_samples_to_encode > 0); - if (uesize) flac_snprintf(ratiostr, sizeof(ratiostr), "%0.3f", ratio); else flac_snprintf(ratiostr, sizeof(ratiostr), "N/A"); + if (encoder_session->compression_ratio > 0.0) + flac_snprintf(ratiostr, sizeof(ratiostr), "%0.3f", encoder_session->compression_ratio); + else + flac_snprintf(ratiostr, sizeof(ratiostr), "N/A"); - if(samples_written == encoder_session->total_samples_to_encode) { + if(encoder_session->samples_written == encoder_session->total_samples_to_encode) { stats_print_name(2, encoder_session->inbasefilename); stats_print_info(2, "%swrote %" PRIu64 " bytes, ratio=%s", encoder_session->verify? "Verify OK, " : "", @@ -2628,7 +2658,7 @@ void print_stats(const EncoderSession *encoder_session) } else { stats_print_name(2, encoder_session->inbasefilename); - stats_print_info(2, "%u%% complete, ratio=%s", (unsigned)floor(progress * 100.0 + 0.5), ratiostr); + stats_print_info(2, "%u%% complete, ratio=%s", (unsigned)floor(encoder_session->progress * 100.0 + 0.5), ratiostr); } } } @@ -2669,7 +2699,7 @@ void print_error_with_init_status(const EncoderSession *e, const char *message, "The encoding parameters specified do not conform to the FLAC Subset and may not\n" "be streamable or playable in hardware devices. If you really understand the\n" "consequences, you can add --lax to the command-line options to encode with\n" - "these parameters anyway. See http://flac.sourceforge.net/format.html#subset\n" + "these parameters anyway. See http://xiph.org/flac/format.html#subset\n" ); } } @@ -2712,10 +2742,10 @@ void print_verify_error(EncoderSession *e) flac__utils_printf(stderr, 1, " and repeat the flac command exactly as before. If it does not give a\n"); flac__utils_printf(stderr, 1, " verify error in the exact same place each time you try it, then there is\n"); flac__utils_printf(stderr, 1, " a problem with your hardware; please see the FAQ:\n"); - flac__utils_printf(stderr, 1, " http://flac.sourceforge.net/faq.html#tools__hardware_prob\n"); + flac__utils_printf(stderr, 1, " http://xiph.org/flac/faq.html#tools__hardware_prob\n"); flac__utils_printf(stderr, 1, " If it does fail in the exact same place every time, keep\n"); flac__utils_printf(stderr, 1, " %s and submit a bug report to:\n", e->outfilename); - flac__utils_printf(stderr, 1, " https://sourceforge.net/bugs/?func=addbug&group_id=13478\n"); + flac__utils_printf(stderr, 1, " https://sourceforge.net/p/flac/bugs/\n"); flac__utils_printf(stderr, 1, " Make sure to upload the FLAC file and use the \"Monitor\" feature to\n"); flac__utils_printf(stderr, 1, " monitor the bug status.\n"); flac__utils_printf(stderr, 1, "Verify FAILED! Do not trust %s\n", e->outfilename); diff --git a/lib-src/libflac/src/flac/encode.h b/lib-src/libflac/src/flac/encode.h index 63769c8ab..d279a6104 100644 --- a/lib-src/libflac/src/flac/encode.h +++ b/lib-src/libflac/src/flac/encode.h @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,7 +20,7 @@ #ifndef flac__encode_h #define flac__encode_h -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -84,6 +84,7 @@ typedef struct { FLAC__bool replay_gain; FLAC__bool ignore_chunk_sizes; FLAC__bool sector_align; + FLAC__bool error_on_compression_fail; FLAC__StreamMetadata *vorbis_comment; FLAC__StreamMetadata *pictures[64]; diff --git a/lib-src/libflac/src/flac/flac.vcproj b/lib-src/libflac/src/flac/flac.vcproj index d0d50321f..ace4e3c4c 100644 --- a/lib-src/libflac/src/flac/flac.vcproj +++ b/lib-src/libflac/src/flac/flac.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc7d-c215-11db-8314-0800200c9a66} + flac + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + + + + + + + + + + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbc80-c215-11db-8314-0800200c9a66} + false + + + {4cefbc81-c215-11db-8314-0800200c9a66} + false + + + {4cefbc89-c215-11db-8314-0800200c9a66} + false + + + {4cefbc8a-c215-11db-8314-0800200c9a66} + false + + + {4cefbc92-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/flac/flac.vcxproj.filters b/lib-src/libflac/src/flac/flac.vcxproj.filters new file mode 100644 index 000000000..c46ad4cb2 --- /dev/null +++ b/lib-src/libflac/src/flac/flac.vcxproj.filters @@ -0,0 +1,62 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/flac/foreign_metadata.c b/lib-src/libflac/src/flac/foreign_metadata.c index 38248d81b..8afe69406 100644 --- a/lib-src/libflac/src/flac/foreign_metadata.c +++ b/lib-src/libflac/src/flac/foreign_metadata.c @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/flac/foreign_metadata.h b/lib-src/libflac/src/flac/foreign_metadata.h index 75c3fec1a..ebe23603a 100644 --- a/lib-src/libflac/src/flac/foreign_metadata.h +++ b/lib-src/libflac/src/flac/foreign_metadata.h @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,7 +20,7 @@ #ifndef flac__foreign_metadata_h #define flac__foreign_metadata_h -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/flac/iffscan.c b/lib-src/libflac/src/flac/iffscan.c index c2790719e..d0feff10c 100644 --- a/lib-src/libflac/src/flac/iffscan.c +++ b/lib-src/libflac/src/flac/iffscan.c @@ -1,6 +1,6 @@ /* iffscan - Simple AIFF/RIFF chunk scanner * Copyright (C) 2007-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) #ifdef _WIN32 if (get_utf8_argv(&argc, &argv) != 0) { - fprintf(stderr, "%ERROR: failed to convert command line parameters to UTF-8\n"); + fprintf(stderr, "ERROR: failed to convert command line parameters to UTF-8\n"); return 1; } #endif diff --git a/lib-src/libflac/src/flac/iffscan.vcproj b/lib-src/libflac/src/flac/iffscan.vcproj index 3153029e4..f1b7520f1 100644 --- a/lib-src/libflac/src/flac/iffscan.vcproj +++ b/lib-src/libflac/src/flac/iffscan.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc94-c215-11db-8314-0800200c9a66} + iffscan + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + $(Configuration)_iffscan\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + $(Platform)\$(Configuration)_iffscan\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + $(Configuration)_iffscan\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + $(Platform)\$(Configuration)_iffscan\ + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/flac/iffscan.vcxproj.filters b/lib-src/libflac/src/flac/iffscan.vcxproj.filters new file mode 100644 index 000000000..0636239ef --- /dev/null +++ b/lib-src/libflac/src/flac/iffscan.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {93995380-89BD-4b04-88EB-6E5FBE522BFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2D32A752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/flac/local_string_utils.c b/lib-src/libflac/src/flac/local_string_utils.c index d0f8ed349..7e252334a 100644 --- a/lib-src/libflac/src/flac/local_string_utils.c +++ b/lib-src/libflac/src/flac/local_string_utils.c @@ -1,7 +1,7 @@ /* flac - Command-line FLAC encoder/decoder */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/flac/local_string_utils.h b/lib-src/libflac/src/flac/local_string_utils.h index 8184b5146..84810527f 100644 --- a/lib-src/libflac/src/flac/local_string_utils.h +++ b/lib-src/libflac/src/flac/local_string_utils.h @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/flac/main.c b/lib-src/libflac/src/flac/main.c index 39a2514dd..d1e018bf9 100644 --- a/lib-src/libflac/src/flac/main.c +++ b/lib-src/libflac/src/flac/main.c @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -46,12 +46,6 @@ #include "utils.h" #include "vorbiscomment.h" -#if defined _MSC_VER || defined __MINGW32__ -#define FLAC__STRCASECMP stricmp -#else -#define FLAC__STRCASECMP strcasecmp -#endif - #if 0 /*[JEC] was:#if HAVE_GETOPT_LONG*/ /*[JEC] see flac/include/share/getopt.h as to why the change */ @@ -173,6 +167,7 @@ static struct share__option long_options_[] = { { "sample-rate" , share__required_argument, 0, 0 }, { "sign" , share__required_argument, 0, 0 }, { "input-size" , share__required_argument, 0, 0 }, + { "error-on-compression-fail" , share__no_argument, 0, 0 }, /* * analysis options @@ -207,6 +202,7 @@ static struct share__option long_options_[] = { { "no-warnings-as-errors" , share__no_argument, 0, 0 }, { "no-residual-gnuplot" , share__no_argument, 0, 0 }, { "no-residual-text" , share__no_argument, 0, 0 }, + { "no-error-on-compression-fail", share__no_argument, 0, 0 }, /* * undocumented debugging options for the test suite */ @@ -271,6 +267,7 @@ static struct { const char *cuesheet_filename; FLAC__bool cued_seekpoints; FLAC__bool channel_map_none; /* --channel-map=none specified, eventually will expand to take actual channel map */ + FLAC__bool error_on_compression_fail; unsigned num_files; char **filenames; @@ -313,7 +310,20 @@ int main(int argc, char *argv[]) #endif srand((unsigned)time(0)); +#ifdef _WIN32 + { + const char *var; + var = getenv("LC_ALL"); + if (!var) + var = getenv("LC_NUMERIC"); + if (!var) + var = getenv("LANG"); + if (!var || strcmp(var, "C") != 0) + setlocale(LC_ALL, ""); + } +#else setlocale(LC_ALL, ""); +#endif if(!init_options()) { flac__utils_printf(stderr, 1, "ERROR: allocating memory\n"); retval = 1; @@ -440,20 +450,11 @@ int do_it(void) return usage_error("ERROR: --replay-gain can only be done with mono/stereo input\n"); if(option_values.format_sample_rate >= 0 && !grabbag__replaygain_is_valid_sample_frequency(option_values.format_sample_rate)) return usage_error("ERROR: invalid sample rate used with --replay-gain\n"); - /* - * We want to reserve padding space for the ReplayGain - * tags that we will set later, to avoid rewriting the - * whole file. - */ if( (option_values.padding >= 0 && option_values.padding < (int)GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED) || (option_values.padding < 0 && FLAC_ENCODE__DEFAULT_PADDING < (int)GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED) ) { flac__utils_printf(stderr, 1, "NOTE: --replay-gain may leave a small PADDING block even with --no-padding\n"); - option_values.padding = GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED; - } - else { - option_values.padding += GRABBAG__REPLAYGAIN_MAX_TAG_SPACE_REQUIRED; } } if(option_values.num_files > 1 && option_values.cmdline_forced_outfilename) { @@ -478,7 +479,7 @@ int do_it(void) } flac__utils_printf(stderr, 2, "\n"); - flac__utils_printf(stderr, 2, "flac %s, Copyright (C) 2000-2009, 2011-2013 Josh Coalson & Xiph.Org Foundation\n", FLAC__VERSION_STRING); + flac__utils_printf(stderr, 2, "flac %s, Copyright (C) 2000-2009 Josh Coalson, 2011-2014 Xiph.Org Foundation\n", FLAC__VERSION_STRING); flac__utils_printf(stderr, 2, "flac comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"); flac__utils_printf(stderr, 2, "welcome to redistribute it under certain conditions. Type `flac' for details.\n\n"); @@ -594,6 +595,7 @@ FLAC__bool init_options(void) option_values.cuesheet_filename = 0; option_values.cued_seekpoints = true; option_values.channel_map_none = false; + option_values.error_on_compression_fail = false; option_values.num_files = 0; option_values.filenames = 0; @@ -908,6 +910,12 @@ int parse_option(int short_option, const char *long_option, const char *option_a else if(0 == strcmp(long_option, "no-md5-sum")) { option_values.debug.do_md5 = false; } + else if(0 == strcmp(long_option, "no-error-on-compression-fail")) { + option_values.error_on_compression_fail = false; + } + else if(0 == strcmp(long_option, "error-on-compression-fail")) { + option_values.error_on_compression_fail = true; + } } else { switch(short_option) { @@ -1159,7 +1167,7 @@ static void usage_header(void) printf("===============================================================================\n"); printf("flac - Command-line FLAC encoder/decoder version %s\n", FLAC__VERSION_STRING); printf("Copyright (C) 2000-2009 Josh Coalson\n"); - printf("Copyright (C) 2011-2013 Xiph.Org Foundation\n"); + printf("Copyright (C) 2011-2014 Xiph.Org Foundation\n"); printf("\n"); printf("This program is free software; you can redistribute it and/or\n"); printf("modify it under the terms of the GNU General Public License\n"); @@ -1187,7 +1195,7 @@ static void usage_summary(void) printf("Analyzing: flac -a [] [] [FLACFILE [...]]\n"); printf("\n"); printf("Be sure to read the list of known bugs at:\n"); - printf("http://flac.sourceforge.net/documentation_bugs.html\n"); + printf("http://xiph.org/flac/documentation_bugs.html\n"); printf("\n"); } @@ -1199,7 +1207,7 @@ void short_usage(void) printf("instructions use 'flac --explain'\n"); printf("\n"); printf("Be sure to read the list of known bugs at:\n"); - printf("http://flac.sourceforge.net/documentation_bugs.html\n"); + printf("http://xiph.org/flac/documentation_bugs.html\n"); printf("\n"); printf("To encode:\n"); printf(" flac [-#] [INPUTFILE [...]]\n"); @@ -1266,8 +1274,11 @@ void show_help(void) printf(" -4, --compression-level-4 Synonymous with -l 8 -b 4096 -M -r 4\n"); printf(" -5, --compression-level-5 Synonymous with -l 8 -b 4096 -m -r 5\n"); printf(" -6, --compression-level-6 Synonymous with -l 8 -b 4096 -m -r 6\n"); - printf(" -7, --compression-level-7 Synonymous with -l 8 -b 4096 -m -e -r 6\n"); - printf(" -8, --compression-level-8, --best Synonymous with -l 12 -b 4096 -m -e -r 6\n"); + printf(" -A tukey(0.5) -A partial_tukey(2)\n"); + printf(" -7, --compression-level-7 Synonymous with -l 12 -b 4096 -m -r 6\n"); + printf(" -A tukey(0.5) -A partial_tukey(2)\n"); + printf(" -8, --compression-level-8, --best Synonymous with -l 12 -b 4096 -m -r 6\n"); + printf(" -A tukey(0.5) -A partial_tukey(2) -A punchout_tukey(3)\n"); printf(" -b, --blocksize=# Specify blocksize in samples\n"); printf(" -m, --mid-side Try mid-side coding for each frame\n"); printf(" -M, --adaptive-mid-side Adaptive mid-side coding for all frames\n"); @@ -1278,21 +1289,23 @@ void show_help(void) printf(" -q, --qlp-coeff-precision=# Specify precision in bits\n"); printf(" -r, --rice-partition-order=[#,]# Set [min,]max residual partition order\n"); printf("format options:\n"); + printf(" --force-raw-format Treat input or output as raw samples\n"); + printf(" --force-aiff-format Force decoding to AIFF format\n"); + printf(" --force-rf64-format Force decoding to RF64 format\n"); + printf(" --force-wave64-format Force decoding to Wave64 format\n"); + printf("raw format options:\n"); printf(" --endian={big|little} Set byte order for samples\n"); printf(" --channels=# Number of channels\n"); printf(" --bps=# Number of bits per sample\n"); printf(" --sample-rate=# Sample rate in Hz\n"); printf(" --sign={signed|unsigned} Sign of samples\n"); printf(" --input-size=# Size of the raw input in bytes\n"); - printf(" --force-raw-format Treat input or output as raw samples\n"); - printf(" --force-aiff-format Force decoding to AIFF format\n"); - printf(" --force-rf64-format Force decoding to RF64 format\n"); - printf(" --force-wave64-format Force decoding to Wave64 format\n"); printf("negative options:\n"); printf(" --no-adaptive-mid-side\n"); printf(" --no-cued-seekpoints\n"); printf(" --no-decode-through-errors\n"); printf(" --no-delete-input-file\n"); + printf(" --no-error-on-compression-fail\n"); printf(" --no-preserve-modtime\n"); printf(" --no-keep-foreign-metadata\n"); printf(" --no-exhaustive-model-search\n"); @@ -1445,11 +1458,9 @@ void show_explain(void) printf(" output in parallel and comparing to the\n"); printf(" original\n"); printf(" --lax Allow encoder to generate non-Subset files\n"); -#if 0 /*@@@ currently undocumented */ printf(" --ignore-chunk-sizes Ignore data chunk sizes in WAVE/AIFF files;\n"); printf(" useful when piping data from programs which\n"); printf(" generate bogus data chunk sizes.\n"); -#endif printf(" --sector-align Align encoding of multiple CD format WAVE files\n"); printf(" on sector boundaries. This option is DEPRECATED\n"); printf(" and may not exist in future versions of flac.\n"); @@ -1569,8 +1580,11 @@ void show_explain(void) printf(" -5, --compression-level-5 Synonymous with -l 8 -b 4096 -m -r 5\n"); printf(" -5 is the default setting\n"); printf(" -6, --compression-level-6 Synonymous with -l 8 -b 4096 -m -r 6\n"); - printf(" -7, --compression-level-7 Synonymous with -l 8 -b 4096 -m -e -r 6\n"); - printf(" -8, --compression-level-8, --best Synonymous with -l 12 -b 4096 -m -e -r 6\n"); + printf(" -A tukey(0.5) -A partial_tukey(2)\n"); + printf(" -7, --compression-level-7 Synonymous with -l 12 -b 4096 -m -r 6\n"); + printf(" -A tukey(0.5) -A partial_tukey(2)\n"); + printf(" -8, --compression-level-8, --best Synonymous with -l 12 -b 4096 -m -r 6\n"); + printf(" -A tukey(0.5) -A partial_tukey(2) -A punchout_tukey(3)\n"); printf(" -m, --mid-side Try mid-side coding for each frame\n"); printf(" (stereo only)\n"); printf(" -M, --adaptive-mid-side Adaptive mid-side coding for all frames\n"); @@ -1581,12 +1595,12 @@ void show_explain(void) printf(" blackman, blackman_harris_4term_92db,\n"); printf(" connes, flattop, gauss(STDDEV), hamming,\n"); printf(" hann, kaiser_bessel, nuttall, rectangle,\n"); - printf(" triangle, tukey(P), welch. More than one\n"); - printf(" may be specified but encoding time is a\n"); - printf(" multiple of the number of functions since\n"); - printf(" they are each tried in turn. The encoder\n"); - printf(" chooses suitable defaults in the absence\n"); - printf(" of any -A options.\n"); + printf(" triangle, tukey(P), welch, partial_tukey(n),\n"); + printf(" punchout_tukey(n). More than one may be\n"); + printf(" specified but encoding time is a multiple of\n"); + printf(" the number of functions since they are each\n"); + printf(" tried in turn. The encoder chooses suitable\n"); + printf(" defaults in the absence of any -A options.\n"); printf(" -l, --max-lpc-order=# Max LPC order; 0 => only fixed predictors.\n"); printf(" Must be <= 12 for Subset streams if sample\n"); printf(" rate is <=48kHz.\n"); @@ -1602,20 +1616,6 @@ void show_explain(void) printf(" default is -r 0; above 4 doesn't usually\n"); printf(" help much)\n"); printf("format options:\n"); - printf(" --endian={big|little} Set byte order for samples\n"); - printf(" --channels=# Number of channels\n"); - printf(" --bps=# Number of bits per sample\n"); - printf(" --sample-rate=# Sample rate in Hz\n"); - printf(" --sign={signed|unsigned} Sign of samples (the default is signed)\n"); - printf(" --input-size=# Size of the raw input in bytes. If you are\n"); - printf(" encoding raw samples from stdin, you must set\n"); - printf(" this option in order to be able to use --skip,\n"); - printf(" --until, --cuesheet, or other options that need\n"); - printf(" to know the size of the input beforehand. If\n"); - printf(" the size given is greater than what is found in\n"); - printf(" the input stream, the encoder will complain\n"); - printf(" about an unexpected end-of-file. If the size\n"); - printf(" given is less, samples will be truncated.\n"); printf(" --force-raw-format Force input (when encoding) or output (when\n"); printf(" decoding) to be treated as raw samples\n"); printf(" --force-aiff-format Force the decoder to output AIFF format. This\n"); @@ -1633,6 +1633,21 @@ void show_explain(void) printf(" set by -o) ends with .w64; this option\n"); printf(" has no effect when encoding since input Wave64 is\n"); printf(" auto-detected.\n"); + printf("raw format options:\n"); + printf(" --endian={big|little} Set byte order for samples\n"); + printf(" --channels=# Number of channels\n"); + printf(" --bps=# Number of bits per sample\n"); + printf(" --sample-rate=# Sample rate in Hz\n"); + printf(" --sign={signed|unsigned} Sign of samples (the default is signed)\n"); + printf(" --input-size=# Size of the raw input in bytes. If you are\n"); + printf(" encoding raw samples from stdin, you must set\n"); + printf(" this option in order to be able to use --skip,\n"); + printf(" --until, --cuesheet, or other options that need\n"); + printf(" to know the size of the input beforehand. If\n"); + printf(" the size given is greater than what is found in\n"); + printf(" the input stream, the encoder will complain\n"); + printf(" about an unexpected end-of-file. If the size\n"); + printf(" given is less, samples will be truncated.\n"); printf("negative options:\n"); printf(" --no-adaptive-mid-side\n"); printf(" --no-cued-seekpoints\n"); @@ -1650,9 +1665,7 @@ void show_explain(void) printf(" --no-qlp-coeff-prec-search\n"); printf(" --no-residual-gnuplot\n"); printf(" --no-residual-text\n"); -#if 0 /*@@@ currently undocumented */ printf(" --no-ignore-chunk-sizes\n"); -#endif printf(" --no-sector-align\n"); printf(" --no-seektable\n"); printf(" --no-silent\n"); @@ -1838,6 +1851,12 @@ int encode_file(const char *infilename, FLAC__bool is_first_file, FLAC__bool is_ return usage_error("ERROR: for encoding a raw file you must specify a value for --endian, --sign, --channels, --bps, and --sample-rate\n"); } } + else { + if(option_values.format_is_big_endian >= 0 || option_values.format_is_unsigned_samples >= 0 || option_values.format_channels >= 0 || option_values.format_bps >= 0 || option_values.format_sample_rate >= 0) { + conditional_fclose(encode_infile); + return usage_error("ERROR: raw format options (--endian, --sign, --channels, --bps, and --sample-rate) are not allowed for non-raw input\n"); + } + } if(option_values.force_to_stdout) { if(option_values.replay_gain) { @@ -1901,6 +1920,7 @@ int encode_file(const char *infilename, FLAC__bool is_first_file, FLAC__bool is_ encode_options.debug.disable_fixed_subframes = option_values.debug.disable_fixed_subframes; encode_options.debug.disable_verbatim_subframes = option_values.debug.disable_verbatim_subframes; encode_options.debug.do_md5 = option_values.debug.do_md5; + encode_options.error_on_compression_fail = option_values.error_on_compression_fail; /* if infilename and outfilename point to the same file, we need to write to a temporary file */ if(encode_infile != stdin && grabbag__file_are_same(infilename, outfilename)) { diff --git a/lib-src/libflac/src/flac/utils.c b/lib-src/libflac/src/flac/utils.c index 9e08bf4a9..2fab29e2d 100644 --- a/lib-src/libflac/src/flac/utils.c +++ b/lib-src/libflac/src/flac/utils.c @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -176,17 +176,20 @@ static int console_chars_left; int get_console_width(void) { - int width = 80; + int width = 0; #if defined _WIN32 width = win_get_console_width(); #elif defined __EMX__ int s[2]; _scrsize (s); width = s[0]; -#elif !defined __ANDROID__ +#elif defined GWINSZ_IN_SYS_IOCTL struct winsize w; - if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1) width = w.ws_col; + if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1) + width = w.ws_col; #endif + if (width <= 0) + width = 80; return width; } @@ -244,12 +247,8 @@ void stats_print_info(int level, const char *format, ...) if (flac__utils_verbosity_ >= level) { va_list args; va_start(args, format); - len = vsnprintf(tmp, sizeof(tmp), format, args); + len = flac_vsnprintf(tmp, sizeof(tmp), format, args); va_end(args); - if (len < 0 || len == sizeof(tmp)) { - tmp[sizeof(tmp)-1] = '\0'; - len = sizeof(tmp)-1; - } stats_clear(); if (len >= console_chars_left) { clear_len = console_chars_left; @@ -258,6 +257,7 @@ void stats_print_info(int level, const char *format, ...) console_chars_left = console_width; } stats_char_count = fprintf(stderr, "%s", tmp); + fflush(stderr); } } @@ -387,7 +387,7 @@ FLAC__bool flac__utils_set_channel_mask_tag(FLAC__StreamMetadata *object, FLAC__ FLAC__ASSERT(object); FLAC__ASSERT(object->type == FLAC__METADATA_TYPE_VORBIS_COMMENT); - FLAC__ASSERT(strlen(CHANNEL_MASK_TAG+1+2+16+1) <= sizeof(tag)); /* +1 for =, +2 for 0x, +16 for digits, +1 for NUL */ + FLAC__ASSERT(strlen(CHANNEL_MASK_TAG)+1+2+16+1 <= sizeof(tag)); /* +1 for =, +2 for 0x, +16 for digits, +1 for NUL */ entry.entry = (FLAC__byte*)tag; if((entry.length = flac_snprintf(tag, sizeof(tag), "%s=0x%04X", CHANNEL_MASK_TAG, (unsigned)channel_mask)) >= sizeof(tag)) return false; diff --git a/lib-src/libflac/src/flac/utils.h b/lib-src/libflac/src/flac/utils.h index 78a257f24..165170a31 100644 --- a/lib-src/libflac/src/flac/utils.h +++ b/lib-src/libflac/src/flac/utils.h @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,7 +20,7 @@ #ifndef flac__utils_h #define flac__utils_h -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/flac/vorbiscomment.c b/lib-src/libflac/src/flac/vorbiscomment.c index 37892cb0a..27c6e9169 100644 --- a/lib-src/libflac/src/flac/vorbiscomment.c +++ b/lib-src/libflac/src/flac/vorbiscomment.c @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -243,7 +243,7 @@ FLAC__bool flac__vorbiscomment_add(FLAC__StreamMetadata *block, const char *comm return false; } - if(!set_vc_field(block, &parsed, &dummy, raw, violation)) { + if(parsed.field_value_length > 0 && !set_vc_field(block, &parsed, &dummy, raw, violation)) { free_field(&parsed); return false; } diff --git a/lib-src/libflac/src/flac/vorbiscomment.h b/lib-src/libflac/src/flac/vorbiscomment.h index 326da8d6a..56179e69b 100644 --- a/lib-src/libflac/src/flac/vorbiscomment.h +++ b/lib-src/libflac/src/flac/vorbiscomment.h @@ -1,6 +1,6 @@ /* flac - Command-line FLAC encoder/decoder * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/libFLAC++/Makefile.am b/lib-src/libflac/src/libFLAC++/Makefile.am index 4a9eb2212..ae6acec6c 100644 --- a/lib-src/libflac/src/libFLAC++/Makefile.am +++ b/lib-src/libflac/src/libFLAC++/Makefile.am @@ -1,6 +1,6 @@ # libFLAC++ - Free Lossless Audio Codec library # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -30,7 +30,6 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. lib_LTLIBRARIES = libFLAC++.la -noinst_LTLIBRARIES = libFLAC++-static.la m4datadir = $(datadir)/aclocal m4data_DATA = libFLAC++.m4 @@ -42,17 +41,18 @@ EXTRA_DIST = \ Makefile.lite \ flac++.pc.in \ libFLAC++_dynamic.vcproj \ + libFLAC++_dynamic.vcxproj \ + libFLAC++_dynamic.vcxproj.filters \ libFLAC++_static.vcproj \ + libFLAC++_static.vcxproj \ + libFLAC++_static.vcxproj.filters \ libFLAC++.m4 # see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention -libFLAC___la_LDFLAGS = $(AM_LDFLAGS) -version-info 9:0:3 @LT_NO_UNDEFINED@ +libFLAC___la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 9:0:3 libFLAC___la_LIBADD = ../libFLAC/libFLAC.la libFLAC___la_SOURCES = \ metadata.cpp \ stream_decoder.cpp \ stream_encoder.cpp - -libFLAC___static_la_LIBADD = $(LOCAL_EXTRA_LIBADD) -libFLAC___static_la_SOURCES = $(libFLAC___la_SOURCES) diff --git a/lib-src/libflac/src/libFLAC++/Makefile.in b/lib-src/libflac/src/libFLAC++/Makefile.in index 7c43034ea..1bf639a30 100644 --- a/lib-src/libflac/src/libFLAC++/Makefile.in +++ b/lib-src/libflac/src/libFLAC++/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # libFLAC++ - Free Lossless Audio Codec library # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -48,23 +47,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -84,18 +111,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/libFLAC++ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/flac++.pc.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/flac++.pc.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -131,21 +160,30 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)" \ "$(DESTDIR)$(pkgconfigdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) -libFLAC___static_la_DEPENDENCIES = -am__objects_1 = metadata.lo stream_decoder.lo stream_encoder.lo -am_libFLAC___static_la_OBJECTS = $(am__objects_1) -libFLAC___static_la_OBJECTS = $(am_libFLAC___static_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent +LTLIBRARIES = $(lib_LTLIBRARIES) libFLAC___la_DEPENDENCIES = ../libFLAC/libFLAC.la am_libFLAC___la_OBJECTS = metadata.lo stream_decoder.lo \ stream_encoder.lo libFLAC___la_OBJECTS = $(am_libFLAC___la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = libFLAC___la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(libFLAC___la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -158,28 +196,41 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) AM_V_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libFLAC___static_la_SOURCES) $(libFLAC___la_SOURCES) -DIST_SOURCES = $(libFLAC___static_la_SOURCES) $(libFLAC___la_SOURCES) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +SOURCES = $(libFLAC___la_SOURCES) +DIST_SOURCES = $(libFLAC___la_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(m4data_DATA) $(pkgconfig_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -220,7 +271,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -240,8 +290,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -335,7 +383,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libFLAC++.la -noinst_LTLIBRARIES = libFLAC++-static.la m4datadir = $(datadir)/aclocal m4data_DATA = libFLAC++.m4 pkgconfigdir = $(libdir)/pkgconfig @@ -345,25 +392,27 @@ EXTRA_DIST = \ Makefile.lite \ flac++.pc.in \ libFLAC++_dynamic.vcproj \ + libFLAC++_dynamic.vcxproj \ + libFLAC++_dynamic.vcxproj.filters \ libFLAC++_static.vcproj \ + libFLAC++_static.vcxproj \ + libFLAC++_static.vcxproj.filters \ libFLAC++.m4 # see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention -libFLAC___la_LDFLAGS = $(AM_LDFLAGS) -version-info 9:0:3 @LT_NO_UNDEFINED@ +libFLAC___la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 9:0:3 libFLAC___la_LIBADD = ../libFLAC/libFLAC.la libFLAC___la_SOURCES = \ metadata.cpp \ stream_decoder.cpp \ stream_encoder.cpp -libFLAC___static_la_LIBADD = $(LOCAL_EXTRA_LIBADD) -libFLAC___static_la_SOURCES = $(libFLAC___la_SOURCES) all: all-am .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -388,13 +437,14 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): flac++.pc: $(top_builddir)/config.status $(srcdir)/flac++.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -421,23 +471,15 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libFLAC++-static.la: $(libFLAC___static_la_OBJECTS) $(libFLAC___static_la_DEPENDENCIES) $(EXTRA_libFLAC___static_la_DEPENDENCIES) - $(AM_V_CXXLD)$(CXXLINK) $(libFLAC___static_la_OBJECTS) $(libFLAC___static_la_LIBADD) $(LIBS) libFLAC++.la: $(libFLAC___la_OBJECTS) $(libFLAC___la_DEPENDENCIES) $(EXTRA_libFLAC___la_DEPENDENCIES) $(AM_V_CXXLD)$(libFLAC___la_LINK) -rpath $(libdir) $(libFLAC___la_OBJECTS) $(libFLAC___la_LIBADD) $(LIBS) @@ -523,26 +565,15 @@ uninstall-pkgconfigDATA: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -554,15 +585,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -571,6 +598,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -645,7 +687,7 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-noinstLTLIBRARIES mostlyclean-am + mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -716,9 +758,9 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-m4dataDATA \ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -729,7 +771,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-m4dataDATA \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ uninstall-m4dataDATA uninstall-pkgconfigDATA diff --git a/lib-src/libflac/src/libFLAC++/Makefile.lite b/lib-src/libflac/src/libFLAC++/Makefile.lite index 51498132c..12b6bdb1d 100644 --- a/lib-src/libflac/src/libFLAC++/Makefile.lite +++ b/lib-src/libflac/src/libFLAC++/Makefile.lite @@ -1,6 +1,6 @@ # libFLAC++ - Free Lossless Audio Codec library # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -38,9 +38,13 @@ libdir = $(topdir)/objs/$(BUILD)/lib ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm -lstdc++ +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm -lsupc++ else LIBS = -lFLAC $(OGG_LIBS) -lm -lsupc++ endif +endif LIB_NAME = libFLAC++ INCLUDES = -I$(topdir)/include diff --git a/lib-src/libflac/src/libFLAC++/libFLAC++_dynamic.vcproj b/lib-src/libflac/src/libFLAC++/libFLAC++_dynamic.vcproj index 2b7575c35..56006e00d 100644 --- a/lib-src/libflac/src/libFLAC++/libFLAC++_dynamic.vcproj +++ b/lib-src/libflac/src/libFLAC++/libFLAC++_dynamic.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc85-c215-11db-8314-0800200c9a66} + libFLAC++_dynamic + Win32Proj + + + + DynamicLibrary + true + + + DynamicLibrary + true + + + DynamicLibrary + + + DynamicLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + $(Configuration)_dynamic\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + $(Platform)\$(Configuration)_dynamic\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + $(Configuration)_dynamic\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + $(Platform)\$(Configuration)_dynamic\ + + + + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FLACPP_API_EXPORTS;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + true + Windows + MachineX86 + + + + + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FLACPP_API_EXPORTS;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + true + Windows + + + + + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FLACPP_API_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + true + Windows + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FLACPP_API_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + true + Windows + true + true + UseLinkTimeCodeGeneration + + + + + + + + + + + + + + + + + {4cefbc83-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/libFLAC++/libFLAC++_dynamic.vcxproj.filters b/lib-src/libflac/src/libFLAC++/libFLAC++_dynamic.vcxproj.filters new file mode 100644 index 000000000..8e64893a7 --- /dev/null +++ b/lib-src/libflac/src/libFLAC++/libFLAC++_dynamic.vcxproj.filters @@ -0,0 +1,44 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {a429b95c-ff8f-4d97-94ec-abfee2afd73c} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/libFLAC++/libFLAC++_static.vcproj b/lib-src/libflac/src/libFLAC++/libFLAC++_static.vcproj index e2c26ce4e..d0a1e997d 100644 --- a/lib-src/libflac/src/libFLAC++/libFLAC++_static.vcproj +++ b/lib-src/libflac/src/libFLAC++/libFLAC++_static.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc86-c215-11db-8314-0800200c9a66} + libFLAC++_static + Win32Proj + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + + + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/libFLAC++/libFLAC++_static.vcxproj.filters b/lib-src/libflac/src/libFLAC++/libFLAC++_static.vcxproj.filters new file mode 100644 index 000000000..e34f01ec3 --- /dev/null +++ b/lib-src/libflac/src/libFLAC++/libFLAC++_static.vcxproj.filters @@ -0,0 +1,44 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {8fde5773-b1ca-496d-872f-5697b89aa10a} + + + + + Source Files + + + Source Files + + + Source Files + + + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/libFLAC++/metadata.cpp b/lib-src/libflac/src/libFLAC++/metadata.cpp index e03acf399..49dd35ac2 100644 --- a/lib-src/libflac/src/libFLAC++/metadata.cpp +++ b/lib-src/libflac/src/libFLAC++/metadata.cpp @@ -1,6 +1,6 @@ /* libFLAC++ - Free Lossless Audio Codec library * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,6 +31,10 @@ */ #define __STDC_LIMIT_MACROS 1 /* otherwise SIZE_MAX is not defined for c++ */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "share/alloc.h" #include "FLAC++/metadata.h" #include "FLAC/assert.h" @@ -519,36 +523,72 @@ namespace FLAC { // VorbisComment::Entry // - VorbisComment::Entry::Entry() + VorbisComment::Entry::Entry() : + is_valid_(true), + entry_(), + field_name_(0), + field_name_length_(0), + field_value_(0), + field_value_length_(0) { zero(); } - VorbisComment::Entry::Entry(const char *field, unsigned field_length) + VorbisComment::Entry::Entry(const char *field, unsigned field_length) : + is_valid_(true), + entry_(), + field_name_(0), + field_name_length_(0), + field_value_(0), + field_value_length_(0) { zero(); construct(field, field_length); } - VorbisComment::Entry::Entry(const char *field) + VorbisComment::Entry::Entry(const char *field) : + is_valid_(true), + entry_(), + field_name_(0), + field_name_length_(0), + field_value_(0), + field_value_length_(0) { zero(); construct(field); } - VorbisComment::Entry::Entry(const char *field_name, const char *field_value, unsigned field_value_length) + VorbisComment::Entry::Entry(const char *field_name, const char *field_value, unsigned field_value_length) : + is_valid_(true), + entry_(), + field_name_(0), + field_name_length_(0), + field_value_(0), + field_value_length_(0) { zero(); construct(field_name, field_value, field_value_length); } - VorbisComment::Entry::Entry(const char *field_name, const char *field_value) + VorbisComment::Entry::Entry(const char *field_name, const char *field_value) : + is_valid_(true), + entry_(), + field_name_(0), + field_name_length_(0), + field_value_(0), + field_value_length_(0) { zero(); construct(field_name, field_value); } - VorbisComment::Entry::Entry(const Entry &entry) + VorbisComment::Entry::Entry(const Entry &entry) : + is_valid_(true), + entry_(), + field_name_(0), + field_name_length_(0), + field_value_(0), + field_value_length_(0) { FLAC__ASSERT(entry.is_valid()); zero(); diff --git a/lib-src/libflac/src/libFLAC++/stream_decoder.cpp b/lib-src/libflac/src/libFLAC++/stream_decoder.cpp index 5d68c2856..2222580a3 100644 --- a/lib-src/libflac/src/libFLAC++/stream_decoder.cpp +++ b/lib-src/libflac/src/libFLAC++/stream_decoder.cpp @@ -1,6 +1,6 @@ /* libFLAC++ - Free Lossless Audio Codec library * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,6 +30,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "FLAC++/decoder.h" #include "FLAC/assert.h" diff --git a/lib-src/libflac/src/libFLAC++/stream_encoder.cpp b/lib-src/libflac/src/libFLAC++/stream_encoder.cpp index bbbbeff7e..4f396009a 100644 --- a/lib-src/libflac/src/libFLAC++/stream_encoder.cpp +++ b/lib-src/libflac/src/libFLAC++/stream_encoder.cpp @@ -1,6 +1,6 @@ /* libFLAC++ - Free Lossless Audio Codec library * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,6 +30,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "FLAC++/encoder.h" #include "FLAC++/metadata.h" #include "FLAC/assert.h" diff --git a/lib-src/libflac/src/libFLAC/Makefile.am b/lib-src/libflac/src/libFLAC/Makefile.am index 86155ab07..276e33446 100644 --- a/lib-src/libflac/src/libFLAC/Makefile.am +++ b/lib-src/libflac/src/libFLAC/Makefile.am @@ -1,6 +1,6 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -39,20 +39,13 @@ endif # FIXME: The following logic should be part of configure, not of Makefile.am if FLaC__CPU_PPC -# The -force_cpusubtype_ALL is needed to insert a ppc64 instruction -# into cpu.c with an asm(). if FLaC__SYS_DARWIN -#@@@ PPC optimizations temporarily disabled -CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM +CPUCFLAGS = -faltivec else -# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific CPUCFLAGS = -if FLaC__CPU_PPC_SPE -else +if FLaC__USE_ALTIVEC CPUCFLAGS += -maltivec -mabi=altivec endif -#@@@ PPC optimizations temporarily disabled -CPUCFLAGS += -DFLAC__NO_ASM endif endif @@ -66,21 +59,6 @@ ARCH_SUBDIRS = ia32 LOCAL_EXTRA_LIBADD = ia32/libFLAC-asm.la endif endif -if FLaC__CPU_PPC -ARCH_SUBDIRS = ppc -if FLaC__HAS_AS__TEMPORARILY_DISABLED -if FLaC__CPU_PPC_SPE -else -LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la -LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning" -else -if FLaC__HAS_GAS__TEMPORARILY_DISABLED -LOCAL_EXTRA_LIBADD = ppc/gas/libFLAC-asm.la -LOCAL_EXTRA_LDFLAGS = "" -endif -endif -endif -endif endif if OS_IS_WINDOWS @@ -101,7 +79,11 @@ EXTRA_DIST = \ Makefile.lite \ flac.pc.in \ libFLAC_dynamic.vcproj \ + libFLAC_dynamic.vcxproj \ + libFLAC_dynamic.vcxproj.filters \ libFLAC_static.vcproj \ + libFLAC_static.vcxproj \ + libFLAC_static.vcxproj.filters \ libFLAC.m4 if FLaC__HAS_OGG @@ -113,7 +95,7 @@ extra_ogg_sources = \ endif # see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention -libFLAC_la_LDFLAGS = $(AM_LDFLAGS) -version-info 11:0:3 $(LOCAL_EXTRA_LDFLAGS) @LT_NO_UNDEFINED@ +libFLAC_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 11:0:3 $(LOCAL_EXTRA_LDFLAGS) libFLAC_sources = \ bitmath.c \ @@ -122,15 +104,24 @@ libFLAC_sources = \ cpu.c \ crc.c \ fixed.c \ + fixed_intrin_sse2.c \ + fixed_intrin_ssse3.c \ float.c \ format.c \ lpc.c \ + lpc_intrin_sse.c \ + lpc_intrin_sse2.c \ + lpc_intrin_sse41.c \ + lpc_intrin_avx2.c \ md5.c \ memory.c \ metadata_iterators.c \ metadata_object.c \ stream_decoder.c \ stream_encoder.c \ + stream_encoder_intrin_sse2.c \ + stream_encoder_intrin_ssse3.c \ + stream_encoder_intrin_avx2.c \ stream_encoder_framing.c \ window.c \ $(extra_ogg_sources) diff --git a/lib-src/libflac/src/libFLAC/Makefile.in b/lib-src/libflac/src/libFLAC/Makefile.in index b9d1388a3..5c214f14c 100644 --- a/lib-src/libflac/src/libFLAC/Makefile.in +++ b/lib-src/libflac/src/libFLAC/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -48,23 +47,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -83,20 +110,22 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@FLaC__CPU_PPC_SPE_FALSE@@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@am__append_1 = -maltivec -mabi=altivec +@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@@FLaC__USE_ALTIVEC_TRUE@am__append_1 = -maltivec -mabi=altivec subdir = src/libFLAC -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/flac.pc.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/flac.pc.in $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -135,36 +164,58 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(m4datadir)" \ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) libFLAC_static_la_DEPENDENCIES = $(LOCAL_EXTRA_LIBADD) am__libFLAC_static_la_SOURCES_DIST = bitmath.c bitreader.c bitwriter.c \ - cpu.c crc.c fixed.c float.c format.c lpc.c md5.c memory.c \ + cpu.c crc.c fixed.c fixed_intrin_sse2.c fixed_intrin_ssse3.c \ + float.c format.c lpc.c lpc_intrin_sse.c lpc_intrin_sse2.c \ + lpc_intrin_sse41.c lpc_intrin_avx2.c md5.c memory.c \ metadata_iterators.c metadata_object.c stream_decoder.c \ - stream_encoder.c stream_encoder_framing.c window.c \ - ogg_decoder_aspect.c ogg_encoder_aspect.c ogg_helper.c \ - ogg_mapping.c + stream_encoder.c stream_encoder_intrin_sse2.c \ + stream_encoder_intrin_ssse3.c stream_encoder_intrin_avx2.c \ + stream_encoder_framing.c window.c ogg_decoder_aspect.c \ + ogg_encoder_aspect.c ogg_helper.c ogg_mapping.c @FLaC__HAS_OGG_TRUE@am__objects_1 = ogg_decoder_aspect.lo \ @FLaC__HAS_OGG_TRUE@ ogg_encoder_aspect.lo ogg_helper.lo \ @FLaC__HAS_OGG_TRUE@ ogg_mapping.lo am__objects_2 = bitmath.lo bitreader.lo bitwriter.lo cpu.lo crc.lo \ - fixed.lo float.lo format.lo lpc.lo md5.lo memory.lo \ + fixed.lo fixed_intrin_sse2.lo fixed_intrin_ssse3.lo float.lo \ + format.lo lpc.lo lpc_intrin_sse.lo lpc_intrin_sse2.lo \ + lpc_intrin_sse41.lo lpc_intrin_avx2.lo md5.lo memory.lo \ metadata_iterators.lo metadata_object.lo stream_decoder.lo \ - stream_encoder.lo stream_encoder_framing.lo window.lo \ - $(am__objects_1) + stream_encoder.lo stream_encoder_intrin_sse2.lo \ + stream_encoder_intrin_ssse3.lo stream_encoder_intrin_avx2.lo \ + stream_encoder_framing.lo window.lo $(am__objects_1) am_libFLAC_static_la_OBJECTS = $(am__objects_2) libFLAC_static_la_OBJECTS = $(am_libFLAC_static_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libFLAC_la_DEPENDENCIES = $(win_utf8_lib) $(LOCAL_EXTRA_LIBADD) am__libFLAC_la_SOURCES_DIST = bitmath.c bitreader.c bitwriter.c cpu.c \ - crc.c fixed.c float.c format.c lpc.c md5.c memory.c \ + crc.c fixed.c fixed_intrin_sse2.c fixed_intrin_ssse3.c float.c \ + format.c lpc.c lpc_intrin_sse.c lpc_intrin_sse2.c \ + lpc_intrin_sse41.c lpc_intrin_avx2.c md5.c memory.c \ metadata_iterators.c metadata_object.c stream_decoder.c \ - stream_encoder.c stream_encoder_framing.c window.c \ - ogg_decoder_aspect.c ogg_encoder_aspect.c ogg_helper.c \ - ogg_mapping.c + stream_encoder.c stream_encoder_intrin_sse2.c \ + stream_encoder_intrin_ssse3.c stream_encoder_intrin_avx2.c \ + stream_encoder_framing.c window.c ogg_decoder_aspect.c \ + ogg_encoder_aspect.c ogg_helper.c ogg_mapping.c am_libFLAC_la_OBJECTS = $(am__objects_2) libFLAC_la_OBJECTS = $(am_libFLAC_la_OBJECTS) libFLAC_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libFLAC_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -177,30 +228,27 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libFLAC_static_la_SOURCES) $(libFLAC_la_SOURCES) DIST_SOURCES = $(am__libFLAC_static_la_SOURCES_DIST) \ $(am__libFLAC_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -209,12 +257,32 @@ am__can_run_installinfo = \ DATA = $(m4data_DATA) $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = ia32 ppc include . +DIST_SUBDIRS = ia32 include . DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -278,7 +346,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -298,8 +365,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -396,29 +461,15 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include lib_LTLIBRARIES = libFLAC.la noinst_LTLIBRARIES = libFLAC-static.la @DEBUG_TRUE@DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT -# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific -#@@@ PPC optimizations temporarily disabled @FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@CPUCFLAGS = \ -@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@ $(am__append_1) \ -@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@ -DFLAC__NO_ASM +@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@ $(am__append_1) # FIXME: The following logic should be part of configure, not of Makefile.am - -# The -force_cpusubtype_ALL is needed to insert a ppc64 instruction -# into cpu.c with an asm(). -#@@@ PPC optimizations temporarily disabled @FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@CPUCFLAGS = -faltivec \ -@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@ -force_cpusubtype_ALL \ -@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@ -DFLAC__NO_ASM \ @FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@ $(am__append_1) AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@ @FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE@ARCH_SUBDIRS = ia32 -@FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE@ARCH_SUBDIRS = ppc @FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ia32/libFLAC-asm.la -@FLaC__CPU_PPC_SPE_FALSE@@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la -@FLaC__CPU_PPC_SPE_TRUE@@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ppc/gas/libFLAC-asm.la -@FLaC__CPU_PPC_SPE_FALSE@@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning" -@FLaC__CPU_PPC_SPE_TRUE@@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LDFLAGS = "" @OS_IS_WINDOWS_TRUE@win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la libFLAC_la_LIBADD = $(win_utf8_lib) $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ -lm SUBDIRS = $(ARCH_SUBDIRS) include . @@ -430,7 +481,11 @@ EXTRA_DIST = \ Makefile.lite \ flac.pc.in \ libFLAC_dynamic.vcproj \ + libFLAC_dynamic.vcxproj \ + libFLAC_dynamic.vcxproj.filters \ libFLAC_static.vcproj \ + libFLAC_static.vcxproj \ + libFLAC_static.vcxproj.filters \ libFLAC.m4 @FLaC__HAS_OGG_TRUE@extra_ogg_sources = \ @@ -441,7 +496,7 @@ EXTRA_DIST = \ # see 'http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning' for numbering convention -libFLAC_la_LDFLAGS = $(AM_LDFLAGS) -version-info 11:0:3 $(LOCAL_EXTRA_LDFLAGS) @LT_NO_UNDEFINED@ +libFLAC_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 11:0:3 $(LOCAL_EXTRA_LDFLAGS) libFLAC_sources = \ bitmath.c \ bitreader.c \ @@ -449,15 +504,24 @@ libFLAC_sources = \ cpu.c \ crc.c \ fixed.c \ + fixed_intrin_sse2.c \ + fixed_intrin_ssse3.c \ float.c \ format.c \ lpc.c \ + lpc_intrin_sse.c \ + lpc_intrin_sse2.c \ + lpc_intrin_sse41.c \ + lpc_intrin_avx2.c \ md5.c \ memory.c \ metadata_iterators.c \ metadata_object.c \ stream_decoder.c \ stream_encoder.c \ + stream_encoder_intrin_sse2.c \ + stream_encoder_intrin_ssse3.c \ + stream_encoder_intrin_avx2.c \ stream_encoder_framing.c \ window.c \ $(extra_ogg_sources) @@ -471,7 +535,7 @@ all: all-recursive .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -496,13 +560,14 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): flac.pc: $(top_builddir)/config.status $(srcdir)/flac.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -529,23 +594,29 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libFLAC-static.la: $(libFLAC_static_la_OBJECTS) $(libFLAC_static_la_DEPENDENCIES) $(EXTRA_libFLAC_static_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libFLAC_static_la_OBJECTS) $(libFLAC_static_la_LIBADD) $(LIBS) + libFLAC.la: $(libFLAC_la_OBJECTS) $(libFLAC_la_DEPENDENCIES) $(EXTRA_libFLAC_la_DEPENDENCIES) $(AM_V_CCLD)$(libFLAC_la_LINK) -rpath $(libdir) $(libFLAC_la_OBJECTS) $(libFLAC_la_LIBADD) $(LIBS) @@ -561,9 +632,15 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed_intrin_sse2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed_intrin_ssse3.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lpc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lpc_intrin_avx2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lpc_intrin_sse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lpc_intrin_sse2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lpc_intrin_sse41.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memory.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata_iterators.Plo@am__quote@ @@ -575,6 +652,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_decoder.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_encoder.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_encoder_framing.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_encoder_intrin_avx2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_encoder_intrin_sse2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream_encoder_intrin_ssse3.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.Plo@am__quote@ .c.o: @@ -650,22 +730,25 @@ uninstall-pkgconfigDATA: dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -680,57 +763,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -746,12 +784,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -763,15 +796,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -780,6 +809,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -949,26 +993,24 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES uninstall-m4dataDATA \ uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-m4dataDATA install-man install-pdf install-pdf-am \ - install-pkgconfigDATA install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-m4dataDATA \ - uninstall-pkgconfigDATA +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-m4dataDATA \ + install-man install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ + uninstall-m4dataDATA uninstall-pkgconfigDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/libFLAC/Makefile.lite b/lib-src/libflac/src/libFLAC/Makefile.lite index 06d5f9363..722acfba0 100644 --- a/lib-src/libflac/src/libFLAC/Makefile.lite +++ b/lib-src/libflac/src/libFLAC/Makefile.lite @@ -1,6 +1,6 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -37,9 +37,13 @@ topdir = ../.. ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = $(OGG_LIBS) -lm endif +endif LIB_NAME = libFLAC ifeq ($(PROC),ppc) @@ -49,7 +53,7 @@ ifeq ($(OS),Solaris) DEFINES = -DFLAC__NO_ASM -DFLAC__ALIGN_MALLOC_DATA else ifeq ($(PROC),i386) - DEFINES = -DFLAC__CPU_IA32 -DFLAC__USE_3DNOW -DFLAC__HAS_NASM -DFLAC__ALIGN_MALLOC_DATA + DEFINES = -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__ALIGN_MALLOC_DATA else DEFINES = -DFLAC__ALIGN_MALLOC_DATA endif @@ -58,18 +62,11 @@ endif INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES) DEBUG_CFLAGS = -DFLAC__OVERFLOW_DETECT -ifeq ($(OS),Darwin) -SRCS_S = \ - ppc/as/lpc_asm.s -else ifeq ($(PROC),i386) SRCS_NASM = \ - ia32/bitreader_asm.nasm \ ia32/cpu_asm.nasm \ ia32/fixed_asm.nasm \ - ia32/lpc_asm.nasm \ - ia32/stream_encoder_asm.nasm -endif + ia32/lpc_asm.nasm endif OGG_SRCS_C = \ @@ -85,15 +82,24 @@ SRCS_C = \ cpu.c \ crc.c \ fixed.c \ + fixed_intrin_sse2.c \ + fixed_intrin_ssse3.c \ float.c \ format.c \ lpc.c \ + lpc_intrin_sse.c \ + lpc_intrin_sse2.c \ + lpc_intrin_sse41.c \ + lpc_intrin_avx2.c \ md5.c \ memory.c \ metadata_iterators.c \ metadata_object.c \ stream_decoder.c \ stream_encoder.c \ + stream_encoder_intrin_sse2.c \ + stream_encoder_intrin_ssse3.c \ + stream_encoder_intrin_avx2.c \ stream_encoder_framing.c \ window.c \ $(OGG_SRCS) diff --git a/lib-src/libflac/src/libFLAC/bitmath.c b/lib-src/libflac/src/libFLAC/bitmath.c index e6b1f5e4a..5b58ca999 100644 --- a/lib-src/libflac/src/libFLAC/bitmath.c +++ b/lib-src/libflac/src/libFLAC/bitmath.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,12 +30,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #include "private/bitmath.h" -#include "FLAC/assert.h" /* An example of what FLAC__bitmath_silog2() computes: * diff --git a/lib-src/libflac/src/libFLAC/bitreader.c b/lib-src/libflac/src/libFLAC/bitreader.c index 6fb03f566..f61229bd4 100644 --- a/lib-src/libflac/src/libFLAC/bitreader.c +++ b/lib-src/libflac/src/libFLAC/bitreader.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -74,7 +74,6 @@ */ static const unsigned FLAC__BITREADER_DEFAULT_CAPACITY = 65536u / FLAC__BITS_PER_WORD; /* in words */ -/* WATCHOUT: assembly routines rely on the order in which these fields are declared */ struct FLAC__BitReader { /* any partially-consumed word at the head will stay right-justified as bits are consumed from the left */ /* any incomplete word at the tail will be left-justified, and bytes from the read callback are added on the right */ @@ -88,7 +87,6 @@ struct FLAC__BitReader { unsigned crc16_align; /* the number of bits in the current consumed word that should not be CRC'd */ FLAC__BitReaderReadCallback read_callback; void *client_data; - FLAC__CPUInfo cpu_info; }; static inline void crc16_update_word_(FLAC__BitReader *br, uint32_t word) @@ -120,8 +118,7 @@ static inline void crc16_update_word_(FLAC__BitReader *br, uint32_t word) br->crc16_align = 0; } -/* would be static except it needs to be called by asm routines */ -FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br) +static FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br) { unsigned start, end; size_t bytes; @@ -232,7 +229,7 @@ void FLAC__bitreader_delete(FLAC__BitReader *br) * ***********************************************************************/ -FLAC__bool FLAC__bitreader_init(FLAC__BitReader *br, FLAC__CPUInfo cpu, FLAC__BitReaderReadCallback rcb, void *cd) +FLAC__bool FLAC__bitreader_init(FLAC__BitReader *br, FLAC__BitReaderReadCallback rcb, void *cd) { FLAC__ASSERT(0 != br); @@ -244,7 +241,6 @@ FLAC__bool FLAC__bitreader_init(FLAC__BitReader *br, FLAC__CPUInfo cpu, FLAC__Bi return false; br->read_callback = rcb; br->client_data = cd; - br->cpu_info = cpu; return true; } @@ -1049,9 +1045,9 @@ FLAC__bool FLAC__bitreader_read_utf8_uint64(FLAC__BitReader *br, FLAC__uint64 *v return true; } -/* These functions a declared inline in this file but are also callable as +/* These functions are declared inline in this file but are also callable as * externs from elsewhere. - * According to the C99 sepc, section 6.7.4, simply providing a function + * According to the C99 spec, section 6.7.4, simply providing a function * prototype in a header file without 'inline' and making the function inline * in this file should be sufficient. * Unfortunately, the Microsoft VS compiler doesn't pick them up externally. To diff --git a/lib-src/libflac/src/libFLAC/bitwriter.c b/lib-src/libflac/src/libFLAC/bitwriter.c index 9a99d139b..76be1bc7b 100644 --- a/lib-src/libflac/src/libFLAC/bitwriter.c +++ b/lib-src/libflac/src/libFLAC/bitwriter.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -524,28 +524,6 @@ FLAC__bool FLAC__bitwriter_write_rice_signed_block(FLAC__BitWriter *bw, const FL msbits = uval >> parameter; -#if 0 /* OPT: can remove this special case if it doesn't make up for the extra compare (doesn't make a statistically significant difference with msvc or gcc/x86) */ - if(bw->bits && bw->bits + msbits + lsbits <= FLAC__BITS_PER_WORD) { /* i.e. if the whole thing fits in the current uint32_t */ - /* ^^^ if bw->bits is 0 then we may have filled the buffer and have no free uint32_t to work in */ - bw->bits = bw->bits + msbits + lsbits; - uval |= mask1; /* set stop bit */ - uval &= mask2; /* mask off unused top bits */ - /* NOT: bw->accum <<= msbits + lsbits because msbits+lsbits could be 32, then the shift would be a NOP */ - bw->accum <<= msbits; - bw->accum <<= lsbits; - bw->accum |= uval; - if(bw->bits == FLAC__BITS_PER_WORD) { - bw->buffer[bw->words++] = SWAP_BE_WORD_TO_HOST(bw->accum); - bw->bits = 0; - /* burying the capacity check down here means we have to grow the buffer a little if there are more vals to do */ - if(bw->capacity <= bw->words && nvals > 1 && !bitwriter_grow_(bw, 1)) { - FLAC__ASSERT(bw->capacity == bw->words); - return false; - } - } - } - else { -#elif 1 /*@@@@@@ OPT: try this version with MSVC6 to see if better, not much difference for gcc-4 */ if(bw->bits && bw->bits + msbits + lsbits < FLAC__BITS_PER_WORD) { /* i.e. if the whole thing fits in the current uint32_t */ /* ^^^ if bw->bits is 0 then we may have filled the buffer and have no free uint32_t to work in */ bw->bits = bw->bits + msbits + lsbits; @@ -555,7 +533,6 @@ FLAC__bool FLAC__bitwriter_write_rice_signed_block(FLAC__BitWriter *bw, const FL bw->accum |= uval; } else { -#endif /* slightly pessimistic size check but faster than "<= bw->words + (bw->bits+msbits+lsbits+FLAC__BITS_PER_WORD-1)/FLAC__BITS_PER_WORD" */ /* OPT: pessimism may cause flurry of false calls to grow_ which eat up all savings before it */ if(bw->capacity <= bw->words + bw->bits + msbits + 1/*lsbits always fit in 1 uint32_t*/ && !bitwriter_grow_(bw, msbits+lsbits)) @@ -610,9 +587,7 @@ break1: bw->buffer[bw->words++] = SWAP_BE_WORD_TO_HOST(bw->accum); bw->accum = uval; } -#if 1 } -#endif vals++; nvals--; } @@ -853,9 +828,9 @@ FLAC__bool FLAC__bitwriter_zero_pad_to_byte_boundary(FLAC__BitWriter *bw) return true; } -/* These functions a declared inline in this file but are also callable as +/* These functions are declared inline in this file but are also callable as * externs from elsewhere. - * According to the C99 sepc, section 6.7.4, simply providing a function + * According to the C99 spec, section 6.7.4, simply providing a function * prototype in a header file without 'inline' and making the function inline * in this file should be sufficient. * Unfortunately, the Microsoft VS compiler doesn't pick them up externally. To diff --git a/lib-src/libflac/src/libFLAC/cpu.c b/lib-src/libflac/src/libFLAC/cpu.c index d8bb1994a..bb0950671 100644 --- a/lib-src/libflac/src/libFLAC/cpu.c +++ b/lib-src/libflac/src/libFLAC/cpu.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,47 +30,46 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #include "private/cpu.h" #include -#include +#include +#ifdef DEBUG +# include +#endif #if defined FLAC__CPU_IA32 # include -#elif defined FLAC__CPU_PPC -# if !defined FLAC__NO_ASM -# if defined FLAC__SYS_DARWIN -# include -# include -# include -# include -# include -# ifndef CPU_SUBTYPE_POWERPC_970 -# define CPU_SUBTYPE_POWERPC_970 ((cpu_subtype_t) 100) -# endif -# else /* FLAC__SYS_DARWIN */ -# include -# include - -static sigjmp_buf jmpbuf; -static volatile sig_atomic_t canjump = 0; - -static void sigill_handler (int sig) +static void disable_sse(FLAC__CPUInfo *info) { - if (!canjump) { - signal (sig, SIG_DFL); - raise (sig); - } - canjump = 0; - siglongjmp (jmpbuf, 1); + info->ia32.sse = false; + info->ia32.sse2 = false; + info->ia32.sse3 = false; + info->ia32.ssse3 = false; + info->ia32.sse41 = false; + info->ia32.sse42 = false; } -# endif /* FLAC__SYS_DARWIN */ -# endif /* FLAC__NO_ASM */ -#endif /* FLAC__CPU_PPC */ + +static void disable_avx(FLAC__CPUInfo *info) +{ + info->ia32.avx = false; + info->ia32.avx2 = false; + info->ia32.fma = false; +} + +#elif defined FLAC__CPU_X86_64 + +static void disable_avx(FLAC__CPUInfo *info) +{ + info->x86.avx = false; + info->x86.avx2 = false; + info->x86.fma = false; +} +#endif #if defined (__NetBSD__) || defined(__OpenBSD__) #include @@ -87,25 +86,34 @@ static void sigill_handler (int sig) /* how to get sysctlbyname()? */ #endif +#ifdef FLAC__CPU_IA32 /* these are flags in EDX of CPUID AX=00000001 */ static const unsigned FLAC__CPUINFO_IA32_CPUID_CMOV = 0x00008000; static const unsigned FLAC__CPUINFO_IA32_CPUID_MMX = 0x00800000; static const unsigned FLAC__CPUINFO_IA32_CPUID_FXSR = 0x01000000; static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE = 0x02000000; static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE2 = 0x04000000; +#endif + /* these are flags in ECX of CPUID AX=00000001 */ static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE3 = 0x00000001; static const unsigned FLAC__CPUINFO_IA32_CPUID_SSSE3 = 0x00000200; -/* these are flags in EDX of CPUID AX=80000001 */ -static const unsigned FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_3DNOW = 0x80000000; -static const unsigned FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_EXT3DNOW = 0x40000000; -static const unsigned FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_EXTMMX = 0x00400000; +static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE41 = 0x00080000; +static const unsigned FLAC__CPUINFO_IA32_CPUID_SSE42 = 0x00100000; +#if defined FLAC__AVX_SUPPORTED +/* these are flags in ECX of CPUID AX=00000001 */ +static const unsigned FLAC__CPUINFO_IA32_CPUID_OSXSAVE = 0x08000000; +static const unsigned FLAC__CPUINFO_IA32_CPUID_AVX = 0x10000000; +static const unsigned FLAC__CPUINFO_IA32_CPUID_FMA = 0x00001000; +/* these are flags in EBX of CPUID AX=00000007 */ +static const unsigned FLAC__CPUINFO_IA32_CPUID_AVX2 = 0x00000020; +#endif /* * Extra stuff needed for detection of OS support for SSE on IA-32 */ -#if defined(FLAC__CPU_IA32) && !defined FLAC__NO_ASM && defined FLAC__HAS_NASM && !defined FLAC__NO_SSE_OS && !defined FLAC__SSE_OS +#if defined(FLAC__CPU_IA32) && !defined FLAC__NO_ASM && (defined FLAC__HAS_NASM || defined FLAC__HAS_X86INTRIN) && !defined FLAC__NO_SSE_OS && !defined FLAC__SSE_OS # if defined(__linux__) /* * If the OS doesn't support SSE, we will get here with a SIGILL. We @@ -120,35 +128,14 @@ static const unsigned FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_EXTMMX = 0x00400000; * 6 bytes extra in case our estimate is wrong * 12 bytes puts us in the NOP "landing zone" */ -# undef USE_OBSOLETE_SIGCONTEXT_FLAVOR /* #define this to use the older signal handler method */ -# ifdef USE_OBSOLETE_SIGCONTEXT_FLAVOR - static void sigill_handler_sse_os(int signal, struct sigcontext sc) - { - (void)signal; - sc.eip += 3 + 3 + 6; - } -# else # include static void sigill_handler_sse_os(int signal, siginfo_t *si, void *uc) { (void)signal, (void)si; ((ucontext_t*)uc)->uc_mcontext.gregs[14/*REG_EIP*/] += 3 + 3 + 6; } -# endif # elif defined(_MSC_VER) # include -# define USE_TRY_CATCH_FLAVOR /* sigill_handler flavor resulted in several crash reports on win32 */ -# ifdef USE_TRY_CATCH_FLAVOR -# else - LONG CALLBACK sigill_handler_sse_os(EXCEPTION_POINTERS *ep) - { - if(ep->ExceptionRecord->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION) { - ep->ContextRecord->Eip += 3 + 3 + 6; - return EXCEPTION_CONTINUE_EXECUTION; - } - return EXCEPTION_CONTINUE_SEARCH; - } -# endif # endif #endif @@ -159,261 +146,342 @@ void FLAC__cpu_info(FLAC__CPUInfo *info) * IA32-specific */ #ifdef FLAC__CPU_IA32 + FLAC__bool ia32_fxsr = false; + FLAC__bool ia32_osxsave = false; + (void) ia32_fxsr; (void) ia32_osxsave; /* to avoid warnings about unused variables */ + memset(info, 0, sizeof(*info)); info->type = FLAC__CPUINFO_TYPE_IA32; -#if !defined FLAC__NO_ASM && defined FLAC__HAS_NASM +#if !defined FLAC__NO_ASM && (defined FLAC__HAS_NASM || defined FLAC__HAS_X86INTRIN) info->use_asm = true; /* we assume a minimum of 80386 with FLAC__CPU_IA32 */ - info->data.ia32.cpuid = FLAC__cpu_have_cpuid_asm_ia32()? true : false; - info->data.ia32.bswap = info->data.ia32.cpuid; /* CPUID => BSWAP since it came after */ - info->data.ia32.cmov = false; - info->data.ia32.mmx = false; - info->data.ia32.fxsr = false; - info->data.ia32.sse = false; - info->data.ia32.sse2 = false; - info->data.ia32.sse3 = false; - info->data.ia32.ssse3 = false; - info->data.ia32._3dnow = false; - info->data.ia32.ext3dnow = false; - info->data.ia32.extmmx = false; - if(info->data.ia32.cpuid) { - /* http://www.sandpile.org/ia32/cpuid.htm */ - FLAC__uint32 flags_edx, flags_ecx; - FLAC__cpu_info_asm_ia32(&flags_edx, &flags_ecx); - info->data.ia32.cmov = (flags_edx & FLAC__CPUINFO_IA32_CPUID_CMOV )? true : false; - info->data.ia32.mmx = (flags_edx & FLAC__CPUINFO_IA32_CPUID_MMX )? true : false; - info->data.ia32.fxsr = (flags_edx & FLAC__CPUINFO_IA32_CPUID_FXSR )? true : false; - info->data.ia32.sse = (flags_edx & FLAC__CPUINFO_IA32_CPUID_SSE )? true : false; - info->data.ia32.sse2 = (flags_edx & FLAC__CPUINFO_IA32_CPUID_SSE2 )? true : false; - info->data.ia32.sse3 = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_SSE3 )? true : false; - info->data.ia32.ssse3 = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_SSSE3)? true : false; - -#ifdef FLAC__USE_3DNOW - flags_edx = FLAC__cpu_info_extended_amd_asm_ia32(); - info->data.ia32._3dnow = (flags_edx & FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_3DNOW )? true : false; - info->data.ia32.ext3dnow = (flags_edx & FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_EXT3DNOW)? true : false; - info->data.ia32.extmmx = (flags_edx & FLAC__CPUINFO_IA32_CPUID_EXTENDED_AMD_EXTMMX )? true : false; +#ifdef FLAC__HAS_X86INTRIN + if(!FLAC__cpu_have_cpuid_x86()) + return; #else - info->data.ia32._3dnow = info->data.ia32.ext3dnow = info->data.ia32.extmmx = false; + if(!FLAC__cpu_have_cpuid_asm_ia32()) + return; #endif + { + /* http://www.sandpile.org/x86/cpuid.htm */ +#ifdef FLAC__HAS_X86INTRIN + FLAC__uint32 flags_eax, flags_ebx, flags_ecx, flags_edx; + FLAC__cpu_info_x86(1, &flags_eax, &flags_ebx, &flags_ecx, &flags_edx); +#else + FLAC__uint32 flags_ecx, flags_edx; + FLAC__cpu_info_asm_ia32(&flags_edx, &flags_ecx); +#endif + info->ia32.cmov = (flags_edx & FLAC__CPUINFO_IA32_CPUID_CMOV )? true : false; + info->ia32.mmx = (flags_edx & FLAC__CPUINFO_IA32_CPUID_MMX )? true : false; + ia32_fxsr = (flags_edx & FLAC__CPUINFO_IA32_CPUID_FXSR )? true : false; + info->ia32.sse = (flags_edx & FLAC__CPUINFO_IA32_CPUID_SSE )? true : false; + info->ia32.sse2 = (flags_edx & FLAC__CPUINFO_IA32_CPUID_SSE2 )? true : false; + info->ia32.sse3 = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_SSE3 )? true : false; + info->ia32.ssse3 = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_SSSE3)? true : false; + info->ia32.sse41 = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_SSE41)? true : false; + info->ia32.sse42 = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_SSE42)? true : false; +#if defined FLAC__HAS_X86INTRIN && defined FLAC__AVX_SUPPORTED + ia32_osxsave = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_OSXSAVE)? true : false; + info->ia32.avx = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_AVX )? true : false; + info->ia32.fma = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_FMA )? true : false; + FLAC__cpu_info_x86(7, &flags_eax, &flags_ebx, &flags_ecx, &flags_edx); + info->ia32.avx2 = (flags_ebx & FLAC__CPUINFO_IA32_CPUID_AVX2 )? true : false; +#endif + } #ifdef DEBUG - fprintf(stderr, "CPU info (IA-32):\n"); - fprintf(stderr, " CPUID ...... %c\n", info->data.ia32.cpuid ? 'Y' : 'n'); - fprintf(stderr, " BSWAP ...... %c\n", info->data.ia32.bswap ? 'Y' : 'n'); - fprintf(stderr, " CMOV ....... %c\n", info->data.ia32.cmov ? 'Y' : 'n'); - fprintf(stderr, " MMX ........ %c\n", info->data.ia32.mmx ? 'Y' : 'n'); - fprintf(stderr, " FXSR ....... %c\n", info->data.ia32.fxsr ? 'Y' : 'n'); - fprintf(stderr, " SSE ........ %c\n", info->data.ia32.sse ? 'Y' : 'n'); - fprintf(stderr, " SSE2 ....... %c\n", info->data.ia32.sse2 ? 'Y' : 'n'); - fprintf(stderr, " SSE3 ....... %c\n", info->data.ia32.sse3 ? 'Y' : 'n'); - fprintf(stderr, " SSSE3 ...... %c\n", info->data.ia32.ssse3 ? 'Y' : 'n'); - fprintf(stderr, " 3DNow! ..... %c\n", info->data.ia32._3dnow ? 'Y' : 'n'); - fprintf(stderr, " 3DNow!-ext . %c\n", info->data.ia32.ext3dnow? 'Y' : 'n'); - fprintf(stderr, " 3DNow!-MMX . %c\n", info->data.ia32.extmmx ? 'Y' : 'n'); + fprintf(stderr, "CPU info (IA-32):\n"); + fprintf(stderr, " CMOV ....... %c\n", info->ia32.cmov ? 'Y' : 'n'); + fprintf(stderr, " MMX ........ %c\n", info->ia32.mmx ? 'Y' : 'n'); + fprintf(stderr, " SSE ........ %c\n", info->ia32.sse ? 'Y' : 'n'); + fprintf(stderr, " SSE2 ....... %c\n", info->ia32.sse2 ? 'Y' : 'n'); + fprintf(stderr, " SSE3 ....... %c\n", info->ia32.sse3 ? 'Y' : 'n'); + fprintf(stderr, " SSSE3 ...... %c\n", info->ia32.ssse3 ? 'Y' : 'n'); + fprintf(stderr, " SSE41 ...... %c\n", info->ia32.sse41 ? 'Y' : 'n'); + fprintf(stderr, " SSE42 ...... %c\n", info->ia32.sse42 ? 'Y' : 'n'); +# if defined FLAC__HAS_X86INTRIN && defined FLAC__AVX_SUPPORTED + fprintf(stderr, " AVX ........ %c\n", info->ia32.avx ? 'Y' : 'n'); + fprintf(stderr, " FMA ........ %c\n", info->ia32.fma ? 'Y' : 'n'); + fprintf(stderr, " AVX2 ....... %c\n", info->ia32.avx2 ? 'Y' : 'n'); +# endif #endif - /* - * now have to check for OS support of SSE/SSE2 - */ - if(info->data.ia32.fxsr || info->data.ia32.sse || info->data.ia32.sse2) { + /* + * now have to check for OS support of SSE instructions + */ + if(info->ia32.sse) { #if defined FLAC__NO_SSE_OS - /* assume user knows better than us; turn it off */ - info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = info->data.ia32.sse3 = info->data.ia32.ssse3 = false; + /* assume user knows better than us; turn it off */ + disable_sse(info); #elif defined FLAC__SSE_OS - /* assume user knows better than us; leave as detected above */ + /* assume user knows better than us; leave as detected above */ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__APPLE__) - int sse = 0; - size_t len; - /* at least one of these must work: */ - len = sizeof(sse); sse = sse || (sysctlbyname("hw.instruction_sse", &sse, &len, NULL, 0) == 0 && sse); - len = sizeof(sse); sse = sse || (sysctlbyname("hw.optional.sse" , &sse, &len, NULL, 0) == 0 && sse); /* __APPLE__ ? */ - if(!sse) - info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = info->data.ia32.sse3 = info->data.ia32.ssse3 = false; + int sse = 0; + size_t len; + /* at least one of these must work: */ + len = sizeof(sse); sse = sse || (sysctlbyname("hw.instruction_sse", &sse, &len, NULL, 0) == 0 && sse); + len = sizeof(sse); sse = sse || (sysctlbyname("hw.optional.sse" , &sse, &len, NULL, 0) == 0 && sse); /* __APPLE__ ? */ + if(!sse) + disable_sse(info); #elif defined(__NetBSD__) || defined (__OpenBSD__) # if __NetBSD_Version__ >= 105250000 || (defined __OpenBSD__) - int val = 0, mib[2] = { CTL_MACHDEP, CPU_SSE }; - size_t len = sizeof(val); - if(sysctl(mib, 2, &val, &len, NULL, 0) < 0 || !val) - info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = info->data.ia32.sse3 = info->data.ia32.ssse3 = false; - else { /* double-check SSE2 */ - mib[1] = CPU_SSE2; - len = sizeof(val); - if(sysctl(mib, 2, &val, &len, NULL, 0) < 0 || !val) - info->data.ia32.sse2 = info->data.ia32.sse3 = info->data.ia32.ssse3 = false; + int val = 0, mib[2] = { CTL_MACHDEP, CPU_SSE }; + size_t len = sizeof(val); + if(sysctl(mib, 2, &val, &len, NULL, 0) < 0 || !val) + disable_sse(info); + else { /* double-check SSE2 */ + mib[1] = CPU_SSE2; + len = sizeof(val); + if(sysctl(mib, 2, &val, &len, NULL, 0) < 0 || !val) { + disable_sse(info); + info->ia32.sse = true; } + } # else - info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = info->data.ia32.sse3 = info->data.ia32.ssse3 = false; + disable_sse(info); # endif #elif defined(__linux__) - int sse = 0; - struct sigaction sigill_save; -#ifdef USE_OBSOLETE_SIGCONTEXT_FLAVOR - if(0 == sigaction(SIGILL, NULL, &sigill_save) && signal(SIGILL, (void (*)(int))sigill_handler_sse_os) != SIG_ERR) -#else - struct sigaction sigill_sse; - sigill_sse.sa_sigaction = sigill_handler_sse_os; - __sigemptyset(&sigill_sse.sa_mask); - sigill_sse.sa_flags = SA_SIGINFO | SA_RESETHAND; /* SA_RESETHAND just in case our SIGILL return jump breaks, so we don't get stuck in a loop */ - if(0 == sigaction(SIGILL, &sigill_sse, &sigill_save)) -#endif - { - /* http://www.ibiblio.org/gferg/ldp/GCC-Inline-Assembly-HOWTO.html */ - /* see sigill_handler_sse_os() for an explanation of the following: */ - asm volatile ( - "xorl %0,%0\n\t" /* for some reason, still need to do this to clear 'sse' var */ - "xorps %%xmm0,%%xmm0\n\t" /* will cause SIGILL if unsupported by OS */ - "incl %0\n\t" /* SIGILL handler will jump over this */ - /* landing zone */ - "nop\n\t" /* SIGILL jump lands here if "inc" is 9 bytes */ - "nop\n\t" - "nop\n\t" - "nop\n\t" - "nop\n\t" - "nop\n\t" - "nop\n\t" /* SIGILL jump lands here if "inc" is 3 bytes (expected) */ - "nop\n\t" - "nop" /* SIGILL jump lands here if "inc" is 1 byte */ - : "=r"(sse) - : "r"(sse) - ); - - sigaction(SIGILL, &sigill_save, NULL); - } - - if(!sse) - info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = info->data.ia32.sse3 = info->data.ia32.ssse3 = false; -#elif defined(_MSC_VER) -# ifdef USE_TRY_CATCH_FLAVOR - _try { - __asm { -# if _MSC_VER <= 1200 - /* VC6 assembler doesn't know SSE, have to emit bytecode instead */ - _emit 0x0F - _emit 0x57 - _emit 0xC0 -# else - xorps xmm0,xmm0 -# endif - } - } - _except(EXCEPTION_EXECUTE_HANDLER) { - if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION) - info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = info->data.ia32.sse3 = info->data.ia32.ssse3 = false; - } -# else - int sse = 0; - LPTOP_LEVEL_EXCEPTION_FILTER save = SetUnhandledExceptionFilter(sigill_handler_sse_os); - /* see GCC version above for explanation */ - /* http://msdn2.microsoft.com/en-us/library/4ks26t93.aspx */ - /* http://www.codeproject.com/cpp/gccasm.asp */ - /* http://www.hick.org/~mmiller/msvc_inline_asm.html */ - __asm { -# if _MSC_VER <= 1200 - /* VC6 assembler doesn't know SSE, have to emit bytecode instead */ - _emit 0x0F - _emit 0x57 - _emit 0xC0 -# else - xorps xmm0,xmm0 -# endif - inc sse - nop - nop - nop - nop - nop - nop - nop - nop - nop - } - SetUnhandledExceptionFilter(save); - if(!sse) - info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = info->data.ia32.sse3 = info->data.ia32.ssse3 = false; -# endif -#else - /* no way to test, disable to be safe */ - info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = info->data.ia32.sse3 = info->data.ia32.ssse3 = false; -#endif -#ifdef DEBUG - fprintf(stderr, " SSE OS sup . %c\n", info->data.ia32.sse ? 'Y' : 'n'); -#endif - - } - } -#else - info->use_asm = false; -#endif - -/* - * PPC-specific - */ -#elif defined FLAC__CPU_PPC - info->type = FLAC__CPUINFO_TYPE_PPC; -# if !defined FLAC__NO_ASM - info->use_asm = true; -# ifdef FLAC__USE_ALTIVEC -# if defined FLAC__SYS_DARWIN - { - int val = 0, mib[2] = { CTL_HW, HW_VECTORUNIT }; - size_t len = sizeof(val); - info->data.ppc.altivec = !(sysctl(mib, 2, &val, &len, NULL, 0) || !val); - } - { - host_basic_info_data_t hostInfo; - mach_msg_type_number_t infoCount; - - infoCount = HOST_BASIC_INFO_COUNT; - host_info(mach_host_self(), HOST_BASIC_INFO, (host_info_t)&hostInfo, &infoCount); - - info->data.ppc.ppc64 = (hostInfo.cpu_type == CPU_TYPE_POWERPC) && (hostInfo.cpu_subtype == CPU_SUBTYPE_POWERPC_970); - } -# else /* FLAC__USE_ALTIVEC && !FLAC__SYS_DARWIN */ - { - /* no Darwin, do it the brute-force way */ - /* @@@@@@ this is not thread-safe; replace with SSE OS method above or remove */ - info->data.ppc.altivec = 0; - info->data.ppc.ppc64 = 0; - - signal (SIGILL, sigill_handler); - canjump = 0; - if (!sigsetjmp (jmpbuf, 1)) { - canjump = 1; - + int sse = 0; + struct sigaction sigill_save; + struct sigaction sigill_sse; + sigill_sse.sa_sigaction = sigill_handler_sse_os; + __sigemptyset(&sigill_sse.sa_mask); + sigill_sse.sa_flags = SA_SIGINFO | SA_RESETHAND; /* SA_RESETHAND just in case our SIGILL return jump breaks, so we don't get stuck in a loop */ + if(0 == sigaction(SIGILL, &sigill_sse, &sigill_save)) + { + /* http://www.ibiblio.org/gferg/ldp/GCC-Inline-Assembly-HOWTO.html */ + /* see sigill_handler_sse_os() for an explanation of the following: */ asm volatile ( - "mtspr 256, %0\n\t" - "vand %%v0, %%v0, %%v0" - : - : "r" (-1) + "xorps %%xmm0,%%xmm0\n\t" /* will cause SIGILL if unsupported by OS */ + "incl %0\n\t" /* SIGILL handler will jump over this */ + /* landing zone */ + "nop\n\t" /* SIGILL jump lands here if "inc" is 9 bytes */ + "nop\n\t" + "nop\n\t" + "nop\n\t" + "nop\n\t" + "nop\n\t" + "nop\n\t" /* SIGILL jump lands here if "inc" is 3 bytes (expected) */ + "nop\n\t" + "nop" /* SIGILL jump lands here if "inc" is 1 byte */ + : "=r"(sse) + : "0"(sse) ); - info->data.ppc.altivec = 1; + sigaction(SIGILL, &sigill_save, NULL); } - canjump = 0; - if (!sigsetjmp (jmpbuf, 1)) { - int x = 0; - canjump = 1; - /* PPC64 hardware implements the cntlzd instruction */ - asm volatile ("cntlzd %0, %1" : "=r" (x) : "r" (x) ); - - info->data.ppc.ppc64 = 1; + if(!sse) + disable_sse(info); +#elif defined(_MSC_VER) + __try { + __asm { + xorps xmm0,xmm0 + } } - signal (SIGILL, SIG_DFL); /*@@@@@@ should save and restore old signal */ + __except(EXCEPTION_EXECUTE_HANDLER) { + if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION) + disable_sse(info); + } +#elif defined(__GNUC__) /* MinGW goes here */ + int sse = 0; + /* Based on the idea described in Agner Fog's manual "Optimizing subroutines in assembly language" */ + /* In theory, not guaranteed to detect lack of OS SSE support on some future Intel CPUs, but in practice works (see the aforementioned manual) */ + if (ia32_fxsr) { + struct { + FLAC__uint32 buff[128]; + } __attribute__((aligned(16))) fxsr; + FLAC__uint32 old_val, new_val; + + asm volatile ("fxsave %0" : "=m" (fxsr) : "m" (fxsr)); + old_val = fxsr.buff[50]; + fxsr.buff[50] ^= 0x0013c0de; /* change value in the buffer */ + asm volatile ("fxrstor %0" : "=m" (fxsr) : "m" (fxsr)); /* try to change SSE register */ + fxsr.buff[50] = old_val; /* restore old value in the buffer */ + asm volatile ("fxsave %0 " : "=m" (fxsr) : "m" (fxsr)); /* old value will be overwritten if SSE register was changed */ + new_val = fxsr.buff[50]; /* == old_val if FXRSTOR didn't change SSE register and (old_val ^ 0x0013c0de) otherwise */ + fxsr.buff[50] = old_val; /* again restore old value in the buffer */ + asm volatile ("fxrstor %0" : "=m" (fxsr) : "m" (fxsr)); /* restore old values of registers */ + + if ((old_val^new_val) == 0x0013c0de) + sse = 1; + } + if(!sse) + disable_sse(info); +#else + /* no way to test, disable to be safe */ + disable_sse(info); +#endif +#ifdef DEBUG + fprintf(stderr, " SSE OS sup . %c\n", info->ia32.sse ? 'Y' : 'n'); +#endif } -# endif -# else /* !FLAC__USE_ALTIVEC */ - info->data.ppc.altivec = 0; - info->data.ppc.ppc64 = 0; -# endif -# else + else /* info->ia32.sse == false */ + disable_sse(info); + + /* + * now have to check for OS support of AVX instructions + */ + if(info->ia32.avx && ia32_osxsave) { + FLAC__uint32 ecr = FLAC__cpu_xgetbv_x86(); + if ((ecr & 0x6) != 0x6) + disable_avx(info); +#ifdef DEBUG + fprintf(stderr, " AVX OS sup . %c\n", info->ia32.avx ? 'Y' : 'n'); +#endif + } + else /* no OS AVX support*/ + disable_avx(info); +#else info->use_asm = false; -# endif +#endif /* - * unknown CPI + * x86-64-specific + */ +#elif defined FLAC__CPU_X86_64 + FLAC__bool x86_osxsave = false; + (void) x86_osxsave; /* to avoid warnings about unused variables */ + memset(info, 0, sizeof(*info)); + info->type = FLAC__CPUINFO_TYPE_X86_64; +#if !defined FLAC__NO_ASM && defined FLAC__HAS_X86INTRIN + info->use_asm = true; + { + /* http://www.sandpile.org/x86/cpuid.htm */ + FLAC__uint32 flags_eax, flags_ebx, flags_ecx, flags_edx; + FLAC__cpu_info_x86(1, &flags_eax, &flags_ebx, &flags_ecx, &flags_edx); + info->x86.sse3 = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_SSE3 )? true : false; + info->x86.ssse3 = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_SSSE3)? true : false; + info->x86.sse41 = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_SSE41)? true : false; + info->x86.sse42 = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_SSE42)? true : false; +#if defined FLAC__AVX_SUPPORTED + x86_osxsave = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_OSXSAVE)? true : false; + info->x86.avx = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_AVX )? true : false; + info->x86.fma = (flags_ecx & FLAC__CPUINFO_IA32_CPUID_FMA )? true : false; + FLAC__cpu_info_x86(7, &flags_eax, &flags_ebx, &flags_ecx, &flags_edx); + info->x86.avx2 = (flags_ebx & FLAC__CPUINFO_IA32_CPUID_AVX2 )? true : false; +#endif + } +#ifdef DEBUG + fprintf(stderr, "CPU info (x86-64):\n"); + fprintf(stderr, " SSE3 ....... %c\n", info->x86.sse3 ? 'Y' : 'n'); + fprintf(stderr, " SSSE3 ...... %c\n", info->x86.ssse3 ? 'Y' : 'n'); + fprintf(stderr, " SSE41 ...... %c\n", info->x86.sse41 ? 'Y' : 'n'); + fprintf(stderr, " SSE42 ...... %c\n", info->x86.sse42 ? 'Y' : 'n'); +# if defined FLAC__AVX_SUPPORTED + fprintf(stderr, " AVX ........ %c\n", info->x86.avx ? 'Y' : 'n'); + fprintf(stderr, " FMA ........ %c\n", info->x86.fma ? 'Y' : 'n'); + fprintf(stderr, " AVX2 ....... %c\n", info->x86.avx2 ? 'Y' : 'n'); +# endif +#endif + + /* + * now have to check for OS support of AVX instructions + */ + if(info->x86.avx && x86_osxsave) { + FLAC__uint32 ecr = FLAC__cpu_xgetbv_x86(); + if ((ecr & 0x6) != 0x6) + disable_avx(info); +#ifdef DEBUG + fprintf(stderr, " AVX OS sup . %c\n", info->x86.avx ? 'Y' : 'n'); +#endif + } + else /* no OS AVX support*/ + disable_avx(info); +#else + info->use_asm = false; +#endif + +/* + * unknown CPU */ #else info->type = FLAC__CPUINFO_TYPE_UNKNOWN; info->use_asm = false; #endif } + +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN + +#if defined _MSC_VER +#include /* for __cpuid() and _xgetbv() */ +#elif defined __GNUC__ && defined HAVE_CPUID_H +#include /* for __get_cpuid() and __get_cpuid_max() */ +#endif + +FLAC__uint32 FLAC__cpu_have_cpuid_x86(void) +{ +#ifdef FLAC__CPU_X86_64 + return 1; +#else +# if defined _MSC_VER || defined __INTEL_COMPILER /* Do they support CPUs w/o CPUID support (or OSes that work on those CPUs)? */ + FLAC__uint32 flags1, flags2; + __asm { + pushfd + pushfd + pop eax + mov flags1, eax + xor eax, 0x200000 + push eax + popfd + pushfd + pop eax + mov flags2, eax + popfd + } + if (((flags1^flags2) & 0x200000) != 0) + return 1; + else + return 0; +# elif defined __GNUC__ && defined HAVE_CPUID_H + if (__get_cpuid_max(0, 0) != 0) + return 1; + else + return 0; +# else + return 0; +# endif +#endif +} + +void FLAC__cpu_info_x86(FLAC__uint32 level, FLAC__uint32 *eax, FLAC__uint32 *ebx, FLAC__uint32 *ecx, FLAC__uint32 *edx) +{ +#if defined _MSC_VER || defined __INTEL_COMPILER + int cpuinfo[4]; + int ext = level & 0x80000000; + __cpuid(cpuinfo, ext); + if((unsigned)cpuinfo[0] < level) { + *eax = *ebx = *ecx = *edx = 0; + return; + } +#if defined FLAC__AVX_SUPPORTED + __cpuidex(cpuinfo, level, 0); /* for AVX2 detection */ +#else + __cpuid(cpuinfo, level); /* some old compilers don't support __cpuidex */ +#endif + *eax = cpuinfo[0]; *ebx = cpuinfo[1]; *ecx = cpuinfo[2]; *edx = cpuinfo[3]; +#elif defined __GNUC__ && defined HAVE_CPUID_H + FLAC__uint32 ext = level & 0x80000000; + __cpuid(ext, *eax, *ebx, *ecx, *edx); + if (*eax < level) { + *eax = *ebx = *ecx = *edx = 0; + return; + } + __cpuid_count(level, 0, *eax, *ebx, *ecx, *edx); +#else + *eax = *ebx = *ecx = *edx = 0; +#endif +} + +FLAC__uint32 FLAC__cpu_xgetbv_x86(void) +{ +#if (defined _MSC_VER || defined __INTEL_COMPILER) && defined FLAC__AVX_SUPPORTED + return (FLAC__uint32)_xgetbv(0); +#elif defined __GNUC__ + FLAC__uint32 lo, hi; + asm volatile (".byte 0x0f, 0x01, 0xd0" : "=a"(lo), "=d"(hi) : "c" (0)); + return lo; +#else + return 0; +#endif +} + +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ diff --git a/lib-src/libflac/src/libFLAC/crc.c b/lib-src/libflac/src/libFLAC/crc.c index c3afd8b81..de2cb1884 100644 --- a/lib-src/libflac/src/libFLAC/crc.c +++ b/lib-src/libflac/src/libFLAC/crc.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/libFLAC/fixed.c b/lib-src/libflac/src/libFLAC/fixed.c index 8c96cc0fc..74b31b328 100644 --- a/lib-src/libflac/src/libFLAC/fixed.c +++ b/lib-src/libflac/src/libFLAC/fixed.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,22 +30,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #include #include +#include "share/compat.h" #include "private/bitmath.h" #include "private/fixed.h" #include "private/macros.h" #include "FLAC/assert.h" -#ifndef M_LN2 -/* math.h in VC++ doesn't seem to have this (how Microsoft is that?) */ -#define M_LN2 0.69314718055994530942 -#endif - #ifdef local_abs #undef local_abs #endif @@ -321,20 +317,11 @@ unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsig FLAC__ASSERT(data_len > 0 || total_error_3 == 0); FLAC__ASSERT(data_len > 0 || total_error_4 == 0); #ifndef FLAC__INTEGER_ONLY_LIBRARY -#if defined _MSC_VER || defined __MINGW32__ - /* with MSVC you have to spoon feed it the casting */ - residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0); - residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0); - residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0); - residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0); - residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)(FLAC__int64)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0); -#else residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0); residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0); residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0); residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0); residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0); -#endif #else residual_bits_per_sample[0] = (total_error_0 > 0) ? local__compute_rbps_wide_integerized(total_error_0, data_len) : 0; residual_bits_per_sample[1] = (total_error_1 > 0) ? local__compute_rbps_wide_integerized(total_error_1, data_len) : 0; diff --git a/lib-src/libflac/src/libFLAC/fixed_intrin_sse2.c b/lib-src/libflac/src/libFLAC/fixed_intrin_sse2.c new file mode 100644 index 000000000..6785f92a9 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/fixed_intrin_sse2.c @@ -0,0 +1,253 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifndef FLAC__INTEGER_ONLY_LIBRARY +#ifndef FLAC__NO_ASM +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#include "private/fixed.h" +#ifdef FLAC__SSE2_SUPPORTED + +#include /* SSE2 */ +#include +#include "private/macros.h" +#include "share/compat.h" +#include "FLAC/assert.h" + +#ifdef FLAC__CPU_IA32 +#define m128i_to_i64(dest, src) _mm_storel_epi64((__m128i*)&dest, src) +#else +#define m128i_to_i64(dest, src) dest = _mm_cvtsi128_si64(src) +#endif + +FLAC__SSE_TARGET("sse2") +unsigned FLAC__fixed_compute_best_predictor_intrin_sse2(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER + 1]) +{ + FLAC__uint32 total_error_0, total_error_1, total_error_2, total_error_3, total_error_4; + unsigned i, order; + + __m128i total_err0, total_err1, total_err2; + + { + FLAC__int32 itmp; + __m128i last_error; + + last_error = _mm_cvtsi32_si128(data[-1]); // 0 0 0 le0 + itmp = data[-2]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // 0 0 le0 le1 + itmp -= data[-3]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // 0 le0 le1 le2 + itmp -= data[-3] - data[-4]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // le0 le1 le2 le3 + + total_err0 = total_err1 = _mm_setzero_si128(); + for(i = 0; i < data_len; i++) { + __m128i err0, err1, tmp; + err0 = _mm_cvtsi32_si128(data[i]); // 0 0 0 e0 + err1 = _mm_shuffle_epi32(err0, _MM_SHUFFLE(0,0,0,0)); // e0 e0 e0 e0 +#if 1 /* OPT_SSE */ + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 le0 le1 le2 + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 0 le0 le1 + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 0 0 le0 + err1 = _mm_sub_epi32(err1, last_error); // e1 e2 e3 e4 +#else + last_error = _mm_add_epi32(last_error, _mm_srli_si128(last_error, 8)); // le0 le1 le2+le0 le3+le1 + last_error = _mm_add_epi32(last_error, _mm_srli_si128(last_error, 4)); // le0 le1+le0 le2+le0+le1 le3+le1+le2+le0 + err1 = _mm_sub_epi32(err1, last_error); // e1 e2 e3 e4 +#endif + tmp = _mm_slli_si128(err0, 12); // e0 0 0 0 + last_error = _mm_srli_si128(err1, 4); // 0 e1 e2 e3 + last_error = _mm_or_si128(last_error, tmp); // e0 e1 e2 e3 + + tmp = _mm_srai_epi32(err0, 31); + err0 = _mm_xor_si128(err0, tmp); + err0 = _mm_sub_epi32(err0, tmp); + tmp = _mm_srai_epi32(err1, 31); + err1 = _mm_xor_si128(err1, tmp); + err1 = _mm_sub_epi32(err1, tmp); + + total_err0 = _mm_add_epi32(total_err0, err0); // 0 0 0 te0 + total_err1 = _mm_add_epi32(total_err1, err1); // te1 te2 te3 te4 + } + } + + total_error_0 = _mm_cvtsi128_si32(total_err0); + total_err2 = total_err1; // te1 te2 te3 te4 + total_err1 = _mm_srli_si128(total_err1, 8); // 0 0 te1 te2 + total_error_4 = _mm_cvtsi128_si32(total_err2); + total_error_2 = _mm_cvtsi128_si32(total_err1); + total_err2 = _mm_srli_si128(total_err2, 4); // 0 te1 te2 te3 + total_err1 = _mm_srli_si128(total_err1, 4); // 0 0 0 te1 + total_error_3 = _mm_cvtsi128_si32(total_err2); + total_error_1 = _mm_cvtsi128_si32(total_err1); + + /* prefer higher order */ + if(total_error_0 < flac_min(flac_min(flac_min(total_error_1, total_error_2), total_error_3), total_error_4)) + order = 0; + else if(total_error_1 < flac_min(flac_min(total_error_2, total_error_3), total_error_4)) + order = 1; + else if(total_error_2 < flac_min(total_error_3, total_error_4)) + order = 2; + else if(total_error_3 < total_error_4) + order = 3; + else + order = 4; + + /* Estimate the expected number of bits per residual signal sample. */ + /* 'total_error*' is linearly related to the variance of the residual */ + /* signal, so we use it directly to compute E(|x|) */ + FLAC__ASSERT(data_len > 0 || total_error_0 == 0); + FLAC__ASSERT(data_len > 0 || total_error_1 == 0); + FLAC__ASSERT(data_len > 0 || total_error_2 == 0); + FLAC__ASSERT(data_len > 0 || total_error_3 == 0); + FLAC__ASSERT(data_len > 0 || total_error_4 == 0); + + residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0); + + return order; +} + +FLAC__SSE_TARGET("sse2") +unsigned FLAC__fixed_compute_best_predictor_wide_intrin_sse2(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER + 1]) +{ + FLAC__uint64 total_error_0, total_error_1, total_error_2, total_error_3, total_error_4; + unsigned i, order; + + __m128i total_err0, total_err1, total_err3; + + { + FLAC__int32 itmp; + __m128i last_error, zero = _mm_setzero_si128(); + + last_error = _mm_cvtsi32_si128(data[-1]); // 0 0 0 le0 + itmp = data[-2]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // 0 0 le0 le1 + itmp -= data[-3]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // 0 le0 le1 le2 + itmp -= data[-3] - data[-4]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // le0 le1 le2 le3 + + total_err0 = total_err1 = total_err3 = _mm_setzero_si128(); + for(i = 0; i < data_len; i++) { + __m128i err0, err1, tmp; + err0 = _mm_cvtsi32_si128(data[i]); // 0 0 0 e0 + err1 = _mm_shuffle_epi32(err0, _MM_SHUFFLE(0,0,0,0)); // e0 e0 e0 e0 +#if 1 /* OPT_SSE */ + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 le0 le1 le2 + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 0 le0 le1 + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 0 0 le0 + err1 = _mm_sub_epi32(err1, last_error); // e1 e2 e3 e4 +#else + last_error = _mm_add_epi32(last_error, _mm_srli_si128(last_error, 8)); // le0 le1 le2+le0 le3+le1 + last_error = _mm_add_epi32(last_error, _mm_srli_si128(last_error, 4)); // le0 le1+le0 le2+le0+le1 le3+le1+le2+le0 + err1 = _mm_sub_epi32(err1, last_error); // e1 e2 e3 e4 +#endif + tmp = _mm_slli_si128(err0, 12); // e0 0 0 0 + last_error = _mm_srli_si128(err1, 4); // 0 e1 e2 e3 + last_error = _mm_or_si128(last_error, tmp); // e0 e1 e2 e3 + + tmp = _mm_srai_epi32(err0, 31); + err0 = _mm_xor_si128(err0, tmp); + err0 = _mm_sub_epi32(err0, tmp); + tmp = _mm_srai_epi32(err1, 31); + err1 = _mm_xor_si128(err1, tmp); + err1 = _mm_sub_epi32(err1, tmp); + + total_err0 = _mm_add_epi64(total_err0, err0); // 0 te0 + err0 = _mm_unpacklo_epi32(err1, zero); // 0 |e3| 0 |e4| + err1 = _mm_unpackhi_epi32(err1, zero); // 0 |e1| 0 |e2| + total_err3 = _mm_add_epi64(total_err3, err0); // te3 te4 + total_err1 = _mm_add_epi64(total_err1, err1); // te1 te2 + } + } + + m128i_to_i64(total_error_0, total_err0); + m128i_to_i64(total_error_4, total_err3); + m128i_to_i64(total_error_2, total_err1); + total_err3 = _mm_srli_si128(total_err3, 8); // 0 te3 + total_err1 = _mm_srli_si128(total_err1, 8); // 0 te1 + m128i_to_i64(total_error_3, total_err3); + m128i_to_i64(total_error_1, total_err1); + + /* prefer higher order */ + if(total_error_0 < flac_min(flac_min(flac_min(total_error_1, total_error_2), total_error_3), total_error_4)) + order = 0; + else if(total_error_1 < flac_min(flac_min(total_error_2, total_error_3), total_error_4)) + order = 1; + else if(total_error_2 < flac_min(total_error_3, total_error_4)) + order = 2; + else if(total_error_3 < total_error_4) + order = 3; + else + order = 4; + + /* Estimate the expected number of bits per residual signal sample. */ + /* 'total_error*' is linearly related to the variance of the residual */ + /* signal, so we use it directly to compute E(|x|) */ + FLAC__ASSERT(data_len > 0 || total_error_0 == 0); + FLAC__ASSERT(data_len > 0 || total_error_1 == 0); + FLAC__ASSERT(data_len > 0 || total_error_2 == 0); + FLAC__ASSERT(data_len > 0 || total_error_3 == 0); + FLAC__ASSERT(data_len > 0 || total_error_4 == 0); + + residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0); + + return order; +} + +#endif /* FLAC__SSE2_SUPPORTED */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* FLAC__NO_ASM */ +#endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/lib-src/libflac/src/libFLAC/fixed_intrin_ssse3.c b/lib-src/libflac/src/libFLAC/fixed_intrin_ssse3.c new file mode 100644 index 000000000..50c663d83 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/fixed_intrin_ssse3.c @@ -0,0 +1,241 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifndef FLAC__INTEGER_ONLY_LIBRARY +#ifndef FLAC__NO_ASM +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#include "private/fixed.h" +#ifdef FLAC__SSSE3_SUPPORTED + +#include /* SSSE3 */ +#include +#include "private/macros.h" +#include "share/compat.h" +#include "FLAC/assert.h" + +#ifdef FLAC__CPU_IA32 +#define m128i_to_i64(dest, src) _mm_storel_epi64((__m128i*)&dest, src) +#else +#define m128i_to_i64(dest, src) dest = _mm_cvtsi128_si64(src) +#endif + +FLAC__SSE_TARGET("ssse3") +unsigned FLAC__fixed_compute_best_predictor_intrin_ssse3(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER + 1]) +{ + FLAC__uint32 total_error_0, total_error_1, total_error_2, total_error_3, total_error_4; + unsigned i, order; + + __m128i total_err0, total_err1, total_err2; + + { + FLAC__int32 itmp; + __m128i last_error; + + last_error = _mm_cvtsi32_si128(data[-1]); // 0 0 0 le0 + itmp = data[-2]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // 0 0 le0 le1 + itmp -= data[-3]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // 0 le0 le1 le2 + itmp -= data[-3] - data[-4]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // le0 le1 le2 le3 + + total_err0 = total_err1 = _mm_setzero_si128(); + for(i = 0; i < data_len; i++) { + __m128i err0, err1; + err0 = _mm_cvtsi32_si128(data[i]); // 0 0 0 e0 + err1 = _mm_shuffle_epi32(err0, _MM_SHUFFLE(0,0,0,0)); // e0 e0 e0 e0 +#if 1 /* OPT_SSE */ + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 le0 le1 le2 + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 0 le0 le1 + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 0 0 le0 + err1 = _mm_sub_epi32(err1, last_error); // e1 e2 e3 e4 +#else + last_error = _mm_add_epi32(last_error, _mm_srli_si128(last_error, 8)); // le0 le1 le2+le0 le3+le1 + last_error = _mm_add_epi32(last_error, _mm_srli_si128(last_error, 4)); // le0 le1+le0 le2+le0+le1 le3+le1+le2+le0 + err1 = _mm_sub_epi32(err1, last_error); // e1 e2 e3 e4 +#endif + last_error = _mm_alignr_epi8(err0, err1, 4); // e0 e1 e2 e3 + + err0 = _mm_abs_epi32(err0); + err1 = _mm_abs_epi32(err1); + + total_err0 = _mm_add_epi32(total_err0, err0); // 0 0 0 te0 + total_err1 = _mm_add_epi32(total_err1, err1); // te1 te2 te3 te4 + } + } + + total_error_0 = _mm_cvtsi128_si32(total_err0); + total_err2 = total_err1; // te1 te2 te3 te4 + total_err1 = _mm_srli_si128(total_err1, 8); // 0 0 te1 te2 + total_error_4 = _mm_cvtsi128_si32(total_err2); + total_error_2 = _mm_cvtsi128_si32(total_err1); + total_err2 = _mm_srli_si128(total_err2, 4); // 0 te1 te2 te3 + total_err1 = _mm_srli_si128(total_err1, 4); // 0 0 0 te1 + total_error_3 = _mm_cvtsi128_si32(total_err2); + total_error_1 = _mm_cvtsi128_si32(total_err1); + + /* prefer higher order */ + if(total_error_0 < flac_min(flac_min(flac_min(total_error_1, total_error_2), total_error_3), total_error_4)) + order = 0; + else if(total_error_1 < flac_min(flac_min(total_error_2, total_error_3), total_error_4)) + order = 1; + else if(total_error_2 < flac_min(total_error_3, total_error_4)) + order = 2; + else if(total_error_3 < total_error_4) + order = 3; + else + order = 4; + + /* Estimate the expected number of bits per residual signal sample. */ + /* 'total_error*' is linearly related to the variance of the residual */ + /* signal, so we use it directly to compute E(|x|) */ + FLAC__ASSERT(data_len > 0 || total_error_0 == 0); + FLAC__ASSERT(data_len > 0 || total_error_1 == 0); + FLAC__ASSERT(data_len > 0 || total_error_2 == 0); + FLAC__ASSERT(data_len > 0 || total_error_3 == 0); + FLAC__ASSERT(data_len > 0 || total_error_4 == 0); + + residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0); + + return order; +} + +FLAC__SSE_TARGET("ssse3") +unsigned FLAC__fixed_compute_best_predictor_wide_intrin_ssse3(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER + 1]) +{ + FLAC__uint64 total_error_0, total_error_1, total_error_2, total_error_3, total_error_4; + unsigned i, order; + + __m128i total_err0, total_err1, total_err3; + + { + FLAC__int32 itmp; + __m128i last_error, zero = _mm_setzero_si128(); + + last_error = _mm_cvtsi32_si128(data[-1]); // 0 0 0 le0 + itmp = data[-2]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // 0 0 le0 le1 + itmp -= data[-3]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // 0 le0 le1 le2 + itmp -= data[-3] - data[-4]; + last_error = _mm_shuffle_epi32(last_error, _MM_SHUFFLE(2,1,0,0)); + last_error = _mm_sub_epi32(last_error, _mm_cvtsi32_si128(itmp)); // le0 le1 le2 le3 + + total_err0 = total_err1 = total_err3 = _mm_setzero_si128(); + for(i = 0; i < data_len; i++) { + __m128i err0, err1; + err0 = _mm_cvtsi32_si128(data[i]); // 0 0 0 e0 + err1 = _mm_shuffle_epi32(err0, _MM_SHUFFLE(0,0,0,0)); // e0 e0 e0 e0 +#if 1 /* OPT_SSE */ + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 le0 le1 le2 + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 0 le0 le1 + err1 = _mm_sub_epi32(err1, last_error); + last_error = _mm_srli_si128(last_error, 4); // 0 0 0 le0 + err1 = _mm_sub_epi32(err1, last_error); // e1 e2 e3 e4 +#else + last_error = _mm_add_epi32(last_error, _mm_srli_si128(last_error, 8)); // le0 le1 le2+le0 le3+le1 + last_error = _mm_add_epi32(last_error, _mm_srli_si128(last_error, 4)); // le0 le1+le0 le2+le0+le1 le3+le1+le2+le0 + err1 = _mm_sub_epi32(err1, last_error); // e1 e2 e3 e4 +#endif + last_error = _mm_alignr_epi8(err0, err1, 4); // e0 e1 e2 e3 + + err0 = _mm_abs_epi32(err0); + err1 = _mm_abs_epi32(err1); // |e1| |e2| |e3| |e4| + + total_err0 = _mm_add_epi64(total_err0, err0); // 0 te0 + err0 = _mm_unpacklo_epi32(err1, zero); // 0 |e3| 0 |e4| + err1 = _mm_unpackhi_epi32(err1, zero); // 0 |e1| 0 |e2| + total_err3 = _mm_add_epi64(total_err3, err0); // te3 te4 + total_err1 = _mm_add_epi64(total_err1, err1); // te1 te2 + } + } + + m128i_to_i64(total_error_0, total_err0); + m128i_to_i64(total_error_4, total_err3); + m128i_to_i64(total_error_2, total_err1); + total_err3 = _mm_srli_si128(total_err3, 8); // 0 te3 + total_err1 = _mm_srli_si128(total_err1, 8); // 0 te1 + m128i_to_i64(total_error_3, total_err3); + m128i_to_i64(total_error_1, total_err1); + + /* prefer higher order */ + if(total_error_0 < flac_min(flac_min(flac_min(total_error_1, total_error_2), total_error_3), total_error_4)) + order = 0; + else if(total_error_1 < flac_min(flac_min(total_error_2, total_error_3), total_error_4)) + order = 1; + else if(total_error_2 < flac_min(total_error_3, total_error_4)) + order = 2; + else if(total_error_3 < total_error_4) + order = 3; + else + order = 4; + + /* Estimate the expected number of bits per residual signal sample. */ + /* 'total_error*' is linearly related to the variance of the residual */ + /* signal, so we use it directly to compute E(|x|) */ + FLAC__ASSERT(data_len > 0 || total_error_0 == 0); + FLAC__ASSERT(data_len > 0 || total_error_1 == 0); + FLAC__ASSERT(data_len > 0 || total_error_2 == 0); + FLAC__ASSERT(data_len > 0 || total_error_3 == 0); + FLAC__ASSERT(data_len > 0 || total_error_4 == 0); + + residual_bits_per_sample[0] = (FLAC__float)((total_error_0 > 0) ? log(M_LN2 * (FLAC__double)total_error_0 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[1] = (FLAC__float)((total_error_1 > 0) ? log(M_LN2 * (FLAC__double)total_error_1 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[2] = (FLAC__float)((total_error_2 > 0) ? log(M_LN2 * (FLAC__double)total_error_2 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[3] = (FLAC__float)((total_error_3 > 0) ? log(M_LN2 * (FLAC__double)total_error_3 / (FLAC__double)data_len) / M_LN2 : 0.0); + residual_bits_per_sample[4] = (FLAC__float)((total_error_4 > 0) ? log(M_LN2 * (FLAC__double)total_error_4 / (FLAC__double)data_len) / M_LN2 : 0.0); + + return order; +} + +#endif /* FLAC__SSSE3_SUPPORTED */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* FLAC__NO_ASM */ +#endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/lib-src/libflac/src/libFLAC/float.c b/lib-src/libflac/src/libFLAC/float.c index f92a9b1d3..068069f36 100644 --- a/lib-src/libflac/src/libFLAC/float.c +++ b/lib-src/libflac/src/libFLAC/float.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/libFLAC/format.c b/lib-src/libflac/src/libFLAC/format.c index 72adefa44..4d0d8329b 100644 --- a/lib-src/libflac/src/libFLAC/format.c +++ b/lib-src/libflac/src/libFLAC/format.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -46,12 +46,7 @@ /* VERSION should come from configure */ FLAC_API const char *FLAC__VERSION_STRING = VERSION; -#if defined _MSC_VER || defined __BORLANDC__ || defined __MINW32__ -/* yet one more hack because of MSVC6: */ -FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.3.0 20130526"; -#else -FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20130526"; -#endif +FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20141125"; FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' }; FLAC_API const unsigned FLAC__STREAM_SYNC = 0x664C6143; diff --git a/lib-src/libflac/src/libFLAC/ia32/Makefile.am b/lib-src/libflac/src/libFLAC/ia32/Makefile.am index e7bb89719..797bf4bc8 100644 --- a/lib-src/libflac/src/libFLAC/ia32/Makefile.am +++ b/lib-src/libflac/src/libFLAC/ia32/Makefile.am @@ -1,6 +1,6 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -38,9 +38,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_LTLIBRARIES = libFLAC-asm.la libFLAC_asm_la_SOURCES = \ - bitreader_asm.nasm \ cpu_asm.nasm \ fixed_asm.nasm \ lpc_asm.nasm \ - nasm.h \ - stream_encoder_asm.nasm + nasm.h diff --git a/lib-src/libflac/src/libFLAC/ia32/Makefile.in b/lib-src/libflac/src/libFLAC/ia32/Makefile.in index 719c109ee..58339269f 100644 --- a/lib-src/libflac/src/libFLAC/ia32/Makefile.in +++ b/lib-src/libflac/src/libFLAC/ia32/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -47,23 +46,51 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -83,17 +110,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/libFLAC/ia32 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -102,12 +131,24 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libFLAC_asm_la_LIBADD = -am_libFLAC_asm_la_OBJECTS = bitreader_asm.lo cpu_asm.lo fixed_asm.lo \ - lpc_asm.lo stream_encoder_asm.lo +am_libFLAC_asm_la_OBJECTS = cpu_asm.lo fixed_asm.lo lpc_asm.lo libFLAC_asm_la_OBJECTS = $(am_libFLAC_asm_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -117,20 +158,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libFLAC_asm_la_SOURCES) DIST_SOURCES = $(libFLAC_asm_la_SOURCES) am__can_run_installinfo = \ @@ -138,6 +175,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -178,7 +232,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -198,8 +251,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -297,18 +348,16 @@ STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_LTLIBRARIES = libFLAC-asm.la libFLAC_asm_la_SOURCES = \ - bitreader_asm.nasm \ cpu_asm.nasm \ fixed_asm.nasm \ lpc_asm.nasm \ - nasm.h \ - stream_encoder_asm.nasm + nasm.h all: all-am .SUFFIXES: .SUFFIXES: .nasm .lo -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -333,20 +382,23 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libFLAC-asm.la: $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_DEPENDENCIES) $(EXTRA_libFLAC_asm_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_LIBADD) $(LIBS) @@ -362,26 +414,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -393,15 +434,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -410,6 +447,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -549,18 +601,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am .nasm.lo: $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@ diff --git a/lib-src/libflac/src/libFLAC/ia32/bitreader_asm.nasm b/lib-src/libflac/src/libFLAC/ia32/bitreader_asm.nasm deleted file mode 100644 index 67e32a65c..000000000 --- a/lib-src/libflac/src/libFLAC/ia32/bitreader_asm.nasm +++ /dev/null @@ -1,593 +0,0 @@ -; vim:filetype=nasm ts=8 - -; libFLAC - Free Lossless Audio Codec library -; Copyright (C) 2001-2009 Josh Coalson -; Copyright (C) 2011-2013 Xiph.Org Foundation -; -; Redistribution and use in source and binary forms, with or without -; modification, are permitted provided that the following conditions -; are met: -; -; - Redistributions of source code must retain the above copyright -; notice, this list of conditions and the following disclaimer. -; -; - Redistributions in binary form must reproduce the above copyright -; notice, this list of conditions and the following disclaimer in the -; documentation and/or other materials provided with the distribution. -; -; - Neither the name of the Xiph.org Foundation nor the names of its -; contributors may be used to endorse or promote products derived from -; this software without specific prior written permission. -; -; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -%include "nasm.h" - - data_section - -cextern FLAC__crc16_table ; unsigned FLAC__crc16_table[256]; -cextern bitreader_read_from_client_ ; FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br); - -cglobal FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap - - code_section - - -; ********************************************************************** -; -; void FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter) -; -; Some details like assertions and other checking is performed by the caller. - ALIGN 16 -cident FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap - - ;ASSERT(0 != br); - ;ASSERT(0 != br->buffer); - ; WATCHOUT: code only works if sizeof(brword)==32; we can make things much faster with this assertion - ;ASSERT(FLAC__BITS_PER_WORD == 32); - ;ASSERT(parameter < 32); - ; the above two asserts also guarantee that the binary part never straddles more than 2 words, so we don't have to loop to read it - - ;; peppered throughout the code at major checkpoints are keys like this as to where things are at that point in time - ;; [esp + 16] unsigned parameter - ;; [esp + 12] unsigned nvals - ;; [esp + 8] int vals[] - ;; [esp + 4] FLAC__BitReader *br - mov eax, [esp + 12] ; if(nvals == 0) - test eax, eax - ja .nvals_gt_0 - mov eax, 1 ; return true; - ret - -.nvals_gt_0: - push ebp - push ebx - push esi - push edi - sub esp, 4 - ;; [esp + 36] unsigned parameter - ;; [esp + 32] unsigned nvals - ;; [esp + 28] int vals[] - ;; [esp + 24] FLAC__BitReader *br - ;; [esp] ucbits - mov ebp, [esp + 24] ; ebp <- br == br->buffer - mov esi, [ebp + 16] ; esi <- br->consumed_words (aka 'cwords' in the C version) - mov ecx, [ebp + 20] ; ecx <- br->consumed_bits (aka 'cbits' in the C version) - xor edi, edi ; edi <- 0 'uval' - ;; ecx cbits - ;; esi cwords - ;; edi uval - ;; ebp br - ;; [ebp] br->buffer - ;; [ebp + 8] br->words - ;; [ebp + 12] br->bytes - ;; [ebp + 16] br->consumed_words - ;; [ebp + 20] br->consumed_bits - ;; [ebp + 24] br->read_crc - ;; [ebp + 28] br->crc16_align - - ; ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits; - mov eax, [ebp + 8] ; eax <- br->words - sub eax, esi ; eax <- br->words-cwords - shl eax, 2 ; eax <- (br->words-cwords)*FLAC__BYTES_PER_WORD - add eax, [ebp + 12] ; eax <- (br->words-cwords)*FLAC__BYTES_PER_WORD + br->bytes - shl eax, 3 ; eax <- (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - sub eax, ecx ; eax <- (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits - mov [esp], eax ; ucbits <- eax - - ALIGN 16 -.val_loop: ; while(1) { - - ; - ; read unary part - ; -.unary_loop: ; while(1) { - ;; ecx cbits - ;; esi cwords - ;; edi uval - ;; ebp br - cmp esi, [ebp + 8] ; while(cwords < br->words) /* if we've not consumed up to a partial tail word... */ - jae near .c1_next1 -.c1_loop: ; { - mov ebx, [ebp] - mov eax, [ebx + 4*esi] ; b = br->buffer[cwords] - mov edx, eax ; edx = br->buffer[cwords] (saved for later use) - shl eax, cl ; b = br->buffer[cwords] << cbits - test eax, eax ; (still have to test since cbits may be 0, thus ZF not updated for shl eax,0) - jz near .c1_next2 ; if(b) { - bsr ebx, eax - not ebx - and ebx, 31 ; ebx = 'i' = # of leading 0 bits in 'b' (eax) - add ecx, ebx ; cbits += i; - add edi, ebx ; uval += i; - add ecx, byte 1 ; cbits++; /* skip over stop bit */ - test ecx, ~31 - jz near .break1 ; if(cbits >= FLAC__BITS_PER_WORD) { /* faster way of testing if(cbits == FLAC__BITS_PER_WORD) */ - ; crc16_update_word_(br, br->buffer[cwords]); - push edi ; [need more registers] - bswap edx ; edx = br->buffer[cwords] swapped; now we can CRC the bytes from LSByte to MSByte which makes things much easier - mov ecx, [ebp + 28] ; ecx <- br->crc16_align - mov eax, [ebp + 24] ; ax <- br->read_crc (a.k.a. crc) -%ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE - mov edi, _FLAC__crc16_table -%else -%ifdef OBJ_FORMAT_elf - mov edi, [esp + 16] ; saved ebx (GOT base) - lea edi, [edi + FLAC__crc16_table wrt ..gotoff] -%else - mov edi, FLAC__crc16_table -%endif -%endif - ;; eax (ax) crc a.k.a. br->read_crc - ;; ebx (bl) intermediate result index into FLAC__crc16_table[] - ;; ecx br->crc16_align - ;; edx byteswapped brword to CRC - ;; esi cwords - ;; edi unsigned FLAC__crc16_table[] - ;; ebp br - test ecx, ecx ; switch(br->crc16_align) ... - jnz .c0b4 ; [br->crc16_align is 0 the vast majority of the time so we optimize the common case] -.c0b0: xor dl, ah ; dl <- (crc>>8)^(word>>24) - movzx ebx, dl - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^(word>>24)] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^(word>>24)] -.c0b1: xor dh, ah ; dh <- (crc>>8)^((word>>16)&0xff)) - movzx ebx, dh - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^((word>>16)&0xff))] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^((word>>16)&0xff))] - shr edx, 16 -.c0b2: xor dl, ah ; dl <- (crc>>8)^((word>>8)&0xff)) - movzx ebx, dl - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^((word>>8)&0xff))] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^((word>>8)&0xff))] -.c0b3: xor dh, ah ; dh <- (crc>>8)^(word&0xff) - movzx ebx, dh - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^(word&0xff)] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^(word&0xff)] - movzx eax, ax - mov [ebp + 24], eax ; br->read_crc <- crc - pop edi - - add esi, byte 1 ; cwords++; - xor ecx, ecx ; cbits = 0; - ; } - jmp near .break1 ; goto break1; - ;; this section relocated out of the way for performance -.c0b4: - mov [ebp + 28], dword 0 ; br->crc16_align <- 0 - cmp ecx, 8 - je .c0b1 - shr edx, 16 - cmp ecx, 16 - je .c0b2 - jmp .c0b3 - - ;; this section relocated out of the way for performance -.c1b4: - mov [ebp + 28], dword 0 ; br->crc16_align <- 0 - cmp ecx, 8 - je .c1b1 - shr edx, 16 - cmp ecx, 16 - je .c1b2 - jmp .c1b3 - -.c1_next2: ; } else { - ;; ecx cbits - ;; edx current brword 'b' - ;; esi cwords - ;; edi uval - ;; ebp br - add edi, 32 - sub edi, ecx ; uval += FLAC__BITS_PER_WORD - cbits; - ; crc16_update_word_(br, br->buffer[cwords]); - push edi ; [need more registers] - bswap edx ; edx = br->buffer[cwords] swapped; now we can CRC the bytes from LSByte to MSByte which makes things much easier - mov ecx, [ebp + 28] ; ecx <- br->crc16_align - mov eax, [ebp + 24] ; ax <- br->read_crc (a.k.a. crc) -%ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE - mov edi, _FLAC__crc16_table -%else -%ifdef OBJ_FORMAT_elf - mov edi, [esp + 16] ; saved ebx (GOT base) - lea edi, [edi + FLAC__crc16_table wrt ..gotoff] -%else - mov edi, FLAC__crc16_table -%endif -%endif - ;; eax (ax) crc a.k.a. br->read_crc - ;; ebx (bl) intermediate result index into FLAC__crc16_table[] - ;; ecx br->crc16_align - ;; edx byteswapped brword to CRC - ;; esi cwords - ;; edi unsigned FLAC__crc16_table[] - ;; ebp br - test ecx, ecx ; switch(br->crc16_align) ... - jnz .c1b4 ; [br->crc16_align is 0 the vast majority of the time so we optimize the common case] -.c1b0: xor dl, ah ; dl <- (crc>>8)^(word>>24) - movzx ebx, dl - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^(word>>24)] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^(word>>24)] -.c1b1: xor dh, ah ; dh <- (crc>>8)^((word>>16)&0xff)) - movzx ebx, dh - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^((word>>16)&0xff))] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^((word>>16)&0xff))] - shr edx, 16 -.c1b2: xor dl, ah ; dl <- (crc>>8)^((word>>8)&0xff)) - movzx ebx, dl - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^((word>>8)&0xff))] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^((word>>8)&0xff))] -.c1b3: xor dh, ah ; dh <- (crc>>8)^(word&0xff) - movzx ebx, dh - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^(word&0xff)] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^(word&0xff)] - movzx eax, ax - mov [ebp + 24], eax ; br->read_crc <- crc - pop edi - - add esi, byte 1 ; cwords++; - xor ecx, ecx ; cbits = 0; - ; /* didn't find stop bit yet, have to keep going... */ - ; } - - cmp esi, [ebp + 8] ; } while(cwords < br->words) /* if we've not consumed up to a partial tail word... */ - jb near .c1_loop - -.c1_next1: - ; at this point we've eaten up all the whole words; have to try - ; reading through any tail bytes before calling the read callback. - ; this is a repeat of the above logic adjusted for the fact we - ; don't have a whole word. note though if the client is feeding - ; us data a byte at a time (unlikely), br->consumed_bits may not - ; be zero. - ;; ecx cbits - ;; esi cwords - ;; edi uval - ;; ebp br - mov edx, [ebp + 12] ; edx <- br->bytes - shl edx, 3 ; edx <- br->bytes*8 - cmp edx, ecx - jbe .read1 ; if(br->bytes*8 > cbits) { [NOTE: this case is rare so it doesn't have to be all that fast ] - mov ebx, [ebp] - ; edx <- const unsigned end = br->bytes * 8; - mov eax, [ebx + 4*esi] ; b = br->buffer[cwords] - xchg edx, ecx ; [edx <- cbits , ecx <- end] - mov ebx, 0xffffffff ; ebx <- FLAC__WORD_ALL_ONES - shr ebx, cl ; ebx <- FLAC__WORD_ALL_ONES >> end - not ebx ; ebx <- ~(FLAC__WORD_ALL_ONES >> end) - xchg edx, ecx ; [edx <- end , ecx <- cbits] - and eax, ebx ; b = (br->buffer[cwords] & ~(FLAC__WORD_ALL_ONES >> end)); - shl eax, cl ; b = (br->buffer[cwords] & ~(FLAC__WORD_ALL_ONES >> end)) << cbits; - test eax, eax ; (still have to test since cbits may be 0, thus ZF not updated for shl eax,0) - jz .c1_next3 ; if(b) { - bsr ebx, eax - not ebx - and ebx, 31 ; ebx = 'i' = # of leading 0 bits in 'b' (eax) - add ecx, ebx ; cbits += i; - add edi, ebx ; uval += i; - add ecx, byte 1 ; cbits++; /* skip over stop bit */ - jmp short .break1 ; goto break1; -.c1_next3: ; } else { - sub edi, ecx - add edi, edx ; uval += end - cbits; - mov ecx, edx ; cbits = end - ; /* didn't find stop bit yet, have to keep going... */ - ; } - ; } -.read1: - ; flush registers and read; bitreader_read_from_client_() does - ; not touch br->consumed_bits at all but we still need to set - ; it in case it fails and we have to return false. - ;; ecx cbits - ;; esi cwords - ;; edi uval - ;; ebp br - mov [ebp + 16], esi ; br->consumed_words = cwords; - mov [ebp + 20], ecx ; br->consumed_bits = cbits; - push ecx ; /* save */ - push ebp ; /* push br argument */ -%ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE - call _bitreader_read_from_client_ -%else -%ifdef OBJ_FORMAT_elf - mov ebx, [esp + 20] ; saved ebx (GOT base) - call bitreader_read_from_client_ wrt ..plt -%else - call bitreader_read_from_client_ -%endif -%endif - pop edx ; /* discard, unused */ - pop ecx ; /* restore */ - mov esi, [ebp + 16] ; cwords = br->consumed_words; - ; ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits; - mov ebx, [ebp + 8] ; ebx <- br->words - sub ebx, esi ; ebx <- br->words-cwords - shl ebx, 2 ; ebx <- (br->words-cwords)*FLAC__BYTES_PER_WORD - add ebx, [ebp + 12] ; ebx <- (br->words-cwords)*FLAC__BYTES_PER_WORD + br->bytes - shl ebx, 3 ; ebx <- (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - sub ebx, ecx ; ebx <- (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits - add ebx, edi ; ebx <- (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits + uval - ; + uval to offset our count by the # of unary bits already - ; consumed before the read, because we will add these back - ; in all at once at break1 - mov [esp], ebx ; ucbits <- ebx - test eax, eax ; if(!bitreader_read_from_client_(br)) - jnz near .unary_loop - jmp .end ; return false; /* eax (the return value) is already 0 */ - ; } /* end while(1) unary part */ - - ALIGN 16 -.break1: - ;; ecx cbits - ;; esi cwords - ;; edi uval - ;; ebp br - ;; [esp] ucbits - sub [esp], edi ; ucbits -= uval; - sub dword [esp], byte 1 ; ucbits--; /* account for stop bit */ - - ; - ; read binary part - ; - mov ebx, [esp + 36] ; ebx <- parameter - test ebx, ebx ; if(parameter) { - jz near .break2 -.read2: - cmp [esp], ebx ; while(ucbits < parameter) { - jae .c2_next1 - ; flush registers and read; bitreader_read_from_client_() does - ; not touch br->consumed_bits at all but we still need to set - ; it in case it fails and we have to return false. - mov [ebp + 16], esi ; br->consumed_words = cwords; - mov [ebp + 20], ecx ; br->consumed_bits = cbits; - push ecx ; /* save */ - push ebx ; /* save */ - push ebp ; /* push br argument */ -%ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE - call _bitreader_read_from_client_ -%else -%ifdef OBJ_FORMAT_elf - mov ebx, [esp + 24] ; saved ebx (GOT base) - call bitreader_read_from_client_ wrt ..plt -%else - call bitreader_read_from_client_ -%endif -%endif - pop edx ; /* discard, unused */ - pop ebx ; /* restore */ - pop ecx ; /* restore */ - mov esi, [ebp + 16] ; cwords = br->consumed_words; - ; ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits; - mov edx, [ebp + 8] ; edx <- br->words - sub edx, esi ; edx <- br->words-cwords - shl edx, 2 ; edx <- (br->words-cwords)*FLAC__BYTES_PER_WORD - add edx, [ebp + 12] ; edx <- (br->words-cwords)*FLAC__BYTES_PER_WORD + br->bytes - shl edx, 3 ; edx <- (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - sub edx, ecx ; edx <- (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits - mov [esp], edx ; ucbits <- edx - test eax, eax ; if(!bitreader_read_from_client_(br)) - jnz .read2 - jmp .end ; return false; /* eax (the return value) is already 0 */ - ; } -.c2_next1: - ;; ebx parameter - ;; ecx cbits - ;; esi cwords - ;; edi uval - ;; ebp br - ;; [esp] ucbits - cmp esi, [ebp + 8] ; if(cwords < br->words) { /* if we've not consumed up to a partial tail word... */ - jae near .c2_next2 - test ecx, ecx ; if(cbits) { - jz near .c2_next3 ; /* this also works when consumed_bits==0, it's just a little slower than necessary for that case */ - mov eax, 32 - mov edx, [ebp] - sub eax, ecx ; const unsigned n = FLAC__BITS_PER_WORD - cbits; - mov edx, [edx + 4*esi] ; const brword word = br->buffer[cwords]; - cmp ebx, eax ; if(parameter < n) { - jae .c2_next4 - ; uval <<= parameter; - ; uval |= (word & (FLAC__WORD_ALL_ONES >> cbits)) >> (n-parameter); - shl edx, cl - xchg ebx, ecx - shld edi, edx, cl - add ebx, ecx ; cbits += parameter; - xchg ebx, ecx ; ebx <- parameter, ecx <- cbits - jmp .break2 ; goto break2; - ; } -.c2_next4: - ; uval <<= n; - ; uval |= word & (FLAC__WORD_ALL_ONES >> cbits); -%if 1 - rol edx, cl ; @@@@@@OPT: may be faster to use rol to save edx so we can restore it for CRC'ing - ; @@@@@@OPT: or put parameter in ch instead and free up ebx completely again -%else - shl edx, cl -%endif - xchg eax, ecx - shld edi, edx, cl - xchg eax, ecx -%if 1 - ror edx, cl ; restored. -%else - mov edx, [ebp] - mov edx, [edx + 4*esi] -%endif - ; crc16_update_word_(br, br->buffer[cwords]); - push edi ; [need more registers] - push ebx ; [need more registers] - push eax ; [need more registers] - bswap edx ; edx = br->buffer[cwords] swapped; now we can CRC the bytes from LSByte to MSByte which makes things much easier - mov ecx, [ebp + 28] ; ecx <- br->crc16_align - mov eax, [ebp + 24] ; ax <- br->read_crc (a.k.a. crc) -%ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE - mov edi, _FLAC__crc16_table -%else -%ifdef OBJ_FORMAT_elf - mov edi, [esp + 24] ; saved ebx (GOT base) - lea edi, [edi + FLAC__crc16_table wrt ..gotoff] -%else - mov edi, FLAC__crc16_table -%endif -%endif - ;; eax (ax) crc a.k.a. br->read_crc - ;; ebx (bl) intermediate result index into FLAC__crc16_table[] - ;; ecx br->crc16_align - ;; edx byteswapped brword to CRC - ;; esi cwords - ;; edi unsigned FLAC__crc16_table[] - ;; ebp br - test ecx, ecx ; switch(br->crc16_align) ... - jnz .c2b4 ; [br->crc16_align is 0 the vast majority of the time so we optimize the common case] -.c2b0: xor dl, ah ; dl <- (crc>>8)^(word>>24) - movzx ebx, dl - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^(word>>24)] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^(word>>24)] -.c2b1: xor dh, ah ; dh <- (crc>>8)^((word>>16)&0xff)) - movzx ebx, dh - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^((word>>16)&0xff))] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^((word>>16)&0xff))] - shr edx, 16 -.c2b2: xor dl, ah ; dl <- (crc>>8)^((word>>8)&0xff)) - movzx ebx, dl - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^((word>>8)&0xff))] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^((word>>8)&0xff))] -.c2b3: xor dh, ah ; dh <- (crc>>8)^(word&0xff) - movzx ebx, dh - mov ecx, [ebx*4 + edi] ; cx <- FLAC__crc16_table[(crc>>8)^(word&0xff)] - shl eax, 8 ; ax <- (crc<<8) - xor eax, ecx ; crc <- ax <- (crc<<8) ^ FLAC__crc16_table[(crc>>8)^(word&0xff)] - movzx eax, ax - mov [ebp + 24], eax ; br->read_crc <- crc - pop eax - pop ebx - pop edi - add esi, byte 1 ; cwords++; - mov ecx, ebx - sub ecx, eax ; cbits = parameter - n; - jz .break2 ; if(cbits) { /* parameter > n, i.e. if there are still bits left to read, there have to be less than 32 so they will all be in the next word */ - ; uval <<= cbits; - ; uval |= (br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits)); - mov eax, [ebp] - mov eax, [eax + 4*esi] - shld edi, eax, cl - ; } - jmp .break2 ; goto break2; - - ;; this section relocated out of the way for performance -.c2b4: - mov [ebp + 28], dword 0 ; br->crc16_align <- 0 - cmp ecx, 8 - je .c2b1 - shr edx, 16 - cmp ecx, 16 - je .c2b2 - jmp .c2b3 - -.c2_next3: ; } else { - mov ecx, ebx ; cbits = parameter; - ; uval <<= cbits; - ; uval |= (br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits)); - mov eax, [ebp] - mov eax, [eax + 4*esi] - shld edi, eax, cl - jmp .break2 ; goto break2; - ; } -.c2_next2: ; } else { - ; in this case we're starting our read at a partial tail word; - ; the reader has guaranteed that we have at least 'parameter' - ; bits available to read, which makes this case simpler. - ; uval <<= parameter; - ; if(cbits) { - ; /* this also works when consumed_bits==0, it's just a little slower than necessary for that case */ - ; uval |= (br->buffer[cwords] & (FLAC__WORD_ALL_ONES >> cbits)) >> (FLAC__BITS_PER_WORD-cbits-parameter); - ; cbits += parameter; - ; goto break2; - ; } else { - ; cbits = parameter; - ; uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits); - ; goto break2; - ; } - ; the above is much shorter in assembly: - mov eax, [ebp] - mov eax, [eax + 4*esi] ; eax <- br->buffer[cwords] - shl eax, cl ; eax <- br->buffer[cwords] << cbits - add ecx, ebx ; cbits += parameter - xchg ebx, ecx ; ebx <- cbits, ecx <- parameter - shld edi, eax, cl ; uval <<= parameter <<< 'parameter' bits of tail word - xchg ebx, ecx ; ebx <- parameter, ecx <- cbits - ; } - ; } -.break2: - sub [esp], ebx ; ucbits -= parameter; - - ; - ; compose the value - ; - mov ebx, [esp + 28] ; ebx <- vals - mov edx, edi ; edx <- uval - and edi, 1 ; edi <- uval & 1 - shr edx, 1 ; edx <- uval >> 1 - neg edi ; edi <- -(int)(uval & 1) - xor edx, edi ; edx <- (uval >> 1 ^ -(int)(uval & 1)) - mov [ebx], edx ; *vals <- edx - sub dword [esp + 32], byte 1 ; --nvals; - jz .finished ; if(nvals == 0) /* jump to finish */ - xor edi, edi ; uval = 0; - add dword [esp + 28], 4 ; ++vals - jmp .val_loop ; } - -.finished: - mov [ebp + 16], esi ; br->consumed_words = cwords; - mov [ebp + 20], ecx ; br->consumed_bits = cbits; - mov eax, 1 -.end: - add esp, 4 - pop edi - pop esi - pop ebx - pop ebp - ret - -end diff --git a/lib-src/libflac/src/libFLAC/ia32/cpu_asm.nasm b/lib-src/libflac/src/libFLAC/ia32/cpu_asm.nasm index e4475dcdf..036e86544 100644 --- a/lib-src/libflac/src/libFLAC/ia32/cpu_asm.nasm +++ b/lib-src/libflac/src/libFLAC/ia32/cpu_asm.nasm @@ -2,7 +2,7 @@ ; libFLAC - Free Lossless Audio Codec library ; Copyright (C) 2001-2009 Josh Coalson -; Copyright (C) 2011-2013 Xiph.Org Foundation +; Copyright (C) 2011-2014 Xiph.Org Foundation ; ; Redistribution and use in source and binary forms, with or without ; modification, are permitted provided that the following conditions @@ -37,7 +37,6 @@ cglobal FLAC__cpu_have_cpuid_asm_ia32 cglobal FLAC__cpu_info_asm_ia32 -cglobal FLAC__cpu_info_extended_amd_asm_ia32 code_section @@ -47,7 +46,6 @@ cglobal FLAC__cpu_info_extended_amd_asm_ia32 ; cident FLAC__cpu_have_cpuid_asm_ia32 - push ebx pushfd pop eax mov edx, eax @@ -56,14 +54,11 @@ cident FLAC__cpu_have_cpuid_asm_ia32 popfd pushfd pop eax - cmp eax, edx - jz .no_cpuid - mov eax, 1 - jmp .end -.no_cpuid: - xor eax, eax -.end: - pop ebx + xor eax, edx + and eax, 0x00200000 + shr eax, 0x15 + push edx + popfd ret ; ********************************************************************** @@ -79,6 +74,10 @@ cident FLAC__cpu_info_asm_ia32 call FLAC__cpu_have_cpuid_asm_ia32 test eax, eax jz .no_cpuid + mov eax, 0 + cpuid + cmp eax, 1 + jb .no_cpuid mov eax, 1 cpuid mov ebx, [esp + 8] @@ -96,23 +95,4 @@ cident FLAC__cpu_info_asm_ia32 pop ebx ret -cident FLAC__cpu_info_extended_amd_asm_ia32 - push ebx - call FLAC__cpu_have_cpuid_asm_ia32 - test eax, eax - jz .no_cpuid - mov eax, 0x80000000 - cpuid - cmp eax, 0x80000001 - jb .no_cpuid - mov eax, 0x80000001 - cpuid - mov eax, edx - jmp .end -.no_cpuid: - xor eax, eax -.end: - pop ebx - ret - -end +; end diff --git a/lib-src/libflac/src/libFLAC/ia32/fixed_asm.nasm b/lib-src/libflac/src/libFLAC/ia32/fixed_asm.nasm index e7a66f8f6..402c02af0 100644 --- a/lib-src/libflac/src/libFLAC/ia32/fixed_asm.nasm +++ b/lib-src/libflac/src/libFLAC/ia32/fixed_asm.nasm @@ -2,7 +2,7 @@ ; libFLAC - Free Lossless Audio Codec library ; Copyright (C) 2001-2009 Josh Coalson -; Copyright (C) 2011-2013 Xiph.Org Foundation +; Copyright (C) 2011-2014 Xiph.Org Foundation ; ; Redistribution and use in source and binary forms, with or without ; modification, are permitted provided that the following conditions @@ -306,4 +306,4 @@ cident FLAC__fixed_compute_best_predictor_asm_ia32_mmx_cmov pop ebp ret -end +; end diff --git a/lib-src/libflac/src/libFLAC/ia32/lpc_asm.nasm b/lib-src/libflac/src/libFLAC/ia32/lpc_asm.nasm index 8c386f9f2..bf6503233 100644 --- a/lib-src/libflac/src/libFLAC/ia32/lpc_asm.nasm +++ b/lib-src/libflac/src/libFLAC/ia32/lpc_asm.nasm @@ -2,7 +2,7 @@ ; libFLAC - Free Lossless Audio Codec library ; Copyright (C) 2001-2009 Josh Coalson -; Copyright (C) 2011-2013 Xiph.Org Foundation +; Copyright (C) 2011-2014 Xiph.Org Foundation ; ; Redistribution and use in source and binary forms, with or without ; modification, are permitted provided that the following conditions @@ -39,11 +39,13 @@ cglobal FLAC__lpc_compute_autocorrelation_asm_ia32 cglobal FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_4 cglobal FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_8 cglobal FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_12 -cglobal FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow +cglobal FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_16 cglobal FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32 cglobal FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx +cglobal FLAC__lpc_compute_residual_from_qlp_coefficients_wide_asm_ia32 cglobal FLAC__lpc_restore_signal_asm_ia32 cglobal FLAC__lpc_restore_signal_asm_ia32_mmx +cglobal FLAC__lpc_restore_signal_wide_asm_ia32 code_section @@ -114,9 +116,8 @@ cident FLAC__lpc_compute_autocorrelation_asm_ia32 lea edx, [eax + eax*2] neg edx lea edx, [eax + edx*4 + .jumper1_0 - .get_eip1] - call .get_eip1 + call .mov_eip_to_ebx .get_eip1: - pop ebx add edx, ebx inc edx ; compensate for the shorter opcode on the last iteration inc edx ; compensate for the shorter opcode on the last iteration @@ -127,6 +128,10 @@ cident FLAC__lpc_compute_autocorrelation_asm_ia32 .loop1_start: jmp edx +.mov_eip_to_ebx: + mov ebx, [esp] + ret + fld st0 ; ST = d d fmul dword [esi + (32*4)] ; ST = d*data[sample+32] d WATCHOUT: not a byte displacement here! fadd dword [edi + (32*4)] ; ST = autoc[32]+d*data[sample+32] d WATCHOUT: not a byte displacement here! @@ -284,9 +289,8 @@ cident FLAC__lpc_compute_autocorrelation_asm_ia32 lea edx, [eax + eax*2] neg edx lea edx, [eax + edx*4 + .jumper2_0 - .get_eip2] - call .get_eip2 + call .mov_eip_to_ebx .get_eip2: - pop ebx add edx, ebx inc edx ; compensate for the shorter opcode on the last iteration inc edx ; compensate for the shorter opcode on the last iteration @@ -596,7 +600,7 @@ cident FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_12 movss xmm3, xmm2 movss xmm2, xmm0 - ; xmm7:xmm6:xmm5 += xmm0:xmm0:xmm0 * xmm3:xmm3:xmm2 + ; xmm7:xmm6:xmm5 += xmm0:xmm0:xmm0 * xmm4:xmm3:xmm2 movaps xmm1, xmm0 mulps xmm1, xmm2 addps xmm5, xmm1 @@ -619,123 +623,91 @@ cident FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_12 ret ALIGN 16 -cident FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow - ;[ebp + 32] autoc - ;[ebp + 28] lag - ;[ebp + 24] data_len - ;[ebp + 20] data +cident FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_16 + ;[ebp + 20] == autoc[] + ;[ebp + 16] == lag + ;[ebp + 12] == data_len + ;[ebp + 8] == data[] + ;[esp] == __m128 + ;[esp + 16] == __m128 push ebp - push ebx - push esi - push edi mov ebp, esp + and esp, -16 ; stack realign for SSE instructions 'movaps' and 'addps' + sub esp, 32 - mov esi, [ebp + 20] - mov edi, [ebp + 24] - mov edx, [ebp + 28] - inc edx - and edx, byte -2 - mov eax, edx - neg eax - and esp, byte -8 - lea esp, [esp + 4 * eax] - mov ecx, edx - xor eax, eax -.loop0: - dec ecx - mov [esp + 4 * ecx], eax - jnz short .loop0 + ;ASSERT(lag > 0) + ;ASSERT(lag <= 12) + ;ASSERT(lag <= data_len) + ;ASSERT(data_len > 0) - mov eax, edi - sub eax, edx - mov ebx, edx - and ebx, byte 1 - sub eax, ebx - lea ecx, [esi + 4 * eax - 12] - cmp esi, ecx - mov eax, esi - ja short .loop2_pre - ALIGN 16 ;4 nops -.loop1_i: - movd mm0, [eax] - movd mm2, [eax + 4] - movd mm4, [eax + 8] - movd mm6, [eax + 12] - mov ebx, edx - punpckldq mm0, mm0 - punpckldq mm2, mm2 - punpckldq mm4, mm4 - punpckldq mm6, mm6 - ALIGN 16 ;3 nops -.loop1_j: - sub ebx, byte 2 - movd mm1, [eax + 4 * ebx] - movd mm3, [eax + 4 * ebx + 4] - movd mm5, [eax + 4 * ebx + 8] - movd mm7, [eax + 4 * ebx + 12] - punpckldq mm1, mm3 - punpckldq mm3, mm5 - pfmul mm1, mm0 - punpckldq mm5, mm7 - pfmul mm3, mm2 - punpckldq mm7, [eax + 4 * ebx + 16] - pfmul mm5, mm4 - pfmul mm7, mm6 - pfadd mm1, mm3 - movq mm3, [esp + 4 * ebx] - pfadd mm5, mm7 - pfadd mm1, mm5 - pfadd mm3, mm1 - movq [esp + 4 * ebx], mm3 - jg short .loop1_j + ; for(coeff = 0; coeff < lag; coeff++) + ; autoc[coeff] = 0.0; + xorps xmm5, xmm5 + xorps xmm6, xmm6 + movaps [esp], xmm5 + movaps [esp + 16], xmm6 - add eax, byte 16 - cmp eax, ecx - jb short .loop1_i + mov edx, [ebp + 12] ; edx == data_len + mov eax, [ebp + 8] ; eax == &data[sample] <- &data[0] -.loop2_pre: - mov ebx, eax - sub eax, esi - shr eax, 2 - lea ecx, [esi + 4 * edi] - mov esi, ebx -.loop2_i: - movd mm0, [esi] - mov ebx, edi - sub ebx, eax - cmp ebx, edx - jbe short .loop2_j - mov ebx, edx -.loop2_j: - dec ebx - movd mm1, [esi + 4 * ebx] - pfmul mm1, mm0 - movd mm2, [esp + 4 * ebx] - pfadd mm1, mm2 - movd [esp + 4 * ebx], mm1 - - jnz short .loop2_j - - add esi, byte 4 - inc eax - cmp esi, ecx - jnz short .loop2_i - - mov edi, [ebp + 32] - mov edx, [ebp + 28] -.loop3: + movss xmm0, [eax] ; xmm0 = 0,0,0,data[0] + add eax, 4 + movaps xmm1, xmm0 ; xmm1 = 0,0,0,data[0] + shufps xmm0, xmm0, 0 ; xmm0 == data[sample],data[sample],data[sample],data[sample] = data[0],data[0],data[0],data[0] + xorps xmm2, xmm2 ; xmm2 = 0,0,0,0 + xorps xmm3, xmm3 ; xmm3 = 0,0,0,0 + xorps xmm4, xmm4 ; xmm4 = 0,0,0,0 + movaps xmm7, xmm0 + mulps xmm7, xmm1 + addps xmm5, xmm7 dec edx - mov eax, [esp + 4 * edx] - mov [edi + 4 * edx], eax - jnz short .loop3 + jz .loop_end + ALIGN 16 +.loop_start: + ; start by reading the next sample + movss xmm0, [eax] ; xmm0 = 0,0,0,data[sample] + add eax, 4 + shufps xmm0, xmm0, 0 ; xmm0 = data[sample],data[sample],data[sample],data[sample] - femms + ; shift xmm4:xmm3:xmm2:xmm1 left by one float + shufps xmm1, xmm1, 93h + shufps xmm2, xmm2, 93h + shufps xmm3, xmm3, 93h + shufps xmm4, xmm4, 93h + movss xmm4, xmm3 + movss xmm3, xmm2 + movss xmm2, xmm1 + movss xmm1, xmm0 + ; xmmB:xmmA:xmm6:xmm5 += xmm0:xmm0:xmm0:xmm0 * xmm4:xmm3:xmm2:xmm1 + movaps xmm7, xmm0 + mulps xmm7, xmm1 + addps xmm5, xmm7 + movaps xmm7, xmm0 + mulps xmm7, xmm2 + addps xmm6, xmm7 + movaps xmm7, xmm0 + mulps xmm7, xmm3 + mulps xmm0, xmm4 + addps xmm7, [esp] + addps xmm0, [esp + 16] + movaps [esp], xmm7 + movaps [esp + 16], xmm0 + + dec edx + jnz .loop_start +.loop_end: + ; store autoc + mov edx, [ebp + 20] ; edx == autoc + movups [edx], xmm5 + movups [edx + 16], xmm6 + movaps xmm5, [esp] + movaps xmm6, [esp + 16] + movups [edx + 32], xmm5 + movups [edx + 48], xmm6 +.end: mov esp, ebp - pop edi - pop esi - pop ebx pop ebp ret @@ -778,7 +750,7 @@ cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32 mov ecx, [esp + 28] mov edx, [ecx] ; edx = qlp_coeff[0] mov eax, [esi - 4] ; eax = data[-1] - mov cl, [esp + 36] ; cl = lp_quantization + mov ecx, [esp + 36] ; cl = lp_quantization ALIGN 16 .i_1_loop_i: imul eax, edx @@ -816,7 +788,7 @@ cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32 inc ecx jnz short .i_32more_loop_j - mov cl, [esp + 36] + mov ecx, [esp + 36] sar ebp, cl neg ebp add ebp, [esi] @@ -829,13 +801,16 @@ cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32 jmp .end +.mov_eip_to_eax: + mov eax, [esp] + ret + .i_32: sub edi, esi neg eax lea edx, [eax + eax * 8 + .jumper_0 - .get_eip0] - call .get_eip0 + call .mov_eip_to_eax .get_eip0: - pop eax add edx, eax inc edx mov eax, [esp + 28] ; eax = qlp_coeff[] @@ -940,7 +915,7 @@ cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32 add ebp, ecx .jumper_0: - mov cl, [esp + 36] + mov ecx, [esp + 36] sar ebp, cl neg ebp add ebp, [esi] @@ -1185,7 +1160,7 @@ cident FLAC__lpc_restore_signal_asm_ia32 mov ecx, [esp + 28] mov edx, [ecx] mov eax, [edi - 4] - mov cl, [esp + 36] + mov ecx, [esp + 36] ALIGN 16 .x87_1_loop_i: imul eax, edx @@ -1221,7 +1196,7 @@ cident FLAC__lpc_restore_signal_asm_ia32 inc ecx jnz short .x87_32more_loop_j - mov cl, [esp + 36] + mov ecx, [esp + 36] sar ebp, cl add ebp, [esi] mov [edi], ebp @@ -1233,13 +1208,16 @@ cident FLAC__lpc_restore_signal_asm_ia32 jmp .end +.mov_eip_to_eax: + mov eax, [esp] + ret + .x87_32: sub esi, edi neg eax lea edx, [eax + eax * 8 + .jumper_0 - .get_eip0] - call .get_eip0 + call .mov_eip_to_eax .get_eip0: - pop eax add edx, eax inc edx ; compensate for the shorter opcode on the last iteration mov eax, [esp + 28] ; eax = qlp_coeff[] @@ -1344,7 +1322,7 @@ cident FLAC__lpc_restore_signal_asm_ia32 add ebp, ecx ; sum += qlp_coeff[ 0] * data[i- 1] .jumper_0: - mov cl, [esp + 36] + mov ecx, [esp + 36] sar ebp, cl ; ebp = (sum >> lp_quantization) add ebp, [esi + edi] ; ebp = residual[i] + (sum >> lp_quantization) mov [edi], ebp ; data[i] = residual[i] + (sum >> lp_quantization) @@ -1505,4 +1483,567 @@ cident FLAC__lpc_restore_signal_asm_ia32_mmx pop ebp ret -end + +; ********************************************************************** +; +;void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]) +; { +; unsigned i, j; +; FLAC__int64 sum; +; +; FLAC__ASSERT(order > 0); +; +; for(i = 0; i < data_len; i++) { +; sum = 0; +; for(j = 0; j < order; j++) +; sum += qlp_coeff[j] * (FLAC__int64)data[i-j-1]; +; residual[i] = data[i] - (FLAC__int32)(sum >> lp_quantization); +; } +; } + ALIGN 16 +cident FLAC__lpc_compute_residual_from_qlp_coefficients_wide_asm_ia32 + ;[esp + 40] residual[] + ;[esp + 36] lp_quantization + ;[esp + 32] order + ;[esp + 28] qlp_coeff[] + ;[esp + 24] data_len + ;[esp + 20] data[] + + ;ASSERT(order > 0) + ;ASSERT(order <= 32) + ;ASSERT(lp_quantization <= 31) + + push ebp + push ebx + push esi + push edi + + mov ebx, [esp + 24] ; ebx = data_len + test ebx, ebx + jz near .end ; do nothing if data_len == 0 + +.begin: + mov eax, [esp + 32] ; eax = order + cmp eax, 1 + jg short .i_32 + + mov esi, [esp + 40] ; esi = residual[] + mov edi, [esp + 20] ; edi = data[] + mov ecx, [esp + 28] ; ecx = qlp_coeff[] + mov ebp, [ecx] ; ebp = qlp_coeff[0] + mov eax, [edi - 4] ; eax = data[-1] + mov ecx, [esp + 36] ; cl = lp_quantization + ALIGN 16 +.i_1_loop_i: + imul ebp ; edx:eax = qlp_coeff[0] * (FLAC__int64)data[i-1] + shrd eax, edx, cl ; 0 <= lp_quantization <= 15 + neg eax + add eax, [edi] + mov [esi], eax + mov eax, [edi] + add esi, 4 + add edi, 4 + dec ebx + jnz .i_1_loop_i + jmp .end + +.mov_eip_to_eax: + mov eax, [esp] + ret + +.i_32: ; eax = order + neg eax + add eax, eax + lea ebp, [eax + eax * 4 + .jumper_0 - .get_eip0] + call .mov_eip_to_eax +.get_eip0: + add ebp, eax + inc ebp ; compensate for the shorter opcode on the last iteration + + mov ebx, [esp + 28] ; ebx = qlp_coeff[] + mov edi, [esp + 20] ; edi = data[] + sub [esp + 40], edi ; residual[] -= data[] + + xor ecx, ecx + xor esi, esi + jmp ebp + +;eax = -- +;edx = -- +;ecx = 0 +;esi = 0 +; +;ebx = qlp_coeff[] +;edi = data[] +;ebp = @address + + mov eax, [ebx + 124] ; eax = qlp_coeff[31] + imul dword [edi - 128] ; edx:eax = qlp_coeff[31] * data[i-32] + add ecx, eax + adc esi, edx ; sum += qlp_coeff[31] * data[i-32] + + mov eax, [ebx + 120] ; eax = qlp_coeff[30] + imul dword [edi - 124] ; edx:eax = qlp_coeff[30] * data[i-31] + add ecx, eax + adc esi, edx ; sum += qlp_coeff[30] * data[i-31] + + mov eax, [ebx + 116] + imul dword [edi - 120] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 112] + imul dword [edi - 116] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 108] + imul dword [edi - 112] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 104] + imul dword [edi - 108] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 100] + imul dword [edi - 104] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 96] + imul dword [edi - 100] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 92] + imul dword [edi - 96] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 88] + imul dword [edi - 92] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 84] + imul dword [edi - 88] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 80] + imul dword [edi - 84] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 76] + imul dword [edi - 80] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 72] + imul dword [edi - 76] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 68] + imul dword [edi - 72] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 64] + imul dword [edi - 68] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 60] + imul dword [edi - 64] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 56] + imul dword [edi - 60] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 52] + imul dword [edi - 56] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 48] + imul dword [edi - 52] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 44] + imul dword [edi - 48] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 40] + imul dword [edi - 44] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 36] + imul dword [edi - 40] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 32] + imul dword [edi - 36] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 28] + imul dword [edi - 32] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 24] + imul dword [edi - 28] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 20] + imul dword [edi - 24] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 16] + imul dword [edi - 20] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 12] + imul dword [edi - 16] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 8] + imul dword [edi - 12] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 4] + imul dword [edi - 8] + add ecx, eax + adc esi, edx + + mov eax, [ebx] ; eax = qlp_coeff[ 0] (NOTE: one byte missing from instruction) + imul dword [edi - 4] ; edx:eax = qlp_coeff[ 0] * data[i- 1] + add ecx, eax + adc esi, edx ; sum += qlp_coeff[ 0] * data[i- 1] + +.jumper_0: + mov edx, ecx +;esi:edx = sum + mov ecx, [esp + 36] ; cl = lp_quantization + shrd edx, esi, cl ; edx = (sum >> lp_quantization) +;eax = -- +;ecx = -- +;edx = sum >> lp_q +;esi = -- + neg edx ; edx = -(sum >> lp_quantization) + mov eax, [esp + 40] ; residual[] - data[] + add edx, [edi] ; edx = data[i] - (sum >> lp_quantization) + mov [edi + eax], edx + add edi, 4 + + dec dword [esp + 24] + jz short .end + xor ecx, ecx + xor esi, esi + jmp ebp + +.end: + pop edi + pop esi + pop ebx + pop ebp + ret + +; ********************************************************************** +; +; void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]) +; { +; unsigned i, j; +; FLAC__int64 sum; +; +; FLAC__ASSERT(order > 0); +; +; for(i = 0; i < data_len; i++) { +; sum = 0; +; for(j = 0; j < order; j++) +; sum += qlp_coeff[j] * (FLAC__int64)data[i-j-1]; +; data[i] = residual[i] + (FLAC__int32)(sum >> lp_quantization); +; } +; } + ALIGN 16 +cident FLAC__lpc_restore_signal_wide_asm_ia32 + ;[esp + 40] data[] + ;[esp + 36] lp_quantization + ;[esp + 32] order + ;[esp + 28] qlp_coeff[] + ;[esp + 24] data_len + ;[esp + 20] residual[] + + ;ASSERT(order > 0) + ;ASSERT(order <= 32) + ;ASSERT(lp_quantization <= 31) + + push ebp + push ebx + push esi + push edi + + mov ebx, [esp + 24] ; ebx = data_len + test ebx, ebx + jz near .end ; do nothing if data_len == 0 + +.begin: + mov eax, [esp + 32] ; eax = order + cmp eax, 1 + jg short .x87_32 + + mov esi, [esp + 20] ; esi = residual[] + mov edi, [esp + 40] ; edi = data[] + mov ecx, [esp + 28] ; ecx = qlp_coeff[] + mov ebp, [ecx] ; ebp = qlp_coeff[0] + mov eax, [edi - 4] ; eax = data[-1] + mov ecx, [esp + 36] ; cl = lp_quantization + ALIGN 16 +.x87_1_loop_i: + imul ebp ; edx:eax = qlp_coeff[0] * (FLAC__int64)data[i-1] + shrd eax, edx, cl ; 0 <= lp_quantization <= 15 +; + add eax, [esi] + mov [edi], eax +; + add esi, 4 + add edi, 4 + dec ebx + jnz .x87_1_loop_i + jmp .end + +.mov_eip_to_eax: + mov eax, [esp] + ret + +.x87_32: ; eax = order + neg eax + add eax, eax + lea ebp, [eax + eax * 4 + .jumper_0 - .get_eip0] + call .mov_eip_to_eax +.get_eip0: + add ebp, eax + inc ebp ; compensate for the shorter opcode on the last iteration + + mov ebx, [esp + 28] ; ebx = qlp_coeff[] + mov edi, [esp + 40] ; esi = data[] + sub [esp + 20], edi ; residual[] -= data[] + + xor ecx, ecx + xor esi, esi + jmp ebp + +;eax = -- +;edx = -- +;ecx = 0 +;esi = 0 +; +;ebx = qlp_coeff[] +;edi = data[] +;ebp = @address + + mov eax, [ebx + 124] ; eax = qlp_coeff[31] + imul dword [edi - 128] ; edx:eax = qlp_coeff[31] * data[i-32] + add ecx, eax + adc esi, edx ; sum += qlp_coeff[31] * data[i-32] + + mov eax, [ebx + 120] ; eax = qlp_coeff[30] + imul dword [edi - 124] ; edx:eax = qlp_coeff[30] * data[i-31] + add ecx, eax + adc esi, edx ; sum += qlp_coeff[30] * data[i-31] + + mov eax, [ebx + 116] + imul dword [edi - 120] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 112] + imul dword [edi - 116] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 108] + imul dword [edi - 112] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 104] + imul dword [edi - 108] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 100] + imul dword [edi - 104] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 96] + imul dword [edi - 100] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 92] + imul dword [edi - 96] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 88] + imul dword [edi - 92] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 84] + imul dword [edi - 88] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 80] + imul dword [edi - 84] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 76] + imul dword [edi - 80] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 72] + imul dword [edi - 76] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 68] + imul dword [edi - 72] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 64] + imul dword [edi - 68] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 60] + imul dword [edi - 64] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 56] + imul dword [edi - 60] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 52] + imul dword [edi - 56] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 48] + imul dword [edi - 52] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 44] + imul dword [edi - 48] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 40] + imul dword [edi - 44] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 36] + imul dword [edi - 40] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 32] + imul dword [edi - 36] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 28] + imul dword [edi - 32] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 24] + imul dword [edi - 28] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 20] + imul dword [edi - 24] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 16] + imul dword [edi - 20] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 12] + imul dword [edi - 16] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 8] + imul dword [edi - 12] + add ecx, eax + adc esi, edx + + mov eax, [ebx + 4] + imul dword [edi - 8] + add ecx, eax + adc esi, edx + + mov eax, [ebx] ; eax = qlp_coeff[ 0] (NOTE: one byte missing from instruction) + imul dword [edi - 4] ; edx:eax = qlp_coeff[ 0] * data[i- 1] + add ecx, eax + adc esi, edx ; sum += qlp_coeff[ 0] * data[i- 1] + +.jumper_0: + mov edx, ecx +;esi:edx = sum + mov ecx, [esp + 36] ; cl = lp_quantization + shrd edx, esi, cl ; edx = (sum >> lp_quantization) +;eax = -- +;ecx = -- +;edx = sum >> lp_q +;esi = -- +; + mov eax, [esp + 20] ; residual[] - data[] + add edx, [edi + eax] ; edx = residual[i] + (sum >> lp_quantization) + mov [edi], edx ; data[i] = residual[i] + (sum >> lp_quantization) + add edi, 4 + + dec dword [esp + 24] + jz short .end + xor ecx, ecx + xor esi, esi + jmp ebp + +.end: + pop edi + pop esi + pop ebx + pop ebp + ret + +; end diff --git a/lib-src/libflac/src/libFLAC/ia32/nasm.h b/lib-src/libflac/src/libFLAC/ia32/nasm.h index 5d9f387c8..efa680819 100644 --- a/lib-src/libflac/src/libFLAC/ia32/nasm.h +++ b/lib-src/libflac/src/libFLAC/ia32/nasm.h @@ -1,6 +1,6 @@ ; libFLAC - Free Lossless Audio Codec library ; Copyright (C) 2001-2009 Josh Coalson -; Copyright (C) 2011-2013 Xiph.Org Foundation +; Copyright (C) 2011-2014 Xiph.Org Foundation ; ; Redistribution and use in source and binary forms, with or without ; modification, are permitted provided that the following conditions @@ -50,11 +50,6 @@ %idefine code_section section .text align=16 %idefine data_section section .data align=32 %idefine bss_section section .bss align=32 -%elifdef OBJ_FORMAT_macho - %define FLAC__PUBLIC_NEEDS_UNDERSCORE - %idefine code_section section .text - %idefine data_section section .data - %idefine bss_section section .bss %else %error unsupported object format! %endif @@ -84,7 +79,7 @@ _%1: %1: %endmacro -%ifndef OBJ_FORMAT_aout +%ifdef OBJ_FORMAT_elf section .note.GNU-stack progbits noalloc noexec nowrite align=1 %endif diff --git a/lib-src/libflac/src/libFLAC/ia32/stream_encoder_asm.nasm b/lib-src/libflac/src/libFLAC/ia32/stream_encoder_asm.nasm deleted file mode 100644 index 86f24e0f5..000000000 --- a/lib-src/libflac/src/libFLAC/ia32/stream_encoder_asm.nasm +++ /dev/null @@ -1,156 +0,0 @@ -; vim:filetype=nasm ts=8 - -; libFLAC - Free Lossless Audio Codec library -; Copyright (C) 2001-2009 Josh Coalson -; Copyright (C) 2011-2013 Xiph.Org Foundation -; -; Redistribution and use in source and binary forms, with or without -; modification, are permitted provided that the following conditions -; are met: -; -; - Redistributions of source code must retain the above copyright -; notice, this list of conditions and the following disclaimer. -; -; - Redistributions in binary form must reproduce the above copyright -; notice, this list of conditions and the following disclaimer in the -; documentation and/or other materials provided with the distribution. -; -; - Neither the name of the Xiph.org Foundation nor the names of its -; contributors may be used to endorse or promote products derived from -; this software without specific prior written permission. -; -; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -%include "nasm.h" - - data_section - -cglobal precompute_partition_info_sums_32bit_asm_ia32_ - - code_section - - -; ********************************************************************** -; -; void FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter) -; void precompute_partition_info_sums_32bit_( -; const FLAC__int32 residual[], -; FLAC__uint64 abs_residual_partition_sums[], -; unsigned blocksize, -; unsigned predictor_order, -; unsigned min_partition_order, -; unsigned max_partition_order -; ) -; - ALIGN 16 -cident precompute_partition_info_sums_32bit_asm_ia32_ - - ;; peppered throughout the code at major checkpoints are keys like this as to where things are at that point in time - ;; [esp + 4] const FLAC__int32 residual[] - ;; [esp + 8] FLAC__uint64 abs_residual_partition_sums[] - ;; [esp + 12] unsigned blocksize - ;; [esp + 16] unsigned predictor_order - ;; [esp + 20] unsigned min_partition_order - ;; [esp + 24] unsigned max_partition_order - push ebp - push ebx - push esi - push edi - sub esp, 8 - ;; [esp + 28] const FLAC__int32 residual[] - ;; [esp + 32] FLAC__uint64 abs_residual_partition_sums[] - ;; [esp + 36] unsigned blocksize - ;; [esp + 40] unsigned predictor_order - ;; [esp + 44] unsigned min_partition_order - ;; [esp + 48] unsigned max_partition_order - ;; [esp] partitions - ;; [esp + 4] default_partition_samples - - mov ecx, [esp + 48] - mov eax, 1 - shl eax, cl - mov [esp], eax ; [esp] <- partitions = 1u << max_partition_order; - mov eax, [esp + 36] - shr eax, cl - mov [esp + 4], eax ; [esp + 4] <- default_partition_samples = blocksize >> max_partition_order; - - ; - ; first do max_partition_order - ; - mov edi, [esp + 4] - sub edi, [esp + 40] ; edi <- end = (unsigned)(-(int)predictor_order) + default_partition_samples - xor esi, esi ; esi <- residual_sample = 0 - xor ecx, ecx ; ecx <- partition = 0 - mov ebp, [esp + 28] ; ebp <- residual[] - xor ebx, ebx ; ebx <- abs_residual_partition_sum = 0; - ; note we put the updates to 'end' and 'abs_residual_partition_sum' at the end of loop0 and in the initialization above so we could align loop0 and loop1 - ALIGN 16 -.loop0: ; for(partition = residual_sample = 0; partition < partitions; partition++) { -.loop1: ; for( ; residual_sample < end; residual_sample++) - mov eax, [ebp + esi * 4] - cdq - xor eax, edx - sub eax, edx - add ebx, eax ; abs_residual_partition_sum += abs(residual[residual_sample]); - ;@@@@@@ check overflow flag and abort here? - add esi, byte 1 - cmp esi, edi ; /* since the loop will always run at least once, we can put the loop check down here */ - jb .loop1 -.next1: - add edi, [esp + 4] ; end += default_partition_samples; - mov eax, [esp + 32] - mov [eax + ecx * 8], ebx ; abs_residual_partition_sums[partition] = abs_residual_partition_sum; - mov [eax + ecx * 8 + 4], dword 0 - xor ebx, ebx ; abs_residual_partition_sum = 0; - add ecx, byte 1 - cmp ecx, [esp] ; /* since the loop will always run at least once, we can put the loop check down here */ - jb .loop0 -.next0: ; } - ; - ; now merge partitions for lower orders - ; - mov esi, [esp + 32] ; esi <- abs_residual_partition_sums[from_partition==0]; - mov eax, [esp] - lea edi, [esi + eax * 8] ; edi <- abs_residual_partition_sums[to_partition==partitions]; - mov ecx, [esp + 48] - sub ecx, byte 1 ; ecx <- partition_order = (int)max_partition_order - 1; - ALIGN 16 -.loop2: ; for(; partition_order >= (int)min_partition_order; partition_order--) { - cmp ecx, [esp + 44] - jl .next2 - mov edx, 1 - shl edx, cl ; const unsigned partitions = 1u << partition_order; - ALIGN 16 -.loop3: ; for(i = 0; i < partitions; i++) { - mov eax, [esi] - mov ebx, [esi + 4] - add eax, [esi + 8] - adc ebx, [esi + 12] - mov [edi], eax - mov [edi + 4], ebx ; a_r_p_s[to_partition] = a_r_p_s[from_partition] + a_r_p_s[from_partition+1]; - add esi, byte 16 - add edi, byte 8 - sub edx, byte 1 - jnz .loop3 ; } - sub ecx, byte 1 - jmp .loop2 ; } -.next2: - - add esp, 8 - pop edi - pop esi - pop ebx - pop ebp - ret - -end diff --git a/lib-src/libflac/src/libFLAC/include/Makefile.am b/lib-src/libflac/src/libFLAC/include/Makefile.am index 922d67556..838601f76 100644 --- a/lib-src/libflac/src/libFLAC/include/Makefile.am +++ b/lib-src/libflac/src/libFLAC/include/Makefile.am @@ -1,6 +1,6 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/Makefile.in b/lib-src/libflac/src/libFLAC/include/Makefile.in index 913eccef3..4f016fe99 100644 --- a/lib-src/libflac/src/libFLAC/include/Makefile.in +++ b/lib-src/libflac/src/libFLAC/include/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -46,23 +45,51 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -82,38 +109,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/libFLAC/include -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -121,9 +157,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -190,7 +246,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -210,8 +265,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -308,7 +361,7 @@ SUBDIRS = private protected all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -333,9 +386,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -346,22 +399,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -376,57 +432,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -442,12 +453,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -459,15 +465,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -476,6 +478,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -636,22 +653,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/libFLAC/include/private/Makefile.am b/lib-src/libflac/src/libFLAC/include/private/Makefile.am index 5a747e12e..30bc8848d 100644 --- a/lib-src/libflac/src/libFLAC/include/private/Makefile.am +++ b/lib-src/libflac/src/libFLAC/include/private/Makefile.am @@ -1,6 +1,6 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -48,5 +48,6 @@ noinst_HEADERS = \ ogg_encoder_aspect.h \ ogg_helper.h \ ogg_mapping.h \ + stream_encoder.h \ stream_encoder_framing.h \ window.h diff --git a/lib-src/libflac/src/libFLAC/include/private/Makefile.in b/lib-src/libflac/src/libFLAC/include/private/Makefile.in index 2ca64461c..0e0fb7550 100644 --- a/lib-src/libflac/src/libFLAC/include/private/Makefile.in +++ b/lib-src/libflac/src/libFLAC/include/private/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -47,23 +46,51 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -83,30 +110,38 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/libFLAC/include/private -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -115,6 +150,23 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -155,7 +207,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -175,8 +226,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -288,13 +337,14 @@ noinst_HEADERS = \ ogg_encoder_aspect.h \ ogg_helper.h \ ogg_mapping.h \ + stream_encoder.h \ stream_encoder_framing.h \ window.h all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -319,9 +369,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -331,26 +381,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -362,15 +401,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -379,6 +414,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -515,17 +565,17 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am diff --git a/lib-src/libflac/src/libFLAC/include/private/all.h b/lib-src/libflac/src/libFLAC/include/private/all.h index a91b56e31..a4463d26d 100644 --- a/lib-src/libflac/src/libFLAC/include/private/all.h +++ b/lib-src/libflac/src/libFLAC/include/private/all.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/bitmath.h b/lib-src/libflac/src/libFLAC/include/private/bitmath.h index ca7362842..22d894f83 100644 --- a/lib-src/libflac/src/libFLAC/include/private/bitmath.h +++ b/lib-src/libflac/src/libFLAC/include/private/bitmath.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,6 +34,7 @@ #define FLAC__PRIVATE__BITMATH_H #include "FLAC/ordinals.h" +#include "FLAC/assert.h" /* for CHAR_BIT */ #include @@ -74,16 +75,19 @@ static inline unsigned int FLAC__clz_soft_uint32(unsigned int word) static inline unsigned int FLAC__clz_uint32(FLAC__uint32 v) { /* Never used with input 0 */ + FLAC__ASSERT(v > 0); #if defined(__INTEL_COMPILER) return _bit_scan_reverse(v) ^ 31U; #elif defined(__GNUC__) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) /* This will translate either to (bsr ^ 31U), clz , ctlz, cntlz, lzcnt depending on - * -march= setting or to a software rutine in exotic machines. */ + * -march= setting or to a software routine in exotic machines. */ return __builtin_clz(v); #elif defined(_MSC_VER) && (_MSC_VER >= 1400) - FLAC__uint32 idx; - _BitScanReverse(&idx, v); - return idx ^ 31U; + { + unsigned long idx; + _BitScanReverse(&idx, v); + return idx ^ 31U; + } #else return FLAC__clz_soft_uint32(v); #endif @@ -99,7 +103,7 @@ static inline unsigned int FLAC__clz2_uint32(FLAC__uint32 v) /* An example of what FLAC__bitmath_ilog2() computes: * - * ilog2( 0) = undefined + * ilog2( 0) = assertion failure * ilog2( 1) = 0 * ilog2( 2) = 1 * ilog2( 3) = 1 @@ -122,45 +126,56 @@ static inline unsigned int FLAC__clz2_uint32(FLAC__uint32 v) static inline unsigned FLAC__bitmath_ilog2(FLAC__uint32 v) { + FLAC__ASSERT(v > 0); +#if defined(__INTEL_COMPILER) + return _bit_scan_reverse(v); +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) + { + unsigned long idx; + _BitScanReverse(&idx, v); + return idx; + } +#else return sizeof(FLAC__uint32) * CHAR_BIT - 1 - FLAC__clz_uint32(v); +#endif } -#ifdef FLAC__INTEGER_ONLY_LIBRARY /*Unused otherwise */ +#ifdef FLAC__INTEGER_ONLY_LIBRARY /* Unused otherwise */ static inline unsigned FLAC__bitmath_ilog2_wide(FLAC__uint64 v) { - if (v == 0) - return 0; + FLAC__ASSERT(v > 0); #if defined(__GNUC__) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) return sizeof(FLAC__uint64) * CHAR_BIT - 1 - __builtin_clzll(v); -/* Sorry, only supported in win64/Itanium.. */ -#elif (defined(_MSC_VER) && (_MSC_VER >= 1400)) && (defined(_M_IA64) || defined(_WIN64)) - FLAC__uint64 idx; - _BitScanReverse64(&idx, v); - return idx ^ 63U; +/* Sorry, only supported in x64/Itanium.. and both have fast FPU which makes integer-only encoder pointless */ +#elif (defined(_MSC_VER) && (_MSC_VER >= 1400)) && (defined(_M_IA64) || defined(_M_X64)) + { + unsigned long idx; + _BitScanReverse64(&idx, v); + return idx; + } #else -/* Brain-damaged compilers will use the fastest possible way that is, +/* Brain-damaged compilers will use the fastest possible way that is, de Bruijn sequences (http://supertech.csail.mit.edu/papers/debruijn.pdf) - (C) Timothy B. Terriberry (tterribe@xiph.org) 2001-2009 LGPL (v2 or later). + (C) Timothy B. Terriberry (tterribe@xiph.org) 2001-2009 CC0 (Public domain). */ - static const unsigned char DEBRUIJN_IDX64[64]={ - 0, 1, 2, 7, 3,13, 8,19, 4,25,14,28, 9,34,20,40, - 5,17,26,38,15,46,29,48,10,31,35,54,21,50,41,57, - 63, 6,12,18,24,27,33,39,16,37,45,47,30,53,49,56, - 62,11,23,32,36,44,52,55,61,22,43,51,60,42,59,58 - }; - int ret; - ret= v>0; - v|= v>>1; - v|= v>>2; - v|= v>>4; - v|= v>>8; - v|= v>>16; - v|= v>>32; - v= (v>>1)+1; - ret+=DEBRUIJN_IDX64[v*0x218A392CD3D5DBF>>58&0x3F]; - return ret; + { + static const unsigned char DEBRUIJN_IDX64[64]={ + 0, 1, 2, 7, 3,13, 8,19, 4,25,14,28, 9,34,20,40, + 5,17,26,38,15,46,29,48,10,31,35,54,21,50,41,57, + 63, 6,12,18,24,27,33,39,16,37,45,47,30,53,49,56, + 62,11,23,32,36,44,52,55,61,22,43,51,60,42,59,58 + }; + v|= v>>1; + v|= v>>2; + v|= v>>4; + v|= v>>8; + v|= v>>16; + v|= v>>32; + v= (v>>1)+1; + return DEBRUIJN_IDX64[v*0x218A392CD3D5DBF>>58&0x3F]; + } #endif } #endif diff --git a/lib-src/libflac/src/libFLAC/include/private/bitreader.h b/lib-src/libflac/src/libFLAC/include/private/bitreader.h index 3bd112101..4dea8d03b 100644 --- a/lib-src/libflac/src/libFLAC/include/private/bitreader.h +++ b/lib-src/libflac/src/libFLAC/include/private/bitreader.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -50,7 +50,7 @@ typedef FLAC__bool (*FLAC__BitReaderReadCallback)(FLAC__byte buffer[], size_t *b */ FLAC__BitReader *FLAC__bitreader_new(void); void FLAC__bitreader_delete(FLAC__BitReader *br); -FLAC__bool FLAC__bitreader_init(FLAC__BitReader *br, FLAC__CPUInfo cpu, FLAC__BitReaderReadCallback rcb, void *cd); +FLAC__bool FLAC__bitreader_init(FLAC__BitReader *br, FLAC__BitReaderReadCallback rcb, void *cd); void FLAC__bitreader_free(FLAC__BitReader *br); /* does not 'free(br)' */ FLAC__bool FLAC__bitreader_clear(FLAC__BitReader *br); void FLAC__bitreader_dump(const FLAC__BitReader *br, FILE *out); @@ -82,19 +82,10 @@ FLAC__bool FLAC__bitreader_read_byte_block_aligned_no_crc(FLAC__BitReader *br, F FLAC__bool FLAC__bitreader_read_unary_unsigned(FLAC__BitReader *br, unsigned *val); FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsigned parameter); FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter); -#ifndef FLAC__NO_ASM -# ifdef FLAC__CPU_IA32 -# ifdef FLAC__HAS_NASM -FLAC__bool FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter); -# endif -# endif -#endif #if 0 /* UNUSED */ FLAC__bool FLAC__bitreader_read_golomb_signed(FLAC__BitReader *br, int *val, unsigned parameter); FLAC__bool FLAC__bitreader_read_golomb_unsigned(FLAC__BitReader *br, unsigned *val, unsigned parameter); #endif FLAC__bool FLAC__bitreader_read_utf8_uint32(FLAC__BitReader *br, FLAC__uint32 *val, FLAC__byte *raw, unsigned *rawlen); FLAC__bool FLAC__bitreader_read_utf8_uint64(FLAC__BitReader *br, FLAC__uint64 *val, FLAC__byte *raw, unsigned *rawlen); - -FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br); #endif diff --git a/lib-src/libflac/src/libFLAC/include/private/bitwriter.h b/lib-src/libflac/src/libFLAC/include/private/bitwriter.h index f46c41902..3b1362d86 100644 --- a/lib-src/libflac/src/libFLAC/include/private/bitwriter.h +++ b/lib-src/libflac/src/libFLAC/include/private/bitwriter.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/cpu.h b/lib-src/libflac/src/libFLAC/include/private/cpu.h index d920a278c..8927897a4 100644 --- a/lib-src/libflac/src/libFLAC/include/private/cpu.h +++ b/lib-src/libflac/src/libFLAC/include/private/cpu.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -39,51 +39,130 @@ #include #endif +#if defined FLAC__HAS_X86INTRIN +/* SSE intrinsics support by ICC/MSVC/GCC */ +#if defined __INTEL_COMPILER + #define FLAC__SSE_TARGET(x) + #define FLAC__SSE_SUPPORTED 1 + #define FLAC__SSE2_SUPPORTED 1 + #if (__INTEL_COMPILER >= 1000) /* Intel C++ Compiler 10.0 */ + #define FLAC__SSSE3_SUPPORTED 1 + #define FLAC__SSE4_1_SUPPORTED 1 + #endif + #if (__INTEL_COMPILER >= 1110) /* Intel C++ Compiler 11.1 */ + #define FLAC__AVX_SUPPORTED 1 + #endif + #if (__INTEL_COMPILER >= 1300) /* Intel C++ Compiler 13.0 */ + #define FLAC__AVX2_SUPPORTED 1 + #define FLAC__FMA_SUPPORTED 1 + #endif +#elif defined _MSC_VER + #define FLAC__SSE_TARGET(x) + #define FLAC__SSE_SUPPORTED 1 + #define FLAC__SSE2_SUPPORTED 1 + #if (_MSC_VER >= 1500) /* MS Visual Studio 2008 */ + #define FLAC__SSSE3_SUPPORTED 1 + #define FLAC__SSE4_1_SUPPORTED 1 + #endif + #if (_MSC_FULL_VER >= 160040219) /* MS Visual Studio 2010 SP1 */ + #define FLAC__AVX_SUPPORTED 1 + #endif + #if (_MSC_VER >= 1700) /* MS Visual Studio 2012 */ + #define FLAC__AVX2_SUPPORTED 1 + #define FLAC__FMA_SUPPORTED 1 + #endif +#elif defined __GNUC__ + #if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)) /* since GCC 4.9 -msse.. compiler options aren't necessary */ + #define FLAC__SSE_TARGET(x) __attribute__ ((__target__ (x))) + #define FLAC__SSE_SUPPORTED 1 + #define FLAC__SSE2_SUPPORTED 1 + #define FLAC__SSSE3_SUPPORTED 1 + #define FLAC__SSE4_1_SUPPORTED 1 + #define FLAC__AVX_SUPPORTED 1 + #define FLAC__AVX2_SUPPORTED 1 + #define FLAC__FMA_SUPPORTED 1 + #else /* for GCC older than 4.9 */ + #define FLAC__SSE_TARGET(x) + #ifdef __SSE__ + #define FLAC__SSE_SUPPORTED 1 + #endif + #ifdef __SSE2__ + #define FLAC__SSE2_SUPPORTED 1 + #endif + #ifdef __SSSE3__ + #define FLAC__SSSE3_SUPPORTED 1 + #endif + #ifdef __SSE4_1__ + #define FLAC__SSE4_1_SUPPORTED 1 + #endif + #ifdef __AVX__ + #define FLAC__AVX_SUPPORTED 1 + #endif + #ifdef __AVX2__ + #define FLAC__AVX2_SUPPORTED 1 + #endif + #ifdef __FMA__ + #define FLAC__FMA_SUPPORTED 1 + #endif + #endif /* GCC version */ +#endif /* compiler version */ +#endif /* intrinsics support */ + typedef enum { FLAC__CPUINFO_TYPE_IA32, - FLAC__CPUINFO_TYPE_PPC, + FLAC__CPUINFO_TYPE_X86_64, FLAC__CPUINFO_TYPE_UNKNOWN } FLAC__CPUInfo_Type; +#if defined FLAC__CPU_IA32 typedef struct { - FLAC__bool cpuid; - FLAC__bool bswap; FLAC__bool cmov; FLAC__bool mmx; - FLAC__bool fxsr; FLAC__bool sse; FLAC__bool sse2; + FLAC__bool sse3; FLAC__bool ssse3; - FLAC__bool _3dnow; - FLAC__bool ext3dnow; - FLAC__bool extmmx; + FLAC__bool sse41; + FLAC__bool sse42; + FLAC__bool avx; + FLAC__bool avx2; + FLAC__bool fma; } FLAC__CPUInfo_IA32; - +#elif defined FLAC__CPU_X86_64 typedef struct { - FLAC__bool altivec; - FLAC__bool ppc64; -} FLAC__CPUInfo_PPC; + FLAC__bool sse3; + FLAC__bool ssse3; + FLAC__bool sse41; + FLAC__bool sse42; + FLAC__bool avx; + FLAC__bool avx2; + FLAC__bool fma; +} FLAC__CPUInfo_x86; +#endif typedef struct { FLAC__bool use_asm; FLAC__CPUInfo_Type type; - union { - FLAC__CPUInfo_IA32 ia32; - FLAC__CPUInfo_PPC ppc; - } data; +#if defined FLAC__CPU_IA32 + FLAC__CPUInfo_IA32 ia32; +#elif defined FLAC__CPU_X86_64 + FLAC__CPUInfo_x86 x86; +#endif } FLAC__CPUInfo; void FLAC__cpu_info(FLAC__CPUInfo *info); #ifndef FLAC__NO_ASM -#ifdef FLAC__CPU_IA32 -#ifdef FLAC__HAS_NASM +# if defined FLAC__CPU_IA32 && defined FLAC__HAS_NASM FLAC__uint32 FLAC__cpu_have_cpuid_asm_ia32(void); void FLAC__cpu_info_asm_ia32(FLAC__uint32 *flags_edx, FLAC__uint32 *flags_ecx); -FLAC__uint32 FLAC__cpu_info_extended_amd_asm_ia32(void); -#endif -#endif +# endif +# if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +FLAC__uint32 FLAC__cpu_have_cpuid_x86(void); +void FLAC__cpu_info_x86(FLAC__uint32 level, FLAC__uint32 *eax, FLAC__uint32 *ebx, FLAC__uint32 *ecx, FLAC__uint32 *edx); +FLAC__uint32 FLAC__cpu_xgetbv_x86(void); +# endif #endif #endif diff --git a/lib-src/libflac/src/libFLAC/include/private/crc.h b/lib-src/libflac/src/libFLAC/include/private/crc.h index c77c78536..29c512ced 100644 --- a/lib-src/libflac/src/libFLAC/include/private/crc.h +++ b/lib-src/libflac/src/libFLAC/include/private/crc.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -51,7 +51,7 @@ FLAC__uint8 FLAC__crc8(const FLAC__byte *data, unsigned len); */ extern unsigned const FLAC__crc16_table[256]; -#define FLAC__CRC16_UPDATE(data, crc) (((((crc)<<8) & 0xffff) ^ FLAC__crc16_table[((crc)>>8) ^ (data)])) +#define FLAC__CRC16_UPDATE(data, crc) ((((crc)<<8) & 0xffff) ^ FLAC__crc16_table[((crc)>>8) ^ (data)]) /* this alternate may be faster on some systems/compilers */ #if 0 #define FLAC__CRC16_UPDATE(data, crc) ((((crc)<<8) ^ FLAC__crc16_table[((crc)>>8) ^ (data)]) & 0xffff) diff --git a/lib-src/libflac/src/libFLAC/include/private/fixed.h b/lib-src/libflac/src/libFLAC/include/private/fixed.h index f786f7dea..dcc471510 100644 --- a/lib-src/libflac/src/libFLAC/include/private/fixed.h +++ b/lib-src/libflac/src/libFLAC/include/private/fixed.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,6 +37,7 @@ #include #endif +#include "private/cpu.h" #include "private/float.h" #include "FLAC/format.h" @@ -54,14 +55,22 @@ */ #ifndef FLAC__INTEGER_ONLY_LIBRARY unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); +unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); # ifndef FLAC__NO_ASM -# ifdef FLAC__CPU_IA32 -# ifdef FLAC__HAS_NASM -unsigned FLAC__fixed_compute_best_predictor_asm_ia32_mmx_cmov(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); +# if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +# ifdef FLAC__SSE2_SUPPORTED +unsigned FLAC__fixed_compute_best_predictor_intrin_sse2(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER + 1]); +unsigned FLAC__fixed_compute_best_predictor_wide_intrin_sse2(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER + 1]); +# endif +# ifdef FLAC__SSSE3_SUPPORTED +unsigned FLAC__fixed_compute_best_predictor_intrin_ssse3(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); +unsigned FLAC__fixed_compute_best_predictor_wide_intrin_ssse3(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER + 1]); # endif # endif +# if defined FLAC__CPU_IA32 && defined FLAC__HAS_NASM +unsigned FLAC__fixed_compute_best_predictor_asm_ia32_mmx_cmov(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); +# endif # endif -unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); #else unsigned FLAC__fixed_compute_best_predictor(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); unsigned FLAC__fixed_compute_best_predictor_wide(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); diff --git a/lib-src/libflac/src/libFLAC/include/private/float.h b/lib-src/libflac/src/libFLAC/include/private/float.h index 78fab99c9..ab2643246 100644 --- a/lib-src/libflac/src/libFLAC/include/private/float.h +++ b/lib-src/libflac/src/libFLAC/include/private/float.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/format.h b/lib-src/libflac/src/libFLAC/include/private/format.h index 240e13a21..2fd346087 100644 --- a/lib-src/libflac/src/libFLAC/include/private/format.h +++ b/lib-src/libflac/src/libFLAC/include/private/format.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/lpc.h b/lib-src/libflac/src/libFLAC/include/private/lpc.h index 34bca4bc3..d36b30be9 100644 --- a/lib-src/libflac/src/libFLAC/include/private/lpc.h +++ b/lib-src/libflac/src/libFLAC/include/private/lpc.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,6 +37,7 @@ #include #endif +#include "private/cpu.h" #include "private/float.h" #include "FLAC/format.h" @@ -75,7 +76,15 @@ void FLAC__lpc_compute_autocorrelation_asm_ia32(const FLAC__real data[], unsigne void FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_4(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); void FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_8(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); void FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_12(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); -void FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); +void FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_16(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); +# endif +# endif +# if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +# ifdef FLAC__SSE_SUPPORTED +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_4(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_8(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_12(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_16(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); # endif # endif #endif @@ -145,6 +154,22 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da # ifdef FLAC__HAS_NASM void FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); void FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); +void FLAC__lpc_compute_residual_from_qlp_coefficients_wide_asm_ia32(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); +# endif +# endif +# if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +# ifdef FLAC__SSE2_SUPPORTED +void FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); +void FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); +# endif +# ifdef FLAC__SSE4_1_SUPPORTED +void FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse41(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); +void FLAC__lpc_compute_residual_from_qlp_coefficients_wide_intrin_sse41(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); +# endif +# ifdef FLAC__AVX2_SUPPORTED +void FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_avx2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); +void FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_avx2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); +void FLAC__lpc_compute_residual_from_qlp_coefficients_wide_intrin_avx2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]); # endif # endif #endif @@ -173,11 +198,17 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l # ifdef FLAC__HAS_NASM void FLAC__lpc_restore_signal_asm_ia32(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); void FLAC__lpc_restore_signal_asm_ia32_mmx(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); +void FLAC__lpc_restore_signal_wide_asm_ia32(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); # endif /* FLAC__HAS_NASM */ -# elif defined FLAC__CPU_PPC -void FLAC__lpc_restore_signal_asm_ppc_altivec_16(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); -void FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); -# endif/* FLAC__CPU_IA32 || FLAC__CPU_PPC */ +# endif /* FLAC__CPU_IA32 */ +# if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +# ifdef FLAC__SSE2_SUPPORTED +void FLAC__lpc_restore_signal_16_intrin_sse2(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); +# endif +# ifdef FLAC__SSE4_1_SUPPORTED +void FLAC__lpc_restore_signal_wide_intrin_sse41(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); +# endif +# endif #endif /* FLAC__NO_ASM */ #ifndef FLAC__INTEGER_ONLY_LIBRARY diff --git a/lib-src/libflac/src/libFLAC/include/private/macros.h b/lib-src/libflac/src/libFLAC/include/private/macros.h index 8282ca2c5..b72b69bcc 100644 --- a/lib-src/libflac/src/libFLAC/include/private/macros.h +++ b/lib-src/libflac/src/libFLAC/include/private/macros.h @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2012 Xiph.org Foundation + * Copyright (C) 2012-2014 Xiph.org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -69,10 +69,4 @@ #define MAX(x,y) ((x) >= (y) ? (x) : (y)) #endif -#if !defined(__cplusplus) && defined(_MSC_VER) -#ifndef inline -#define inline __inline -#endif -#endif - #endif diff --git a/lib-src/libflac/src/libFLAC/include/private/md5.h b/lib-src/libflac/src/libFLAC/include/private/md5.h index e5f675a83..c665ab313 100644 --- a/lib-src/libflac/src/libFLAC/include/private/md5.h +++ b/lib-src/libflac/src/libFLAC/include/private/md5.h @@ -28,11 +28,17 @@ #include "FLAC/ordinals.h" +typedef union { + FLAC__byte *p8; + FLAC__int16 *p16; + FLAC__int32 *p32; +} FLAC__multibyte; + typedef struct { FLAC__uint32 in[16]; FLAC__uint32 buf[4]; FLAC__uint32 bytes[2]; - FLAC__byte *internal_buf; + FLAC__multibyte internal_buf; size_t capacity; } FLAC__MD5Context; diff --git a/lib-src/libflac/src/libFLAC/include/private/memory.h b/lib-src/libflac/src/libFLAC/include/private/memory.h index 512081c52..c9f27129e 100644 --- a/lib-src/libflac/src/libFLAC/include/private/memory.h +++ b/lib-src/libflac/src/libFLAC/include/private/memory.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/metadata.h b/lib-src/libflac/src/libFLAC/include/private/metadata.h index 24a4bc6bf..092764c26 100644 --- a/lib-src/libflac/src/libFLAC/include/private/metadata.h +++ b/lib-src/libflac/src/libFLAC/include/private/metadata.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/ogg_decoder_aspect.h b/lib-src/libflac/src/libFLAC/include/private/ogg_decoder_aspect.h index c7af2b194..439bf8e4d 100644 --- a/lib-src/libflac/src/libFLAC/include/private/ogg_decoder_aspect.h +++ b/lib-src/libflac/src/libFLAC/include/private/ogg_decoder_aspect.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/ogg_encoder_aspect.h b/lib-src/libflac/src/libFLAC/include/private/ogg_encoder_aspect.h index 53f069ebf..709597d44 100644 --- a/lib-src/libflac/src/libFLAC/include/private/ogg_encoder_aspect.h +++ b/lib-src/libflac/src/libFLAC/include/private/ogg_encoder_aspect.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/ogg_helper.h b/lib-src/libflac/src/libFLAC/include/private/ogg_helper.h index aa3c2b245..87b96ef89 100644 --- a/lib-src/libflac/src/libFLAC/include/private/ogg_helper.h +++ b/lib-src/libflac/src/libFLAC/include/private/ogg_helper.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/ogg_mapping.h b/lib-src/libflac/src/libFLAC/include/private/ogg_mapping.h index adc5fe8aa..d35a46cd8 100644 --- a/lib-src/libflac/src/libFLAC/include/private/ogg_mapping.h +++ b/lib-src/libflac/src/libFLAC/include/private/ogg_mapping.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/stream_encoder.h b/lib-src/libflac/src/libFLAC/include/private/stream_encoder.h new file mode 100644 index 000000000..96d313586 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/include/private/stream_encoder.h @@ -0,0 +1,67 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef FLAC__PRIVATE__STREAM_ENCODER_H +#define FLAC__PRIVATE__STREAM_ENCODER_H + +#ifdef HAVE_CONFIG_H +#include +#endif + +/* + * This is used to avoid overflow with unusual signals in 32-bit + * accumulator in the *precompute_partition_info_sums_* functions. + */ +#define FLAC__MAX_EXTRA_RESIDUAL_BPS 4 + +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#include "private/cpu.h" +#include "FLAC/format.h" + +#ifdef FLAC__SSE2_SUPPORTED +extern void FLAC__precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], + unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps); +#endif + +#ifdef FLAC__SSSE3_SUPPORTED +extern void FLAC__precompute_partition_info_sums_intrin_ssse3(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], + unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps); +#endif + +#ifdef FLAC__AVX2_SUPPORTED +extern void FLAC__precompute_partition_info_sums_intrin_avx2(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], + unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps); +#endif + +#endif + +#endif diff --git a/lib-src/libflac/src/libFLAC/include/private/stream_encoder_framing.h b/lib-src/libflac/src/libFLAC/include/private/stream_encoder_framing.h index 1839c045d..2b7387a76 100644 --- a/lib-src/libflac/src/libFLAC/include/private/stream_encoder_framing.h +++ b/lib-src/libflac/src/libFLAC/include/private/stream_encoder_framing.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/private/window.h b/lib-src/libflac/src/libFLAC/include/private/window.h index e712b4af8..52c92621d 100644 --- a/lib-src/libflac/src/libFLAC/include/private/window.h +++ b/lib-src/libflac/src/libFLAC/include/private/window.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2006-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -65,6 +65,8 @@ void FLAC__window_nuttall(FLAC__real *window, const FLAC__int32 L); void FLAC__window_rectangle(FLAC__real *window, const FLAC__int32 L); void FLAC__window_triangle(FLAC__real *window, const FLAC__int32 L); void FLAC__window_tukey(FLAC__real *window, const FLAC__int32 L, const FLAC__real p); +void FLAC__window_partial_tukey(FLAC__real *window, const FLAC__int32 L, const FLAC__real p, const FLAC__real start, const FLAC__real end); +void FLAC__window_punchout_tukey(FLAC__real *window, const FLAC__int32 L, const FLAC__real p, const FLAC__real start, const FLAC__real end); void FLAC__window_welch(FLAC__real *window, const FLAC__int32 L); #endif /* !defined FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/lib-src/libflac/src/libFLAC/include/protected/Makefile.am b/lib-src/libflac/src/libFLAC/include/protected/Makefile.am index ba1e516ce..a931a5258 100644 --- a/lib-src/libflac/src/libFLAC/include/protected/Makefile.am +++ b/lib-src/libflac/src/libFLAC/include/protected/Makefile.am @@ -1,6 +1,6 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/protected/Makefile.in b/lib-src/libflac/src/libFLAC/include/protected/Makefile.in index 212726def..16a20244f 100644 --- a/lib-src/libflac/src/libFLAC/include/protected/Makefile.in +++ b/lib-src/libflac/src/libFLAC/include/protected/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # libFLAC - Free Lossless Audio Codec library # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -47,23 +46,51 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -83,30 +110,38 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/libFLAC/include/protected -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -115,6 +150,23 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -155,7 +207,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -175,8 +226,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -277,7 +326,7 @@ noinst_HEADERS = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -302,9 +351,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -314,26 +363,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -345,15 +383,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -362,6 +396,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -498,17 +547,17 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am diff --git a/lib-src/libflac/src/libFLAC/include/protected/all.h b/lib-src/libflac/src/libFLAC/include/protected/all.h index c9608d487..90912af5c 100644 --- a/lib-src/libflac/src/libFLAC/include/protected/all.h +++ b/lib-src/libflac/src/libFLAC/include/protected/all.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/lib-src/libflac/src/libFLAC/include/protected/stream_decoder.h b/lib-src/libflac/src/libFLAC/include/protected/stream_decoder.h index 629776fbf..7be95afda 100644 --- a/lib-src/libflac/src/libFLAC/include/protected/stream_decoder.h +++ b/lib-src/libflac/src/libFLAC/include/protected/stream_decoder.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -40,6 +40,7 @@ typedef struct FLAC__StreamDecoderProtected { FLAC__StreamDecoderState state; + FLAC__StreamDecoderInitStatus initstate; unsigned channels; FLAC__ChannelAssignment channel_assignment; unsigned bits_per_sample; diff --git a/lib-src/libflac/src/libFLAC/include/protected/stream_encoder.h b/lib-src/libflac/src/libFLAC/include/protected/stream_encoder.h index 011adc083..6917f5d48 100644 --- a/lib-src/libflac/src/libFLAC/include/protected/stream_encoder.h +++ b/lib-src/libflac/src/libFLAC/include/protected/stream_encoder.h @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -59,6 +59,8 @@ typedef enum { FLAC__APODIZATION_RECTANGLE, FLAC__APODIZATION_TRIANGLE, FLAC__APODIZATION_TUKEY, + FLAC__APODIZATION_PARTIAL_TUKEY, + FLAC__APODIZATION_PUNCHOUT_TUKEY, FLAC__APODIZATION_WELCH } FLAC__ApodizationFunction; @@ -71,6 +73,11 @@ typedef struct { struct { FLAC__real p; } tukey; + struct { + FLAC__real p; + FLAC__real start; + FLAC__real end; + } multiple_tukey; } parameters; } FLAC__ApodizationSpecification; diff --git a/lib-src/libflac/src/libFLAC/libFLAC_dynamic.vcproj b/lib-src/libflac/src/libFLAC/libFLAC_dynamic.vcproj index 506934196..d372d341f 100644 --- a/lib-src/libflac/src/libFLAC/libFLAC_dynamic.vcproj +++ b/lib-src/libflac/src/libFLAC/libFLAC_dynamic.vcproj @@ -17,8 +17,8 @@ + + @@ -303,6 +310,14 @@ RelativePath=".\fixed.c" > + + + + @@ -315,6 +330,18 @@ RelativePath=".\lpc.c" > + + + + + + @@ -359,6 +386,14 @@ RelativePath=".\stream_encoder_framing.c" > + + + + @@ -404,34 +439,6 @@ > - - - - - - - - - - @@ -504,30 +511,6 @@ /> - - - - - - - - diff --git a/lib-src/libflac/src/libFLAC/libFLAC_dynamic.vcxproj b/lib-src/libflac/src/libFLAC/libFLAC_dynamic.vcxproj new file mode 100644 index 000000000..89f24e2a3 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/libFLAC_dynamic.vcxproj @@ -0,0 +1,325 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc83-c215-11db-8314-0800200c9a66} + libFLAC_dynamic + Win32Proj + + + + DynamicLibrary + true + + + DynamicLibrary + true + + + DynamicLibrary + + + DynamicLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + $(Configuration)_dynamic\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + $(Platform)\$(Configuration)_dynamic\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + $(Configuration)_dynamic\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + $(Platform)\$(Configuration)_dynamic\ + + + + /D "_USE_MATH_DEFINES" %(AdditionalOptions) + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__SSE_OS;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;VERSION="1.3.1";DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + MachineX86 + + + + + /D "_USE_MATH_DEFINES" %(AdditionalOptions) + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;VERSION="1.3.1";DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + + + + + /D "_USE_MATH_DEFINES" %(AdditionalOptions) + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__SSE_OS;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;VERSION="1.3.1";FLaC__INLINE=_inline;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + Fast + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + /D "_USE_MATH_DEFINES" %(AdditionalOptions) + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;FLAC_API_EXPORTS;FLAC__HAS_OGG;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;VERSION="1.3.1";FLaC__INLINE=_inline;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + Fast + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + UseLinkTimeCodeGeneration + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + + + + + + + + + + + + + + + + + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + + + + + + + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj + + ia32/cpu_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/cpu_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/cpu_asm.obj;%(Outputs) + ia32/cpu_asm.obj;%(Outputs) + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj + + ia32/cpu_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/cpu_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/cpu_asm.obj;%(Outputs) + ia32/cpu_asm.obj;%(Outputs) + true + true + + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj + + ia32/fixed_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/fixed_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/fixed_asm.obj;%(Outputs) + ia32/fixed_asm.obj;%(Outputs) + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj + + ia32/fixed_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/fixed_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/fixed_asm.obj;%(Outputs) + ia32/fixed_asm.obj;%(Outputs) + true + true + + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj + + ia32/lpc_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/lpc_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/lpc_asm.obj;%(Outputs) + ia32/lpc_asm.obj;%(Outputs) + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj + + ia32/lpc_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/lpc_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/lpc_asm.obj;%(Outputs) + ia32/lpc_asm.obj;%(Outputs) + true + true + + + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/libFLAC/libFLAC_dynamic.vcxproj.filters b/lib-src/libflac/src/libFLAC/libFLAC_dynamic.vcxproj.filters new file mode 100644 index 000000000..fa79a8dc6 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/libFLAC_dynamic.vcxproj.filters @@ -0,0 +1,214 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {c048646d-1833-4a52-9849-022db831cc79} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/libFLAC/libFLAC_static.vcproj b/lib-src/libflac/src/libFLAC/libFLAC_static.vcproj index 4d4c1af71..fe0ac583b 100644 --- a/lib-src/libflac/src/libFLAC/libFLAC_static.vcproj +++ b/lib-src/libflac/src/libFLAC/libFLAC_static.vcproj @@ -17,8 +17,8 @@ + + @@ -318,6 +323,14 @@ RelativePath=".\fixed.c" > + + + + @@ -330,6 +343,18 @@ RelativePath=".\lpc.c" > + + + + + + @@ -374,35 +399,19 @@ RelativePath=".\stream_encoder_framing.c" > + + + + - - - - - - - - @@ -475,30 +484,6 @@ /> - - - - - - - - diff --git a/lib-src/libflac/src/libFLAC/libFLAC_static.vcxproj b/lib-src/libflac/src/libFLAC/libFLAC_static.vcxproj new file mode 100644 index 000000000..9131f5be2 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/libFLAC_static.vcxproj @@ -0,0 +1,279 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + libFLAC_static + Win32Proj + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + + /D "_USE_MATH_DEFINES" %(AdditionalOptions) + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__SSE_OS;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;VERSION="1.3.1";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + /D "_USE_MATH_DEFINES" %(AdditionalOptions) + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;VERSION="1.3.1";FLAC__NO_DLL;DEBUG;FLAC__OVERFLOW_DETECT;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + /D "_USE_MATH_DEFINES" %(AdditionalOptions) + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__SSE_OS;FLAC__HAS_NASM;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;VERSION="1.3.1";FLAC__NO_DLL;FLaC__INLINE=_inline;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + Fast + + + + + /D "_USE_MATH_DEFINES" %(AdditionalOptions) + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__HAS_OGG;FLAC__CPU_X86_64;FLAC__HAS_X86INTRIN;FLAC__ALIGN_MALLOC_DATA;VERSION="1.3.1";FLAC__NO_DLL;FLaC__INLINE=_inline;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + Fast + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + + + + + + + + + + + + + + + + + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + /arch:AVX %(AdditionalOptions) + + + + + + + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj + + ia32/cpu_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/cpu_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/cpu_asm.obj;%(Outputs) + ia32/cpu_asm.obj;%(Outputs) + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/cpu_asm.nasm -o ia32/cpu_asm.obj + + ia32/cpu_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/cpu_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/cpu_asm.obj;%(Outputs) + ia32/cpu_asm.obj;%(Outputs) + true + true + + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj + + ia32/fixed_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/fixed_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/fixed_asm.obj;%(Outputs) + ia32/fixed_asm.obj;%(Outputs) + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/fixed_asm.nasm -o ia32/fixed_asm.obj + + ia32/fixed_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/fixed_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/fixed_asm.obj;%(Outputs) + ia32/fixed_asm.obj;%(Outputs) + true + true + + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj + + ia32/lpc_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/lpc_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/lpc_asm.obj;%(Outputs) + ia32/lpc_asm.obj;%(Outputs) + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj + + nasm.exe -f win32 -d OBJ_FORMAT_win32 -i ia32/ ia32/lpc_asm.nasm -o ia32/lpc_asm.obj + + ia32/lpc_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/lpc_asm.nasm;ia32/nasm.h;%(AdditionalInputs) + ia32/lpc_asm.obj;%(Outputs) + ia32/lpc_asm.obj;%(Outputs) + true + true + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/libFLAC/libFLAC_static.vcxproj.filters b/lib-src/libflac/src/libFLAC/libFLAC_static.vcxproj.filters new file mode 100644 index 000000000..bc99bf3b0 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/libFLAC_static.vcxproj.filters @@ -0,0 +1,214 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {7493d9cf-1406-4a3c-9811-63f0cd6ccd36} + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + Public Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/libFLAC/lpc.c b/lib-src/libflac/src/libFLAC/lpc.c index 3dee02e3a..ca98c5cf8 100644 --- a/lib-src/libflac/src/libFLAC/lpc.c +++ b/lib-src/libflac/src/libFLAC/lpc.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -51,11 +51,6 @@ #ifndef FLAC__INTEGER_ONLY_LIBRARY -#ifndef M_LN2 -/* math.h in VC++ doesn't seem to have this (how Microsoft is that?) */ -#define M_LN2 0.69314718055994530942 -#endif - #if !defined(HAVE_LROUND) #if defined(_MSC_VER) #include @@ -66,7 +61,7 @@ static inline long int lround(double x) { return (long)(x + copysign (0.5, x)); } -//If this fails, we are in the precence of a mid 90's compiler..move along... +/* If this fails, we are in the presence of a mid 90's compiler, move along... */ #endif void FLAC__lpc_window_data(const FLAC__int32 in[], const FLAC__real window[], FLAC__real out[], unsigned data_len) @@ -161,7 +156,7 @@ void FLAC__lpc_compute_lp_coefficients(const FLAC__real autoc[], unsigned *max_o lp_coeff[i][j] = (FLAC__real)(-lpc[j]); /* negate FIR filter coeff to get predictor coeff */ error[i] = err; - /* see SF bug #1601812 http://sourceforge.net/tracker/index.php?func=detail&aid=1601812&group_id=13478&atid=113478 */ + /* see SF bug https://sourceforge.net/p/flac/bugs/234/ */ if(err == 0.0) { *max_order = i+1; return; @@ -265,7 +260,12 @@ int FLAC__lpc_quantize_coefficients(const FLAC__real lp_coeff[], unsigned order, return 0; } -void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]) +#if defined(_MSC_VER) +// silence MSVC warnings about __restrict modifier +#pragma warning ( disable : 4028 ) +#endif + +void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 * flac_restrict data, unsigned data_len, const FLAC__int32 * flac_restrict qlp_coeff, unsigned order, int lp_quantization, FLAC__int32 * flac_restrict residual) #if defined(FLAC__OVERFLOW_DETECT) || !defined(FLAC__LPC_UNROLLED_FILTER_LOOPS) { FLAC__int64 sumo; @@ -525,7 +525,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients(const FLAC__int32 *data, u } #endif -void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]) +void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 * flac_restrict data, unsigned data_len, const FLAC__int32 * flac_restrict qlp_coeff, unsigned order, int lp_quantization, FLAC__int32 * flac_restrict residual) #if defined(FLAC__OVERFLOW_DETECT) || !defined(FLAC__LPC_UNROLLED_FILTER_LOOPS) { unsigned i, j; @@ -550,7 +550,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da break; } if(FLAC__bitmath_silog2_wide((FLAC__int64)(*data) - (sum >> lp_quantization)) > 32) { - fprintf(stderr,"FLAC__lpc_compute_residual_from_qlp_coefficients_wide: OVERFLOW, i=%u, data=%d, sum=%" PRId64 ", residual=%" PRId64 "\n", i, *data, (long long)(sum >> lp_quantization), ((FLAC__int64)(*data) - (sum >> lp_quantization))); + fprintf(stderr,"FLAC__lpc_compute_residual_from_qlp_coefficients_wide: OVERFLOW, i=%u, data=%d, sum=%" PRId64 ", residual=%" PRId64 "\n", i, *data, (int64_t)(sum >> lp_quantization), ((FLAC__int64)(*data) - (sum >> lp_quantization))); break; } *(residual++) = *(data++) - (FLAC__int32)(sum >> lp_quantization); @@ -781,7 +781,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da #endif /* !defined FLAC__INTEGER_ONLY_LIBRARY */ -void FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]) +void FLAC__lpc_restore_signal(const FLAC__int32 * flac_restrict residual, unsigned data_len, const FLAC__int32 * flac_restrict qlp_coeff, unsigned order, int lp_quantization, FLAC__int32 * flac_restrict data) #if defined(FLAC__OVERFLOW_DETECT) || !defined(FLAC__LPC_UNROLLED_FILTER_LOOPS) { FLAC__int64 sumo; @@ -1042,7 +1042,7 @@ void FLAC__lpc_restore_signal(const FLAC__int32 residual[], unsigned data_len, c } #endif -void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]) +void FLAC__lpc_restore_signal_wide(const FLAC__int32 * flac_restrict residual, unsigned data_len, const FLAC__int32 * flac_restrict qlp_coeff, unsigned order, int lp_quantization, FLAC__int32 * flac_restrict data) #if defined(FLAC__OVERFLOW_DETECT) || !defined(FLAC__LPC_UNROLLED_FILTER_LOOPS) { unsigned i, j; @@ -1296,6 +1296,10 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l } #endif +#if defined(_MSC_VER) +#pragma warning ( default : 4028 ) +#endif + #ifndef FLAC__INTEGER_ONLY_LIBRARY FLAC__double FLAC__lpc_compute_expected_bits_per_residual_sample(FLAC__double lpc_error, unsigned total_samples) diff --git a/lib-src/libflac/src/libFLAC/lpc_intrin_avx2.c b/lib-src/libflac/src/libFLAC/lpc_intrin_avx2.c new file mode 100644 index 000000000..8eec85e11 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/lpc_intrin_avx2.c @@ -0,0 +1,1120 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifndef FLAC__INTEGER_ONLY_LIBRARY +#ifndef FLAC__NO_ASM +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#include "private/lpc.h" +#ifdef FLAC__AVX2_SUPPORTED + +#include "FLAC/assert.h" +#include "FLAC/format.h" + +#include /* AVX2 */ + +FLAC__SSE_TARGET("avx2") +void FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_avx2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]) +{ + int i; + FLAC__int32 sum; + __m128i cnt = _mm_cvtsi32_si128(lp_quantization); + + FLAC__ASSERT(order > 0); + FLAC__ASSERT(order <= 32); + + if(order <= 12) { + if(order > 8) { + if(order > 10) { + if(order == 12) { + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(0xffff & qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(0xffff & qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(0xffff & qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(0xffff & qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(0xffff & qlp_coeff[6 ]); + q7 = _mm256_set1_epi32(0xffff & qlp_coeff[7 ]); + q8 = _mm256_set1_epi32(0xffff & qlp_coeff[8 ]); + q9 = _mm256_set1_epi32(0xffff & qlp_coeff[9 ]); + q10 = _mm256_set1_epi32(0xffff & qlp_coeff[10]); + q11 = _mm256_set1_epi32(0xffff & qlp_coeff[11]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q11, _mm256_loadu_si256((const __m256i*)(data+i-12))); + mull = _mm256_madd_epi16(q10, _mm256_loadu_si256((const __m256i*)(data+i-11))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q9, _mm256_loadu_si256((const __m256i*)(data+i-10))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q8, _mm256_loadu_si256((const __m256i*)(data+i-9 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q7, _mm256_loadu_si256((const __m256i*)(data+i-8 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q6, _mm256_loadu_si256((const __m256i*)(data+i-7 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q5, _mm256_loadu_si256((const __m256i*)(data+i-6 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q4, _mm256_loadu_si256((const __m256i*)(data+i-5 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q3, _mm256_loadu_si256((const __m256i*)(data+i-4 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q2, _mm256_loadu_si256((const __m256i*)(data+i-3 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 11 */ + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(0xffff & qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(0xffff & qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(0xffff & qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(0xffff & qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(0xffff & qlp_coeff[6 ]); + q7 = _mm256_set1_epi32(0xffff & qlp_coeff[7 ]); + q8 = _mm256_set1_epi32(0xffff & qlp_coeff[8 ]); + q9 = _mm256_set1_epi32(0xffff & qlp_coeff[9 ]); + q10 = _mm256_set1_epi32(0xffff & qlp_coeff[10]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q10, _mm256_loadu_si256((const __m256i*)(data+i-11))); + mull = _mm256_madd_epi16(q9, _mm256_loadu_si256((const __m256i*)(data+i-10))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q8, _mm256_loadu_si256((const __m256i*)(data+i-9 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q7, _mm256_loadu_si256((const __m256i*)(data+i-8 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q6, _mm256_loadu_si256((const __m256i*)(data+i-7 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q5, _mm256_loadu_si256((const __m256i*)(data+i-6 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q4, _mm256_loadu_si256((const __m256i*)(data+i-5 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q3, _mm256_loadu_si256((const __m256i*)(data+i-4 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q2, _mm256_loadu_si256((const __m256i*)(data+i-3 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + else { + if(order == 10) { + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(0xffff & qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(0xffff & qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(0xffff & qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(0xffff & qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(0xffff & qlp_coeff[6 ]); + q7 = _mm256_set1_epi32(0xffff & qlp_coeff[7 ]); + q8 = _mm256_set1_epi32(0xffff & qlp_coeff[8 ]); + q9 = _mm256_set1_epi32(0xffff & qlp_coeff[9 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q9, _mm256_loadu_si256((const __m256i*)(data+i-10))); + mull = _mm256_madd_epi16(q8, _mm256_loadu_si256((const __m256i*)(data+i-9 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q7, _mm256_loadu_si256((const __m256i*)(data+i-8 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q6, _mm256_loadu_si256((const __m256i*)(data+i-7 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q5, _mm256_loadu_si256((const __m256i*)(data+i-6 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q4, _mm256_loadu_si256((const __m256i*)(data+i-5 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q3, _mm256_loadu_si256((const __m256i*)(data+i-4 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q2, _mm256_loadu_si256((const __m256i*)(data+i-3 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 9 */ + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(0xffff & qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(0xffff & qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(0xffff & qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(0xffff & qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(0xffff & qlp_coeff[6 ]); + q7 = _mm256_set1_epi32(0xffff & qlp_coeff[7 ]); + q8 = _mm256_set1_epi32(0xffff & qlp_coeff[8 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q8, _mm256_loadu_si256((const __m256i*)(data+i-9 ))); + mull = _mm256_madd_epi16(q7, _mm256_loadu_si256((const __m256i*)(data+i-8 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q6, _mm256_loadu_si256((const __m256i*)(data+i-7 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q5, _mm256_loadu_si256((const __m256i*)(data+i-6 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q4, _mm256_loadu_si256((const __m256i*)(data+i-5 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q3, _mm256_loadu_si256((const __m256i*)(data+i-4 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q2, _mm256_loadu_si256((const __m256i*)(data+i-3 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + } + else if(order > 4) { + if(order > 6) { + if(order == 8) { + __m256i q0, q1, q2, q3, q4, q5, q6, q7; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(0xffff & qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(0xffff & qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(0xffff & qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(0xffff & qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(0xffff & qlp_coeff[6 ]); + q7 = _mm256_set1_epi32(0xffff & qlp_coeff[7 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q7, _mm256_loadu_si256((const __m256i*)(data+i-8 ))); + mull = _mm256_madd_epi16(q6, _mm256_loadu_si256((const __m256i*)(data+i-7 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q5, _mm256_loadu_si256((const __m256i*)(data+i-6 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q4, _mm256_loadu_si256((const __m256i*)(data+i-5 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q3, _mm256_loadu_si256((const __m256i*)(data+i-4 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q2, _mm256_loadu_si256((const __m256i*)(data+i-3 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 7 */ + __m256i q0, q1, q2, q3, q4, q5, q6; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(0xffff & qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(0xffff & qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(0xffff & qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(0xffff & qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(0xffff & qlp_coeff[6 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q6, _mm256_loadu_si256((const __m256i*)(data+i-7 ))); + mull = _mm256_madd_epi16(q5, _mm256_loadu_si256((const __m256i*)(data+i-6 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q4, _mm256_loadu_si256((const __m256i*)(data+i-5 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q3, _mm256_loadu_si256((const __m256i*)(data+i-4 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q2, _mm256_loadu_si256((const __m256i*)(data+i-3 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + else { + if(order == 6) { + __m256i q0, q1, q2, q3, q4, q5; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(0xffff & qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(0xffff & qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(0xffff & qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(0xffff & qlp_coeff[5 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q5, _mm256_loadu_si256((const __m256i*)(data+i-6 ))); + mull = _mm256_madd_epi16(q4, _mm256_loadu_si256((const __m256i*)(data+i-5 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q3, _mm256_loadu_si256((const __m256i*)(data+i-4 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q2, _mm256_loadu_si256((const __m256i*)(data+i-3 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 5 */ + __m256i q0, q1, q2, q3, q4; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(0xffff & qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(0xffff & qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(0xffff & qlp_coeff[4 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q4, _mm256_loadu_si256((const __m256i*)(data+i-5 ))); + mull = _mm256_madd_epi16(q3, _mm256_loadu_si256((const __m256i*)(data+i-4 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q2, _mm256_loadu_si256((const __m256i*)(data+i-3 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + } + else { + if(order > 2) { + if(order == 4) { + __m256i q0, q1, q2, q3; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(0xffff & qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(0xffff & qlp_coeff[3 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q3, _mm256_loadu_si256((const __m256i*)(data+i-4 ))); + mull = _mm256_madd_epi16(q2, _mm256_loadu_si256((const __m256i*)(data+i-3 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 3 */ + __m256i q0, q1, q2; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(0xffff & qlp_coeff[2 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q2, _mm256_loadu_si256((const __m256i*)(data+i-3 ))); + mull = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + else { + if(order == 2) { + __m256i q0, q1; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(0xffff & qlp_coeff[1 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_madd_epi16(q1, _mm256_loadu_si256((const __m256i*)(data+i-2 ))); + mull = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 1 */ + __m256i q0; + q0 = _mm256_set1_epi32(0xffff & qlp_coeff[0 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ; + summ = _mm256_madd_epi16(q0, _mm256_loadu_si256((const __m256i*)(data+i-1 ))); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + } + for(; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 12: sum += qlp_coeff[11] * data[i-12]; + case 11: sum += qlp_coeff[10] * data[i-11]; + case 10: sum += qlp_coeff[ 9] * data[i-10]; + case 9: sum += qlp_coeff[ 8] * data[i- 9]; + case 8: sum += qlp_coeff[ 7] * data[i- 8]; + case 7: sum += qlp_coeff[ 6] * data[i- 7]; + case 6: sum += qlp_coeff[ 5] * data[i- 6]; + case 5: sum += qlp_coeff[ 4] * data[i- 5]; + case 4: sum += qlp_coeff[ 3] * data[i- 4]; + case 3: sum += qlp_coeff[ 2] * data[i- 3]; + case 2: sum += qlp_coeff[ 1] * data[i- 2]; + case 1: sum += qlp_coeff[ 0] * data[i- 1]; + } + residual[i] = data[i] - (sum >> lp_quantization); + } + } + else { /* order > 12 */ + for(i = 0; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 32: sum += qlp_coeff[31] * data[i-32]; + case 31: sum += qlp_coeff[30] * data[i-31]; + case 30: sum += qlp_coeff[29] * data[i-30]; + case 29: sum += qlp_coeff[28] * data[i-29]; + case 28: sum += qlp_coeff[27] * data[i-28]; + case 27: sum += qlp_coeff[26] * data[i-27]; + case 26: sum += qlp_coeff[25] * data[i-26]; + case 25: sum += qlp_coeff[24] * data[i-25]; + case 24: sum += qlp_coeff[23] * data[i-24]; + case 23: sum += qlp_coeff[22] * data[i-23]; + case 22: sum += qlp_coeff[21] * data[i-22]; + case 21: sum += qlp_coeff[20] * data[i-21]; + case 20: sum += qlp_coeff[19] * data[i-20]; + case 19: sum += qlp_coeff[18] * data[i-19]; + case 18: sum += qlp_coeff[17] * data[i-18]; + case 17: sum += qlp_coeff[16] * data[i-17]; + case 16: sum += qlp_coeff[15] * data[i-16]; + case 15: sum += qlp_coeff[14] * data[i-15]; + case 14: sum += qlp_coeff[13] * data[i-14]; + case 13: sum += qlp_coeff[12] * data[i-13]; + sum += qlp_coeff[11] * data[i-12]; + sum += qlp_coeff[10] * data[i-11]; + sum += qlp_coeff[ 9] * data[i-10]; + sum += qlp_coeff[ 8] * data[i- 9]; + sum += qlp_coeff[ 7] * data[i- 8]; + sum += qlp_coeff[ 6] * data[i- 7]; + sum += qlp_coeff[ 5] * data[i- 6]; + sum += qlp_coeff[ 4] * data[i- 5]; + sum += qlp_coeff[ 3] * data[i- 4]; + sum += qlp_coeff[ 2] * data[i- 3]; + sum += qlp_coeff[ 1] * data[i- 2]; + sum += qlp_coeff[ 0] * data[i- 1]; + } + residual[i] = data[i] - (sum >> lp_quantization); + } + } + _mm256_zeroupper(); +} + +FLAC__SSE_TARGET("avx2") +void FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_avx2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]) +{ + int i; + FLAC__int32 sum; + __m128i cnt = _mm_cvtsi32_si128(lp_quantization); + + FLAC__ASSERT(order > 0); + FLAC__ASSERT(order <= 32); + + if(order <= 12) { + if(order > 8) { + if(order > 10) { + if(order == 12) { + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(qlp_coeff[6 ]); + q7 = _mm256_set1_epi32(qlp_coeff[7 ]); + q8 = _mm256_set1_epi32(qlp_coeff[8 ]); + q9 = _mm256_set1_epi32(qlp_coeff[9 ]); + q10 = _mm256_set1_epi32(qlp_coeff[10]); + q11 = _mm256_set1_epi32(qlp_coeff[11]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q11, _mm256_loadu_si256((const __m256i*)(data+i-12))); + mull = _mm256_mullo_epi32(q10, _mm256_loadu_si256((const __m256i*)(data+i-11))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q9, _mm256_loadu_si256((const __m256i*)(data+i-10))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q8, _mm256_loadu_si256((const __m256i*)(data+i-9))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q7, _mm256_loadu_si256((const __m256i*)(data+i-8))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q6, _mm256_loadu_si256((const __m256i*)(data+i-7))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q5, _mm256_loadu_si256((const __m256i*)(data+i-6))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q4, _mm256_loadu_si256((const __m256i*)(data+i-5))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q3, _mm256_loadu_si256((const __m256i*)(data+i-4))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q2, _mm256_loadu_si256((const __m256i*)(data+i-3))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 11 */ + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(qlp_coeff[6 ]); + q7 = _mm256_set1_epi32(qlp_coeff[7 ]); + q8 = _mm256_set1_epi32(qlp_coeff[8 ]); + q9 = _mm256_set1_epi32(qlp_coeff[9 ]); + q10 = _mm256_set1_epi32(qlp_coeff[10]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q10, _mm256_loadu_si256((const __m256i*)(data+i-11))); + mull = _mm256_mullo_epi32(q9, _mm256_loadu_si256((const __m256i*)(data+i-10))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q8, _mm256_loadu_si256((const __m256i*)(data+i-9))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q7, _mm256_loadu_si256((const __m256i*)(data+i-8))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q6, _mm256_loadu_si256((const __m256i*)(data+i-7))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q5, _mm256_loadu_si256((const __m256i*)(data+i-6))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q4, _mm256_loadu_si256((const __m256i*)(data+i-5))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q3, _mm256_loadu_si256((const __m256i*)(data+i-4))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q2, _mm256_loadu_si256((const __m256i*)(data+i-3))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + else { + if(order == 10) { + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(qlp_coeff[6 ]); + q7 = _mm256_set1_epi32(qlp_coeff[7 ]); + q8 = _mm256_set1_epi32(qlp_coeff[8 ]); + q9 = _mm256_set1_epi32(qlp_coeff[9 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q9, _mm256_loadu_si256((const __m256i*)(data+i-10))); + mull = _mm256_mullo_epi32(q8, _mm256_loadu_si256((const __m256i*)(data+i-9))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q7, _mm256_loadu_si256((const __m256i*)(data+i-8))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q6, _mm256_loadu_si256((const __m256i*)(data+i-7))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q5, _mm256_loadu_si256((const __m256i*)(data+i-6))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q4, _mm256_loadu_si256((const __m256i*)(data+i-5))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q3, _mm256_loadu_si256((const __m256i*)(data+i-4))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q2, _mm256_loadu_si256((const __m256i*)(data+i-3))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 9 */ + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(qlp_coeff[6 ]); + q7 = _mm256_set1_epi32(qlp_coeff[7 ]); + q8 = _mm256_set1_epi32(qlp_coeff[8 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q8, _mm256_loadu_si256((const __m256i*)(data+i-9))); + mull = _mm256_mullo_epi32(q7, _mm256_loadu_si256((const __m256i*)(data+i-8))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q6, _mm256_loadu_si256((const __m256i*)(data+i-7))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q5, _mm256_loadu_si256((const __m256i*)(data+i-6))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q4, _mm256_loadu_si256((const __m256i*)(data+i-5))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q3, _mm256_loadu_si256((const __m256i*)(data+i-4))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q2, _mm256_loadu_si256((const __m256i*)(data+i-3))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + } + else if(order > 4) { + if(order > 6) { + if(order == 8) { + __m256i q0, q1, q2, q3, q4, q5, q6, q7; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(qlp_coeff[6 ]); + q7 = _mm256_set1_epi32(qlp_coeff[7 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q7, _mm256_loadu_si256((const __m256i*)(data+i-8))); + mull = _mm256_mullo_epi32(q6, _mm256_loadu_si256((const __m256i*)(data+i-7))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q5, _mm256_loadu_si256((const __m256i*)(data+i-6))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q4, _mm256_loadu_si256((const __m256i*)(data+i-5))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q3, _mm256_loadu_si256((const __m256i*)(data+i-4))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q2, _mm256_loadu_si256((const __m256i*)(data+i-3))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 7 */ + __m256i q0, q1, q2, q3, q4, q5, q6; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(qlp_coeff[5 ]); + q6 = _mm256_set1_epi32(qlp_coeff[6 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q6, _mm256_loadu_si256((const __m256i*)(data+i-7))); + mull = _mm256_mullo_epi32(q5, _mm256_loadu_si256((const __m256i*)(data+i-6))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q4, _mm256_loadu_si256((const __m256i*)(data+i-5))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q3, _mm256_loadu_si256((const __m256i*)(data+i-4))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q2, _mm256_loadu_si256((const __m256i*)(data+i-3))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + else { + if(order == 6) { + __m256i q0, q1, q2, q3, q4, q5; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(qlp_coeff[4 ]); + q5 = _mm256_set1_epi32(qlp_coeff[5 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q5, _mm256_loadu_si256((const __m256i*)(data+i-6))); + mull = _mm256_mullo_epi32(q4, _mm256_loadu_si256((const __m256i*)(data+i-5))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q3, _mm256_loadu_si256((const __m256i*)(data+i-4))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q2, _mm256_loadu_si256((const __m256i*)(data+i-3))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 5 */ + __m256i q0, q1, q2, q3, q4; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(qlp_coeff[3 ]); + q4 = _mm256_set1_epi32(qlp_coeff[4 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q4, _mm256_loadu_si256((const __m256i*)(data+i-5))); + mull = _mm256_mullo_epi32(q3, _mm256_loadu_si256((const __m256i*)(data+i-4))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q2, _mm256_loadu_si256((const __m256i*)(data+i-3))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + } + else { + if(order > 2) { + if(order == 4) { + __m256i q0, q1, q2, q3; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(qlp_coeff[2 ]); + q3 = _mm256_set1_epi32(qlp_coeff[3 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q3, _mm256_loadu_si256((const __m256i*)(data+i-4))); + mull = _mm256_mullo_epi32(q2, _mm256_loadu_si256((const __m256i*)(data+i-3))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 3 */ + __m256i q0, q1, q2; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + q2 = _mm256_set1_epi32(qlp_coeff[2 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q2, _mm256_loadu_si256((const __m256i*)(data+i-3))); + mull = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); summ = _mm256_add_epi32(summ, mull); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + else { + if(order == 2) { + __m256i q0, q1; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + q1 = _mm256_set1_epi32(qlp_coeff[1 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ, mull; + summ = _mm256_mullo_epi32(q1, _mm256_loadu_si256((const __m256i*)(data+i-2))); + mull = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); summ = _mm256_add_epi32(summ, mull); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + else { /* order == 1 */ + __m256i q0; + q0 = _mm256_set1_epi32(qlp_coeff[0 ]); + + for(i = 0; i < (int)data_len-7; i+=8) { + __m256i summ; + summ = _mm256_mullo_epi32(q0, _mm256_loadu_si256((const __m256i*)(data+i-1))); + summ = _mm256_sra_epi32(summ, cnt); + _mm256_storeu_si256((__m256i*)(residual+i), _mm256_sub_epi32(_mm256_loadu_si256((const __m256i*)(data+i)), summ)); + } + } + } + } + for(; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 12: sum += qlp_coeff[11] * data[i-12]; + case 11: sum += qlp_coeff[10] * data[i-11]; + case 10: sum += qlp_coeff[ 9] * data[i-10]; + case 9: sum += qlp_coeff[ 8] * data[i- 9]; + case 8: sum += qlp_coeff[ 7] * data[i- 8]; + case 7: sum += qlp_coeff[ 6] * data[i- 7]; + case 6: sum += qlp_coeff[ 5] * data[i- 6]; + case 5: sum += qlp_coeff[ 4] * data[i- 5]; + case 4: sum += qlp_coeff[ 3] * data[i- 4]; + case 3: sum += qlp_coeff[ 2] * data[i- 3]; + case 2: sum += qlp_coeff[ 1] * data[i- 2]; + case 1: sum += qlp_coeff[ 0] * data[i- 1]; + } + residual[i] = data[i] - (sum >> lp_quantization); + } + } + else { /* order > 12 */ + for(i = 0; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 32: sum += qlp_coeff[31] * data[i-32]; + case 31: sum += qlp_coeff[30] * data[i-31]; + case 30: sum += qlp_coeff[29] * data[i-30]; + case 29: sum += qlp_coeff[28] * data[i-29]; + case 28: sum += qlp_coeff[27] * data[i-28]; + case 27: sum += qlp_coeff[26] * data[i-27]; + case 26: sum += qlp_coeff[25] * data[i-26]; + case 25: sum += qlp_coeff[24] * data[i-25]; + case 24: sum += qlp_coeff[23] * data[i-24]; + case 23: sum += qlp_coeff[22] * data[i-23]; + case 22: sum += qlp_coeff[21] * data[i-22]; + case 21: sum += qlp_coeff[20] * data[i-21]; + case 20: sum += qlp_coeff[19] * data[i-20]; + case 19: sum += qlp_coeff[18] * data[i-19]; + case 18: sum += qlp_coeff[17] * data[i-18]; + case 17: sum += qlp_coeff[16] * data[i-17]; + case 16: sum += qlp_coeff[15] * data[i-16]; + case 15: sum += qlp_coeff[14] * data[i-15]; + case 14: sum += qlp_coeff[13] * data[i-14]; + case 13: sum += qlp_coeff[12] * data[i-13]; + sum += qlp_coeff[11] * data[i-12]; + sum += qlp_coeff[10] * data[i-11]; + sum += qlp_coeff[ 9] * data[i-10]; + sum += qlp_coeff[ 8] * data[i- 9]; + sum += qlp_coeff[ 7] * data[i- 8]; + sum += qlp_coeff[ 6] * data[i- 7]; + sum += qlp_coeff[ 5] * data[i- 6]; + sum += qlp_coeff[ 4] * data[i- 5]; + sum += qlp_coeff[ 3] * data[i- 4]; + sum += qlp_coeff[ 2] * data[i- 3]; + sum += qlp_coeff[ 1] * data[i- 2]; + sum += qlp_coeff[ 0] * data[i- 1]; + } + residual[i] = data[i] - (sum >> lp_quantization); + } + } + _mm256_zeroupper(); +} + +static FLAC__int32 pack_arr[8] = { 0, 2, 4, 6, 1, 3, 5, 7 }; + +FLAC__SSE_TARGET("avx2") +void FLAC__lpc_compute_residual_from_qlp_coefficients_wide_intrin_avx2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]) +{ + int i; + FLAC__int64 sum; + __m128i cnt = _mm_cvtsi32_si128(lp_quantization); + __m256i pack = _mm256_loadu_si256((const __m256i *)pack_arr); + + FLAC__ASSERT(order > 0); + FLAC__ASSERT(order <= 32); + FLAC__ASSERT(lp_quantization <= 32); /* there's no _mm256_sra_epi64() so we have to use _mm256_srl_epi64() */ + + if(order <= 12) { + if(order > 8) { + if(order > 10) { + if(order == 12) { + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + q2 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[2 ])); + q3 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[3 ])); + q4 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[4 ])); + q5 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[5 ])); + q6 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[6 ])); + q7 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[7 ])); + q8 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[8 ])); + q9 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[9 ])); + q10 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[10])); + q11 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[11])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q11, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-12)))); + mull = _mm256_mul_epi32(q10, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-11)))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q9, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-10)))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q8, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-9 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q7, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-8 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q6, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-7 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q5, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-6 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q4, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-5 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q3, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-4 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q2, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-3 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + else { /* order == 11 */ + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + q2 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[2 ])); + q3 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[3 ])); + q4 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[4 ])); + q5 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[5 ])); + q6 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[6 ])); + q7 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[7 ])); + q8 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[8 ])); + q9 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[9 ])); + q10 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[10])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q10, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-11)))); + mull = _mm256_mul_epi32(q9, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-10)))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q8, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-9 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q7, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-8 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q6, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-7 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q5, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-6 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q4, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-5 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q3, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-4 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q2, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-3 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + } + else { + if(order == 10) { + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + q2 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[2 ])); + q3 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[3 ])); + q4 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[4 ])); + q5 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[5 ])); + q6 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[6 ])); + q7 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[7 ])); + q8 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[8 ])); + q9 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[9 ])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q9, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-10)))); + mull = _mm256_mul_epi32(q8, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-9 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q7, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-8 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q6, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-7 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q5, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-6 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q4, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-5 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q3, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-4 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q2, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-3 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + else { /* order == 9 */ + __m256i q0, q1, q2, q3, q4, q5, q6, q7, q8; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + q2 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[2 ])); + q3 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[3 ])); + q4 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[4 ])); + q5 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[5 ])); + q6 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[6 ])); + q7 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[7 ])); + q8 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[8 ])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q8, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-9 )))); + mull = _mm256_mul_epi32(q7, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-8 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q6, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-7 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q5, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-6 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q4, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-5 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q3, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-4 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q2, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-3 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + } + } + else if(order > 4) { + if(order > 6) { + if(order == 8) { + __m256i q0, q1, q2, q3, q4, q5, q6, q7; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + q2 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[2 ])); + q3 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[3 ])); + q4 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[4 ])); + q5 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[5 ])); + q6 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[6 ])); + q7 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[7 ])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q7, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-8 )))); + mull = _mm256_mul_epi32(q6, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-7 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q5, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-6 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q4, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-5 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q3, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-4 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q2, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-3 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + else { /* order == 7 */ + __m256i q0, q1, q2, q3, q4, q5, q6; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + q2 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[2 ])); + q3 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[3 ])); + q4 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[4 ])); + q5 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[5 ])); + q6 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[6 ])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q6, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-7 )))); + mull = _mm256_mul_epi32(q5, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-6 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q4, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-5 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q3, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-4 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q2, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-3 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + } + else { + if(order == 6) { + __m256i q0, q1, q2, q3, q4, q5; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + q2 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[2 ])); + q3 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[3 ])); + q4 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[4 ])); + q5 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[5 ])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q5, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-6 )))); + mull = _mm256_mul_epi32(q4, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-5 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q3, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-4 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q2, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-3 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + else { /* order == 5 */ + __m256i q0, q1, q2, q3, q4; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + q2 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[2 ])); + q3 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[3 ])); + q4 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[4 ])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q4, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-5 )))); + mull = _mm256_mul_epi32(q3, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-4 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q2, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-3 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + } + } + else { + if(order > 2) { + if(order == 4) { + __m256i q0, q1, q2, q3; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + q2 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[2 ])); + q3 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[3 ])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q3, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-4 )))); + mull = _mm256_mul_epi32(q2, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-3 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + else { /* order == 3 */ + __m256i q0, q1, q2; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + q2 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[2 ])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q2, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-3 )))); + mull = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); summ = _mm256_add_epi64(summ, mull); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + } + else { + if(order == 2) { + __m256i q0, q1; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + q1 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[1 ])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ, mull; + summ = _mm256_mul_epi32(q1, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-2 )))); + mull = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); summ = _mm256_add_epi64(summ, mull); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + else { /* order == 1 */ + __m256i q0; + q0 = _mm256_cvtepu32_epi64(_mm_set1_epi32(qlp_coeff[0 ])); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m256i summ; + summ = _mm256_mul_epi32(q0, _mm256_cvtepu32_epi64(_mm_loadu_si128((const __m128i*)(data+i-1 )))); + summ = _mm256_permutevar8x32_epi32(_mm256_srl_epi64(summ, cnt), pack); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), _mm256_castsi256_si128(summ))); + } + } + } + } + for(; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 12: sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; + case 11: sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; + case 10: sum += qlp_coeff[ 9] * (FLAC__int64)data[i-10]; + case 9: sum += qlp_coeff[ 8] * (FLAC__int64)data[i- 9]; + case 8: sum += qlp_coeff[ 7] * (FLAC__int64)data[i- 8]; + case 7: sum += qlp_coeff[ 6] * (FLAC__int64)data[i- 7]; + case 6: sum += qlp_coeff[ 5] * (FLAC__int64)data[i- 6]; + case 5: sum += qlp_coeff[ 4] * (FLAC__int64)data[i- 5]; + case 4: sum += qlp_coeff[ 3] * (FLAC__int64)data[i- 4]; + case 3: sum += qlp_coeff[ 2] * (FLAC__int64)data[i- 3]; + case 2: sum += qlp_coeff[ 1] * (FLAC__int64)data[i- 2]; + case 1: sum += qlp_coeff[ 0] * (FLAC__int64)data[i- 1]; + } + residual[i] = data[i] - (FLAC__int32)(sum >> lp_quantization); + } + } + else { /* order > 12 */ + for(i = 0; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 32: sum += qlp_coeff[31] * (FLAC__int64)data[i-32]; + case 31: sum += qlp_coeff[30] * (FLAC__int64)data[i-31]; + case 30: sum += qlp_coeff[29] * (FLAC__int64)data[i-30]; + case 29: sum += qlp_coeff[28] * (FLAC__int64)data[i-29]; + case 28: sum += qlp_coeff[27] * (FLAC__int64)data[i-28]; + case 27: sum += qlp_coeff[26] * (FLAC__int64)data[i-27]; + case 26: sum += qlp_coeff[25] * (FLAC__int64)data[i-26]; + case 25: sum += qlp_coeff[24] * (FLAC__int64)data[i-25]; + case 24: sum += qlp_coeff[23] * (FLAC__int64)data[i-24]; + case 23: sum += qlp_coeff[22] * (FLAC__int64)data[i-23]; + case 22: sum += qlp_coeff[21] * (FLAC__int64)data[i-22]; + case 21: sum += qlp_coeff[20] * (FLAC__int64)data[i-21]; + case 20: sum += qlp_coeff[19] * (FLAC__int64)data[i-20]; + case 19: sum += qlp_coeff[18] * (FLAC__int64)data[i-19]; + case 18: sum += qlp_coeff[17] * (FLAC__int64)data[i-18]; + case 17: sum += qlp_coeff[16] * (FLAC__int64)data[i-17]; + case 16: sum += qlp_coeff[15] * (FLAC__int64)data[i-16]; + case 15: sum += qlp_coeff[14] * (FLAC__int64)data[i-15]; + case 14: sum += qlp_coeff[13] * (FLAC__int64)data[i-14]; + case 13: sum += qlp_coeff[12] * (FLAC__int64)data[i-13]; + sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; + sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; + sum += qlp_coeff[ 9] * (FLAC__int64)data[i-10]; + sum += qlp_coeff[ 8] * (FLAC__int64)data[i- 9]; + sum += qlp_coeff[ 7] * (FLAC__int64)data[i- 8]; + sum += qlp_coeff[ 6] * (FLAC__int64)data[i- 7]; + sum += qlp_coeff[ 5] * (FLAC__int64)data[i- 6]; + sum += qlp_coeff[ 4] * (FLAC__int64)data[i- 5]; + sum += qlp_coeff[ 3] * (FLAC__int64)data[i- 4]; + sum += qlp_coeff[ 2] * (FLAC__int64)data[i- 3]; + sum += qlp_coeff[ 1] * (FLAC__int64)data[i- 2]; + sum += qlp_coeff[ 0] * (FLAC__int64)data[i- 1]; + } + residual[i] = data[i] - (FLAC__int32)(sum >> lp_quantization); + } + } + _mm256_zeroupper(); +} + +#endif /* FLAC__AVX2_SUPPORTED */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* FLAC__NO_ASM */ +#endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/lib-src/libflac/src/libFLAC/lpc_intrin_sse.c b/lib-src/libflac/src/libFLAC/lpc_intrin_sse.c new file mode 100644 index 000000000..81bf586e1 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/lpc_intrin_sse.c @@ -0,0 +1,451 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifndef FLAC__INTEGER_ONLY_LIBRARY +#ifndef FLAC__NO_ASM +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#include "private/lpc.h" +#ifdef FLAC__SSE_SUPPORTED + +#include "FLAC/assert.h" +#include "FLAC/format.h" + +#include /* SSE */ + +#if 1 +/* Faster on current Intel (starting from Core i aka Nehalem) and all AMD CPUs */ + +FLAC__SSE_TARGET("sse") +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_4(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]) +{ + int i; + int limit = data_len - 4; + __m128 sum0; + + (void) lag; + FLAC__ASSERT(lag <= 4); + FLAC__ASSERT(lag <= data_len); + + sum0 = _mm_setzero_ps(); + + for(i = 0; i <= limit; i++) { + __m128 d, d0; + d0 = _mm_loadu_ps(data+i); + d = d0; d = _mm_shuffle_ps(d, d, 0); + sum0 = _mm_add_ps(sum0, _mm_mul_ps(d0, d)); + } + + { + __m128 d0 = _mm_setzero_ps(); + limit++; if(limit < 0) limit = 0; + + for(i = data_len-1; i >= limit; i--) { + __m128 d; + d = _mm_load_ss(data+i); d = _mm_shuffle_ps(d, d, 0); + d0 = _mm_shuffle_ps(d0, d0, _MM_SHUFFLE(2,1,0,3)); + d0 = _mm_move_ss(d0, d); + sum0 = _mm_add_ps(sum0, _mm_mul_ps(d, d0)); + } + } + + _mm_storeu_ps(autoc, sum0); +} + +FLAC__SSE_TARGET("sse") +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_8(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]) +{ + int i; + int limit = data_len - 8; + __m128 sum0, sum1; + + (void) lag; + FLAC__ASSERT(lag <= 8); + FLAC__ASSERT(lag <= data_len); + + sum0 = _mm_setzero_ps(); + sum1 = _mm_setzero_ps(); + + for(i = 0; i <= limit; i++) { + __m128 d, d0, d1; + d0 = _mm_loadu_ps(data+i); + d1 = _mm_loadu_ps(data+i+4); + d = d0; d = _mm_shuffle_ps(d, d, 0); + sum0 = _mm_add_ps(sum0, _mm_mul_ps(d0, d)); + sum1 = _mm_add_ps(sum1, _mm_mul_ps(d1, d)); + } + + { + __m128 d0 = _mm_setzero_ps(); + __m128 d1 = _mm_setzero_ps(); + limit++; if(limit < 0) limit = 0; + + for(i = data_len-1; i >= limit; i--) { + __m128 d; + d = _mm_load_ss(data+i); d = _mm_shuffle_ps(d, d, 0); + d1 = _mm_shuffle_ps(d1, d1, _MM_SHUFFLE(2,1,0,3)); + d0 = _mm_shuffle_ps(d0, d0, _MM_SHUFFLE(2,1,0,3)); + d1 = _mm_move_ss(d1, d0); + d0 = _mm_move_ss(d0, d); + sum1 = _mm_add_ps(sum1, _mm_mul_ps(d, d1)); + sum0 = _mm_add_ps(sum0, _mm_mul_ps(d, d0)); + } + } + + _mm_storeu_ps(autoc, sum0); + _mm_storeu_ps(autoc+4, sum1); +} + +FLAC__SSE_TARGET("sse") +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_12(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]) +{ + int i; + int limit = data_len - 12; + __m128 sum0, sum1, sum2; + + (void) lag; + FLAC__ASSERT(lag <= 12); + FLAC__ASSERT(lag <= data_len); + + sum0 = _mm_setzero_ps(); + sum1 = _mm_setzero_ps(); + sum2 = _mm_setzero_ps(); + + for(i = 0; i <= limit; i++) { + __m128 d, d0, d1, d2; + d0 = _mm_loadu_ps(data+i); + d1 = _mm_loadu_ps(data+i+4); + d2 = _mm_loadu_ps(data+i+8); + d = d0; d = _mm_shuffle_ps(d, d, 0); + sum0 = _mm_add_ps(sum0, _mm_mul_ps(d0, d)); + sum1 = _mm_add_ps(sum1, _mm_mul_ps(d1, d)); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(d2, d)); + } + + { + __m128 d0 = _mm_setzero_ps(); + __m128 d1 = _mm_setzero_ps(); + __m128 d2 = _mm_setzero_ps(); + limit++; if(limit < 0) limit = 0; + + for(i = data_len-1; i >= limit; i--) { + __m128 d; + d = _mm_load_ss(data+i); d = _mm_shuffle_ps(d, d, 0); + d2 = _mm_shuffle_ps(d2, d2, _MM_SHUFFLE(2,1,0,3)); + d1 = _mm_shuffle_ps(d1, d1, _MM_SHUFFLE(2,1,0,3)); + d0 = _mm_shuffle_ps(d0, d0, _MM_SHUFFLE(2,1,0,3)); + d2 = _mm_move_ss(d2, d1); + d1 = _mm_move_ss(d1, d0); + d0 = _mm_move_ss(d0, d); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(d, d2)); + sum1 = _mm_add_ps(sum1, _mm_mul_ps(d, d1)); + sum0 = _mm_add_ps(sum0, _mm_mul_ps(d, d0)); + } + } + + _mm_storeu_ps(autoc, sum0); + _mm_storeu_ps(autoc+4, sum1); + _mm_storeu_ps(autoc+8, sum2); +} + +FLAC__SSE_TARGET("sse") +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_16(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]) +{ + int i; + int limit = data_len - 16; + __m128 sum0, sum1, sum2, sum3; + + (void) lag; + FLAC__ASSERT(lag <= 16); + FLAC__ASSERT(lag <= data_len); + + sum0 = _mm_setzero_ps(); + sum1 = _mm_setzero_ps(); + sum2 = _mm_setzero_ps(); + sum3 = _mm_setzero_ps(); + + for(i = 0; i <= limit; i++) { + __m128 d, d0, d1, d2, d3; + d0 = _mm_loadu_ps(data+i); + d1 = _mm_loadu_ps(data+i+4); + d2 = _mm_loadu_ps(data+i+8); + d3 = _mm_loadu_ps(data+i+12); + d = d0; d = _mm_shuffle_ps(d, d, 0); + sum0 = _mm_add_ps(sum0, _mm_mul_ps(d0, d)); + sum1 = _mm_add_ps(sum1, _mm_mul_ps(d1, d)); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(d2, d)); + sum3 = _mm_add_ps(sum3, _mm_mul_ps(d3, d)); + } + + { + __m128 d0 = _mm_setzero_ps(); + __m128 d1 = _mm_setzero_ps(); + __m128 d2 = _mm_setzero_ps(); + __m128 d3 = _mm_setzero_ps(); + limit++; if(limit < 0) limit = 0; + + for(i = data_len-1; i >= limit; i--) { + __m128 d; + d = _mm_load_ss(data+i); d = _mm_shuffle_ps(d, d, 0); + d3 = _mm_shuffle_ps(d3, d3, _MM_SHUFFLE(2,1,0,3)); + d2 = _mm_shuffle_ps(d2, d2, _MM_SHUFFLE(2,1,0,3)); + d1 = _mm_shuffle_ps(d1, d1, _MM_SHUFFLE(2,1,0,3)); + d0 = _mm_shuffle_ps(d0, d0, _MM_SHUFFLE(2,1,0,3)); + d3 = _mm_move_ss(d3, d2); + d2 = _mm_move_ss(d2, d1); + d1 = _mm_move_ss(d1, d0); + d0 = _mm_move_ss(d0, d); + sum3 = _mm_add_ps(sum3, _mm_mul_ps(d, d3)); + sum2 = _mm_add_ps(sum2, _mm_mul_ps(d, d2)); + sum1 = _mm_add_ps(sum1, _mm_mul_ps(d, d1)); + sum0 = _mm_add_ps(sum0, _mm_mul_ps(d, d0)); + } + } + + _mm_storeu_ps(autoc, sum0); + _mm_storeu_ps(autoc+4, sum1); + _mm_storeu_ps(autoc+8, sum2); + _mm_storeu_ps(autoc+12,sum3); +} + +#else +/* Faster on older Intel CPUs (up to Core 2) */ + +FLAC__SSE_TARGET("sse") +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_4(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]) +{ + __m128 xmm0, xmm2, xmm5; + + (void) lag; + FLAC__ASSERT(lag > 0); + FLAC__ASSERT(lag <= 4); + FLAC__ASSERT(lag <= data_len); + FLAC__ASSERT(data_len > 0); + + xmm5 = _mm_setzero_ps(); + + xmm0 = _mm_load_ss(data++); + xmm2 = xmm0; + xmm0 = _mm_shuffle_ps(xmm0, xmm0, 0); + + xmm0 = _mm_mul_ps(xmm0, xmm2); + xmm5 = _mm_add_ps(xmm5, xmm0); + + data_len--; + + while(data_len) + { + xmm0 = _mm_load1_ps(data++); + + xmm2 = _mm_shuffle_ps(xmm2, xmm2, _MM_SHUFFLE(2,1,0,3)); + xmm2 = _mm_move_ss(xmm2, xmm0); + xmm0 = _mm_mul_ps(xmm0, xmm2); + xmm5 = _mm_add_ps(xmm5, xmm0); + + data_len--; + } + + _mm_storeu_ps(autoc, xmm5); +} + +FLAC__SSE_TARGET("sse") +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_8(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]) +{ + __m128 xmm0, xmm1, xmm2, xmm3, xmm5, xmm6; + + (void) lag; + FLAC__ASSERT(lag > 0); + FLAC__ASSERT(lag <= 8); + FLAC__ASSERT(lag <= data_len); + FLAC__ASSERT(data_len > 0); + + xmm5 = _mm_setzero_ps(); + xmm6 = _mm_setzero_ps(); + + xmm0 = _mm_load_ss(data++); + xmm2 = xmm0; + xmm0 = _mm_shuffle_ps(xmm0, xmm0, 0); + xmm3 = _mm_setzero_ps(); + + xmm0 = _mm_mul_ps(xmm0, xmm2); + xmm5 = _mm_add_ps(xmm5, xmm0); + + data_len--; + + while(data_len) + { + xmm0 = _mm_load1_ps(data++); + + xmm2 = _mm_shuffle_ps(xmm2, xmm2, _MM_SHUFFLE(2,1,0,3)); + xmm3 = _mm_shuffle_ps(xmm3, xmm3, _MM_SHUFFLE(2,1,0,3)); + xmm3 = _mm_move_ss(xmm3, xmm2); + xmm2 = _mm_move_ss(xmm2, xmm0); + + xmm1 = xmm0; + xmm1 = _mm_mul_ps(xmm1, xmm3); + xmm0 = _mm_mul_ps(xmm0, xmm2); + xmm6 = _mm_add_ps(xmm6, xmm1); + xmm5 = _mm_add_ps(xmm5, xmm0); + + data_len--; + } + + _mm_storeu_ps(autoc, xmm5); + _mm_storeu_ps(autoc+4, xmm6); +} + +FLAC__SSE_TARGET("sse") +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_12(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]) +{ + __m128 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7; + + (void) lag; + FLAC__ASSERT(lag > 0); + FLAC__ASSERT(lag <= 12); + FLAC__ASSERT(lag <= data_len); + FLAC__ASSERT(data_len > 0); + + xmm5 = _mm_setzero_ps(); + xmm6 = _mm_setzero_ps(); + xmm7 = _mm_setzero_ps(); + + xmm0 = _mm_load_ss(data++); + xmm2 = xmm0; + xmm0 = _mm_shuffle_ps(xmm0, xmm0, 0); + xmm3 = _mm_setzero_ps(); + xmm4 = _mm_setzero_ps(); + + xmm0 = _mm_mul_ps(xmm0, xmm2); + xmm5 = _mm_add_ps(xmm5, xmm0); + + data_len--; + + while(data_len) + { + xmm0 = _mm_load1_ps(data++); + + xmm2 = _mm_shuffle_ps(xmm2, xmm2, _MM_SHUFFLE(2,1,0,3)); + xmm3 = _mm_shuffle_ps(xmm3, xmm3, _MM_SHUFFLE(2,1,0,3)); + xmm4 = _mm_shuffle_ps(xmm4, xmm4, _MM_SHUFFLE(2,1,0,3)); + xmm4 = _mm_move_ss(xmm4, xmm3); + xmm3 = _mm_move_ss(xmm3, xmm2); + xmm2 = _mm_move_ss(xmm2, xmm0); + + xmm1 = xmm0; + xmm1 = _mm_mul_ps(xmm1, xmm2); + xmm5 = _mm_add_ps(xmm5, xmm1); + xmm1 = xmm0; + xmm1 = _mm_mul_ps(xmm1, xmm3); + xmm6 = _mm_add_ps(xmm6, xmm1); + xmm0 = _mm_mul_ps(xmm0, xmm4); + xmm7 = _mm_add_ps(xmm7, xmm0); + + data_len--; + } + + _mm_storeu_ps(autoc, xmm5); + _mm_storeu_ps(autoc+4, xmm6); + _mm_storeu_ps(autoc+8, xmm7); +} + +FLAC__SSE_TARGET("sse") +void FLAC__lpc_compute_autocorrelation_intrin_sse_lag_16(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]) +{ + __m128 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9; + + (void) lag; + FLAC__ASSERT(lag > 0); + FLAC__ASSERT(lag <= 16); + FLAC__ASSERT(lag <= data_len); + FLAC__ASSERT(data_len > 0); + + xmm6 = _mm_setzero_ps(); + xmm7 = _mm_setzero_ps(); + xmm8 = _mm_setzero_ps(); + xmm9 = _mm_setzero_ps(); + + xmm0 = _mm_load_ss(data++); + xmm2 = xmm0; + xmm0 = _mm_shuffle_ps(xmm0, xmm0, 0); + xmm3 = _mm_setzero_ps(); + xmm4 = _mm_setzero_ps(); + xmm5 = _mm_setzero_ps(); + + xmm0 = _mm_mul_ps(xmm0, xmm2); + xmm6 = _mm_add_ps(xmm6, xmm0); + + data_len--; + + while(data_len) + { + xmm0 = _mm_load1_ps(data++); + + /* shift xmm5:xmm4:xmm3:xmm2 left by one float */ + xmm5 = _mm_shuffle_ps(xmm5, xmm5, _MM_SHUFFLE(2,1,0,3)); + xmm4 = _mm_shuffle_ps(xmm4, xmm4, _MM_SHUFFLE(2,1,0,3)); + xmm3 = _mm_shuffle_ps(xmm3, xmm3, _MM_SHUFFLE(2,1,0,3)); + xmm2 = _mm_shuffle_ps(xmm2, xmm2, _MM_SHUFFLE(2,1,0,3)); + xmm5 = _mm_move_ss(xmm5, xmm4); + xmm4 = _mm_move_ss(xmm4, xmm3); + xmm3 = _mm_move_ss(xmm3, xmm2); + xmm2 = _mm_move_ss(xmm2, xmm0); + + /* xmm9|xmm8|xmm7|xmm6 += xmm0|xmm0|xmm0|xmm0 * xmm5|xmm4|xmm3|xmm2 */ + xmm1 = xmm0; + xmm1 = _mm_mul_ps(xmm1, xmm5); + xmm9 = _mm_add_ps(xmm9, xmm1); + xmm1 = xmm0; + xmm1 = _mm_mul_ps(xmm1, xmm4); + xmm8 = _mm_add_ps(xmm8, xmm1); + xmm1 = xmm0; + xmm1 = _mm_mul_ps(xmm1, xmm3); + xmm7 = _mm_add_ps(xmm7, xmm1); + xmm0 = _mm_mul_ps(xmm0, xmm2); + xmm6 = _mm_add_ps(xmm6, xmm0); + + data_len--; + } + + _mm_storeu_ps(autoc, xmm6); + _mm_storeu_ps(autoc+4, xmm7); + _mm_storeu_ps(autoc+8, xmm8); + _mm_storeu_ps(autoc+12,xmm9); +} +#endif + +#endif /* FLAC__SSE_SUPPORTED */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* FLAC__NO_ASM */ +#endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/lib-src/libflac/src/libFLAC/lpc_intrin_sse2.c b/lib-src/libflac/src/libFLAC/lpc_intrin_sse2.c new file mode 100644 index 000000000..e1908ed6d --- /dev/null +++ b/lib-src/libflac/src/libFLAC/lpc_intrin_sse2.c @@ -0,0 +1,1088 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifndef FLAC__INTEGER_ONLY_LIBRARY +#ifndef FLAC__NO_ASM +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#include "private/lpc.h" +#ifdef FLAC__SSE2_SUPPORTED + +#include "FLAC/assert.h" +#include "FLAC/format.h" + +#include /* SSE2 */ + +#define RESIDUAL16_RESULT(xmmN) curr = *data++; *residual++ = curr - (_mm_cvtsi128_si32(xmmN) >> lp_quantization); +#define DATA16_RESULT(xmmN) curr = *residual++ + (_mm_cvtsi128_si32(xmmN) >> lp_quantization); *data++ = curr; + +#define RESIDUAL32_RESULT(xmmN) residual[i] = data[i] - (_mm_cvtsi128_si32(xmmN) >> lp_quantization); +#define DATA32_RESULT(xmmN) data[i] = residual[i] + (_mm_cvtsi128_si32(xmmN) >> lp_quantization); + +FLAC__SSE_TARGET("sse2") +void FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]) +{ + int i; + FLAC__int32 sum; + __m128i cnt = _mm_cvtsi32_si128(lp_quantization); + + FLAC__ASSERT(order > 0); + FLAC__ASSERT(order <= 32); + + if(order <= 12) { + if(order > 8) { + if(order > 10) { + if(order == 12) { + __m128i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(0xffff & qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(0xffff & qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(0xffff & qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(0xffff & qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(0xffff & qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + q7 = _mm_cvtsi32_si128(0xffff & qlp_coeff[7]); q7 = _mm_shuffle_epi32(q7, _MM_SHUFFLE(0,0,0,0)); + q8 = _mm_cvtsi32_si128(0xffff & qlp_coeff[8]); q8 = _mm_shuffle_epi32(q8, _MM_SHUFFLE(0,0,0,0)); + q9 = _mm_cvtsi32_si128(0xffff & qlp_coeff[9]); q9 = _mm_shuffle_epi32(q9, _MM_SHUFFLE(0,0,0,0)); + q10 = _mm_cvtsi32_si128(0xffff & qlp_coeff[10]); q10 = _mm_shuffle_epi32(q10, _MM_SHUFFLE(0,0,0,0)); + q11 = _mm_cvtsi32_si128(0xffff & qlp_coeff[11]); q11 = _mm_shuffle_epi32(q11, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q11, _mm_loadu_si128((const __m128i*)(data+i-12))); + mull = _mm_madd_epi16(q10, _mm_loadu_si128((const __m128i*)(data+i-11))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q9, _mm_loadu_si128((const __m128i*)(data+i-10))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q8, _mm_loadu_si128((const __m128i*)(data+i-9))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q7, _mm_loadu_si128((const __m128i*)(data+i-8))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 11 */ + __m128i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(0xffff & qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(0xffff & qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(0xffff & qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(0xffff & qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(0xffff & qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + q7 = _mm_cvtsi32_si128(0xffff & qlp_coeff[7]); q7 = _mm_shuffle_epi32(q7, _MM_SHUFFLE(0,0,0,0)); + q8 = _mm_cvtsi32_si128(0xffff & qlp_coeff[8]); q8 = _mm_shuffle_epi32(q8, _MM_SHUFFLE(0,0,0,0)); + q9 = _mm_cvtsi32_si128(0xffff & qlp_coeff[9]); q9 = _mm_shuffle_epi32(q9, _MM_SHUFFLE(0,0,0,0)); + q10 = _mm_cvtsi32_si128(0xffff & qlp_coeff[10]); q10 = _mm_shuffle_epi32(q10, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q10, _mm_loadu_si128((const __m128i*)(data+i-11))); + mull = _mm_madd_epi16(q9, _mm_loadu_si128((const __m128i*)(data+i-10))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q8, _mm_loadu_si128((const __m128i*)(data+i-9))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q7, _mm_loadu_si128((const __m128i*)(data+i-8))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + else { + if(order == 10) { + __m128i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(0xffff & qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(0xffff & qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(0xffff & qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(0xffff & qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(0xffff & qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + q7 = _mm_cvtsi32_si128(0xffff & qlp_coeff[7]); q7 = _mm_shuffle_epi32(q7, _MM_SHUFFLE(0,0,0,0)); + q8 = _mm_cvtsi32_si128(0xffff & qlp_coeff[8]); q8 = _mm_shuffle_epi32(q8, _MM_SHUFFLE(0,0,0,0)); + q9 = _mm_cvtsi32_si128(0xffff & qlp_coeff[9]); q9 = _mm_shuffle_epi32(q9, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q9, _mm_loadu_si128((const __m128i*)(data+i-10))); + mull = _mm_madd_epi16(q8, _mm_loadu_si128((const __m128i*)(data+i-9))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q7, _mm_loadu_si128((const __m128i*)(data+i-8))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 9 */ + __m128i q0, q1, q2, q3, q4, q5, q6, q7, q8; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(0xffff & qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(0xffff & qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(0xffff & qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(0xffff & qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(0xffff & qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + q7 = _mm_cvtsi32_si128(0xffff & qlp_coeff[7]); q7 = _mm_shuffle_epi32(q7, _MM_SHUFFLE(0,0,0,0)); + q8 = _mm_cvtsi32_si128(0xffff & qlp_coeff[8]); q8 = _mm_shuffle_epi32(q8, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q8, _mm_loadu_si128((const __m128i*)(data+i-9))); + mull = _mm_madd_epi16(q7, _mm_loadu_si128((const __m128i*)(data+i-8))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + } + else if(order > 4) { + if(order > 6) { + if(order == 8) { + __m128i q0, q1, q2, q3, q4, q5, q6, q7; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(0xffff & qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(0xffff & qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(0xffff & qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(0xffff & qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(0xffff & qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + q7 = _mm_cvtsi32_si128(0xffff & qlp_coeff[7]); q7 = _mm_shuffle_epi32(q7, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q7, _mm_loadu_si128((const __m128i*)(data+i-8))); + mull = _mm_madd_epi16(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 7 */ + __m128i q0, q1, q2, q3, q4, q5, q6; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(0xffff & qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(0xffff & qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(0xffff & qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(0xffff & qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(0xffff & qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); + mull = _mm_madd_epi16(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + else { + if(order == 6) { + __m128i q0, q1, q2, q3, q4, q5; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(0xffff & qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(0xffff & qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(0xffff & qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(0xffff & qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); + mull = _mm_madd_epi16(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 5 */ + __m128i q0, q1, q2, q3, q4; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(0xffff & qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(0xffff & qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(0xffff & qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); + mull = _mm_madd_epi16(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + } + else { + if(order > 2) { + if(order == 4) { + __m128i q0, q1, q2, q3; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(0xffff & qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(0xffff & qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); + mull = _mm_madd_epi16(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 3 */ + __m128i q0, q1, q2; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(0xffff & qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); + mull = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + else { + if(order == 2) { + __m128i q0, q1; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(0xffff & qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_madd_epi16(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); + mull = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 1 */ + __m128i q0; + q0 = _mm_cvtsi32_si128(0xffff & qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ; + summ = _mm_madd_epi16(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + } + for(; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 12: sum += qlp_coeff[11] * data[i-12]; + case 11: sum += qlp_coeff[10] * data[i-11]; + case 10: sum += qlp_coeff[ 9] * data[i-10]; + case 9: sum += qlp_coeff[ 8] * data[i- 9]; + case 8: sum += qlp_coeff[ 7] * data[i- 8]; + case 7: sum += qlp_coeff[ 6] * data[i- 7]; + case 6: sum += qlp_coeff[ 5] * data[i- 6]; + case 5: sum += qlp_coeff[ 4] * data[i- 5]; + case 4: sum += qlp_coeff[ 3] * data[i- 4]; + case 3: sum += qlp_coeff[ 2] * data[i- 3]; + case 2: sum += qlp_coeff[ 1] * data[i- 2]; + case 1: sum += qlp_coeff[ 0] * data[i- 1]; + } + residual[i] = data[i] - (sum >> lp_quantization); + } + } + else { /* order > 12 */ + for(i = 0; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 32: sum += qlp_coeff[31] * data[i-32]; + case 31: sum += qlp_coeff[30] * data[i-31]; + case 30: sum += qlp_coeff[29] * data[i-30]; + case 29: sum += qlp_coeff[28] * data[i-29]; + case 28: sum += qlp_coeff[27] * data[i-28]; + case 27: sum += qlp_coeff[26] * data[i-27]; + case 26: sum += qlp_coeff[25] * data[i-26]; + case 25: sum += qlp_coeff[24] * data[i-25]; + case 24: sum += qlp_coeff[23] * data[i-24]; + case 23: sum += qlp_coeff[22] * data[i-23]; + case 22: sum += qlp_coeff[21] * data[i-22]; + case 21: sum += qlp_coeff[20] * data[i-21]; + case 20: sum += qlp_coeff[19] * data[i-20]; + case 19: sum += qlp_coeff[18] * data[i-19]; + case 18: sum += qlp_coeff[17] * data[i-18]; + case 17: sum += qlp_coeff[16] * data[i-17]; + case 16: sum += qlp_coeff[15] * data[i-16]; + case 15: sum += qlp_coeff[14] * data[i-15]; + case 14: sum += qlp_coeff[13] * data[i-14]; + case 13: sum += qlp_coeff[12] * data[i-13]; + sum += qlp_coeff[11] * data[i-12]; + sum += qlp_coeff[10] * data[i-11]; + sum += qlp_coeff[ 9] * data[i-10]; + sum += qlp_coeff[ 8] * data[i- 9]; + sum += qlp_coeff[ 7] * data[i- 8]; + sum += qlp_coeff[ 6] * data[i- 7]; + sum += qlp_coeff[ 5] * data[i- 6]; + sum += qlp_coeff[ 4] * data[i- 5]; + sum += qlp_coeff[ 3] * data[i- 4]; + sum += qlp_coeff[ 2] * data[i- 3]; + sum += qlp_coeff[ 1] * data[i- 2]; + sum += qlp_coeff[ 0] * data[i- 1]; + } + residual[i] = data[i] - (sum >> lp_quantization); + } + } +} + +FLAC__SSE_TARGET("sse2") +void FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]) +{ + int i; + + FLAC__ASSERT(order > 0); + FLAC__ASSERT(order <= 32); + + if(order <= 12) { + if(order > 8) { /* order == 9, 10, 11, 12 */ + if(order > 10) { /* order == 11, 12 */ + if(order == 12) { + __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); // 0 0 q[1] q[0] + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); // 0 0 q[3] q[2] + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); // 0 0 q[5] q[4] + xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); // 0 0 q[7] q[6] + xmm4 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8)); // 0 0 q[9] q[8] + xmm5 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+10)); // 0 0 q[11] q[10] + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); // 0 q[1] 0 q[0] + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); // 0 q[3] 0 q[2] + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); // 0 q[5] 0 q[4] + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); // 0 q[7] 0 q[6] + xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(3,1,2,0)); // 0 q[9] 0 q[8] + xmm5 = _mm_shuffle_epi32(xmm5, _MM_SHUFFLE(3,1,2,0)); // 0 q[11] 0 q[10] + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[11] * data[i-12]; + //sum += qlp_coeff[10] * data[i-11]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-12)); // 0 0 d[i-11] d[i-12] + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); // 0 d[i-12] 0 d[i-11] + xmm7 = _mm_mul_epu32(xmm7, xmm5); /* we use _unsigned_ multiplication and discard high dword of the result values */ + + //sum += qlp_coeff[9] * data[i-10]; + //sum += qlp_coeff[8] * data[i-9]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-10)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm4); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[7] * data[i-8]; + //sum += qlp_coeff[6] * data[i-7]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm3); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[5] * data[i-6]; + //sum += qlp_coeff[4] * data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm2); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[3] * data[i-4]; + //sum += qlp_coeff[2] * data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm1); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm0); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + else { /* order == 11 */ + __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); + xmm4 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8)); + xmm5 = _mm_cvtsi32_si128(qlp_coeff[10]); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); + xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum = qlp_coeff[10] * data[i-11]; + xmm7 = _mm_cvtsi32_si128(data[i-11]); + xmm7 = _mm_mul_epu32(xmm7, xmm5); + + //sum += qlp_coeff[9] * data[i-10]; + //sum += qlp_coeff[8] * data[i-9]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-10)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm4); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[7] * data[i-8]; + //sum += qlp_coeff[6] * data[i-7]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm3); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[5] * data[i-6]; + //sum += qlp_coeff[4] * data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm2); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[3] * data[i-4]; + //sum += qlp_coeff[2] * data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm1); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm0); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + } + else { /* order == 9, 10 */ + if(order == 10) { + __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); + xmm4 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8)); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); + xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[9] * data[i-10]; + //sum += qlp_coeff[8] * data[i-9]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-10)); + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); + xmm7 = _mm_mul_epu32(xmm7, xmm4); + + //sum += qlp_coeff[7] * data[i-8]; + //sum += qlp_coeff[6] * data[i-7]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm3); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[5] * data[i-6]; + //sum += qlp_coeff[4] * data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm2); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[3] * data[i-4]; + //sum += qlp_coeff[2] * data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm1); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm0); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + else { /* order == 9 */ + __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); + xmm4 = _mm_cvtsi32_si128(qlp_coeff[8]); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum = qlp_coeff[8] * data[i-9]; + xmm7 = _mm_cvtsi32_si128(data[i-9]); + xmm7 = _mm_mul_epu32(xmm7, xmm4); + + //sum += qlp_coeff[7] * data[i-8]; + //sum += qlp_coeff[6] * data[i-7]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm3); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[5] * data[i-6]; + //sum += qlp_coeff[4] * data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm2); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[3] * data[i-4]; + //sum += qlp_coeff[2] * data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm1); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm0); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + } + } + else if(order > 4) { /* order == 5, 6, 7, 8 */ + if(order > 6) { /* order == 7, 8 */ + if(order == 8) { + __m128i xmm0, xmm1, xmm2, xmm3, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[7] * data[i-8]; + //sum += qlp_coeff[6] * data[i-7]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-8)); + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); + xmm7 = _mm_mul_epu32(xmm7, xmm3); + + //sum += qlp_coeff[5] * data[i-6]; + //sum += qlp_coeff[4] * data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm2); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[3] * data[i-4]; + //sum += qlp_coeff[2] * data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm1); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm0); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + else { /* order == 7 */ + __m128i xmm0, xmm1, xmm2, xmm3, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + xmm3 = _mm_cvtsi32_si128(qlp_coeff[6]); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum = qlp_coeff[6] * data[i-7]; + xmm7 = _mm_cvtsi32_si128(data[i-7]); + xmm7 = _mm_mul_epu32(xmm7, xmm3); + + //sum += qlp_coeff[5] * data[i-6]; + //sum += qlp_coeff[4] * data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm2); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[3] * data[i-4]; + //sum += qlp_coeff[2] * data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm1); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm0); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + } + else { /* order == 5, 6 */ + if(order == 6) { + __m128i xmm0, xmm1, xmm2, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[5] * data[i-6]; + //sum += qlp_coeff[4] * data[i-5]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); + xmm7 = _mm_mul_epu32(xmm7, xmm2); + + //sum += qlp_coeff[3] * data[i-4]; + //sum += qlp_coeff[2] * data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm1); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm0); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + else { /* order == 5 */ + __m128i xmm0, xmm1, xmm2, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_cvtsi32_si128(qlp_coeff[4]); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum = qlp_coeff[4] * data[i-5]; + xmm7 = _mm_cvtsi32_si128(data[i-5]); + xmm7 = _mm_mul_epu32(xmm7, xmm2); + + //sum += qlp_coeff[3] * data[i-4]; + //sum += qlp_coeff[2] * data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm1); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm0); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + } + } + else { /* order == 1, 2, 3, 4 */ + if(order > 2) { /* order == 3, 4 */ + if(order == 4) { + __m128i xmm0, xmm1, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[3] * data[i-4]; + //sum += qlp_coeff[2] * data[i-3]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); + xmm7 = _mm_mul_epu32(xmm7, xmm1); + + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm0); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + else { /* order == 3 */ + __m128i xmm0, xmm1, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_cvtsi32_si128(qlp_coeff[2]); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum = qlp_coeff[2] * data[i-3]; + xmm7 = _mm_cvtsi32_si128(data[i-3]); + xmm7 = _mm_mul_epu32(xmm7, xmm1); + + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epu32(xmm6, xmm0); + xmm7 = _mm_add_epi32(xmm7, xmm6); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + } + else { /* order == 1, 2 */ + if(order == 2) { + __m128i xmm0, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[1] * data[i-2]; + //sum += qlp_coeff[0] * data[i-1]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); + xmm7 = _mm_mul_epu32(xmm7, xmm0); + + xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL32_RESULT(xmm7); + } + } + else { /* order == 1 */ + for(i = 0; i < (int)data_len; i++) + residual[i] = data[i] - ((qlp_coeff[0] * data[i-1]) >> lp_quantization); + } + } + } + } + else { /* order > 12 */ + FLAC__int32 sum; + for(i = 0; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 32: sum += qlp_coeff[31] * data[i-32]; + case 31: sum += qlp_coeff[30] * data[i-31]; + case 30: sum += qlp_coeff[29] * data[i-30]; + case 29: sum += qlp_coeff[28] * data[i-29]; + case 28: sum += qlp_coeff[27] * data[i-28]; + case 27: sum += qlp_coeff[26] * data[i-27]; + case 26: sum += qlp_coeff[25] * data[i-26]; + case 25: sum += qlp_coeff[24] * data[i-25]; + case 24: sum += qlp_coeff[23] * data[i-24]; + case 23: sum += qlp_coeff[22] * data[i-23]; + case 22: sum += qlp_coeff[21] * data[i-22]; + case 21: sum += qlp_coeff[20] * data[i-21]; + case 20: sum += qlp_coeff[19] * data[i-20]; + case 19: sum += qlp_coeff[18] * data[i-19]; + case 18: sum += qlp_coeff[17] * data[i-18]; + case 17: sum += qlp_coeff[16] * data[i-17]; + case 16: sum += qlp_coeff[15] * data[i-16]; + case 15: sum += qlp_coeff[14] * data[i-15]; + case 14: sum += qlp_coeff[13] * data[i-14]; + case 13: sum += qlp_coeff[12] * data[i-13]; + sum += qlp_coeff[11] * data[i-12]; + sum += qlp_coeff[10] * data[i-11]; + sum += qlp_coeff[ 9] * data[i-10]; + sum += qlp_coeff[ 8] * data[i- 9]; + sum += qlp_coeff[ 7] * data[i- 8]; + sum += qlp_coeff[ 6] * data[i- 7]; + sum += qlp_coeff[ 5] * data[i- 6]; + sum += qlp_coeff[ 4] * data[i- 5]; + sum += qlp_coeff[ 3] * data[i- 4]; + sum += qlp_coeff[ 2] * data[i- 3]; + sum += qlp_coeff[ 1] * data[i- 2]; + sum += qlp_coeff[ 0] * data[i- 1]; + } + residual[i] = data[i] - (sum >> lp_quantization); + } + } +} + +#if defined FLAC__CPU_IA32 && !defined FLAC__HAS_NASM /* unused for x64; not better than MMX asm */ + +FLAC__SSE_TARGET("sse2") +void FLAC__lpc_restore_signal_16_intrin_sse2(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]) +{ + if (order < 8 || order > 12) { + FLAC__lpc_restore_signal(residual, data_len, qlp_coeff, order, lp_quantization, data); + return; + } + if (data_len == 0) + return; + + FLAC__ASSERT(order >= 8); + FLAC__ASSERT(order <= 12); + + if(order > 8) { /* order == 9, 10, 11, 12 */ + FLAC__int32 curr; + __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7; + xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0)); + xmm6 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4)); + xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+8)); /* read 0 to 3 uninitialized coeffs... */ + switch(order) /* ...and zero them out */ + { + case 9: + xmm1 = _mm_slli_si128(xmm1, 12); xmm1 = _mm_srli_si128(xmm1, 12); break; + case 10: + xmm1 = _mm_slli_si128(xmm1, 8); xmm1 = _mm_srli_si128(xmm1, 8); break; + case 11: + xmm1 = _mm_slli_si128(xmm1, 4); xmm1 = _mm_srli_si128(xmm1, 4); break; + } + xmm2 = _mm_setzero_si128(); + xmm0 = _mm_packs_epi32(xmm0, xmm6); + xmm1 = _mm_packs_epi32(xmm1, xmm2); + + xmm4 = _mm_loadu_si128((const __m128i*)(data-12)); + xmm5 = _mm_loadu_si128((const __m128i*)(data-8)); + xmm3 = _mm_loadu_si128((const __m128i*)(data-4)); + xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(0,1,2,3)); + xmm5 = _mm_shuffle_epi32(xmm5, _MM_SHUFFLE(0,1,2,3)); + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3)); + xmm4 = _mm_packs_epi32(xmm4, xmm2); + xmm3 = _mm_packs_epi32(xmm3, xmm5); + + xmm7 = _mm_slli_si128(xmm1, 2); + xmm7 = _mm_or_si128(xmm7, _mm_srli_si128(xmm0, 14)); + xmm2 = _mm_slli_si128(xmm0, 2); + + /* xmm0, xmm1: qlp_coeff + xmm2, xmm7: qlp_coeff << 16 bit + xmm3, xmm4: data */ + + xmm5 = _mm_madd_epi16(xmm4, xmm1); + xmm6 = _mm_madd_epi16(xmm3, xmm0); + xmm6 = _mm_add_epi32(xmm6, xmm5); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8)); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4)); + + DATA16_RESULT(xmm6); + + data_len--; + + if(data_len % 2) { + xmm6 = _mm_srli_si128(xmm3, 14); + xmm4 = _mm_slli_si128(xmm4, 2); + xmm3 = _mm_slli_si128(xmm3, 2); + xmm4 = _mm_or_si128(xmm4, xmm6); + xmm3 = _mm_insert_epi16(xmm3, curr, 0); + + xmm5 = _mm_madd_epi16(xmm4, xmm1); + xmm6 = _mm_madd_epi16(xmm3, xmm0); + xmm6 = _mm_add_epi32(xmm6, xmm5); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8)); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4)); + + DATA16_RESULT(xmm6); + + data_len--; + } + + while(data_len) { /* data_len is a multiple of 2 */ + /* 1 _mm_slli_si128 per data element less but we need shifted qlp_coeff in xmm2:xmm7 */ + xmm6 = _mm_srli_si128(xmm3, 12); + xmm4 = _mm_slli_si128(xmm4, 4); + xmm3 = _mm_slli_si128(xmm3, 4); + xmm4 = _mm_or_si128(xmm4, xmm6); + xmm3 = _mm_insert_epi16(xmm3, curr, 1); + + xmm5 = _mm_madd_epi16(xmm4, xmm7); + xmm6 = _mm_madd_epi16(xmm3, xmm2); + xmm6 = _mm_add_epi32(xmm6, xmm5); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8)); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4)); + + DATA16_RESULT(xmm6); + + xmm3 = _mm_insert_epi16(xmm3, curr, 0); + + xmm5 = _mm_madd_epi16(xmm4, xmm1); + xmm6 = _mm_madd_epi16(xmm3, xmm0); + xmm6 = _mm_add_epi32(xmm6, xmm5); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8)); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4)); + + DATA16_RESULT(xmm6); + + data_len-=2; + } + } /* endif(order > 8) */ + else + { + FLAC__int32 curr; + __m128i xmm0, xmm1, xmm3, xmm6; + xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4)); + xmm0 = _mm_packs_epi32(xmm0, xmm1); + + xmm1 = _mm_loadu_si128((const __m128i*)(data-8)); + xmm3 = _mm_loadu_si128((const __m128i*)(data-4)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(0,1,2,3)); + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3)); + xmm3 = _mm_packs_epi32(xmm3, xmm1); + + /* xmm0: qlp_coeff + xmm3: data */ + + xmm6 = _mm_madd_epi16(xmm3, xmm0); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8)); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4)); + + DATA16_RESULT(xmm6); + + data_len--; + + while(data_len) { + xmm3 = _mm_slli_si128(xmm3, 2); + xmm3 = _mm_insert_epi16(xmm3, curr, 0); + + xmm6 = _mm_madd_epi16(xmm3, xmm0); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8)); + xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4)); + + DATA16_RESULT(xmm6); + + data_len--; + } + } +} + +#endif /* defined FLAC__CPU_IA32 && !defined FLAC__HAS_NASM */ + +#endif /* FLAC__SSE2_SUPPORTED */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* FLAC__NO_ASM */ +#endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/lib-src/libflac/src/libFLAC/lpc_intrin_sse41.c b/lib-src/libflac/src/libFLAC/lpc_intrin_sse41.c new file mode 100644 index 000000000..b6f4e5e07 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/lpc_intrin_sse41.c @@ -0,0 +1,1312 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifndef FLAC__INTEGER_ONLY_LIBRARY +#ifndef FLAC__NO_ASM +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#include "private/lpc.h" +#ifdef FLAC__SSE4_1_SUPPORTED + +#include "FLAC/assert.h" +#include "FLAC/format.h" + +#include /* SSE4.1 */ + +#if defined FLAC__CPU_IA32 /* unused for x64 */ + +#define RESIDUAL64_RESULT(xmmN) residual[i] = data[i] - _mm_cvtsi128_si32(_mm_srl_epi64(xmmN, cnt)) +#define RESIDUAL64_RESULT1(xmmN) residual[i] = data[i] - _mm_cvtsi128_si32(_mm_srli_epi64(xmmN, lp_quantization)) + +FLAC__SSE_TARGET("sse4.1") +void FLAC__lpc_compute_residual_from_qlp_coefficients_wide_intrin_sse41(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]) +{ + int i; + __m128i cnt = _mm_cvtsi32_si128(lp_quantization); + + FLAC__ASSERT(order > 0); + FLAC__ASSERT(order <= 32); + FLAC__ASSERT(lp_quantization <= 32); /* there's no _mm_sra_epi64() so we have to use _mm_srl_epi64() */ + + if(order <= 12) { + if(order > 8) { /* order == 9, 10, 11, 12 */ + if(order > 10) { /* order == 11, 12 */ + if(order == 12) { + __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); // 0 0 q[1] q[0] + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); // 0 0 q[3] q[2] + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); // 0 0 q[5] q[4] + xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); // 0 0 q[7] q[6] + xmm4 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8)); // 0 0 q[9] q[8] + xmm5 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+10)); // 0 0 q[11] q[10] + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); // 0 q[1] 0 q[0] + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); // 0 q[3] 0 q[2] + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); // 0 q[5] 0 q[4] + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); // 0 q[7] 0 q[6] + xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(3,1,2,0)); // 0 q[9] 0 q[8] + xmm5 = _mm_shuffle_epi32(xmm5, _MM_SHUFFLE(3,1,2,0)); // 0 q[11] 0 q[10] + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; + //sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-12)); // 0 0 d[i-11] d[i-12] + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); // 0 d[i-12] 0 d[i-11] + xmm7 = _mm_mul_epi32(xmm7, xmm5); + + //sum += qlp_coeff[9] * (FLAC__int64)data[i-10]; + //sum += qlp_coeff[8] * (FLAC__int64)data[i-9]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-10)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm4); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[7] * (FLAC__int64)data[i-8]; + //sum += qlp_coeff[6] * (FLAC__int64)data[i-7]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm3); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; + //sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm2); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; + //sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm1); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm0); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT1(xmm7); + } + } + else { /* order == 11 */ + __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); + xmm4 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8)); + xmm5 = _mm_cvtsi32_si128(qlp_coeff[10]); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); + xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum = qlp_coeff[10] * (FLAC__int64)data[i-11]; + xmm7 = _mm_cvtsi32_si128(data[i-11]); + xmm7 = _mm_mul_epi32(xmm7, xmm5); + + //sum += qlp_coeff[9] * (FLAC__int64)data[i-10]; + //sum += qlp_coeff[8] * (FLAC__int64)data[i-9]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-10)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm4); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[7] * (FLAC__int64)data[i-8]; + //sum += qlp_coeff[6] * (FLAC__int64)data[i-7]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm3); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; + //sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm2); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; + //sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm1); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm0); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT1(xmm7); + } + } + } + else { /* order == 9, 10 */ + if(order == 10) { + __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); + xmm4 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8)); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); + xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[9] * (FLAC__int64)data[i-10]; + //sum += qlp_coeff[8] * (FLAC__int64)data[i-9]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-10)); + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); + xmm7 = _mm_mul_epi32(xmm7, xmm4); + + //sum += qlp_coeff[7] * (FLAC__int64)data[i-8]; + //sum += qlp_coeff[6] * (FLAC__int64)data[i-7]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm3); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; + //sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm2); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; + //sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm1); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm0); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT(xmm7); + } + } + else { /* order == 9 */ + __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); + xmm4 = _mm_cvtsi32_si128(qlp_coeff[8]); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum = qlp_coeff[8] * (FLAC__int64)data[i-9]; + xmm7 = _mm_cvtsi32_si128(data[i-9]); + xmm7 = _mm_mul_epi32(xmm7, xmm4); + + //sum += qlp_coeff[7] * (FLAC__int64)data[i-8]; + //sum += qlp_coeff[6] * (FLAC__int64)data[i-7]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm3); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; + //sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm2); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; + //sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm1); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm0); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT(xmm7); + } + } + } + } + else if(order > 4) { /* order == 5, 6, 7, 8 */ + if(order > 6) { /* order == 7, 8 */ + if(order == 8) { + __m128i xmm0, xmm1, xmm2, xmm3, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[7] * (FLAC__int64)data[i-8]; + //sum += qlp_coeff[6] * (FLAC__int64)data[i-7]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-8)); + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); + xmm7 = _mm_mul_epi32(xmm7, xmm3); + + //sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; + //sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm2); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; + //sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm1); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm0); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT(xmm7); + } + } + else { /* order == 7 */ + __m128i xmm0, xmm1, xmm2, xmm3, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + xmm3 = _mm_cvtsi32_si128(qlp_coeff[6]); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum = qlp_coeff[6] * (FLAC__int64)data[i-7]; + xmm7 = _mm_cvtsi32_si128(data[i-7]); + xmm7 = _mm_mul_epi32(xmm7, xmm3); + + //sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; + //sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm2); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; + //sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm1); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm0); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT(xmm7); + } + } + } + else { /* order == 5, 6 */ + if(order == 6) { + __m128i xmm0, xmm1, xmm2, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; + //sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-6)); + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); + xmm7 = _mm_mul_epi32(xmm7, xmm2); + + //sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; + //sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm1); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm0); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT(xmm7); + } + } + else { /* order == 5 */ + __m128i xmm0, xmm1, xmm2, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + xmm2 = _mm_cvtsi32_si128(qlp_coeff[4]); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum = qlp_coeff[4] * (FLAC__int64)data[i-5]; + xmm7 = _mm_cvtsi32_si128(data[i-5]); + xmm7 = _mm_mul_epi32(xmm7, xmm2); + + //sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; + //sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm1); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm0); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT(xmm7); + } + } + } + } + else { /* order == 1, 2, 3, 4 */ + if(order > 2) { /* order == 3, 4 */ + if(order == 4) { + __m128i xmm0, xmm1, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; + //sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-4)); + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); + xmm7 = _mm_mul_epi32(xmm7, xmm1); + + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm0); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT(xmm7); + } + } + else { /* order == 3 */ + __m128i xmm0, xmm1, xmm6, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm1 = _mm_cvtsi32_si128(qlp_coeff[2]); + + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum = qlp_coeff[2] * (FLAC__int64)data[i-3]; + xmm7 = _mm_cvtsi32_si128(data[i-3]); + xmm7 = _mm_mul_epi32(xmm7, xmm1); + + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1)); + xmm6 = _mm_mul_epi32(xmm6, xmm0); + xmm7 = _mm_add_epi64(xmm7, xmm6); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT(xmm7); + } + } + } + else { /* order == 1, 2 */ + if(order == 2) { + __m128i xmm0, xmm7; + xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); + + for(i = 0; i < (int)data_len; i++) { + //sum = 0; + //sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; + //sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-2)); + xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); + xmm7 = _mm_mul_epi32(xmm7, xmm0); + + xmm7 = _mm_add_epi64(xmm7, _mm_srli_si128(xmm7, 8)); + RESIDUAL64_RESULT(xmm7); + } + } + else { /* order == 1 */ + __m128i xmm0, xmm7; + xmm0 = _mm_cvtsi32_si128(qlp_coeff[0]); + + for(i = 0; i < (int)data_len; i++) { + //sum = qlp_coeff[0] * (FLAC__int64)data[i-1]; + xmm7 = _mm_cvtsi32_si128(data[i-1]); + xmm7 = _mm_mul_epi32(xmm7, xmm0); + RESIDUAL64_RESULT(xmm7); + } + } + } + } + } + else { /* order > 12 */ + FLAC__int64 sum; + for(i = 0; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 32: sum += qlp_coeff[31] * (FLAC__int64)data[i-32]; + case 31: sum += qlp_coeff[30] * (FLAC__int64)data[i-31]; + case 30: sum += qlp_coeff[29] * (FLAC__int64)data[i-30]; + case 29: sum += qlp_coeff[28] * (FLAC__int64)data[i-29]; + case 28: sum += qlp_coeff[27] * (FLAC__int64)data[i-28]; + case 27: sum += qlp_coeff[26] * (FLAC__int64)data[i-27]; + case 26: sum += qlp_coeff[25] * (FLAC__int64)data[i-26]; + case 25: sum += qlp_coeff[24] * (FLAC__int64)data[i-25]; + case 24: sum += qlp_coeff[23] * (FLAC__int64)data[i-24]; + case 23: sum += qlp_coeff[22] * (FLAC__int64)data[i-23]; + case 22: sum += qlp_coeff[21] * (FLAC__int64)data[i-22]; + case 21: sum += qlp_coeff[20] * (FLAC__int64)data[i-21]; + case 20: sum += qlp_coeff[19] * (FLAC__int64)data[i-20]; + case 19: sum += qlp_coeff[18] * (FLAC__int64)data[i-19]; + case 18: sum += qlp_coeff[17] * (FLAC__int64)data[i-18]; + case 17: sum += qlp_coeff[16] * (FLAC__int64)data[i-17]; + case 16: sum += qlp_coeff[15] * (FLAC__int64)data[i-16]; + case 15: sum += qlp_coeff[14] * (FLAC__int64)data[i-15]; + case 14: sum += qlp_coeff[13] * (FLAC__int64)data[i-14]; + case 13: sum += qlp_coeff[12] * (FLAC__int64)data[i-13]; + sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; + sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; + sum += qlp_coeff[ 9] * (FLAC__int64)data[i-10]; + sum += qlp_coeff[ 8] * (FLAC__int64)data[i- 9]; + sum += qlp_coeff[ 7] * (FLAC__int64)data[i- 8]; + sum += qlp_coeff[ 6] * (FLAC__int64)data[i- 7]; + sum += qlp_coeff[ 5] * (FLAC__int64)data[i- 6]; + sum += qlp_coeff[ 4] * (FLAC__int64)data[i- 5]; + sum += qlp_coeff[ 3] * (FLAC__int64)data[i- 4]; + sum += qlp_coeff[ 2] * (FLAC__int64)data[i- 3]; + sum += qlp_coeff[ 1] * (FLAC__int64)data[i- 2]; + sum += qlp_coeff[ 0] * (FLAC__int64)data[i- 1]; + } + residual[i] = data[i] - (FLAC__int32)(sum >> lp_quantization); + } + } +} + +FLAC__SSE_TARGET("sse4.1") +void FLAC__lpc_restore_signal_wide_intrin_sse41(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]) +{ + int i; + __m128i cnt = _mm_cvtsi32_si128(lp_quantization); + + if (!data_len) + return; + + FLAC__ASSERT(order > 0); + FLAC__ASSERT(order <= 32); + FLAC__ASSERT(lp_quantization <= 32); /* there's no _mm_sra_epi64() so we have to use _mm_srl_epi64() */ + + if(order <= 12) { + if(order > 8) { /* order == 9, 10, 11, 12 */ + if(order > 10) { /* order == 11, 12 */ + __m128i qlp[6], dat[6]; + __m128i summ, temp; + qlp[0] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); // 0 0 q[1] q[0] + qlp[1] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); // 0 0 q[3] q[2] + qlp[2] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); // 0 0 q[5] q[4] + qlp[3] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); // 0 0 q[7] q[6] + qlp[4] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8)); // 0 0 q[9] q[8] + if (order == 12) + qlp[5] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+10)); // 0 0 q[11] q[10] + else + qlp[5] = _mm_cvtsi32_si128(qlp_coeff[10]); // 0 0 0 q[10] + + qlp[0] = _mm_shuffle_epi32(qlp[0], _MM_SHUFFLE(2,0,3,1)); // 0 q[0] 0 q[1] + qlp[1] = _mm_shuffle_epi32(qlp[1], _MM_SHUFFLE(2,0,3,1)); // 0 q[2] 0 q[3] + qlp[2] = _mm_shuffle_epi32(qlp[2], _MM_SHUFFLE(2,0,3,1)); // 0 q[4] 0 q[5] + qlp[3] = _mm_shuffle_epi32(qlp[3], _MM_SHUFFLE(2,0,3,1)); // 0 q[5] 0 q[7] + qlp[4] = _mm_shuffle_epi32(qlp[4], _MM_SHUFFLE(2,0,3,1)); // 0 q[8] 0 q[9] + qlp[5] = _mm_shuffle_epi32(qlp[5], _MM_SHUFFLE(2,0,3,1)); // 0 q[10] 0 q[11] + + dat[5] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-12))); // ? d[i-11] ? d[i-12] + dat[4] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-10))); // ? d[i-9] ? d[i-10] + dat[3] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-8 ))); // ? d[i-7] ? d[i-8] + dat[2] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-6 ))); // ? d[i-5] ? d[i-6] + dat[1] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-4 ))); // ? d[i-3] ? d[i-4] + dat[0] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-2 ))); // ? d[i-1] ? d[i-2] + + summ = _mm_mul_epi32(dat[5], qlp[5]) ; + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[4], qlp[4])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[3], qlp[3])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[2], qlp[2])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[1], qlp[1])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[0], qlp[0])); + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); // ?_64 sum_64 + summ = _mm_srl_epi64(summ, cnt); // ?_64 (sum >> lp_quantization)_64 == ?_32 ?_32 ?_32 (sum >> lp_quantization)_32 + temp = _mm_cvtsi32_si128(residual[0]); // 0 0 0 r[i] + temp = _mm_add_epi32(temp, summ); // ? ? ? d[i] + data[0] = _mm_cvtsi128_si32(temp); + + for(i = 1; i < (int)data_len; i++) { + dat[5] = _mm_alignr_epi8(dat[4], dat[5], 8); // ? d[i-10] ? d[i-11] + dat[4] = _mm_alignr_epi8(dat[3], dat[4], 8); // ? d[i-8] ? d[i-9] + dat[3] = _mm_alignr_epi8(dat[2], dat[3], 8); // ? d[i-6] ? d[i-7] + dat[2] = _mm_alignr_epi8(dat[1], dat[2], 8); // ? d[i-4] ? d[i-5] + dat[1] = _mm_alignr_epi8(dat[0], dat[1], 8); // ? d[i-2] ? d[i-3] + dat[0] = _mm_alignr_epi8(temp, dat[0], 8); // ? d[i ] ? d[i-1] + + summ = _mm_mul_epi32(dat[5], qlp[5]) ; + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[4], qlp[4])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[3], qlp[3])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[2], qlp[2])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[1], qlp[1])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[0], qlp[0])); + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); // ?_64 sum_64 + summ = _mm_srl_epi64(summ, cnt); // ?_64 (sum >> lp_quantization)_64 == ?_32 ?_32 ?_32 (sum >> lp_quantization)_32 + temp = _mm_cvtsi32_si128(residual[i]); // 0 0 0 r[i] + temp = _mm_add_epi32(temp, summ); // ? ? ? d[i] + data[i] = _mm_cvtsi128_si32(temp); + } + } + else { /* order == 9, 10 */ + __m128i qlp[5], dat[5]; + __m128i summ, temp; + qlp[0] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + qlp[1] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + qlp[2] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + qlp[3] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); + if (order == 10) + qlp[4] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8)); + else + qlp[4] = _mm_cvtsi32_si128(qlp_coeff[8]); + + qlp[0] = _mm_shuffle_epi32(qlp[0], _MM_SHUFFLE(2,0,3,1)); + qlp[1] = _mm_shuffle_epi32(qlp[1], _MM_SHUFFLE(2,0,3,1)); + qlp[2] = _mm_shuffle_epi32(qlp[2], _MM_SHUFFLE(2,0,3,1)); + qlp[3] = _mm_shuffle_epi32(qlp[3], _MM_SHUFFLE(2,0,3,1)); + qlp[4] = _mm_shuffle_epi32(qlp[4], _MM_SHUFFLE(2,0,3,1)); + + dat[4] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-10))); + dat[3] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-8 ))); + dat[2] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-6 ))); + dat[1] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-4 ))); + dat[0] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-2 ))); + + summ = _mm_mul_epi32(dat[4], qlp[4]) ; + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[3], qlp[3])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[2], qlp[2])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[1], qlp[1])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[0], qlp[0])); + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[0]); + temp = _mm_add_epi32(temp, summ); + data[0] = _mm_cvtsi128_si32(temp); + + for(i = 1; i < (int)data_len; i++) { + dat[4] = _mm_alignr_epi8(dat[3], dat[4], 8); + dat[3] = _mm_alignr_epi8(dat[2], dat[3], 8); + dat[2] = _mm_alignr_epi8(dat[1], dat[2], 8); + dat[1] = _mm_alignr_epi8(dat[0], dat[1], 8); + dat[0] = _mm_alignr_epi8(temp, dat[0], 8); + + summ = _mm_mul_epi32(dat[4], qlp[4]) ; + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[3], qlp[3])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[2], qlp[2])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[1], qlp[1])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[0], qlp[0])); + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[i]); + temp = _mm_add_epi32(temp, summ); + data[i] = _mm_cvtsi128_si32(temp); + } + } + } + else if(order > 4) { /* order == 5, 6, 7, 8 */ + if(order > 6) { /* order == 7, 8 */ + __m128i qlp[4], dat[4]; + __m128i summ, temp; + qlp[0] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + qlp[1] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + qlp[2] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + if (order == 8) + qlp[3] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6)); + else + qlp[3] = _mm_cvtsi32_si128(qlp_coeff[6]); + + qlp[0] = _mm_shuffle_epi32(qlp[0], _MM_SHUFFLE(2,0,3,1)); + qlp[1] = _mm_shuffle_epi32(qlp[1], _MM_SHUFFLE(2,0,3,1)); + qlp[2] = _mm_shuffle_epi32(qlp[2], _MM_SHUFFLE(2,0,3,1)); + qlp[3] = _mm_shuffle_epi32(qlp[3], _MM_SHUFFLE(2,0,3,1)); + + dat[3] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-8 ))); + dat[2] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-6 ))); + dat[1] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-4 ))); + dat[0] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-2 ))); + + summ = _mm_mul_epi32(dat[3], qlp[3]) ; + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[2], qlp[2])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[1], qlp[1])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[0], qlp[0])); + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[0]); + temp = _mm_add_epi32(temp, summ); + data[0] = _mm_cvtsi128_si32(temp); + + for(i = 1; i < (int)data_len; i++) { + dat[3] = _mm_alignr_epi8(dat[2], dat[3], 8); + dat[2] = _mm_alignr_epi8(dat[1], dat[2], 8); + dat[1] = _mm_alignr_epi8(dat[0], dat[1], 8); + dat[0] = _mm_alignr_epi8(temp, dat[0], 8); + + summ = _mm_mul_epi32(dat[3], qlp[3]) ; + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[2], qlp[2])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[1], qlp[1])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[0], qlp[0])); + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[i]); + temp = _mm_add_epi32(temp, summ); + data[i] = _mm_cvtsi128_si32(temp); + } + } + else { /* order == 5, 6 */ + __m128i qlp[3], dat[3]; + __m128i summ, temp; + qlp[0] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + qlp[1] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + if (order == 6) + qlp[2] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4)); + else + qlp[2] = _mm_cvtsi32_si128(qlp_coeff[4]); + + qlp[0] = _mm_shuffle_epi32(qlp[0], _MM_SHUFFLE(2,0,3,1)); + qlp[1] = _mm_shuffle_epi32(qlp[1], _MM_SHUFFLE(2,0,3,1)); + qlp[2] = _mm_shuffle_epi32(qlp[2], _MM_SHUFFLE(2,0,3,1)); + + dat[2] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-6 ))); + dat[1] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-4 ))); + dat[0] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-2 ))); + + summ = _mm_mul_epi32(dat[2], qlp[2]) ; + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[1], qlp[1])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[0], qlp[0])); + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[0]); + temp = _mm_add_epi32(temp, summ); + data[0] = _mm_cvtsi128_si32(temp); + + for(i = 1; i < (int)data_len; i++) { + dat[2] = _mm_alignr_epi8(dat[1], dat[2], 8); + dat[1] = _mm_alignr_epi8(dat[0], dat[1], 8); + dat[0] = _mm_alignr_epi8(temp, dat[0], 8); + + summ = _mm_mul_epi32(dat[2], qlp[2]) ; + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[1], qlp[1])); + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[0], qlp[0])); + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[i]); + temp = _mm_add_epi32(temp, summ); + data[i] = _mm_cvtsi128_si32(temp); + } + } + } + else { /* order == 1, 2, 3, 4 */ + if(order > 2) { /* order == 3, 4 */ + __m128i qlp[2], dat[2]; + __m128i summ, temp; + qlp[0] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0)); + if (order == 4) + qlp[1] = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2)); + else + qlp[1] = _mm_cvtsi32_si128(qlp_coeff[2]); + + qlp[0] = _mm_shuffle_epi32(qlp[0], _MM_SHUFFLE(2,0,3,1)); + qlp[1] = _mm_shuffle_epi32(qlp[1], _MM_SHUFFLE(2,0,3,1)); + + dat[1] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-4 ))); + dat[0] = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-2 ))); + + summ = _mm_mul_epi32(dat[1], qlp[1]) ; + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[0], qlp[0])); + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[0]); + temp = _mm_add_epi32(temp, summ); + data[0] = _mm_cvtsi128_si32(temp); + + for(i = 1; i < (int)data_len; i++) { + dat[1] = _mm_alignr_epi8(dat[0], dat[1], 8); + dat[0] = _mm_alignr_epi8(temp, dat[0], 8); + + summ = _mm_mul_epi32(dat[1], qlp[1]) ; + summ = _mm_add_epi64(summ, _mm_mul_epi32(dat[0], qlp[0])); + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[i]); + temp = _mm_add_epi32(temp, summ); + data[i] = _mm_cvtsi128_si32(temp); + } + } + else { /* order == 1, 2 */ + if(order == 2) { + __m128i qlp0, dat0; + __m128i summ, temp; + qlp0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff)); + qlp0 = _mm_shuffle_epi32(qlp0, _MM_SHUFFLE(2,0,3,1)); + + dat0 = _mm_cvtepu32_epi64(_mm_loadl_epi64((const __m128i*)(data-2 ))); + + summ = _mm_mul_epi32(dat0, qlp0) ; + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[0]); + temp = _mm_add_epi32(temp, summ); + data[0] = _mm_cvtsi128_si32(temp); + + for(i = 1; i < (int)data_len; i++) { + dat0 = _mm_alignr_epi8(temp, dat0, 8); + + summ = _mm_mul_epi32(dat0, qlp0) ; + + summ = _mm_add_epi64(summ, _mm_srli_si128(summ, 8)); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[i]); + temp = _mm_add_epi32(temp, summ); + data[i] = _mm_cvtsi128_si32(temp); + } + } + else { /* order == 1 */ + __m128i qlp0; + __m128i summ, temp; + qlp0 = _mm_cvtsi32_si128(qlp_coeff[0]); + temp = _mm_cvtsi32_si128(data[-1]); + + summ = _mm_mul_epi32(temp, qlp0); + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[0]); + temp = _mm_add_epi32(temp, summ); + data[0] = _mm_cvtsi128_si32(temp); + + for(i = 1; i < (int)data_len; i++) { + summ = _mm_mul_epi32(temp, qlp0) ; + summ = _mm_srl_epi64(summ, cnt); + temp = _mm_cvtsi32_si128(residual[i]); + temp = _mm_add_epi32(temp, summ); + data[i] = _mm_cvtsi128_si32(temp); + } + } + } + } + } + else { /* order > 12 */ + FLAC__int64 sum; + for(i = 0; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 32: sum += qlp_coeff[31] * (FLAC__int64)data[i-32]; + case 31: sum += qlp_coeff[30] * (FLAC__int64)data[i-31]; + case 30: sum += qlp_coeff[29] * (FLAC__int64)data[i-30]; + case 29: sum += qlp_coeff[28] * (FLAC__int64)data[i-29]; + case 28: sum += qlp_coeff[27] * (FLAC__int64)data[i-28]; + case 27: sum += qlp_coeff[26] * (FLAC__int64)data[i-27]; + case 26: sum += qlp_coeff[25] * (FLAC__int64)data[i-26]; + case 25: sum += qlp_coeff[24] * (FLAC__int64)data[i-25]; + case 24: sum += qlp_coeff[23] * (FLAC__int64)data[i-24]; + case 23: sum += qlp_coeff[22] * (FLAC__int64)data[i-23]; + case 22: sum += qlp_coeff[21] * (FLAC__int64)data[i-22]; + case 21: sum += qlp_coeff[20] * (FLAC__int64)data[i-21]; + case 20: sum += qlp_coeff[19] * (FLAC__int64)data[i-20]; + case 19: sum += qlp_coeff[18] * (FLAC__int64)data[i-19]; + case 18: sum += qlp_coeff[17] * (FLAC__int64)data[i-18]; + case 17: sum += qlp_coeff[16] * (FLAC__int64)data[i-17]; + case 16: sum += qlp_coeff[15] * (FLAC__int64)data[i-16]; + case 15: sum += qlp_coeff[14] * (FLAC__int64)data[i-15]; + case 14: sum += qlp_coeff[13] * (FLAC__int64)data[i-14]; + case 13: sum += qlp_coeff[12] * (FLAC__int64)data[i-13]; + sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; + sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; + sum += qlp_coeff[ 9] * (FLAC__int64)data[i-10]; + sum += qlp_coeff[ 8] * (FLAC__int64)data[i- 9]; + sum += qlp_coeff[ 7] * (FLAC__int64)data[i- 8]; + sum += qlp_coeff[ 6] * (FLAC__int64)data[i- 7]; + sum += qlp_coeff[ 5] * (FLAC__int64)data[i- 6]; + sum += qlp_coeff[ 4] * (FLAC__int64)data[i- 5]; + sum += qlp_coeff[ 3] * (FLAC__int64)data[i- 4]; + sum += qlp_coeff[ 2] * (FLAC__int64)data[i- 3]; + sum += qlp_coeff[ 1] * (FLAC__int64)data[i- 2]; + sum += qlp_coeff[ 0] * (FLAC__int64)data[i- 1]; + } + data[i] = residual[i] + (FLAC__int32)(sum >> lp_quantization); + } + } +} + +#endif /* defined FLAC__CPU_IA32 */ + +FLAC__SSE_TARGET("sse4.1") +void FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse41(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[]) +{ + int i; + FLAC__int32 sum; + __m128i cnt = _mm_cvtsi32_si128(lp_quantization); + + FLAC__ASSERT(order > 0); + FLAC__ASSERT(order <= 32); + + if(order <= 12) { + if(order > 8) { + if(order > 10) { + if(order == 12) { + __m128i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10, q11; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + q7 = _mm_cvtsi32_si128(qlp_coeff[7]); q7 = _mm_shuffle_epi32(q7, _MM_SHUFFLE(0,0,0,0)); + q8 = _mm_cvtsi32_si128(qlp_coeff[8]); q8 = _mm_shuffle_epi32(q8, _MM_SHUFFLE(0,0,0,0)); + q9 = _mm_cvtsi32_si128(qlp_coeff[9]); q9 = _mm_shuffle_epi32(q9, _MM_SHUFFLE(0,0,0,0)); + q10 = _mm_cvtsi32_si128(qlp_coeff[10]); q10 = _mm_shuffle_epi32(q10, _MM_SHUFFLE(0,0,0,0)); + q11 = _mm_cvtsi32_si128(qlp_coeff[11]); q11 = _mm_shuffle_epi32(q11, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q11, _mm_loadu_si128((const __m128i*)(data+i-12))); + mull = _mm_mullo_epi32(q10, _mm_loadu_si128((const __m128i*)(data+i-11))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q9, _mm_loadu_si128((const __m128i*)(data+i-10))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q8, _mm_loadu_si128((const __m128i*)(data+i-9))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q7, _mm_loadu_si128((const __m128i*)(data+i-8))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 11 */ + __m128i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9, q10; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + q7 = _mm_cvtsi32_si128(qlp_coeff[7]); q7 = _mm_shuffle_epi32(q7, _MM_SHUFFLE(0,0,0,0)); + q8 = _mm_cvtsi32_si128(qlp_coeff[8]); q8 = _mm_shuffle_epi32(q8, _MM_SHUFFLE(0,0,0,0)); + q9 = _mm_cvtsi32_si128(qlp_coeff[9]); q9 = _mm_shuffle_epi32(q9, _MM_SHUFFLE(0,0,0,0)); + q10 = _mm_cvtsi32_si128(qlp_coeff[10]); q10 = _mm_shuffle_epi32(q10, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q10, _mm_loadu_si128((const __m128i*)(data+i-11))); + mull = _mm_mullo_epi32(q9, _mm_loadu_si128((const __m128i*)(data+i-10))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q8, _mm_loadu_si128((const __m128i*)(data+i-9))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q7, _mm_loadu_si128((const __m128i*)(data+i-8))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + else { + if(order == 10) { + __m128i q0, q1, q2, q3, q4, q5, q6, q7, q8, q9; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + q7 = _mm_cvtsi32_si128(qlp_coeff[7]); q7 = _mm_shuffle_epi32(q7, _MM_SHUFFLE(0,0,0,0)); + q8 = _mm_cvtsi32_si128(qlp_coeff[8]); q8 = _mm_shuffle_epi32(q8, _MM_SHUFFLE(0,0,0,0)); + q9 = _mm_cvtsi32_si128(qlp_coeff[9]); q9 = _mm_shuffle_epi32(q9, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q9, _mm_loadu_si128((const __m128i*)(data+i-10))); + mull = _mm_mullo_epi32(q8, _mm_loadu_si128((const __m128i*)(data+i-9))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q7, _mm_loadu_si128((const __m128i*)(data+i-8))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 9 */ + __m128i q0, q1, q2, q3, q4, q5, q6, q7, q8; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + q7 = _mm_cvtsi32_si128(qlp_coeff[7]); q7 = _mm_shuffle_epi32(q7, _MM_SHUFFLE(0,0,0,0)); + q8 = _mm_cvtsi32_si128(qlp_coeff[8]); q8 = _mm_shuffle_epi32(q8, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q8, _mm_loadu_si128((const __m128i*)(data+i-9))); + mull = _mm_mullo_epi32(q7, _mm_loadu_si128((const __m128i*)(data+i-8))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + } + else if(order > 4) { + if(order > 6) { + if(order == 8) { + __m128i q0, q1, q2, q3, q4, q5, q6, q7; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + q7 = _mm_cvtsi32_si128(qlp_coeff[7]); q7 = _mm_shuffle_epi32(q7, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q7, _mm_loadu_si128((const __m128i*)(data+i-8))); + mull = _mm_mullo_epi32(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 7 */ + __m128i q0, q1, q2, q3, q4, q5, q6; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + q6 = _mm_cvtsi32_si128(qlp_coeff[6]); q6 = _mm_shuffle_epi32(q6, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q6, _mm_loadu_si128((const __m128i*)(data+i-7))); + mull = _mm_mullo_epi32(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + else { + if(order == 6) { + __m128i q0, q1, q2, q3, q4, q5; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + q5 = _mm_cvtsi32_si128(qlp_coeff[5]); q5 = _mm_shuffle_epi32(q5, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q5, _mm_loadu_si128((const __m128i*)(data+i-6))); + mull = _mm_mullo_epi32(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 5 */ + __m128i q0, q1, q2, q3, q4; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + q4 = _mm_cvtsi32_si128(qlp_coeff[4]); q4 = _mm_shuffle_epi32(q4, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q4, _mm_loadu_si128((const __m128i*)(data+i-5))); + mull = _mm_mullo_epi32(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + } + else { + if(order > 2) { + if(order == 4) { + __m128i q0, q1, q2, q3; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + q3 = _mm_cvtsi32_si128(qlp_coeff[3]); q3 = _mm_shuffle_epi32(q3, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q3, _mm_loadu_si128((const __m128i*)(data+i-4))); + mull = _mm_mullo_epi32(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 3 */ + __m128i q0, q1, q2; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + q2 = _mm_cvtsi32_si128(qlp_coeff[2]); q2 = _mm_shuffle_epi32(q2, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q2, _mm_loadu_si128((const __m128i*)(data+i-3))); + mull = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); summ = _mm_add_epi32(summ, mull); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + else { + if(order == 2) { + __m128i q0, q1; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + q1 = _mm_cvtsi32_si128(qlp_coeff[1]); q1 = _mm_shuffle_epi32(q1, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ, mull; + summ = _mm_mullo_epi32(q1, _mm_loadu_si128((const __m128i*)(data+i-2))); + mull = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); summ = _mm_add_epi32(summ, mull); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + else { /* order == 1 */ + __m128i q0; + q0 = _mm_cvtsi32_si128(qlp_coeff[0]); q0 = _mm_shuffle_epi32(q0, _MM_SHUFFLE(0,0,0,0)); + + for(i = 0; i < (int)data_len-3; i+=4) { + __m128i summ; + summ = _mm_mullo_epi32(q0, _mm_loadu_si128((const __m128i*)(data+i-1))); + summ = _mm_sra_epi32(summ, cnt); + _mm_storeu_si128((__m128i*)(residual+i), _mm_sub_epi32(_mm_loadu_si128((const __m128i*)(data+i)), summ)); + } + } + } + } + for(; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 12: sum += qlp_coeff[11] * data[i-12]; + case 11: sum += qlp_coeff[10] * data[i-11]; + case 10: sum += qlp_coeff[ 9] * data[i-10]; + case 9: sum += qlp_coeff[ 8] * data[i- 9]; + case 8: sum += qlp_coeff[ 7] * data[i- 8]; + case 7: sum += qlp_coeff[ 6] * data[i- 7]; + case 6: sum += qlp_coeff[ 5] * data[i- 6]; + case 5: sum += qlp_coeff[ 4] * data[i- 5]; + case 4: sum += qlp_coeff[ 3] * data[i- 4]; + case 3: sum += qlp_coeff[ 2] * data[i- 3]; + case 2: sum += qlp_coeff[ 1] * data[i- 2]; + case 1: sum += qlp_coeff[ 0] * data[i- 1]; + } + residual[i] = data[i] - (sum >> lp_quantization); + } + } + else { /* order > 12 */ + for(i = 0; i < (int)data_len; i++) { + sum = 0; + switch(order) { + case 32: sum += qlp_coeff[31] * data[i-32]; + case 31: sum += qlp_coeff[30] * data[i-31]; + case 30: sum += qlp_coeff[29] * data[i-30]; + case 29: sum += qlp_coeff[28] * data[i-29]; + case 28: sum += qlp_coeff[27] * data[i-28]; + case 27: sum += qlp_coeff[26] * data[i-27]; + case 26: sum += qlp_coeff[25] * data[i-26]; + case 25: sum += qlp_coeff[24] * data[i-25]; + case 24: sum += qlp_coeff[23] * data[i-24]; + case 23: sum += qlp_coeff[22] * data[i-23]; + case 22: sum += qlp_coeff[21] * data[i-22]; + case 21: sum += qlp_coeff[20] * data[i-21]; + case 20: sum += qlp_coeff[19] * data[i-20]; + case 19: sum += qlp_coeff[18] * data[i-19]; + case 18: sum += qlp_coeff[17] * data[i-18]; + case 17: sum += qlp_coeff[16] * data[i-17]; + case 16: sum += qlp_coeff[15] * data[i-16]; + case 15: sum += qlp_coeff[14] * data[i-15]; + case 14: sum += qlp_coeff[13] * data[i-14]; + case 13: sum += qlp_coeff[12] * data[i-13]; + sum += qlp_coeff[11] * data[i-12]; + sum += qlp_coeff[10] * data[i-11]; + sum += qlp_coeff[ 9] * data[i-10]; + sum += qlp_coeff[ 8] * data[i- 9]; + sum += qlp_coeff[ 7] * data[i- 8]; + sum += qlp_coeff[ 6] * data[i- 7]; + sum += qlp_coeff[ 5] * data[i- 6]; + sum += qlp_coeff[ 4] * data[i- 5]; + sum += qlp_coeff[ 3] * data[i- 4]; + sum += qlp_coeff[ 2] * data[i- 3]; + sum += qlp_coeff[ 1] * data[i- 2]; + sum += qlp_coeff[ 0] * data[i- 1]; + } + residual[i] = data[i] - (sum >> lp_quantization); + } + } +} + +#endif /* FLAC__SSE4_1_SUPPORTED */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* FLAC__NO_ASM */ +#endif /* FLAC__INTEGER_ONLY_LIBRARY */ diff --git a/lib-src/libflac/src/libFLAC/md5.c b/lib-src/libflac/src/libFLAC/md5.c index e251d50be..e5adc3e35 100644 --- a/lib-src/libflac/src/libFLAC/md5.c +++ b/lib-src/libflac/src/libFLAC/md5.c @@ -1,4 +1,4 @@ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -7,6 +7,7 @@ #include "private/md5.h" #include "share/alloc.h" +#include "share/endswap.h" /* * This code implements the MD5 message-digest algorithm. @@ -223,7 +224,7 @@ void FLAC__MD5Init(FLAC__MD5Context *ctx) ctx->bytes[0] = 0; ctx->bytes[1] = 0; - ctx->internal_buf = 0; + ctx->internal_buf.p8= 0; ctx->capacity = 0; } @@ -259,9 +260,9 @@ void FLAC__MD5Final(FLAC__byte digest[16], FLAC__MD5Context *ctx) byteSwap(ctx->buf, 4); memcpy(digest, ctx->buf, 16); - if(0 != ctx->internal_buf) { - free(ctx->internal_buf); - ctx->internal_buf = 0; + if (0 != ctx->internal_buf.p8) { + free(ctx->internal_buf.p8); + ctx->internal_buf.p8= 0; ctx->capacity = 0; } memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ @@ -270,58 +271,124 @@ void FLAC__MD5Final(FLAC__byte digest[16], FLAC__MD5Context *ctx) /* * Convert the incoming audio signal to a byte stream */ -static void format_input_(FLAC__byte *buf, const FLAC__int32 * const signal[], unsigned channels, unsigned samples, unsigned bytes_per_sample) +static void format_input_(FLAC__multibyte *mbuf, const FLAC__int32 * const signal[], unsigned channels, unsigned samples, unsigned bytes_per_sample) { + FLAC__byte *buf_ = mbuf->p8; + FLAC__int16 *buf16 = mbuf->p16; + FLAC__int32 *buf32 = mbuf->p32; + FLAC__int32 a_word; unsigned channel, sample; - register FLAC__int32 a_word; - register FLAC__byte *buf_ = buf; -#if WORDS_BIGENDIAN -#else - if(channels == 2 && bytes_per_sample == 2) { - FLAC__int16 *buf1_ = ((FLAC__int16*)buf_) + 1; - memcpy(buf_, signal[0], sizeof(FLAC__int32) * samples); - for(sample = 0; sample < samples; sample++, buf1_+=2) - *buf1_ = (FLAC__int16)signal[1][sample]; - } - else if(channels == 1 && bytes_per_sample == 2) { - FLAC__int16 *buf1_ = (FLAC__int16*)buf_; - for(sample = 0; sample < samples; sample++) - *buf1_++ = (FLAC__int16)signal[0][sample]; - } - else -#endif - if(bytes_per_sample == 2) { - if(channels == 2) { - for(sample = 0; sample < samples; sample++) { + /* Storage in the output buffer, buf, is little endian. */ + +#define BYTES_CHANNEL_SELECTOR(bytes, channels) (bytes * 100 + channels) + + /* First do the most commonly used combinations. */ + switch (BYTES_CHANNEL_SELECTOR (bytes_per_sample, channels)) { + /* One byte per sample. */ + case (BYTES_CHANNEL_SELECTOR (1, 1)): + for (sample = 0; sample < samples; sample++) + *buf_++ = signal[0][sample]; + return; + + case (BYTES_CHANNEL_SELECTOR (1, 2)): + for (sample = 0; sample < samples; sample++) { + *buf_++ = signal[0][sample]; + *buf_++ = signal[1][sample]; + } + return; + + case (BYTES_CHANNEL_SELECTOR (1, 4)): + for (sample = 0; sample < samples; sample++) { + *buf_++ = signal[0][sample]; + *buf_++ = signal[1][sample]; + *buf_++ = signal[2][sample]; + *buf_++ = signal[3][sample]; + } + return; + + case (BYTES_CHANNEL_SELECTOR (1, 6)): + for (sample = 0; sample < samples; sample++) { + *buf_++ = signal[0][sample]; + *buf_++ = signal[1][sample]; + *buf_++ = signal[2][sample]; + *buf_++ = signal[3][sample]; + *buf_++ = signal[4][sample]; + *buf_++ = signal[5][sample]; + } + return; + + case (BYTES_CHANNEL_SELECTOR (1, 8)): + for (sample = 0; sample < samples; sample++) { + *buf_++ = signal[0][sample]; + *buf_++ = signal[1][sample]; + *buf_++ = signal[2][sample]; + *buf_++ = signal[3][sample]; + *buf_++ = signal[4][sample]; + *buf_++ = signal[5][sample]; + *buf_++ = signal[6][sample]; + *buf_++ = signal[7][sample]; + } + return; + + /* Two bytes per sample. */ + case (BYTES_CHANNEL_SELECTOR (2, 1)): + for (sample = 0; sample < samples; sample++) + *buf16++ = H2LE_16(signal[0][sample]); + return; + + case (BYTES_CHANNEL_SELECTOR (2, 2)): + for (sample = 0; sample < samples; sample++) { + *buf16++ = H2LE_16(signal[0][sample]); + *buf16++ = H2LE_16(signal[1][sample]); + } + return; + + case (BYTES_CHANNEL_SELECTOR (2, 4)): + for (sample = 0; sample < samples; sample++) { + *buf16++ = H2LE_16(signal[0][sample]); + *buf16++ = H2LE_16(signal[1][sample]); + *buf16++ = H2LE_16(signal[2][sample]); + *buf16++ = H2LE_16(signal[3][sample]); + } + return; + + case (BYTES_CHANNEL_SELECTOR (2, 6)): + for (sample = 0; sample < samples; sample++) { + *buf16++ = H2LE_16(signal[0][sample]); + *buf16++ = H2LE_16(signal[1][sample]); + *buf16++ = H2LE_16(signal[2][sample]); + *buf16++ = H2LE_16(signal[3][sample]); + *buf16++ = H2LE_16(signal[4][sample]); + *buf16++ = H2LE_16(signal[5][sample]); + } + return; + + case (BYTES_CHANNEL_SELECTOR (2, 8)): + for (sample = 0; sample < samples; sample++) { + *buf16++ = H2LE_16(signal[0][sample]); + *buf16++ = H2LE_16(signal[1][sample]); + *buf16++ = H2LE_16(signal[2][sample]); + *buf16++ = H2LE_16(signal[3][sample]); + *buf16++ = H2LE_16(signal[4][sample]); + *buf16++ = H2LE_16(signal[5][sample]); + *buf16++ = H2LE_16(signal[6][sample]); + *buf16++ = H2LE_16(signal[7][sample]); + } + return; + + /* Three bytes per sample. */ + case (BYTES_CHANNEL_SELECTOR (3, 1)): + for (sample = 0; sample < samples; sample++) { a_word = signal[0][sample]; *buf_++ = (FLAC__byte)a_word; a_word >>= 8; - *buf_++ = (FLAC__byte)a_word; - a_word = signal[1][sample]; *buf_++ = (FLAC__byte)a_word; a_word >>= 8; *buf_++ = (FLAC__byte)a_word; } - } - else if(channels == 1) { - for(sample = 0; sample < samples; sample++) { - a_word = signal[0][sample]; - *buf_++ = (FLAC__byte)a_word; a_word >>= 8; - *buf_++ = (FLAC__byte)a_word; - } - } - else { - for(sample = 0; sample < samples; sample++) { - for(channel = 0; channel < channels; channel++) { - a_word = signal[channel][sample]; - *buf_++ = (FLAC__byte)a_word; a_word >>= 8; - *buf_++ = (FLAC__byte)a_word; - } - } - } - } - else if(bytes_per_sample == 3) { - if(channels == 2) { - for(sample = 0; sample < samples; sample++) { + return; + + case (BYTES_CHANNEL_SELECTOR (3, 2)): + for (sample = 0; sample < samples; sample++) { a_word = signal[0][sample]; *buf_++ = (FLAC__byte)a_word; a_word >>= 8; *buf_++ = (FLAC__byte)a_word; a_word >>= 8; @@ -331,60 +398,90 @@ static void format_input_(FLAC__byte *buf, const FLAC__int32 * const signal[], u *buf_++ = (FLAC__byte)a_word; a_word >>= 8; *buf_++ = (FLAC__byte)a_word; } - } - else if(channels == 1) { - for(sample = 0; sample < samples; sample++) { - a_word = signal[0][sample]; - *buf_++ = (FLAC__byte)a_word; a_word >>= 8; - *buf_++ = (FLAC__byte)a_word; a_word >>= 8; - *buf_++ = (FLAC__byte)a_word; + return; + + /* Four bytes per sample. */ + case (BYTES_CHANNEL_SELECTOR (4, 1)): + for (sample = 0; sample < samples; sample++) + *buf32++ = H2LE_32(signal[0][sample]); + return; + + case (BYTES_CHANNEL_SELECTOR (4, 2)): + for (sample = 0; sample < samples; sample++) { + *buf32++ = H2LE_32(signal[0][sample]); + *buf32++ = H2LE_32(signal[1][sample]); } - } - else { - for(sample = 0; sample < samples; sample++) { - for(channel = 0; channel < channels; channel++) { + return; + + case (BYTES_CHANNEL_SELECTOR (4, 4)): + for (sample = 0; sample < samples; sample++) { + *buf32++ = H2LE_32(signal[0][sample]); + *buf32++ = H2LE_32(signal[1][sample]); + *buf32++ = H2LE_32(signal[2][sample]); + *buf32++ = H2LE_32(signal[3][sample]); + } + return; + + case (BYTES_CHANNEL_SELECTOR (4, 6)): + for (sample = 0; sample < samples; sample++) { + *buf32++ = H2LE_32(signal[0][sample]); + *buf32++ = H2LE_32(signal[1][sample]); + *buf32++ = H2LE_32(signal[2][sample]); + *buf32++ = H2LE_32(signal[3][sample]); + *buf32++ = H2LE_32(signal[4][sample]); + *buf32++ = H2LE_32(signal[5][sample]); + } + return; + + case (BYTES_CHANNEL_SELECTOR (4, 8)): + for (sample = 0; sample < samples; sample++) { + *buf32++ = H2LE_32(signal[0][sample]); + *buf32++ = H2LE_32(signal[1][sample]); + *buf32++ = H2LE_32(signal[2][sample]); + *buf32++ = H2LE_32(signal[3][sample]); + *buf32++ = H2LE_32(signal[4][sample]); + *buf32++ = H2LE_32(signal[5][sample]); + *buf32++ = H2LE_32(signal[6][sample]); + *buf32++ = H2LE_32(signal[7][sample]); + } + return; + + default: + break; + } + + /* General version. */ + switch (bytes_per_sample) { + case 1: + for (sample = 0; sample < samples; sample++) + for (channel = 0; channel < channels; channel++) + *buf_++ = signal[channel][sample]; + return; + + case 2: + for (sample = 0; sample < samples; sample++) + for (channel = 0; channel < channels; channel++) + *buf16++ = H2LE_16(signal[channel][sample]); + return; + + case 3: + for (sample = 0; sample < samples; sample++) + for (channel = 0; channel < channels; channel++) { a_word = signal[channel][sample]; *buf_++ = (FLAC__byte)a_word; a_word >>= 8; *buf_++ = (FLAC__byte)a_word; a_word >>= 8; *buf_++ = (FLAC__byte)a_word; } - } - } - } - else if(bytes_per_sample == 1) { - if(channels == 2) { - for(sample = 0; sample < samples; sample++) { - a_word = signal[0][sample]; - *buf_++ = (FLAC__byte)a_word; - a_word = signal[1][sample]; - *buf_++ = (FLAC__byte)a_word; - } - } - else if(channels == 1) { - for(sample = 0; sample < samples; sample++) { - a_word = signal[0][sample]; - *buf_++ = (FLAC__byte)a_word; - } - } - else { - for(sample = 0; sample < samples; sample++) { - for(channel = 0; channel < channels; channel++) { - a_word = signal[channel][sample]; - *buf_++ = (FLAC__byte)a_word; - } - } - } - } - else { /* bytes_per_sample == 4, maybe optimize more later */ - for(sample = 0; sample < samples; sample++) { - for(channel = 0; channel < channels; channel++) { - a_word = signal[channel][sample]; - *buf_++ = (FLAC__byte)a_word; a_word >>= 8; - *buf_++ = (FLAC__byte)a_word; a_word >>= 8; - *buf_++ = (FLAC__byte)a_word; a_word >>= 8; - *buf_++ = (FLAC__byte)a_word; - } - } + return; + + case 4: + for (sample = 0; sample < samples; sample++) + for (channel = 0; channel < channels; channel++) + *buf32++ = H2LE_32(signal[channel][sample]); + return; + + default: + break; } } @@ -396,26 +493,26 @@ FLAC__bool FLAC__MD5Accumulate(FLAC__MD5Context *ctx, const FLAC__int32 * const const size_t bytes_needed = (size_t)channels * (size_t)samples * (size_t)bytes_per_sample; /* overflow check */ - if((size_t)channels > SIZE_MAX / (size_t)bytes_per_sample) + if ((size_t)channels > SIZE_MAX / (size_t)bytes_per_sample) return false; - if((size_t)channels * (size_t)bytes_per_sample > SIZE_MAX / (size_t)samples) + if ((size_t)channels * (size_t)bytes_per_sample > SIZE_MAX / (size_t)samples) return false; - if(ctx->capacity < bytes_needed) { - FLAC__byte *tmp = realloc(ctx->internal_buf, bytes_needed); - if(0 == tmp) { - free(ctx->internal_buf); - if(0 == (ctx->internal_buf = safe_malloc_(bytes_needed))) + if (ctx->capacity < bytes_needed) { + FLAC__byte *tmp = realloc(ctx->internal_buf.p8, bytes_needed); + if (0 == tmp) { + free(ctx->internal_buf.p8); + if (0 == (ctx->internal_buf.p8= safe_malloc_(bytes_needed))) return false; } else - ctx->internal_buf = tmp; + ctx->internal_buf.p8= tmp; ctx->capacity = bytes_needed; } - format_input_(ctx->internal_buf, signal, channels, samples, bytes_per_sample); + format_input_(&ctx->internal_buf, signal, channels, samples, bytes_per_sample); - FLAC__MD5Update(ctx, ctx->internal_buf, bytes_needed); + FLAC__MD5Update(ctx, ctx->internal_buf.p8, bytes_needed); return true; } diff --git a/lib-src/libflac/src/libFLAC/memory.c b/lib-src/libflac/src/libFLAC/memory.c index a413b8c7e..d22df70eb 100644 --- a/lib-src/libflac/src/libFLAC/memory.c +++ b/lib-src/libflac/src/libFLAC/memory.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,10 +30,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif +#ifdef HAVE_STDINT_H +#include +#endif + #include "private/memory.h" #include "FLAC/assert.h" #include "share/alloc.h" @@ -46,25 +50,8 @@ void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address) #ifdef FLAC__ALIGN_MALLOC_DATA /* align on 32-byte (256-bit) boundary */ - x = safe_malloc_add_2op_(bytes, /*+*/31); -#ifdef SIZEOF_VOIDP -#if SIZEOF_VOIDP == 4 - /* could do *aligned_address = x + ((unsigned) (32 - (((unsigned)x) & 31))) & 31; */ - *aligned_address = (void*)(((unsigned)x + 31) & -32); -#elif SIZEOF_VOIDP == 8 - *aligned_address = (void*)(((FLAC__uint64)x + 31) & (FLAC__uint64)(-((FLAC__int64)32))); -#else -# error Unsupported sizeof(void*) -#endif -#else - /* there's got to be a better way to do this right for all archs */ - if(sizeof(void*) == sizeof(unsigned)) - *aligned_address = (void*)(((unsigned)x + 31) & -32); - else if(sizeof(void*) == sizeof(FLAC__uint64)) - *aligned_address = (void*)(((FLAC__uint64)x + 31) & (FLAC__uint64)(-((FLAC__int64)32))); - else - return 0; -#endif + x = safe_malloc_add_2op_(bytes, /*+*/31L); + *aligned_address = (void*)(((uintptr_t)x + 31L) & -32L); #else x = safe_malloc_(bytes); *aligned_address = x; diff --git a/lib-src/libflac/src/libFLAC/metadata_iterators.c b/lib-src/libflac/src/libFLAC/metadata_iterators.c index de69cf7cb..1e2892560 100644 --- a/lib-src/libflac/src/libFLAC/metadata_iterators.c +++ b/lib-src/libflac/src/libFLAC/metadata_iterators.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -77,8 +77,8 @@ static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_streaminfo_c static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_padding_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Seek seek_cb, FLAC__StreamMetadata_Padding *block, unsigned block_length); static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_application_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_Application *block, unsigned block_length); static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_seektable_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_SeekTable *block, unsigned block_length); -static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_entry_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_VorbisComment_Entry *entry); -static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_VorbisComment *block); +static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_entry_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_VorbisComment_Entry *entry, unsigned max_length); +static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__IOCallback_Seek seek_cb, FLAC__StreamMetadata_VorbisComment *block, unsigned block_length); static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_cuesheet_track_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_CueSheet_Track *track); static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_cuesheet_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_CueSheet *block); static FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_picture_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_Picture *block); @@ -763,8 +763,10 @@ FLAC_API FLAC__bool FLAC__metadata_simple_iterator_insert_block_after(FLAC__Meta FLAC__ASSERT(0 != iterator->file); FLAC__ASSERT(0 != block); - if(!iterator->is_writable) + if(!iterator->is_writable) { + iterator->status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_NOT_WRITABLE; return false; + } if(block->type == FLAC__METADATA_TYPE_STREAMINFO) { iterator->status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_ILLEGAL_INPUT; @@ -2091,7 +2093,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_cb_(FLAC__IOHandle case FLAC__METADATA_TYPE_SEEKTABLE: return read_metadata_block_data_seektable_cb_(handle, read_cb, &block->data.seek_table, block->length); case FLAC__METADATA_TYPE_VORBIS_COMMENT: - return read_metadata_block_data_vorbis_comment_cb_(handle, read_cb, &block->data.vorbis_comment); + return read_metadata_block_data_vorbis_comment_cb_(handle, read_cb, seek_cb, &block->data.vorbis_comment, block->length); case FLAC__METADATA_TYPE_CUESHEET: return read_metadata_block_data_cuesheet_cb_(handle, read_cb, &block->data.cue_sheet); case FLAC__METADATA_TYPE_PICTURE: @@ -2189,16 +2191,24 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_seektable_cb_(FLAC_ return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK; } -FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_entry_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_VorbisComment_Entry *entry) +FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_entry_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_VorbisComment_Entry *entry, unsigned max_length) { const unsigned entry_length_len = FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN / 8; FLAC__byte buffer[4]; /* magic number is asserted below */ FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN / 8 == sizeof(buffer)); + if(max_length < entry_length_len) + return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA; + + max_length -= entry_length_len; if(read_cb(buffer, 1, entry_length_len, handle) != entry_length_len) return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR; entry->length = unpack_uint32_little_endian_(buffer, entry_length_len); + if(max_length < entry->length) { + entry->length = 0; + return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA; + } else max_length -= entry->length; if(0 != entry->entry) free(entry->entry); @@ -2219,7 +2229,7 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_entr return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK; } -FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__StreamMetadata_VorbisComment *block) +FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_cb_(FLAC__IOHandle handle, FLAC__IOCallback_Read read_cb, FLAC__IOCallback_Seek seek_cb, FLAC__StreamMetadata_VorbisComment *block, unsigned block_length) { unsigned i; FLAC__Metadata_SimpleIteratorStatus status; @@ -2228,9 +2238,16 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_cb_( FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN / 8 == sizeof(buffer)); - if(FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK != (status = read_metadata_block_data_vorbis_comment_entry_cb_(handle, read_cb, &(block->vendor_string)))) + status = read_metadata_block_data_vorbis_comment_entry_cb_(handle, read_cb, &(block->vendor_string), block_length); + if(block_length >= 4) + block_length -= 4; + if(status == FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA) + goto skip; + else if(status != FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK) return status; + block_length -= block->vendor_string.length; + if(block_length < num_comments_len) goto skip; else block_length -= num_comments_len; if(read_cb(buffer, 1, num_comments_len, handle) != num_comments_len) return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_READ_ERROR; block->num_comments = unpack_uint32_little_endian_(buffer, num_comments_len); @@ -2242,8 +2259,21 @@ FLAC__Metadata_SimpleIteratorStatus read_metadata_block_data_vorbis_comment_cb_( return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR; for(i = 0; i < block->num_comments; i++) { - if(FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK != (status = read_metadata_block_data_vorbis_comment_entry_cb_(handle, read_cb, block->comments + i))) - return status; + status = read_metadata_block_data_vorbis_comment_entry_cb_(handle, read_cb, block->comments + i, block_length); + if(block_length >= 4) block_length -= 4; + if(status == FLAC__METADATA_SIMPLE_ITERATOR_STATUS_BAD_METADATA) { + block->num_comments = i; + goto skip; + } + else if(status != FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK) return status; + block_length -= block->comments[i].length; + } + + skip: + if(block_length > 0) { + /* bad metadata */ + if(0 != seek_cb(handle, block_length, SEEK_CUR)) + return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_SEEK_ERROR; } return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK; @@ -3201,13 +3231,18 @@ static int local_snprintf(char *str, size_t size, const char *fmt, ...) { va_list va; - int rc ; + int rc; va_start (va, fmt); -#ifdef _MSC_VER +#if defined _MSC_VER + if (size == 0) + return 1024; rc = vsnprintf_s (str, size, _TRUNCATE, fmt, va); - rc = (rc > 0) ? rc : (size == 0 ? 1024 : size * 2); + if (rc < 0) + rc = size - 1; +#elif defined __MINGW32__ + rc = __mingw_vsnprintf (str, size, fmt, va); #else rc = vsnprintf (str, size, fmt, va); #endif diff --git a/lib-src/libflac/src/libFLAC/metadata_object.c b/lib-src/libflac/src/libFLAC/metadata_object.c index 550323890..0456297a3 100644 --- a/lib-src/libflac/src/libFLAC/metadata_object.c +++ b/lib-src/libflac/src/libFLAC/metadata_object.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -264,7 +264,7 @@ static FLAC__bool vorbiscomment_set_entry_(FLAC__StreamMetadata *object, FLAC__S save = dest->entry; - if(0 != src->entry && src->length > 0) { + if(0 != src->entry) { if(copy) { /* do the copy first so that if we fail we leave the dest object untouched */ if(!copy_vcentry_(dest, src)) @@ -440,7 +440,7 @@ FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_new(FLAC__MetadataType type { FLAC__StreamMetadata *object; - if(type > FLAC__MAX_METADATA_TYPE_CODE) + if(type > FLAC__MAX_METADATA_TYPE) return 0; object = calloc(1, sizeof(FLAC__StreamMetadata)); diff --git a/lib-src/libflac/src/libFLAC/ogg_decoder_aspect.c b/lib-src/libflac/src/libFLAC/ogg_decoder_aspect.c index daebe8172..219c47953 100644 --- a/lib-src/libflac/src/libFLAC/ogg_decoder_aspect.c +++ b/lib-src/libflac/src/libFLAC/ogg_decoder_aspect.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/libFLAC/ogg_encoder_aspect.c b/lib-src/libflac/src/libFLAC/ogg_encoder_aspect.c index 902a9e564..39bb9e962 100644 --- a/lib-src/libflac/src/libFLAC/ogg_encoder_aspect.c +++ b/lib-src/libflac/src/libFLAC/ogg_encoder_aspect.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/libFLAC/ogg_helper.c b/lib-src/libflac/src/libFLAC/ogg_helper.c index 255e3cd75..8b3a655ad 100644 --- a/lib-src/libflac/src/libFLAC/ogg_helper.c +++ b/lib-src/libflac/src/libFLAC/ogg_helper.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/libFLAC/ogg_mapping.c b/lib-src/libflac/src/libFLAC/ogg_mapping.c index 8f3501697..125b4587e 100644 --- a/lib-src/libflac/src/libFLAC/ogg_mapping.c +++ b/lib-src/libflac/src/libFLAC/ogg_mapping.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/libFLAC/ppc/Makefile.am b/lib-src/libflac/src/libFLAC/ppc/Makefile.am deleted file mode 100644 index c652313c0..000000000 --- a/lib-src/libflac/src/libFLAC/ppc/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# libFLAC - Free Lossless Audio Codec library -# Copyright (C) 2004-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# - Neither the name of the Xiph.org Foundation nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -SUBDIRS = as gas diff --git a/lib-src/libflac/src/libFLAC/ppc/Makefile.in b/lib-src/libflac/src/libFLAC/ppc/Makefile.in deleted file mode 100644 index 50b5db34a..000000000 --- a/lib-src/libflac/src/libFLAC/ppc/Makefile.in +++ /dev/null @@ -1,659 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# libFLAC - Free Lossless Audio Codec library -# Copyright (C) 2004-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# - Neither the name of the Xiph.org Foundation nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/libFLAC/ppc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ -FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NASM = @NASM@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OBJ_FORMAT = @OBJ_FORMAT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OGG_PACKAGE = @OGG_PACKAGE@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -XMMS_CFLAGS = @XMMS_CFLAGS@ -XMMS_CONFIG = @XMMS_CONFIG@ -XMMS_DATA_DIR = @XMMS_DATA_DIR@ -XMMS_EFFECT_PLUGIN_DIR = @XMMS_EFFECT_PLUGIN_DIR@ -XMMS_GENERAL_PLUGIN_DIR = @XMMS_GENERAL_PLUGIN_DIR@ -XMMS_INPUT_PLUGIN_DIR = @XMMS_INPUT_PLUGIN_DIR@ -XMMS_LIBS = @XMMS_LIBS@ -XMMS_OUTPUT_PLUGIN_DIR = @XMMS_OUTPUT_PLUGIN_DIR@ -XMMS_PLUGIN_DIR = @XMMS_PLUGIN_DIR@ -XMMS_VERSION = @XMMS_VERSION@ -XMMS_VISUALIZATION_PLUGIN_DIR = @XMMS_VISUALIZATION_PLUGIN_DIR@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = as gas -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libFLAC/ppc/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/libFLAC/ppc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libflac/src/libFLAC/ppc/as/Makefile.am b/lib-src/libflac/src/libFLAC/ppc/as/Makefile.am deleted file mode 100644 index 366bf49e6..000000000 --- a/lib-src/libflac/src/libFLAC/ppc/as/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -# libFLAC - Free Lossless Audio Codec library -# Copyright (C) 2004-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# - Neither the name of the Xiph.org Foundation nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#@@@ -if FLaC__HAS_AS__TEMPORARILY_DISABLED - -SUFFIXES = .s .lo - -STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh - -# For some unknown reason libtool can't figure out the tag for 'as', so -# we fake it with --tag=CC and strip out unwanted options. -.s.lo: - $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) as -force_cpusubtype_ALL -o $@ $< - -noinst_LTLIBRARIES = libFLAC-asm.la -libFLAC_asm_la_SOURCES = \ - lpc_asm.s - -else - -EXTRA_DIST = \ - lpc_asm.s - -endif diff --git a/lib-src/libflac/src/libFLAC/ppc/as/Makefile.in b/lib-src/libflac/src/libFLAC/ppc/as/Makefile.in deleted file mode 100644 index d6e1cec12..000000000 --- a/lib-src/libflac/src/libFLAC/ppc/as/Makefile.in +++ /dev/null @@ -1,590 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# libFLAC - Free Lossless Audio Codec library -# Copyright (C) 2004-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# - Neither the name of the Xiph.org Foundation nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/libFLAC/ppc/as -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libFLAC_asm_la_LIBADD = -am__libFLAC_asm_la_SOURCES_DIST = lpc_asm.s -@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@am_libFLAC_asm_la_OBJECTS = \ -@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@ lpc_asm.lo -libFLAC_asm_la_OBJECTS = $(am_libFLAC_asm_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@am_libFLAC_asm_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) -LTCCASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ - $(CCASFLAGS) -AM_V_CCAS = $(am__v_CCAS_@AM_V@) -am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@) -am__v_CCAS_0 = @echo " CCAS " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libFLAC_asm_la_SOURCES) -DIST_SOURCES = $(am__libFLAC_asm_la_SOURCES_DIST) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ -FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NASM = @NASM@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OBJ_FORMAT = @OBJ_FORMAT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OGG_PACKAGE = @OGG_PACKAGE@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -XMMS_CFLAGS = @XMMS_CFLAGS@ -XMMS_CONFIG = @XMMS_CONFIG@ -XMMS_DATA_DIR = @XMMS_DATA_DIR@ -XMMS_EFFECT_PLUGIN_DIR = @XMMS_EFFECT_PLUGIN_DIR@ -XMMS_GENERAL_PLUGIN_DIR = @XMMS_GENERAL_PLUGIN_DIR@ -XMMS_INPUT_PLUGIN_DIR = @XMMS_INPUT_PLUGIN_DIR@ -XMMS_LIBS = @XMMS_LIBS@ -XMMS_OUTPUT_PLUGIN_DIR = @XMMS_OUTPUT_PLUGIN_DIR@ -XMMS_PLUGIN_DIR = @XMMS_PLUGIN_DIR@ -XMMS_VERSION = @XMMS_VERSION@ -XMMS_VISUALIZATION_PLUGIN_DIR = @XMMS_VISUALIZATION_PLUGIN_DIR@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -#@@@ -@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@SUFFIXES = .s .lo -@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh -@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@noinst_LTLIBRARIES = libFLAC-asm.la -@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@libFLAC_asm_la_SOURCES = \ -@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@ lpc_asm.s - -@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@EXTRA_DIST = \ -@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@ lpc_asm.s - -all: all-am - -.SUFFIXES: -.SUFFIXES: .s .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libFLAC/ppc/as/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/libFLAC/ppc/as/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libFLAC-asm.la: $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_DEPENDENCIES) $(EXTRA_libFLAC_asm_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(am_libFLAC_asm_la_rpath) $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -.s.o: - $(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ $< - -.s.obj: - $(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@.s.lo: - $(AM_V_CCAS)$(LTCCASCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - - -# For some unknown reason libtool can't figure out the tag for 'as', so -# we fake it with --tag=CC and strip out unwanted options. -@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@.s.lo: -@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@ $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) as -force_cpusubtype_ALL -o $@ $< - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libflac/src/libFLAC/ppc/as/lpc_asm.s b/lib-src/libflac/src/libFLAC/ppc/as/lpc_asm.s deleted file mode 100644 index e3c07fc9e..000000000 --- a/lib-src/libflac/src/libFLAC/ppc/as/lpc_asm.s +++ /dev/null @@ -1,430 +0,0 @@ -; libFLAC - Free Lossless Audio Codec library -; Copyright (C) 2004-2009 Josh Coalson -; Copyright (C) 2011-2013 Xiph.Org Foundation -; -; Redistribution and use in source and binary forms, with or without -; modification, are permitted provided that the following conditions -; are met: -; -; - Redistributions of source code must retain the above copyright -; notice, this list of conditions and the following disclaimer. -; -; - Redistributions in binary form must reproduce the above copyright -; notice, this list of conditions and the following disclaimer in the -; documentation and/or other materials provided with the distribution. -; -; - Neither the name of the Xiph.org Foundation nor the names of its -; contributors may be used to endorse or promote products derived from -; this software without specific prior written permission. -; -; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -.text - .align 2 -.globl _FLAC__lpc_restore_signal_asm_ppc_altivec_16 - -.globl _FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8 - -_FLAC__lpc_restore_signal_asm_ppc_altivec_16: -; r3: residual[] -; r4: data_len -; r5: qlp_coeff[] -; r6: order -; r7: lp_quantization -; r8: data[] - -; see src/libFLAC/lpc.c:FLAC__lpc_restore_signal() -; these is a PowerPC/Altivec assembly version which requires bps<=16 (or actual -; bps<=15 for mid-side coding, since that uses an extra bit) - -; these should be fast; the inner loop is unrolled (it takes no more than -; 3*(order%4) instructions, all of which are arithmetic), and all of the -; coefficients and all relevant history stay in registers, so the outer loop -; has only one load from memory (the residual) - -; I have not yet run this through simg4, so there may be some avoidable stalls, -; and there may be a somewhat more clever way to do the outer loop - -; the branch mechanism may prevent dynamic loading; I still need to examine -; this issue, and there may be a more elegant method - - stmw r31,-4(r1) - - addi r9,r1,-28 - li r31,0xf - andc r9,r9,r31 ; for quadword-aligned stack data - - slwi r6,r6,2 ; adjust for word size - slwi r4,r4,2 - add r4,r4,r8 ; r4 = data+data_len - - mfspr r0,256 ; cache old vrsave - addis r31,0,hi16(0xfffffc00) - ori r31,r31,lo16(0xfffffc00) - mtspr 256,r31 ; declare VRs in vrsave - - cmplw cr0,r8,r4 ; i> lp_quantization - - lvewx v21,0,r3 ; v21[n]: *residual - vperm v21,v21,v21,v18 ; v21[3]: *residual - vaddsws v20,v21,v20 ; v20[3]: *residual + (sum >> lp_quantization) - vsldoi v18,v18,v18,4 ; increment shift vector - - vperm v21,v20,v20,v17 ; v21[n]: shift for storage - vsldoi v17,v17,v17,12 ; increment shift vector - stvewx v21,0,r8 - - vsldoi v20,v20,v20,12 - vsldoi v8,v8,v20,4 ; insert value onto history - - addi r3,r3,4 - addi r8,r8,4 - cmplw cr0,r8,r4 ; i> lp_quantization - - lvewx v9,0,r3 ; v9[n]: *residual - vperm v9,v9,v9,v6 ; v9[3]: *residual - vaddsws v8,v9,v8 ; v8[3]: *residual + (sum >> lp_quantization) - vsldoi v6,v6,v6,4 ; increment shift vector - - vperm v9,v8,v8,v5 ; v9[n]: shift for storage - vsldoi v5,v5,v5,12 ; increment shift vector - stvewx v9,0,r8 - - vsldoi v8,v8,v8,12 - vsldoi v2,v2,v8,4 ; insert value onto history - - addi r3,r3,4 - addi r8,r8,4 - cmplw cr0,r8,r4 ; i/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/libFLAC/ppc/gas -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -libFLAC_asm_la_LIBADD = -am__libFLAC_asm_la_SOURCES_DIST = lpc_asm.s -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@am_libFLAC_asm_la_OBJECTS = \ -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@ lpc_asm.lo -libFLAC_asm_la_OBJECTS = $(am_libFLAC_asm_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@am_libFLAC_asm_la_rpath = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) -LTCCASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ - $(CCASFLAGS) -AM_V_CCAS = $(am__v_CCAS_@AM_V@) -am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@) -am__v_CCAS_0 = @echo " CCAS " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libFLAC_asm_la_SOURCES) -DIST_SOURCES = $(am__libFLAC_asm_la_SOURCES_DIST) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ -FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NASM = @NASM@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OBJ_FORMAT = @OBJ_FORMAT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OGG_PACKAGE = @OGG_PACKAGE@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -XMMS_CFLAGS = @XMMS_CFLAGS@ -XMMS_CONFIG = @XMMS_CONFIG@ -XMMS_DATA_DIR = @XMMS_DATA_DIR@ -XMMS_EFFECT_PLUGIN_DIR = @XMMS_EFFECT_PLUGIN_DIR@ -XMMS_GENERAL_PLUGIN_DIR = @XMMS_GENERAL_PLUGIN_DIR@ -XMMS_INPUT_PLUGIN_DIR = @XMMS_INPUT_PLUGIN_DIR@ -XMMS_LIBS = @XMMS_LIBS@ -XMMS_OUTPUT_PLUGIN_DIR = @XMMS_OUTPUT_PLUGIN_DIR@ -XMMS_PLUGIN_DIR = @XMMS_PLUGIN_DIR@ -XMMS_VERSION = @XMMS_VERSION@ -XMMS_VISUALIZATION_PLUGIN_DIR = @XMMS_VISUALIZATION_PLUGIN_DIR@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -#@@@ -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@SUFFIXES = .s .lo -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@STRIP_NON_ASM = sh $(top_srcdir)/strip_non_asm_libtool_args.sh -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@noinst_LTLIBRARIES = libFLAC-asm.la -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@libFLAC_asm_la_SOURCES = \ -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@ lpc_asm.s - -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@EXTRA_DIST = \ -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@ lpc_asm.s - -all: all-am - -.SUFFIXES: -.SUFFIXES: .s .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libFLAC/ppc/gas/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/libFLAC/ppc/gas/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libFLAC-asm.la: $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_DEPENDENCIES) $(EXTRA_libFLAC_asm_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(am_libFLAC_asm_la_rpath) $(libFLAC_asm_la_OBJECTS) $(libFLAC_asm_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -.s.o: - $(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ $< - -.s.obj: - $(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_FALSE@.s.lo: - $(AM_V_CCAS)$(LTCCASCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am - - -# For some unknown reason libtool can't figure out the tag for 'gas', so -# we fake it with --tag=CC and strip out unwanted options. -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@.s.lo: -@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@ $(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) gas -force_cpusubtype_ALL -o $@ $< - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libflac/src/libFLAC/ppc/gas/lpc_asm.s b/lib-src/libflac/src/libFLAC/ppc/gas/lpc_asm.s deleted file mode 100644 index 77a72bb40..000000000 --- a/lib-src/libflac/src/libFLAC/ppc/gas/lpc_asm.s +++ /dev/null @@ -1,432 +0,0 @@ -# libFLAC - Free Lossless Audio Codec library -# Copyright (C) 2004-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# - Neither the name of the Xiph.org Foundation nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -.text - .align 2 -.globl _FLAC__lpc_restore_signal_asm_ppc_altivec_16 -.type _FLAC__lpc_restore_signal_asm_ppc_altivec_16, @function - -.globl _FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8 -.type _FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8, @function - -_FLAC__lpc_restore_signal_asm_ppc_altivec_16: -# r3: residual[] -# r4: data_len -# r5: qlp_coeff[] -# r6: order -# r7: lp_quantization -# r8: data[] - -# see src/libFLAC/lpc.c:FLAC__lpc_restore_signal() -# these is a PowerPC/Altivec assembly version which requires bps<=16 (or actual -# bps<=15 for mid-side coding, since that uses an extra bit) - -# these should be fast; the inner loop is unrolled (it takes no more than -# 3*(order%4) instructions, all of which are arithmetic), and all of the -# coefficients and all relevant history stay in registers, so the outer loop -# has only one load from memory (the residual) - -# I have not yet run this through simg4, so there may be some avoidable stalls, -# and there may be a somewhat more clever way to do the outer loop - -# the branch mechanism may prevent dynamic loading; I still need to examine -# this issue, and there may be a more elegant method - - stmw r31,-4(r1) - - addi r9,r1,-28 - li r31,0xf - andc r9,r9,r31 # for quadword-aligned stack data - - slwi r6,r6,2 # adjust for word size - slwi r4,r4,2 - add r4,r4,r8 # r4 = data+data_len - - mfspr r0,256 # cache old vrsave - addis r31,0,0xffff - ori r31,r31,0xfc00 - mtspr 256,r31 # declare VRs in vrsave - - cmplw cr0,r8,r4 # i> lp_quantization - - lvewx v21,0,r3 # v21[n]: *residual - vperm v21,v21,v21,v18 # v21[3]: *residual - vaddsws v20,v21,v20 # v20[3]: *residual + (sum >> lp_quantization) - vsldoi v18,v18,v18,4 # increment shift vector - - vperm v21,v20,v20,v17 # v21[n]: shift for storage - vsldoi v17,v17,v17,12 # increment shift vector - stvewx v21,0,r8 - - vsldoi v20,v20,v20,12 - vsldoi v8,v8,v20,4 # insert value onto history - - addi r3,r3,4 - addi r8,r8,4 - cmplw cr0,r8,r4 # i> lp_quantization - - lvewx v9,0,r3 # v9[n]: *residual - vperm v9,v9,v9,v6 # v9[3]: *residual - vaddsws v8,v9,v8 # v8[3]: *residual + (sum >> lp_quantization) - vsldoi v6,v6,v6,4 # increment shift vector - - vperm v9,v8,v8,v5 # v9[n]: shift for storage - vsldoi v5,v5,v5,12 # increment shift vector - stvewx v9,0,r8 - - vsldoi v8,v8,v8,12 - vsldoi v2,v2,v8,4 # insert value onto history - - addi r3,r3,4 - addi r8,r8,4 - cmplw cr0,r8,r4 # i #endif @@ -71,7 +71,7 @@ FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC = * ***********************************************************************/ -static FLAC__byte ID3V2_TAG_[3] = { 'I', 'D', '3' }; +static const FLAC__byte ID3V2_TAG_[3] = { 'I', 'D', '3' }; /*********************************************************************** * @@ -87,7 +87,7 @@ static FLAC__bool find_metadata_(FLAC__StreamDecoder *decoder); static FLAC__bool read_metadata_(FLAC__StreamDecoder *decoder); static FLAC__bool read_metadata_streaminfo_(FLAC__StreamDecoder *decoder, FLAC__bool is_last, unsigned length); static FLAC__bool read_metadata_seektable_(FLAC__StreamDecoder *decoder, FLAC__bool is_last, unsigned length); -static FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_VorbisComment *obj); +static FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_VorbisComment *obj, unsigned length); static FLAC__bool read_metadata_cuesheet_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_CueSheet *obj); static FLAC__bool read_metadata_picture_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_Picture *obj); static FLAC__bool skip_id3v2_tag_(FLAC__StreamDecoder *decoder); @@ -142,9 +142,6 @@ typedef struct FLAC__StreamDecoderPrivate { void (*local_lpc_restore_signal_64bit)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); /* for use when the signal is <= 16 bits-per-sample, or <= 15 bits-per-sample on a side channel (which requires 1 extra bit): */ void (*local_lpc_restore_signal_16bit)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); - /* for use when the signal is <= 16 bits-per-sample, or <= 15 bits-per-sample on a side channel (which requires 1 extra bit), AND order <= 8: */ - void (*local_lpc_restore_signal_16bit_order8)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]); - FLAC__bool (*local_bitreader_read_rice_signed_block)(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter); void *client_data; FILE *file; /* only used if FLAC__stream_decoder_init_file()/FLAC__stream_decoder_init_file() called, else NULL */ FLAC__BitReader *input; @@ -381,7 +378,7 @@ static FLAC__StreamDecoderInitStatus init_stream_internal_( #if FLAC__HAS_OGG decoder->private_->is_ogg = is_ogg; if(is_ogg && !FLAC__ogg_decoder_aspect_init(&decoder->protected_->ogg_decoder_aspect)) - return decoder->protected_->state = FLAC__STREAM_DECODER_OGG_ERROR; + return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE; #endif /* @@ -392,42 +389,44 @@ static FLAC__StreamDecoderInitStatus init_stream_internal_( decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal; decoder->private_->local_lpc_restore_signal_64bit = FLAC__lpc_restore_signal_wide; decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal; - decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal; - decoder->private_->local_bitreader_read_rice_signed_block = FLAC__bitreader_read_rice_signed_block; /* now override with asm where appropriate */ #ifndef FLAC__NO_ASM if(decoder->private_->cpuinfo.use_asm) { #ifdef FLAC__CPU_IA32 FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32); #ifdef FLAC__HAS_NASM -#if 1 /*@@@@@@ OPT: not clearly faster, needs more testing */ - if(decoder->private_->cpuinfo.data.ia32.bswap) - decoder->private_->local_bitreader_read_rice_signed_block = FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap; -#endif - if(decoder->private_->cpuinfo.data.ia32.mmx) { + decoder->private_->local_lpc_restore_signal_64bit = FLAC__lpc_restore_signal_wide_asm_ia32; /* OPT_IA32: was really necessary for GCC < 4.9 */ + if(decoder->private_->cpuinfo.ia32.mmx) { decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_ia32; decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_asm_ia32_mmx; - decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_asm_ia32_mmx; } else { decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_ia32; decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_asm_ia32; - decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_asm_ia32; } #endif -#elif defined FLAC__CPU_PPC - FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_PPC); - if(decoder->private_->cpuinfo.data.ppc.altivec) { - decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_asm_ppc_altivec_16; - decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8; +#ifdef FLAC__HAS_X86INTRIN +# if defined FLAC__SSE2_SUPPORTED && !defined FLAC__HAS_NASM /* OPT_SSE: not better than MMX asm */ + if(decoder->private_->cpuinfo.ia32.sse2) { + decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_16_intrin_sse2; } +# endif +# if defined FLAC__SSE4_1_SUPPORTED + if(decoder->private_->cpuinfo.ia32.sse41) { + decoder->private_->local_lpc_restore_signal_64bit = FLAC__lpc_restore_signal_wide_intrin_sse41; + } +# endif +#endif +#elif defined FLAC__CPU_X86_64 + FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_X86_64); + /* No useful SSE optimizations yet */ #endif } #endif /* from here on, errors are fatal */ - if(!FLAC__bitreader_init(decoder->private_->input, decoder->private_->cpuinfo, read_callback_, decoder)) { + if(!FLAC__bitreader_init(decoder->private_->input, read_callback_, decoder)) { decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; return FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR; } @@ -528,10 +527,10 @@ static FLAC__StreamDecoderInitStatus init_FILE_internal_( FLAC__ASSERT(0 != file); if(decoder->protected_->state != FLAC__STREAM_DECODER_UNINITIALIZED) - return decoder->protected_->state = FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED; + return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED; if(0 == write_callback || 0 == error_callback) - return decoder->protected_->state = FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS; + return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS; /* * To make sure that our file does not go unclosed after an error, we @@ -602,10 +601,10 @@ static FLAC__StreamDecoderInitStatus init_file_internal_( * in FLAC__stream_decoder_init_FILE() before the FILE* is assigned. */ if(decoder->protected_->state != FLAC__STREAM_DECODER_UNINITIALIZED) - return decoder->protected_->state = FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED; + return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED; if(0 == write_callback || 0 == error_callback) - return decoder->protected_->state = FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS; + return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS; file = filename? flac_fopen(filename, "rb") : stdin; @@ -651,7 +650,7 @@ FLAC_API FLAC__bool FLAC__stream_decoder_finish(FLAC__StreamDecoder *decoder) if(decoder->protected_->state == FLAC__STREAM_DECODER_UNINITIALIZED) return true; - /* see the comment in FLAC__seekable_stream_decoder_reset() as to why we + /* see the comment in FLAC__stream_decoder_reset() as to why we * always call FLAC__MD5Final() */ FLAC__MD5Final(decoder->private_->computed_md5sum, &decoder->private_->md5context); @@ -1313,9 +1312,6 @@ FLAC__bool allocate_output_(FLAC__StreamDecoder *decoder, unsigned size, unsigne memset(tmp, 0, sizeof(FLAC__int32)*4); decoder->private_->output[i] = tmp + 4; - /* WATCHOUT: - * minimum of quadword alignment for PPC vector optimizations is REQUIRED: - */ if(!FLAC__memory_alloc_aligned_int32_array(size, &decoder->private_->residual_unaligned[i], &decoder->private_->residual[i])) { decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; return false; @@ -1365,6 +1361,10 @@ FLAC__bool find_metadata_(FLAC__StreamDecoder *decoder) id = 0; continue; } + + if(id >= 3) + return false; + if(x == ID3V2_TAG_[id]) { id++; i = 0; @@ -1443,6 +1443,7 @@ FLAC__bool read_metadata_(FLAC__StreamDecoder *decoder) unsigned real_length = length; FLAC__StreamMetadata block; + memset(&block, 0, sizeof(block)); block.is_last = is_last; block.type = (FLAC__MetadataType)type; block.length = length; @@ -1467,36 +1468,37 @@ FLAC__bool read_metadata_(FLAC__StreamDecoder *decoder) return false; /* read_callback_ sets the state for us */ } else { + FLAC__bool ok = true; switch(type) { case FLAC__METADATA_TYPE_PADDING: /* skip the padding bytes */ if(!FLAC__bitreader_skip_byte_block_aligned_no_crc(decoder->private_->input, real_length)) - return false; /* read_callback_ sets the state for us */ + ok = false; /* read_callback_ sets the state for us */ break; case FLAC__METADATA_TYPE_APPLICATION: /* remember, we read the ID already */ if(real_length > 0) { if(0 == (block.data.application.data = malloc(real_length))) { decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; - return false; + ok = false; } - if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, block.data.application.data, real_length)) - return false; /* read_callback_ sets the state for us */ + else if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, block.data.application.data, real_length)) + ok = false; /* read_callback_ sets the state for us */ } else block.data.application.data = 0; break; case FLAC__METADATA_TYPE_VORBIS_COMMENT: - if(!read_metadata_vorbiscomment_(decoder, &block.data.vorbis_comment)) - return false; + if(!read_metadata_vorbiscomment_(decoder, &block.data.vorbis_comment, real_length)) + ok = false; break; case FLAC__METADATA_TYPE_CUESHEET: if(!read_metadata_cuesheet_(decoder, &block.data.cue_sheet)) - return false; + ok = false; break; case FLAC__METADATA_TYPE_PICTURE: if(!read_metadata_picture_(decoder, &block.data.picture)) - return false; + ok = false; break; case FLAC__METADATA_TYPE_STREAMINFO: case FLAC__METADATA_TYPE_SEEKTABLE: @@ -1506,16 +1508,16 @@ FLAC__bool read_metadata_(FLAC__StreamDecoder *decoder) if(real_length > 0) { if(0 == (block.data.unknown.data = malloc(real_length))) { decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; - return false; + ok = false; } - if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, block.data.unknown.data, real_length)) - return false; /* read_callback_ sets the state for us */ + else if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, block.data.unknown.data, real_length)) + ok = false; /* read_callback_ sets the state for us */ } else block.data.unknown.data = 0; break; } - if(!decoder->private_->is_seeking && decoder->private_->metadata_callback) + if(ok && !decoder->private_->is_seeking && decoder->private_->metadata_callback) decoder->private_->metadata_callback(decoder, &block, decoder->private_->client_data); /* now we have to free any malloc()ed data in the block */ @@ -1560,6 +1562,9 @@ FLAC__bool read_metadata_(FLAC__StreamDecoder *decoder) free(block.data.unknown.data); break; } + + if(!ok) /* anything that unsets "ok" should also make sure decoder->protected_->state is updated */ + return false; } } @@ -1686,58 +1691,88 @@ FLAC__bool read_metadata_seektable_(FLAC__StreamDecoder *decoder, FLAC__bool is_ return true; } -FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_VorbisComment *obj) +FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_VorbisComment *obj, unsigned length) { FLAC__uint32 i; FLAC__ASSERT(FLAC__bitreader_is_consumed_byte_aligned(decoder->private_->input)); /* read vendor string */ - FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN == 32); - if(!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->vendor_string.length)) - return false; /* read_callback_ sets the state for us */ - if(obj->vendor_string.length > 0) { - if(0 == (obj->vendor_string.entry = safe_malloc_add_2op_(obj->vendor_string.length, /*+*/1))) { - decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; - return false; - } - if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->vendor_string.entry, obj->vendor_string.length)) + if (length >= 8) { + length -= 8; /* vendor string length + num comments entries alone take 8 bytes */ + FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN == 32); + if (!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->vendor_string.length)) return false; /* read_callback_ sets the state for us */ - obj->vendor_string.entry[obj->vendor_string.length] = '\0'; - } - else - obj->vendor_string.entry = 0; - - /* read num comments */ - FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN == 32); - if(!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->num_comments)) - return false; /* read_callback_ sets the state for us */ - - /* read comments */ - if(obj->num_comments > 0) { - if(0 == (obj->comments = safe_malloc_mul_2op_p(obj->num_comments, /*times*/sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) { - decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; - return false; - } - for(i = 0; i < obj->num_comments; i++) { - FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN == 32); - if(!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->comments[i].length)) - return false; /* read_callback_ sets the state for us */ - if(obj->comments[i].length > 0) { - if(0 == (obj->comments[i].entry = safe_malloc_add_2op_(obj->comments[i].length, /*+*/1))) { - decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; - return false; - } - if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) - return false; /* read_callback_ sets the state for us */ - obj->comments[i].entry[obj->comments[i].length] = '\0'; + if (obj->vendor_string.length > 0) { + if (length < obj->vendor_string.length) { + obj->vendor_string.length = 0; + obj->vendor_string.entry = 0; + goto skip; } else - obj->comments[i].entry = 0; + length -= obj->vendor_string.length; + if (0 == (obj->vendor_string.entry = safe_malloc_add_2op_(obj->vendor_string.length, /*+*/1))) { + decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; + return false; + } + if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->vendor_string.entry, obj->vendor_string.length)) + return false; /* read_callback_ sets the state for us */ + obj->vendor_string.entry[obj->vendor_string.length] = '\0'; } + else + obj->vendor_string.entry = 0; + + /* read num comments */ + FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN == 32); + if (!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->num_comments)) + return false; /* read_callback_ sets the state for us */ + + /* read comments */ + if (obj->num_comments > 0) { + if (0 == (obj->comments = safe_malloc_mul_2op_p(obj->num_comments, /*times*/sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) { + decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; + return false; + } + for (i = 0; i < obj->num_comments; i++) { + FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN == 32); + if (length < 4) { + obj->num_comments = i; + goto skip; + } + else + length -= 4; + if (!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->comments[i].length)) + return false; /* read_callback_ sets the state for us */ + if (obj->comments[i].length > 0) { + if (length < obj->comments[i].length) { + obj->comments[i].length = 0; + obj->comments[i].entry = 0; + obj->num_comments = i; + goto skip; + } + else + length -= obj->comments[i].length; + if (0 == (obj->comments[i].entry = safe_malloc_add_2op_(obj->comments[i].length, /*+*/1))) { + decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR; + return false; + } + if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length)) + return false; /* read_callback_ sets the state for us */ + obj->comments[i].entry[obj->comments[i].length] = '\0'; + } + else + obj->comments[i].entry = 0; + } + } + else + obj->comments = 0; } - else { - obj->comments = 0; + + skip: + if (length > 0) { + /* This will only happen on files with invalid data in comments */ + if(!FLAC__bitreader_skip_byte_block_aligned_no_crc(decoder->private_->input, length)) + return false; /* read_callback_ sets the state for us */ } return true; @@ -2652,12 +2687,8 @@ FLAC__bool read_subframe_lpc_(FLAC__StreamDecoder *decoder, unsigned channel, un if( (FLAC__uint64)order * ((((FLAC__uint64)1)<qlp_coeff_precision)-1) < (((FLAC__uint64)-1) << 32) ) */ if(bps + subframe->qlp_coeff_precision + FLAC__bitmath_ilog2(order) <= 32) - if(bps <= 16 && subframe->qlp_coeff_precision <= 16) { - if(order <= 8) - decoder->private_->local_lpc_restore_signal_16bit_order8(decoder->private_->residual[channel], decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order, subframe->quantization_level, decoder->private_->output[channel]+order); - else - decoder->private_->local_lpc_restore_signal_16bit(decoder->private_->residual[channel], decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order, subframe->quantization_level, decoder->private_->output[channel]+order); - } + if(bps <= 16 && subframe->qlp_coeff_precision <= 16) + decoder->private_->local_lpc_restore_signal_16bit(decoder->private_->residual[channel], decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order, subframe->quantization_level, decoder->private_->output[channel]+order); else decoder->private_->local_lpc_restore_signal(decoder->private_->residual[channel], decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order, subframe->quantization_level, decoder->private_->output[channel]+order); else @@ -2705,14 +2736,16 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, unsigne if(decoder->private_->frame.header.blocksize < predictor_order) { send_error_to_client_(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC); decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC; - return true; + /* We have received a potentially malicious bit stream. All we can do is error out to avoid a heap overflow. */ + return false; } } else { if(partition_samples < predictor_order) { send_error_to_client_(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC); decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC; - return true; + /* We have received a potentially malicious bit stream. All we can do is error out to avoid a heap overflow. */ + return false; } } @@ -2729,7 +2762,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, unsigne if(rice_parameter < pesc) { partitioned_rice_contents->raw_bits[partition] = 0; u = (partition_order == 0 || partition > 0)? partition_samples : partition_samples - predictor_order; - if(!decoder->private_->local_bitreader_read_rice_signed_block(decoder->private_->input, residual + sample, u, rice_parameter)) + if(!FLAC__bitreader_read_rice_signed_block(decoder->private_->input, residual + sample, u, rice_parameter)) return false; /* read_callback_ sets the state for us */ sample += u; } @@ -3071,12 +3104,7 @@ FLAC__bool seek_to_absolute_sample_(FLAC__StreamDecoder *decoder, FLAC__uint64 s return false; } #ifndef FLAC__INTEGER_ONLY_LIBRARY -#if defined _MSC_VER || defined __MINGW32__ - /* with VC++ you have to spoon feed it the casting */ - pos = (FLAC__int64)lower_bound + (FLAC__int64)((FLAC__double)(FLAC__int64)(target_sample - lower_bound_sample) / (FLAC__double)(FLAC__int64)(upper_bound_sample - lower_bound_sample) * (FLAC__double)(FLAC__int64)(upper_bound - lower_bound)) - approx_bytes_per_frame; -#else pos = (FLAC__int64)lower_bound + (FLAC__int64)((FLAC__double)(target_sample - lower_bound_sample) / (FLAC__double)(upper_bound_sample - lower_bound_sample) * (FLAC__double)(upper_bound - lower_bound)) - approx_bytes_per_frame; -#endif #else /* a little less accurate: */ if(upper_bound - lower_bound < 0xffffffff) @@ -3200,12 +3228,7 @@ FLAC__bool seek_to_absolute_sample_ogg_(FLAC__StreamDecoder *decoder, FLAC__uint } else { #ifndef FLAC__INTEGER_ONLY_LIBRARY -#if defined _MSC_VER || defined __MINGW32__ - /* with MSVC you have to spoon feed it the casting */ - pos = (FLAC__uint64)((FLAC__double)(FLAC__int64)(target_sample - left_sample) / (FLAC__double)(FLAC__int64)(right_sample - left_sample) * (FLAC__double)(FLAC__int64)(right_pos - left_pos)); -#else pos = (FLAC__uint64)((FLAC__double)(target_sample - left_sample) / (FLAC__double)(right_sample - left_sample) * (FLAC__double)(right_pos - left_pos)); -#endif #else /* a little less accurate: */ if ((target_sample-left_sample <= 0xffffffff) && (right_pos-left_pos <= 0xffffffff)) diff --git a/lib-src/libflac/src/libFLAC/stream_encoder.c b/lib-src/libflac/src/libFLAC/stream_encoder.c index 290d038c4..45bdb252b 100644 --- a/lib-src/libflac/src/libFLAC/stream_encoder.c +++ b/lib-src/libflac/src/libFLAC/stream_encoder.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -39,6 +39,7 @@ #include /* for malloc() */ #include /* for memcpy() */ #include /* for off_t */ +#include "share/compat.h" #include "FLAC/assert.h" #include "FLAC/stream_decoder.h" #include "protected/stream_encoder.h" @@ -56,10 +57,10 @@ #include "private/ogg_helper.h" #include "private/ogg_mapping.h" #endif +#include "private/stream_encoder.h" #include "private/stream_encoder_framing.h" #include "private/window.h" #include "share/alloc.h" -#include "share/compat.h" #include "share/private.h" @@ -105,16 +106,18 @@ static struct CompressionLevels { unsigned min_residual_partition_order; unsigned max_residual_partition_order; unsigned rice_parameter_search_dist; + const char *apodization; } compression_levels_[] = { - { false, false, 0, 0, false, false, false, 0, 3, 0 }, - { true , true , 0, 0, false, false, false, 0, 3, 0 }, - { true , false, 0, 0, false, false, false, 0, 3, 0 }, - { false, false, 6, 0, false, false, false, 0, 4, 0 }, - { true , true , 8, 0, false, false, false, 0, 4, 0 }, - { true , false, 8, 0, false, false, false, 0, 5, 0 }, - { true , false, 8, 0, false, false, false, 0, 6, 0 }, - { true , false, 8, 0, false, false, true , 0, 6, 0 }, - { true , false, 12, 0, false, false, true , 0, 6, 0 } + { false, false, 0, 0, false, false, false, 0, 3, 0, "tukey(5e-1)" }, + { true , true , 0, 0, false, false, false, 0, 3, 0, "tukey(5e-1)" }, + { true , false, 0, 0, false, false, false, 0, 3, 0, "tukey(5e-1)" }, + { false, false, 6, 0, false, false, false, 0, 4, 0, "tukey(5e-1)" }, + { true , true , 8, 0, false, false, false, 0, 4, 0, "tukey(5e-1)" }, + { true , false, 8, 0, false, false, false, 0, 5, 0, "tukey(5e-1)" }, + { true , false, 8, 0, false, false, false, 0, 6, 0, "tukey(5e-1);partial_tukey(2)" }, + { true , false, 12, 0, false, false, false, 0, 6, 0, "tukey(5e-1);partial_tukey(2)" }, + { true , false, 12, 0, false, false, false, 0, 6, 0, "tukey(5e-1);partial_tukey(2);punchout_tukey(3)" } + /* here we use locale-independent 5e-1 instead of 0.5 or 0,5 */ }; @@ -344,10 +347,13 @@ typedef struct FLAC__StreamEncoderPrivate { unsigned current_frame_number; FLAC__MD5Context md5context; FLAC__CPUInfo cpuinfo; + void (*local_precompute_partition_info_sums)(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps); #ifndef FLAC__INTEGER_ONLY_LIBRARY unsigned (*local_fixed_compute_best_predictor)(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); + unsigned (*local_fixed_compute_best_predictor_wide)(const FLAC__int32 data[], unsigned data_len, FLAC__float residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); #else unsigned (*local_fixed_compute_best_predictor)(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); + unsigned (*local_fixed_compute_best_predictor_wide)(const FLAC__int32 data[], unsigned data_len, FLAC__fixedpoint residual_bits_per_sample[FLAC__MAX_FIXED_ORDER+1]); #endif #ifndef FLAC__INTEGER_ONLY_LIBRARY void (*local_lpc_compute_autocorrelation)(const FLAC__real data[], unsigned data_len, unsigned lag, FLAC__real autoc[]); @@ -875,7 +881,9 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_( #ifndef FLAC__INTEGER_ONLY_LIBRARY encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation; #endif + encoder->private_->local_precompute_partition_info_sums = precompute_partition_info_sums_; encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor; + encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide; #ifndef FLAC__INTEGER_ONLY_LIBRARY encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients; encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide; @@ -888,21 +896,23 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_( # ifdef FLAC__CPU_IA32 FLAC__ASSERT(encoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32); # ifdef FLAC__HAS_NASM - if(encoder->private_->cpuinfo.data.ia32.sse) { + if(encoder->private_->cpuinfo.ia32.sse) { if(encoder->protected_->max_lpc_order < 4) encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_4; else if(encoder->protected_->max_lpc_order < 8) encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_8; else if(encoder->protected_->max_lpc_order < 12) encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_12; + else if(encoder->protected_->max_lpc_order < 16) + encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_sse_lag_16; else encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32; } - else if(encoder->private_->cpuinfo.data.ia32._3dnow) - encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32_3dnow; else encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_asm_ia32; - if(encoder->private_->cpuinfo.data.ia32.mmx) { + + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide_asm_ia32; /* OPT_IA32: was really necessary for GCC < 4.9 */ + if(encoder->private_->cpuinfo.ia32.mmx) { encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32; encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx; } @@ -910,16 +920,137 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_( encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32; encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32; } - if(encoder->private_->cpuinfo.data.ia32.mmx && encoder->private_->cpuinfo.data.ia32.cmov) + + if(encoder->private_->cpuinfo.ia32.mmx && encoder->private_->cpuinfo.ia32.cmov) encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_asm_ia32_mmx_cmov; # endif /* FLAC__HAS_NASM */ -# endif /* FLAC__CPU_IA32 */ +# ifdef FLAC__HAS_X86INTRIN +# if defined FLAC__SSE_SUPPORTED + if(encoder->private_->cpuinfo.ia32.sse) { + if(encoder->protected_->max_lpc_order < 4) + encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_4; + else if(encoder->protected_->max_lpc_order < 8) + encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_8; + else if(encoder->protected_->max_lpc_order < 12) + encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_12; + else if(encoder->protected_->max_lpc_order < 16) + encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_16; + else + encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation; + } +# endif + +# ifdef FLAC__SSE2_SUPPORTED + if(encoder->private_->cpuinfo.ia32.sse2) { + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse2; + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2; + } +# endif +# ifdef FLAC__SSE4_1_SUPPORTED + if(encoder->private_->cpuinfo.ia32.sse41) { + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse41; + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide_intrin_sse41; + } +# endif +# ifdef FLAC__AVX2_SUPPORTED + if(encoder->private_->cpuinfo.ia32.avx2) { + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_avx2; + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_avx2; + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide_intrin_avx2; + } +# endif + +# ifdef FLAC__SSE2_SUPPORTED + if (encoder->private_->cpuinfo.ia32.sse2) { + encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_intrin_sse2; + encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide_intrin_sse2; + } +# endif +# ifdef FLAC__SSSE3_SUPPORTED + if (encoder->private_->cpuinfo.ia32.ssse3) { + encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_intrin_ssse3; + encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide_intrin_ssse3; + } +# endif +# endif /* FLAC__HAS_X86INTRIN */ +# elif defined FLAC__CPU_X86_64 + FLAC__ASSERT(encoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_X86_64); +# ifdef FLAC__HAS_X86INTRIN +# ifdef FLAC__SSE_SUPPORTED + if(encoder->protected_->max_lpc_order < 4) + encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_4; + else if(encoder->protected_->max_lpc_order < 8) + encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_8; + else if(encoder->protected_->max_lpc_order < 12) + encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_12; + else if(encoder->protected_->max_lpc_order < 16) + encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_16; +# endif + +# ifdef FLAC__SSE2_SUPPORTED + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2; +# endif +# ifdef FLAC__SSE4_1_SUPPORTED + if(encoder->private_->cpuinfo.x86.sse41) { + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse41; + } +# endif +# ifdef FLAC__AVX2_SUPPORTED + if(encoder->private_->cpuinfo.x86.avx2) { + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_avx2; + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_avx2; + encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_64bit = FLAC__lpc_compute_residual_from_qlp_coefficients_wide_intrin_avx2; + } +# endif + +# ifdef FLAC__SSE2_SUPPORTED + encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_intrin_sse2; + encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide_intrin_sse2; +# endif +# ifdef FLAC__SSSE3_SUPPORTED + if (encoder->private_->cpuinfo.x86.ssse3) { + encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_intrin_ssse3; + encoder->private_->local_fixed_compute_best_predictor_wide = FLAC__fixed_compute_best_predictor_wide_intrin_ssse3; + } +# endif +# endif /* FLAC__HAS_X86INTRIN */ +# endif /* FLAC__CPU_... */ } # endif /* !FLAC__NO_ASM */ #endif /* !FLAC__INTEGER_ONLY_LIBRARY */ +#if !defined FLAC__NO_ASM && defined FLAC__HAS_X86INTRIN + if(encoder->private_->cpuinfo.use_asm) { +# if defined FLAC__CPU_IA32 +# ifdef FLAC__SSE2_SUPPORTED + if(encoder->private_->cpuinfo.ia32.sse2) + encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_sse2; +# endif +# ifdef FLAC__SSSE3_SUPPORTED + if(encoder->private_->cpuinfo.ia32.ssse3) + encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_ssse3; +# endif +# ifdef FLAC__AVX2_SUPPORTED + if(encoder->private_->cpuinfo.ia32.avx2) + encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_avx2; +# endif +# elif defined FLAC__CPU_X86_64 +# ifdef FLAC__SSE2_SUPPORTED + encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_sse2; +# endif +# ifdef FLAC__SSSE3_SUPPORTED + if(encoder->private_->cpuinfo.x86.ssse3) + encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_ssse3; +# endif +# ifdef FLAC__AVX2_SUPPORTED + if(encoder->private_->cpuinfo.x86.avx2) + encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_avx2; +# endif +# endif /* FLAC__CPU_... */ + } +#endif /* !FLAC__NO_ASM && FLAC__HAS_X86INTRIN */ /* finally override based on wide-ness if necessary */ if(encoder->private_->use_wide_by_block) { - encoder->private_->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor_wide; + encoder->private_->local_fixed_compute_best_predictor = encoder->private_->local_fixed_compute_best_predictor_wide; } /* set state to OK; from here on, errors are fatal and we'll override the state then */ @@ -1179,6 +1310,13 @@ static FLAC__StreamEncoderInitStatus init_FILE_internal_( if(file == stdout) file = get_binary_stdout_(); /* just to be safe */ +#ifdef _WIN32 + /* + * Windows can suffer quite badly from disk fragmentation. This can be + * reduced significantly by setting the output buffer size to be 10MB. + */ + setvbuf(file, NULL, _IOFBF, 10*1024*1024); +#endif encoder->private_->file = file; encoder->private_->progress_callback = progress_callback; @@ -1447,11 +1585,10 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_compression_level(FLAC__StreamEncod ok &= FLAC__stream_encoder_set_do_mid_side_stereo (encoder, compression_levels_[value].do_mid_side_stereo); ok &= FLAC__stream_encoder_set_loose_mid_side_stereo (encoder, compression_levels_[value].loose_mid_side_stereo); #ifndef FLAC__INTEGER_ONLY_LIBRARY -#if 0 - /* was: */ +#if 1 ok &= FLAC__stream_encoder_set_apodization (encoder, compression_levels_[value].apodization); - /* but it's too hard to specify the string in a locale-specific way */ #else + /* equivalent to -A tukey(0.5) */ encoder->protected_->num_apodizations = 1; encoder->protected_->apodizations[0].type = FLAC__APODIZATION_TUKEY; encoder->protected_->apodizations[0].parameters.tukey.p = 0.5; @@ -1555,6 +1692,48 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_apodization(FLAC__StreamEncoder *en encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_TUKEY; } } + else if(n>15 && 0 == strncmp("partial_tukey(" , specification, 14)) { + FLAC__int32 tukey_parts = (FLAC__int32)strtod(specification+14, 0); + const char *si_1 = strchr(specification, '/'); + FLAC__real overlap = si_1?flac_min((FLAC__real)strtod(si_1+1, 0),0.99f):0.1f; + FLAC__real overlap_units = 1.0f/(1.0f - overlap) - 1.0f; + const char *si_2 = strchr((si_1?(si_1+1):specification), '/'); + FLAC__real tukey_p = si_2?(FLAC__real)strtod(si_2+1, 0):0.2f; + + if (tukey_parts <= 1) { + encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.tukey.p = tukey_p; + encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_TUKEY; + }else if (encoder->protected_->num_apodizations + tukey_parts < 32){ + FLAC__int32 m; + for(m = 0; m < tukey_parts; m++){ + encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.p = tukey_p; + encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.start = m/(tukey_parts+overlap_units); + encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.end = (m+1+overlap_units)/(tukey_parts+overlap_units); + encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_PARTIAL_TUKEY; + } + } + } + else if(n>16 && 0 == strncmp("punchout_tukey(" , specification, 15)) { + FLAC__int32 tukey_parts = (FLAC__int32)strtod(specification+15, 0); + const char *si_1 = strchr(specification, '/'); + FLAC__real overlap = si_1?flac_min((FLAC__real)strtod(si_1+1, 0),0.99f):0.2f; + FLAC__real overlap_units = 1.0f/(1.0f - overlap) - 1.0f; + const char *si_2 = strchr((si_1?(si_1+1):specification), '/'); + FLAC__real tukey_p = si_2?(FLAC__real)strtod(si_2+1, 0):0.2f; + + if (tukey_parts <= 1) { + encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.tukey.p = tukey_p; + encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_TUKEY; + }else if (encoder->protected_->num_apodizations + tukey_parts < 32){ + FLAC__int32 m; + for(m = 0; m < tukey_parts; m++){ + encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.p = tukey_p; + encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.start = m/(tukey_parts+overlap_units); + encoder->protected_->apodizations[encoder->protected_->num_apodizations].parameters.multiple_tukey.end = (m+1+overlap_units)/(tukey_parts+overlap_units); + encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_PUNCHOUT_TUKEY; + } + } + } else if(n==5 && 0 == strncmp("welch" , specification, n)) encoder->protected_->apodizations[encoder->protected_->num_apodizations++].type = FLAC__APODIZATION_WELCH; if (encoder->protected_->num_apodizations == 32) @@ -2236,8 +2415,8 @@ FLAC__bool resize_buffers_(FLAC__StreamEncoder *encoder, unsigned new_blocksize) ok = true; - /* WATCHOUT: FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx() - * requires that the input arrays (in our case the integer signals) + /* WATCHOUT: FLAC__lpc_compute_residual_from_qlp_coefficients_asm_ia32_mmx() and ..._intrin_sse2() + * require that the input arrays (in our case the integer signals) * have a buffer of up to 3 zeroes in front (at negative indices) for * alignment purposes; we use 4 in front to keep the data well-aligned. */ @@ -2334,6 +2513,12 @@ FLAC__bool resize_buffers_(FLAC__StreamEncoder *encoder, unsigned new_blocksize) case FLAC__APODIZATION_TUKEY: FLAC__window_tukey(encoder->private_->window[i], new_blocksize, encoder->protected_->apodizations[i].parameters.tukey.p); break; + case FLAC__APODIZATION_PARTIAL_TUKEY: + FLAC__window_partial_tukey(encoder->private_->window[i], new_blocksize, encoder->protected_->apodizations[i].parameters.multiple_tukey.p, encoder->protected_->apodizations[i].parameters.multiple_tukey.start, encoder->protected_->apodizations[i].parameters.multiple_tukey.end); + break; + case FLAC__APODIZATION_PUNCHOUT_TUKEY: + FLAC__window_punchout_tukey(encoder->private_->window[i], new_blocksize, encoder->protected_->apodizations[i].parameters.multiple_tukey.p, encoder->protected_->apodizations[i].parameters.multiple_tukey.start, encoder->protected_->apodizations[i].parameters.multiple_tukey.end); + break; case FLAC__APODIZATION_WELCH: FLAC__window_welch(encoder->private_->window[i], new_blocksize); break; @@ -3165,7 +3350,7 @@ FLAC__bool process_subframe_( #endif #ifndef FLAC__INTEGER_ONLY_LIBRARY FLAC__double lpc_residual_bits_per_sample; - FLAC__real autoc[FLAC__MAX_LPC_ORDER+1]; /* WATCHOUT: the size is important even though encoder->protected_->max_lpc_order might be less; some asm routines need all the space */ + FLAC__real autoc[FLAC__MAX_LPC_ORDER+1]; /* WATCHOUT: the size is important even though encoder->protected_->max_lpc_order might be less; some asm and x86 intrinsic routines need all the space */ FLAC__double lpc_error[FLAC__MAX_LPC_ORDER]; unsigned min_lpc_order, max_lpc_order, lpc_order; unsigned min_qlp_coeff_precision, max_qlp_coeff_precision, qlp_coeff_precision; @@ -3318,9 +3503,9 @@ FLAC__bool process_subframe_( } if(encoder->protected_->do_qlp_coeff_prec_search) { min_qlp_coeff_precision = FLAC__MIN_QLP_COEFF_PRECISION; - /* try to ensure a 32-bit datapath throughout for 16bps(+1bps for side channel) or less */ - if(subframe_bps <= 17) { - max_qlp_coeff_precision = flac_min(32 - subframe_bps - lpc_order, FLAC__MAX_QLP_COEFF_PRECISION); + /* try to keep qlp coeff precision such that only 32-bit math is required for decode of <=16bps streams */ + if(subframe_bps <= 16) { + max_qlp_coeff_precision = flac_min(32 - subframe_bps - FLAC__bitmath_ilog2(lpc_order), FLAC__MAX_QLP_COEFF_PRECISION); max_qlp_coeff_precision = flac_max(max_qlp_coeff_precision, min_qlp_coeff_precision); } else @@ -3556,7 +3741,7 @@ unsigned evaluate_lpc_subframe_( FLAC__EntropyCodingMethod_PartitionedRiceContents *partitioned_rice_contents ) { - FLAC__int32 qlp_coeff[FLAC__MAX_LPC_ORDER]; + FLAC__int32 qlp_coeff[FLAC__MAX_LPC_ORDER]; /* WATCHOUT: the size is important; some x86 intrinsic routines need more than lpc order elements */ unsigned i, residual_bits, estimate; int quantization, ret; const unsigned residual_samples = blocksize - order; @@ -3671,7 +3856,7 @@ unsigned find_best_partition_order_( max_partition_order = FLAC__format_get_max_rice_partition_order_from_blocksize_limited_max_and_predictor_order(max_partition_order, blocksize, predictor_order); min_partition_order = flac_min(min_partition_order, max_partition_order); - precompute_partition_info_sums_(residual, abs_residual_partition_sums, residual_samples, predictor_order, min_partition_order, max_partition_order, bps); + private_->local_precompute_partition_info_sums(residual, abs_residual_partition_sums, residual_samples, predictor_order, min_partition_order, max_partition_order, bps); if(do_escape_coding) precompute_partition_info_escapes_(residual, raw_bits_per_partition, residual_samples, predictor_order, min_partition_order, max_partition_order); @@ -3743,17 +3928,6 @@ unsigned find_best_partition_order_( return best_residual_bits; } -#if defined(FLAC__CPU_IA32) && !defined FLAC__NO_ASM && defined FLAC__HAS_NASM -extern void precompute_partition_info_sums_32bit_asm_ia32_( - const FLAC__int32 residual[], - FLAC__uint64 abs_residual_partition_sums[], - unsigned blocksize, - unsigned predictor_order, - unsigned min_partition_order, - unsigned max_partition_order -); -#endif - void precompute_partition_info_sums_( const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], @@ -3769,21 +3943,12 @@ void precompute_partition_info_sums_( FLAC__ASSERT(default_partition_samples > predictor_order); -#if defined(FLAC__CPU_IA32) && !defined FLAC__NO_ASM && defined FLAC__HAS_NASM - /* slightly pessimistic but still catches all common cases */ - /* WATCHOUT: "+ bps" is an assumption that the average residual magnitude will not be more than "bps" bits */ - if(FLAC__bitmath_ilog2(default_partition_samples) + bps < 32) { - precompute_partition_info_sums_32bit_asm_ia32_(residual, abs_residual_partition_sums, residual_samples + predictor_order, predictor_order, min_partition_order, max_partition_order); - return; - } -#endif - /* first do max_partition_order */ { unsigned partition, residual_sample, end = (unsigned)(-(int)predictor_order); - /* slightly pessimistic but still catches all common cases */ - /* WATCHOUT: "+ bps" is an assumption that the average residual magnitude will not be more than "bps" bits */ - if(FLAC__bitmath_ilog2(default_partition_samples) + bps < 32) { + /* WATCHOUT: "+ bps + FLAC__MAX_EXTRA_RESIDUAL_BPS" is the maximum + * assumed size of the average residual magnitude */ + if(FLAC__bitmath_ilog2(default_partition_samples) + bps + FLAC__MAX_EXTRA_RESIDUAL_BPS < 32) { FLAC__uint32 abs_residual_partition_sum; for(partition = residual_sample = 0; partition < partitions; partition++) { @@ -4027,8 +4192,35 @@ FLAC__bool set_partitioned_rice_( * in the partition, so the actual mean is * mean/partition_samples */ +#if 0 /* old simple code */ for(rice_parameter = 0, k = partition_samples; k < mean; rice_parameter++, k <<= 1) ; +#else +#if defined FLAC__CPU_X86_64 /* and other 64-bit arch, too */ + if(mean <= 0x80000000/512) { /* 512: more or less optimal for both 16- and 24-bit input */ +#else + if(mean <= 0x80000000/8) { /* 32-bit arch: use 32-bit math if possible */ +#endif + FLAC__uint32 k2, mean2 = (FLAC__uint32) mean; + rice_parameter = 0; k2 = partition_samples; + while(k2*8 < mean2) { /* requires: mean <= (2^31)/8 */ + rice_parameter += 4; k2 <<= 4; /* tuned for 16-bit input */ + } + while(k2 < mean2) { /* requires: mean <= 2^31 */ + rice_parameter++; k2 <<= 1; + } + } + else { + rice_parameter = 0; k = partition_samples; + if(mean <= FLAC__U64L(0x8000000000000000)/128) /* usually mean is _much_ smaller than this value */ + while(k*128 < mean) { /* requires: mean <= (2^63)/128 */ + rice_parameter += 8; k <<= 8; /* tuned for 24-bit input */ + } + while(k < mean) { /* requires: mean <= 2^63 */ + rice_parameter++; k <<= 1; + } + } +#endif if(rice_parameter >= rice_parameter_limit) { #ifdef DEBUG_VERBOSE fprintf(stderr, "clipping rice_parameter (%u -> %u) @6\n", rice_parameter, rice_parameter_limit - 1); diff --git a/lib-src/libflac/src/libFLAC/stream_encoder_framing.c b/lib-src/libflac/src/libFLAC/stream_encoder_framing.c index ee905e6b6..959eca0a7 100644 --- a/lib-src/libflac/src/libFLAC/stream_encoder_framing.c +++ b/lib-src/libflac/src/libFLAC/stream_encoder_framing.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/libFLAC/stream_encoder_intrin_avx2.c b/lib-src/libflac/src/libFLAC/stream_encoder_intrin_avx2.c new file mode 100644 index 000000000..3aa31972a --- /dev/null +++ b/lib-src/libflac/src/libFLAC/stream_encoder_intrin_avx2.c @@ -0,0 +1,142 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifndef FLAC__NO_ASM +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#include "private/stream_encoder.h" +#include "private/bitmath.h" +#ifdef FLAC__AVX2_SUPPORTED + +#include /* for abs() */ +#include /* AVX2 */ +#include "FLAC/assert.h" + +FLAC__SSE_TARGET("avx2") +void FLAC__precompute_partition_info_sums_intrin_avx2(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], + unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps) +{ + const unsigned default_partition_samples = (residual_samples + predictor_order) >> max_partition_order; + unsigned partitions = 1u << max_partition_order; + + FLAC__ASSERT(default_partition_samples > predictor_order); + + /* first do max_partition_order */ + { + unsigned partition, residual_sample, end = (unsigned)(-(int)predictor_order); + __m256i res256, sum256; + __m128i res128, sum128; + + if(FLAC__bitmath_ilog2(default_partition_samples) + bps + FLAC__MAX_EXTRA_RESIDUAL_BPS < 32) { + for(partition = residual_sample = 0; partition < partitions; partition++) { + end += default_partition_samples; + sum256 = _mm256_setzero_si256(); + + for( ; (int)residual_sample < (int)end-7; residual_sample+=8) { + res256 = _mm256_abs_epi32(_mm256_loadu_si256((const __m256i*)(residual+residual_sample))); + sum256 = _mm256_add_epi32(sum256, res256); + } + + sum128 = _mm_add_epi32(_mm256_extracti128_si256(sum256, 1), _mm256_castsi256_si128(sum256)); + + for( ; (int)residual_sample < (int)end-3; residual_sample+=4) { + res128 = _mm_abs_epi32(_mm_loadu_si128((const __m128i*)(residual+residual_sample))); + sum128 = _mm_add_epi32(sum128, res128); + } + + for( ; residual_sample < end; residual_sample++) { + res128 = _mm_cvtsi32_si128(residual[residual_sample]); + res128 = _mm_abs_epi32(res128); + sum128 = _mm_add_epi32(sum128, res128); + } + + sum128 = _mm_hadd_epi32(sum128, sum128); + sum128 = _mm_hadd_epi32(sum128, sum128); + abs_residual_partition_sums[partition] = (FLAC__uint32)_mm_cvtsi128_si32(sum128); + } + } + else { /* have to pessimistically use 64 bits for accumulator */ + for(partition = residual_sample = 0; partition < partitions; partition++) { + end += default_partition_samples; + sum256 = _mm256_setzero_si256(); + + for( ; (int)residual_sample < (int)end-3; residual_sample+=4) { + res128 = _mm_abs_epi32(_mm_loadu_si128((const __m128i*)(residual+residual_sample))); + res256 = _mm256_cvtepu32_epi64(res128); + sum256 = _mm256_add_epi64(sum256, res256); + } + + sum128 = _mm_add_epi64(_mm256_extracti128_si256(sum256, 1), _mm256_castsi256_si128(sum256)); + + for( ; (int)residual_sample < (int)end-1; residual_sample+=2) { + res128 = _mm_loadl_epi64((const __m128i*)(residual+residual_sample)); + res128 = _mm_abs_epi32(res128); + res128 = _mm_cvtepu32_epi64(res128); + sum128 = _mm_add_epi64(sum128, res128); + } + + for( ; residual_sample < end; residual_sample++) { + res128 = _mm_cvtsi32_si128(residual[residual_sample]); + res128 = _mm_abs_epi32(res128); + sum128 = _mm_add_epi64(sum128, res128); + } + + sum128 = _mm_add_epi64(sum128, _mm_srli_si128(sum128, 8)); + _mm_storel_epi64((__m128i*)(abs_residual_partition_sums+partition), sum128); + } + } + } + + /* now merge partitions for lower orders */ + { + unsigned from_partition = 0, to_partition = partitions; + int partition_order; + for(partition_order = (int)max_partition_order - 1; partition_order >= (int)min_partition_order; partition_order--) { + unsigned i; + partitions >>= 1; + for(i = 0; i < partitions; i++) { + abs_residual_partition_sums[to_partition++] = + abs_residual_partition_sums[from_partition ] + + abs_residual_partition_sums[from_partition+1]; + from_partition += 2; + } + } + } + _mm256_zeroupper(); +} + +#endif /* FLAC__AVX2_SUPPORTED */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* FLAC__NO_ASM */ diff --git a/lib-src/libflac/src/libFLAC/stream_encoder_intrin_sse2.c b/lib-src/libflac/src/libFLAC/stream_encoder_intrin_sse2.c new file mode 100644 index 000000000..ec5541c01 --- /dev/null +++ b/lib-src/libflac/src/libFLAC/stream_encoder_intrin_sse2.c @@ -0,0 +1,159 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifndef FLAC__NO_ASM +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#include "private/stream_encoder.h" +#include "private/bitmath.h" +#ifdef FLAC__SSE2_SUPPORTED + +#include /* for abs() */ +#include /* SSE2 */ +#include "FLAC/assert.h" + +FLAC__SSE_TARGET("sse2") +void FLAC__precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], + unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps) +{ + const unsigned default_partition_samples = (residual_samples + predictor_order) >> max_partition_order; + unsigned partitions = 1u << max_partition_order; + + FLAC__ASSERT(default_partition_samples > predictor_order); + + /* first do max_partition_order */ + { + unsigned partition, residual_sample, end = (unsigned)(-(int)predictor_order); + unsigned e1, e3; + __m128i mm_res, mm_sum, mm_mask; + + if(FLAC__bitmath_ilog2(default_partition_samples) + bps + FLAC__MAX_EXTRA_RESIDUAL_BPS < 32) { + for(partition = residual_sample = 0; partition < partitions; partition++) { + end += default_partition_samples; + mm_sum = _mm_setzero_si128(); + + e1 = (residual_sample + 3) & ~3; e3 = end & ~3; + if(e1 > end) + e1 = end; /* try flac -l 1 -b 16 and you'll be here */ + + /* assumption: residual[] is properly aligned so (residual + e1) is properly aligned too and _mm_loadu_si128() is fast */ + for( ; residual_sample < e1; residual_sample++) { + mm_res = _mm_cvtsi32_si128(residual[residual_sample]); + mm_mask = _mm_srai_epi32(mm_res, 31); + mm_res = _mm_xor_si128(mm_res, mm_mask); + mm_res = _mm_sub_epi32(mm_res, mm_mask); /* abs(INT_MIN) is undefined, but if the residual is INT_MIN we have bigger problems */ + mm_sum = _mm_add_epi32(mm_sum, mm_res); + } + + for( ; residual_sample < e3; residual_sample+=4) { + mm_res = _mm_loadu_si128((const __m128i*)(residual+residual_sample)); + mm_mask = _mm_srai_epi32(mm_res, 31); + mm_res = _mm_xor_si128(mm_res, mm_mask); + mm_res = _mm_sub_epi32(mm_res, mm_mask); + mm_sum = _mm_add_epi32(mm_sum, mm_res); + } + + for( ; residual_sample < end; residual_sample++) { + mm_res = _mm_cvtsi32_si128(residual[residual_sample]); + mm_mask = _mm_srai_epi32(mm_res, 31); + mm_res = _mm_xor_si128(mm_res, mm_mask); + mm_res = _mm_sub_epi32(mm_res, mm_mask); + mm_sum = _mm_add_epi32(mm_sum, mm_res); + } + + mm_sum = _mm_add_epi32(mm_sum, _mm_srli_si128(mm_sum, 8)); + mm_sum = _mm_add_epi32(mm_sum, _mm_srli_si128(mm_sum, 4)); + abs_residual_partition_sums[partition] = (FLAC__uint32)_mm_cvtsi128_si32(mm_sum); + } + } + else { /* have to pessimistically use 64 bits for accumulator */ + for(partition = residual_sample = 0; partition < partitions; partition++) { + end += default_partition_samples; + mm_sum = _mm_setzero_si128(); + + e1 = (residual_sample + 1) & ~1; e3 = end & ~1; + FLAC__ASSERT(e1 <= end); + + for( ; residual_sample < e1; residual_sample++) { + mm_res = _mm_cvtsi32_si128(residual[residual_sample]); /* 0 0 0 r0 */ + mm_mask = _mm_srai_epi32(mm_res, 31); + mm_res = _mm_xor_si128(mm_res, mm_mask); + mm_res = _mm_sub_epi32(mm_res, mm_mask); /* 0 0 0 |r0| == 00 |r0_64| */ + mm_sum = _mm_add_epi64(mm_sum, mm_res); + } + + for( ; residual_sample < e3; residual_sample+=2) { + mm_res = _mm_loadl_epi64((const __m128i*)(residual+residual_sample)); /* 0 0 r1 r0 */ + mm_mask = _mm_srai_epi32(mm_res, 31); + mm_res = _mm_xor_si128(mm_res, mm_mask); + mm_res = _mm_sub_epi32(mm_res, mm_mask); /* 0 0 |r1| |r0| */ + mm_res = _mm_shuffle_epi32(mm_res, _MM_SHUFFLE(3,1,2,0)); /* 0 |r1| 0 |r0| == |r1_64| |r0_64| */ + mm_sum = _mm_add_epi64(mm_sum, mm_res); + } + + for( ; residual_sample < end; residual_sample++) { + mm_res = _mm_cvtsi32_si128(residual[residual_sample]); + mm_mask = _mm_srai_epi32(mm_res, 31); + mm_res = _mm_xor_si128(mm_res, mm_mask); + mm_res = _mm_sub_epi32(mm_res, mm_mask); + mm_sum = _mm_add_epi64(mm_sum, mm_res); + } + + mm_sum = _mm_add_epi64(mm_sum, _mm_srli_si128(mm_sum, 8)); + _mm_storel_epi64((__m128i*)(abs_residual_partition_sums+partition), mm_sum); + } + } + } + + /* now merge partitions for lower orders */ + { + unsigned from_partition = 0, to_partition = partitions; + int partition_order; + for(partition_order = (int)max_partition_order - 1; partition_order >= (int)min_partition_order; partition_order--) { + unsigned i; + partitions >>= 1; + for(i = 0; i < partitions; i++) { + abs_residual_partition_sums[to_partition++] = + abs_residual_partition_sums[from_partition ] + + abs_residual_partition_sums[from_partition+1]; + from_partition += 2; + } + } + } +} + +#endif /* FLAC__SSE2_SUPPORTED */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* FLAC__NO_ASM */ diff --git a/lib-src/libflac/src/libFLAC/stream_encoder_intrin_ssse3.c b/lib-src/libflac/src/libFLAC/stream_encoder_intrin_ssse3.c new file mode 100644 index 000000000..2dbd18c5b --- /dev/null +++ b/lib-src/libflac/src/libFLAC/stream_encoder_intrin_ssse3.c @@ -0,0 +1,147 @@ +/* libFLAC - Free Lossless Audio Codec library + * Copyright (C) 2000-2009 Josh Coalson + * Copyright (C) 2011-2014 Xiph.Org Foundation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * - Neither the name of the Xiph.org Foundation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#ifndef FLAC__NO_ASM +#if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN +#include "private/stream_encoder.h" +#include "private/bitmath.h" +#ifdef FLAC__SSSE3_SUPPORTED + +#include /* for abs() */ +#include /* SSSE3 */ +#include "FLAC/assert.h" + +FLAC__SSE_TARGET("ssse3") +void FLAC__precompute_partition_info_sums_intrin_ssse3(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], + unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps) +{ + const unsigned default_partition_samples = (residual_samples + predictor_order) >> max_partition_order; + unsigned partitions = 1u << max_partition_order; + + FLAC__ASSERT(default_partition_samples > predictor_order); + + /* first do max_partition_order */ + { + unsigned partition, residual_sample, end = (unsigned)(-(int)predictor_order); + unsigned e1, e3; + __m128i mm_res, mm_sum; + + if(FLAC__bitmath_ilog2(default_partition_samples) + bps + FLAC__MAX_EXTRA_RESIDUAL_BPS < 32) { + for(partition = residual_sample = 0; partition < partitions; partition++) { + end += default_partition_samples; + mm_sum = _mm_setzero_si128(); + + e1 = (residual_sample + 3) & ~3; e3 = end & ~3; + if(e1 > end) + e1 = end; /* try flac -l 1 -b 16 and you'll be here */ + + /* assumption: residual[] is properly aligned so (residual + e1) is properly aligned too and _mm_loadu_si128() is fast */ + for( ; residual_sample < e1; residual_sample++) { + mm_res = _mm_cvtsi32_si128(residual[residual_sample]); + mm_res = _mm_abs_epi32(mm_res); /* abs(INT_MIN) is undefined, but if the residual is INT_MIN we have bigger problems */ + mm_sum = _mm_add_epi32(mm_sum, mm_res); + } + + for( ; residual_sample < e3; residual_sample+=4) { + mm_res = _mm_loadu_si128((const __m128i*)(residual+residual_sample)); + mm_res = _mm_abs_epi32(mm_res); + mm_sum = _mm_add_epi32(mm_sum, mm_res); + } + + for( ; residual_sample < end; residual_sample++) { + mm_res = _mm_cvtsi32_si128(residual[residual_sample]); + mm_res = _mm_abs_epi32(mm_res); + mm_sum = _mm_add_epi32(mm_sum, mm_res); + } + + mm_sum = _mm_hadd_epi32(mm_sum, mm_sum); + mm_sum = _mm_hadd_epi32(mm_sum, mm_sum); + abs_residual_partition_sums[partition] = (FLAC__uint32)_mm_cvtsi128_si32(mm_sum); + } + } + else { /* have to pessimistically use 64 bits for accumulator */ + for(partition = residual_sample = 0; partition < partitions; partition++) { + end += default_partition_samples; + mm_sum = _mm_setzero_si128(); + + e1 = (residual_sample + 1) & ~1; e3 = end & ~1; + FLAC__ASSERT(e1 <= end); + + for( ; residual_sample < e1; residual_sample++) { + mm_res = _mm_cvtsi32_si128(residual[residual_sample]); /* 0 0 0 r0 */ + mm_res = _mm_abs_epi32(mm_res); /* 0 0 0 |r0| == 00 |r0_64| */ + mm_sum = _mm_add_epi64(mm_sum, mm_res); + } + + for( ; residual_sample < e3; residual_sample+=2) { + mm_res = _mm_loadl_epi64((const __m128i*)(residual+residual_sample)); /* 0 0 r1 r0 */ + mm_res = _mm_abs_epi32(mm_res); /* 0 0 |r1| |r0| */ + mm_res = _mm_shuffle_epi32(mm_res, _MM_SHUFFLE(3,1,2,0)); /* 0 |r1| 0 |r0| == |r1_64| |r0_64| */ + mm_sum = _mm_add_epi64(mm_sum, mm_res); + } + + for( ; residual_sample < end; residual_sample++) { + mm_res = _mm_cvtsi32_si128(residual[residual_sample]); + mm_res = _mm_abs_epi32(mm_res); + mm_sum = _mm_add_epi64(mm_sum, mm_res); + } + + mm_sum = _mm_add_epi64(mm_sum, _mm_srli_si128(mm_sum, 8)); + _mm_storel_epi64((__m128i*)(abs_residual_partition_sums+partition), mm_sum); + } + } + } + + /* now merge partitions for lower orders */ + { + unsigned from_partition = 0, to_partition = partitions; + int partition_order; + for(partition_order = (int)max_partition_order - 1; partition_order >= (int)min_partition_order; partition_order--) { + unsigned i; + partitions >>= 1; + for(i = 0; i < partitions; i++) { + abs_residual_partition_sums[to_partition++] = + abs_residual_partition_sums[from_partition ] + + abs_residual_partition_sums[from_partition+1]; + from_partition += 2; + } + } + } +} + +#endif /* FLAC__SSSE3_SUPPORTED */ +#endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */ +#endif /* FLAC__NO_ASM */ diff --git a/lib-src/libflac/src/libFLAC/window.c b/lib-src/libflac/src/libFLAC/window.c index 70adb748b..4387ef727 100644 --- a/lib-src/libflac/src/libFLAC/window.c +++ b/lib-src/libflac/src/libFLAC/window.c @@ -1,6 +1,6 @@ /* libFLAC - Free Lossless Audio Codec library * Copyright (C) 2006-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,22 +30,18 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #include +#include "share/compat.h" #include "FLAC/assert.h" #include "FLAC/format.h" #include "private/window.h" #ifndef FLAC__INTEGER_ONLY_LIBRARY -#ifndef M_PI -/* math.h in VC++ doesn't seem to have this (how Microsoft is that?) */ -#define M_PI 3.14159265358979323846 -#endif - void FLAC__window_bartlett(FLAC__real *window, const FLAC__int32 L) { @@ -62,7 +58,7 @@ void FLAC__window_bartlett(FLAC__real *window, const FLAC__int32 L) for (n = 0; n <= L/2-1; n++) window[n] = 2.0f * n / (float)N; for (; n <= N; n++) - window[n] = 2.0f - 2.0f * (N-n) / (float)N; + window[n] = 2.0f - 2.0f * n / (float)N; } } @@ -72,7 +68,7 @@ void FLAC__window_bartlett_hann(FLAC__real *window, const FLAC__int32 L) FLAC__int32 n; for (n = 0; n < L; n++) - window[n] = (FLAC__real)(0.62f - 0.48f * fabs((float)n/(float)N+0.5f) + 0.38f * cos(2.0f * M_PI * ((float)n/(float)N+0.5f))); + window[n] = (FLAC__real)(0.62f - 0.48f * fabs((float)n/(float)N-0.5f) - 0.38f * cos(2.0f * M_PI * ((float)n/(float)N))); } void FLAC__window_blackman(FLAC__real *window, const FLAC__int32 L) @@ -177,16 +173,16 @@ void FLAC__window_triangle(FLAC__real *window, const FLAC__int32 L) FLAC__int32 n; if (L & 1) { - for (n = 1; n <= L+1/2; n++) + for (n = 1; n <= (L+1)/2; n++) window[n-1] = 2.0f * n / ((float)L + 1.0f); for (; n <= L; n++) - window[n-1] = - (float)(2 * (L - n + 1)) / ((float)L + 1.0f); + window[n-1] = (float)(2 * (L - n + 1)) / ((float)L + 1.0f); } else { for (n = 1; n <= L/2; n++) - window[n-1] = 2.0f * n / (float)L; + window[n-1] = 2.0f * n / ((float)L + 1.0f); for (; n <= L; n++) - window[n-1] = ((float)(2 * (L - n)) + 1.0f) / (float)L; + window[n-1] = (float)(2 * (L - n + 1)) / ((float)L + 1.0f); } } @@ -211,6 +207,66 @@ void FLAC__window_tukey(FLAC__real *window, const FLAC__int32 L, const FLAC__rea } } +void FLAC__window_partial_tukey(FLAC__real *window, const FLAC__int32 L, const FLAC__real p, const FLAC__real start, const FLAC__real end) +{ + const FLAC__int32 start_n = (FLAC__int32)(start * L); + const FLAC__int32 end_n = (FLAC__int32)(end * L); + const FLAC__int32 N = end_n - start_n; + FLAC__int32 Np, n, i; + + if (p <= 0.0f) + FLAC__window_partial_tukey(window, L, 0.05f, start, end); + else if (p >= 1.0f) + FLAC__window_partial_tukey(window, L, 0.95f, start, end); + else { + + Np = (FLAC__int32)(p / 2.0f * N); + + for (n = 0; n < start_n && n < L; n++) + window[n] = 0.0f; + for (i = 1; n < (start_n+Np) && n < L; n++, i++) + window[n] = (FLAC__real)(0.5f - 0.5f * cos(M_PI * i / Np)); + for (; n < (end_n-Np) && n < L; n++) + window[n] = 1.0f; + for (i = Np; n < end_n && n < L; n++, i--) + window[n] = (FLAC__real)(0.5f - 0.5f * cos(M_PI * i / Np)); + for (; n < L; n++) + window[n] = 0.0f; + } +} + +void FLAC__window_punchout_tukey(FLAC__real *window, const FLAC__int32 L, const FLAC__real p, const FLAC__real start, const FLAC__real end) +{ + const FLAC__int32 start_n = (FLAC__int32)(start * L); + const FLAC__int32 end_n = (FLAC__int32)(end * L); + FLAC__int32 Ns, Ne, n, i; + + if (p <= 0.0f) + FLAC__window_punchout_tukey(window, L, 0.05f, start, end); + else if (p >= 1.0f) + FLAC__window_punchout_tukey(window, L, 0.95f, start, end); + else { + + Ns = (FLAC__int32)(p / 2.0f * start_n); + Ne = (FLAC__int32)(p / 2.0f * (L - end_n)); + + for (n = 0, i = 1; n < Ns && n < L; n++, i++) + window[n] = (FLAC__real)(0.5f - 0.5f * cos(M_PI * i / Ns)); + for (; n < start_n-Ns && n < L; n++) + window[n] = 1.0f; + for (i = Ns; n < start_n && n < L; n++, i--) + window[n] = (FLAC__real)(0.5f - 0.5f * cos(M_PI * i / Ns)); + for (; n < end_n && n < L; n++) + window[n] = 0.0f; + for (i = 1; n < end_n+Ne && n < L; n++, i++) + window[n] = (FLAC__real)(0.5f - 0.5f * cos(M_PI * i / Ne)); + for (; n < L - (Ne) && n < L; n++) + window[n] = 1.0f; + for (i = Ne; n < L; n++, i--) + window[n] = (FLAC__real)(0.5f - 0.5f * cos(M_PI * i / Ne)); + } +} + void FLAC__window_welch(FLAC__real *window, const FLAC__int32 L) { const FLAC__int32 N = L - 1; diff --git a/lib-src/libflac/src/metaflac/Makefile.am b/lib-src/libflac/src/metaflac/Makefile.am index d6e76e842..e3355ce8e 100644 --- a/lib-src/libflac/src/metaflac/Makefile.am +++ b/lib-src/libflac/src/metaflac/Makefile.am @@ -1,6 +1,6 @@ # metaflac - Command-line FLAC metadata editor # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -22,7 +22,9 @@ AM_CFLAGS = @OGG_CFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include EXTRA_DIST = \ Makefile.lite \ - metaflac.vcproj + metaflac.vcproj \ + metaflac.vcxproj \ + metaflac.vcxproj.filters metaflac_SOURCES = \ main.c \ diff --git a/lib-src/libflac/src/metaflac/Makefile.in b/lib-src/libflac/src/metaflac/Makefile.in index 188ea6c9f..c5f396a0c 100644 --- a/lib-src/libflac/src/metaflac/Makefile.in +++ b/lib-src/libflac/src/metaflac/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # metaflac - Command-line FLAC metadata editor # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = metaflac$(EXEEXT) subdir = src/metaflac -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -107,9 +137,22 @@ metaflac_DEPENDENCIES = \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = metaflac_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(metaflac_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -122,20 +165,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(metaflac_SOURCES) DIST_SOURCES = $(metaflac_SOURCES) am__can_run_installinfo = \ @@ -143,6 +182,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -183,7 +239,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -203,8 +258,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -301,7 +354,9 @@ AM_CFLAGS = @OGG_CFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include EXTRA_DIST = \ Makefile.lite \ - metaflac.vcproj + metaflac.vcproj \ + metaflac.vcxproj \ + metaflac.vcxproj.filters metaflac_SOURCES = \ main.c \ @@ -334,7 +389,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -359,9 +414,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @@ -373,10 +428,12 @@ install-binPROGRAMS: $(bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -397,7 +454,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -410,6 +468,7 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + metaflac$(EXEEXT): $(metaflac_OBJECTS) $(metaflac_DEPENDENCIES) $(EXTRA_metaflac_DEPENDENCIES) @rm -f metaflac$(EXEEXT) $(AM_V_CCLD)$(metaflac_LINK) $(metaflac_OBJECTS) $(metaflac_LDADD) $(LIBS) @@ -461,26 +520,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -492,15 +540,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -509,6 +553,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -653,19 +712,19 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/metaflac/Makefile.lite b/lib-src/libflac/src/metaflac/Makefile.lite index 9192384b2..7d4f1a586 100644 --- a/lib-src/libflac/src/metaflac/Makefile.lite +++ b/lib-src/libflac/src/metaflac/Makefile.lite @@ -1,6 +1,6 @@ # metaflac - Command-line FLAC metadata editor # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I./include -I$(topdir)/include $(OGG_INCLUDES) ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(libdir)/libgetopt.a $(libdir)/libutf8.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -lgrabbag -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lgrabbag -lFLAC -lreplaygain_analysis -lgetopt -lutf8 -lgrabbag $(OGG_LIBS) -lm endif +endif SRCS_C = \ main.c \ diff --git a/lib-src/libflac/src/metaflac/main.c b/lib-src/libflac/src/metaflac/main.c index 86acbbba5..eb8737a12 100644 --- a/lib-src/libflac/src/metaflac/main.c +++ b/lib-src/libflac/src/metaflac/main.c @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -43,7 +43,20 @@ int main(int argc, char *argv[]) } #endif +#ifdef _WIN32 + { + const char *var; + var = getenv("LC_ALL"); + if (!var) + var = getenv("LC_NUMERIC"); + if (!var) + var = getenv("LANG"); + if (!var || strcmp(var, "C") != 0) + setlocale(LC_ALL, ""); + } +#else setlocale(LC_ALL, ""); +#endif init_options(&options); if ((ret = parse_options(argc, argv, &options)) == 0) diff --git a/lib-src/libflac/src/metaflac/metaflac.vcproj b/lib-src/libflac/src/metaflac/metaflac.vcproj index d6637fe15..076406b8a 100644 --- a/lib-src/libflac/src/metaflac/metaflac.vcproj +++ b/lib-src/libflac/src/metaflac/metaflac.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc87-c215-11db-8314-0800200c9a66} + metaflac + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + + + + + + + + + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbc80-c215-11db-8314-0800200c9a66} + false + + + {4cefbc81-c215-11db-8314-0800200c9a66} + false + + + {4cefbc89-c215-11db-8314-0800200c9a66} + false + + + {4cefbc92-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/metaflac/metaflac.vcxproj.filters b/lib-src/libflac/src/metaflac/metaflac.vcxproj.filters new file mode 100644 index 000000000..763405dca --- /dev/null +++ b/lib-src/libflac/src/metaflac/metaflac.vcxproj.filters @@ -0,0 +1,59 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/metaflac/operations.c b/lib-src/libflac/src/metaflac/operations.c index 76e6c5854..23d4bff16 100644 --- a/lib-src/libflac/src/metaflac/operations.c +++ b/lib-src/libflac/src/metaflac/operations.c @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/metaflac/operations.h b/lib-src/libflac/src/metaflac/operations.h index 72bf41134..de8e7cbc0 100644 --- a/lib-src/libflac/src/metaflac/operations.h +++ b/lib-src/libflac/src/metaflac/operations.h @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/metaflac/operations_shorthand.h b/lib-src/libflac/src/metaflac/operations_shorthand.h index 468993b22..ab4c08a2e 100644 --- a/lib-src/libflac/src/metaflac/operations_shorthand.h +++ b/lib-src/libflac/src/metaflac/operations_shorthand.h @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/metaflac/operations_shorthand_cuesheet.c b/lib-src/libflac/src/metaflac/operations_shorthand_cuesheet.c index e113b1936..e508ae373 100644 --- a/lib-src/libflac/src/metaflac/operations_shorthand_cuesheet.c +++ b/lib-src/libflac/src/metaflac/operations_shorthand_cuesheet.c @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/metaflac/operations_shorthand_picture.c b/lib-src/libflac/src/metaflac/operations_shorthand_picture.c index 794ab124b..806cf6393 100644 --- a/lib-src/libflac/src/metaflac/operations_shorthand_picture.c +++ b/lib-src/libflac/src/metaflac/operations_shorthand_picture.c @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/metaflac/operations_shorthand_seektable.c b/lib-src/libflac/src/metaflac/operations_shorthand_seektable.c index 1532a2730..dc1bfd482 100644 --- a/lib-src/libflac/src/metaflac/operations_shorthand_seektable.c +++ b/lib-src/libflac/src/metaflac/operations_shorthand_seektable.c @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/metaflac/operations_shorthand_streaminfo.c b/lib-src/libflac/src/metaflac/operations_shorthand_streaminfo.c index aff015157..6ba5d1176 100644 --- a/lib-src/libflac/src/metaflac/operations_shorthand_streaminfo.c +++ b/lib-src/libflac/src/metaflac/operations_shorthand_streaminfo.c @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/metaflac/operations_shorthand_vorbiscomment.c b/lib-src/libflac/src/metaflac/operations_shorthand_vorbiscomment.c index 64912665a..d2d3a623a 100644 --- a/lib-src/libflac/src/metaflac/operations_shorthand_vorbiscomment.c +++ b/lib-src/libflac/src/metaflac/operations_shorthand_vorbiscomment.c @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/metaflac/options.c b/lib-src/libflac/src/metaflac/options.c index a9629b23e..16713d2c0 100644 --- a/lib-src/libflac/src/metaflac/options.c +++ b/lib-src/libflac/src/metaflac/options.c @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/metaflac/options.h b/lib-src/libflac/src/metaflac/options.h index a31a0fa41..0e7fa5afc 100644 --- a/lib-src/libflac/src/metaflac/options.h +++ b/lib-src/libflac/src/metaflac/options.h @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/metaflac/usage.c b/lib-src/libflac/src/metaflac/usage.c index 0054fb9c4..250fc1c60 100644 --- a/lib-src/libflac/src/metaflac/usage.c +++ b/lib-src/libflac/src/metaflac/usage.c @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -32,7 +32,7 @@ static void usage_header(FILE *out) fprintf(out, "==============================================================================\n"); fprintf(out, "metaflac - Command-line FLAC metadata editor version %s\n", FLAC__VERSION_STRING); fprintf(out, "Copyright (C) 2001-2009 Josh Coalson\n"); - fprintf(out, "Copyright (C) 2011-2013 Xiph.Org Foundation\n"); + fprintf(out, "Copyright (C) 2011-2014 Xiph.Org Foundation\n"); fprintf(out, "\n"); fprintf(out, "This program is free software; you can redistribute it and/or\n"); fprintf(out, "modify it under the terms of the GNU General Public License\n"); diff --git a/lib-src/libflac/src/metaflac/usage.h b/lib-src/libflac/src/metaflac/usage.h index e852ea9eb..700ca156c 100644 --- a/lib-src/libflac/src/metaflac/usage.h +++ b/lib-src/libflac/src/metaflac/usage.h @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/metaflac/utils.c b/lib-src/libflac/src/metaflac/utils.c index 097537b2d..d6ea81fde 100644 --- a/lib-src/libflac/src/metaflac/utils.c +++ b/lib-src/libflac/src/metaflac/utils.c @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -75,7 +75,7 @@ void local_strcat(char **dest, const char *source) *dest = safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1); if(0 == *dest) die("out of memory growing string"); - safe_strncpy((*dest)+ndest, source, ndest + nsource + 1); + safe_strncpy((*dest)+ndest, source, nsource + 1); } static inline int local_isprint(int c) @@ -167,7 +167,7 @@ void print_error_with_chain_status(FLAC__Metadata_Chain *chain, const char *form } else if(status == FLAC__METADATA_CHAIN_STATUS_BAD_METADATA) { flac_fprintf(stderr, "\n" - "The metadata to be writted does not conform to the FLAC metadata\n" + "The metadata to be written does not conform to the FLAC metadata\n" "specifications.\n" ); } diff --git a/lib-src/libflac/src/metaflac/utils.h b/lib-src/libflac/src/metaflac/utils.h index dfe6a291c..e87cdd92f 100644 --- a/lib-src/libflac/src/metaflac/utils.h +++ b/lib-src/libflac/src/metaflac/utils.h @@ -1,6 +1,6 @@ /* metaflac - Command-line FLAC metadata editor * Copyright (C) 2001-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/monkeys_audio_utilities/Makefile.am b/lib-src/libflac/src/monkeys_audio_utilities/Makefile.am deleted file mode 100644 index 5a0156e70..000000000 --- a/lib-src/libflac/src/monkeys_audio_utilities/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# FLAC - Free Lossless Audio Codec -# Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# This file is part the FLAC project. FLAC is comprised of several -# components distributed under different licenses. The codec libraries -# are distributed under Xiph.Org's BSD-like license (see the file -# COPYING.Xiph in this distribution). All other programs, libraries, and -# plugins are distributed under the GPL (see COPYING.GPL). The documentation -# is distributed under the Gnu FDL (see COPYING.FDL). Each file in the -# FLAC distribution contains at the top the terms under which it may be -# distributed. -# -# Since this particular file is relevant to all components of FLAC, -# it may be distributed under the Xiph.Org license, which is the least -# restrictive of those mentioned above. See the file COPYING.Xiph in this -# distribution. - -SUBDIRS = flac_mac flac_ren diff --git a/lib-src/libflac/src/monkeys_audio_utilities/Makefile.in b/lib-src/libflac/src/monkeys_audio_utilities/Makefile.in deleted file mode 100644 index 83f0185a0..000000000 --- a/lib-src/libflac/src/monkeys_audio_utilities/Makefile.in +++ /dev/null @@ -1,646 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# FLAC - Free Lossless Audio Codec -# Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# This file is part the FLAC project. FLAC is comprised of several -# components distributed under different licenses. The codec libraries -# are distributed under Xiph.Org's BSD-like license (see the file -# COPYING.Xiph in this distribution). All other programs, libraries, and -# plugins are distributed under the GPL (see COPYING.GPL). The documentation -# is distributed under the Gnu FDL (see COPYING.FDL). Each file in the -# FLAC distribution contains at the top the terms under which it may be -# distributed. -# -# Since this particular file is relevant to all components of FLAC, -# it may be distributed under the Xiph.Org license, which is the least -# restrictive of those mentioned above. See the file COPYING.Xiph in this -# distribution. -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/monkeys_audio_utilities -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ -FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NASM = @NASM@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OBJ_FORMAT = @OBJ_FORMAT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OGG_PACKAGE = @OGG_PACKAGE@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -XMMS_CFLAGS = @XMMS_CFLAGS@ -XMMS_CONFIG = @XMMS_CONFIG@ -XMMS_DATA_DIR = @XMMS_DATA_DIR@ -XMMS_EFFECT_PLUGIN_DIR = @XMMS_EFFECT_PLUGIN_DIR@ -XMMS_GENERAL_PLUGIN_DIR = @XMMS_GENERAL_PLUGIN_DIR@ -XMMS_INPUT_PLUGIN_DIR = @XMMS_INPUT_PLUGIN_DIR@ -XMMS_LIBS = @XMMS_LIBS@ -XMMS_OUTPUT_PLUGIN_DIR = @XMMS_OUTPUT_PLUGIN_DIR@ -XMMS_PLUGIN_DIR = @XMMS_PLUGIN_DIR@ -XMMS_VERSION = @XMMS_VERSION@ -XMMS_VISUALIZATION_PLUGIN_DIR = @XMMS_VISUALIZATION_PLUGIN_DIR@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = flac_mac flac_ren -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/monkeys_audio_utilities/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/monkeys_audio_utilities/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.am b/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.am deleted file mode 100644 index 1ea3b96b7..000000000 --- a/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# flac_mac - wedge utility to add FLAC support to Monkey's Audio -# Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -EXTRA_DIST = \ - flac_mac.vcproj \ - main.c diff --git a/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.in b/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.in deleted file mode 100644 index c2b6d6b2b..000000000 --- a/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/Makefile.in +++ /dev/null @@ -1,450 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# flac_mac - wedge utility to add FLAC support to Monkey's Audio -# Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/monkeys_audio_utilities/flac_mac -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ -FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NASM = @NASM@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OBJ_FORMAT = @OBJ_FORMAT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OGG_PACKAGE = @OGG_PACKAGE@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -XMMS_CFLAGS = @XMMS_CFLAGS@ -XMMS_CONFIG = @XMMS_CONFIG@ -XMMS_DATA_DIR = @XMMS_DATA_DIR@ -XMMS_EFFECT_PLUGIN_DIR = @XMMS_EFFECT_PLUGIN_DIR@ -XMMS_GENERAL_PLUGIN_DIR = @XMMS_GENERAL_PLUGIN_DIR@ -XMMS_INPUT_PLUGIN_DIR = @XMMS_INPUT_PLUGIN_DIR@ -XMMS_LIBS = @XMMS_LIBS@ -XMMS_OUTPUT_PLUGIN_DIR = @XMMS_OUTPUT_PLUGIN_DIR@ -XMMS_PLUGIN_DIR = @XMMS_PLUGIN_DIR@ -XMMS_VERSION = @XMMS_VERSION@ -XMMS_VISUALIZATION_PLUGIN_DIR = @XMMS_VISUALIZATION_PLUGIN_DIR@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = \ - flac_mac.vcproj \ - main.c - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/monkeys_audio_utilities/flac_mac/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/monkeys_audio_utilities/flac_mac/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj b/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj deleted file mode 100644 index cc6c29893..000000000 --- a/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/flac_mac.vcproj +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/main.c b/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/main.c deleted file mode 100644 index 3ea4254f0..000000000 --- a/lib-src/libflac/src/monkeys_audio_utilities/flac_mac/main.c +++ /dev/null @@ -1,231 +0,0 @@ -/* flac_mac - wedge utility to add FLAC support to Monkey's Audio - * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* - * This program can be used to allow FLAC to masquerade as one of the other - * supported lossless codecs in Monkey's Audio. See the documentation for - * how to do this. - */ - -#if HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include -#include - -#include "share/compat.h" -#include "share/safe_str.h" - -static int execit(char *prog, char *args); -static int forkit(char *prog, char *args); - -int main(int argc, char *argv[]) -{ - int flac_return_val = 0, opt_arg = 1, from_arg = -1, to_arg = -1, flac_level = 5, i; - char prog[MAX_PATH], cmdline[MAX_PATH*2], from[MAX_PATH], to[MAX_PATH], macdir[MAX_PATH], options[256], *p; - enum { WAVPACK, RKAU, SHORTEN } codec; - - /* get the directory where MAC external codecs reside */ - if(0 != (p = strrchr(argv[0],'\\'))) { - safe_strncpy(macdir, argv[0], sizeof(macdir)); - *(strrchr(macdir,'\\')+1) = '\0'; - } - else { - safe_strncpy(macdir, "", sizeof(macdir)); - } - - /* determine which codec we were called as and parse the options */ - if(p == 0) - p = argv[0]; - else - p++; - if(0 == strnicmp(p, "short", 5)) { - codec = SHORTEN; - } - else if(0 == strnicmp(p, "rkau", 4)) { - codec = RKAU; - if(argv[1][0] == '-' && argv[1][1] == 'l') { - opt_arg = 2; - switch(argv[1][2]) { - case '1': flac_level = 1; break; - case '2': flac_level = 5; break; - case '3': flac_level = 8; break; - } - } - } - else if(0 == strnicmp(p, "wavpack", 7)) { - codec = WAVPACK; - if(argv[1][0] == '-') { - opt_arg = 2; - switch(argv[1][1]) { - case 'f': flac_level = 1; break; - case 'h': flac_level = 8; break; - default: opt_arg = 1; - } - } - } - else { - return -5; - } - - /* figure out which arguments are the source and destination files */ - for(i = 1; i < argc; i++) - if(argv[i][0] != '-') { - from_arg = i++; - break; - } - for( ; i < argc; i++) - if(argv[i][0] != '-') { - to_arg = i++; - break; - } - if(to_arg < 0) - return -4; - - /* build the command to call flac with */ - flac_snprintf(prog, sizeof (prog), "%sflac.exe", macdir); - flac_snprintf(options, sizeof (options), "-%d", flac_level); - for(i = opt_arg; i < argc; i++) - if(argv[i][0] == '-') { - safe_strncat(options, " ", sizeof(options)); - safe_strncat(options, argv[i], sizeof(options)); - } - flac_snprintf(cmdline, sizeof (cmdline), "\"%s\" %s -o \"%s\" \"%s\"", prog, options, argv[to_arg], argv[from_arg]); - - flac_return_val = execit(prog, cmdline); - - /* - * Now that flac has finished, we need to fork a process that will rename - * the resulting file with the correct extension once MAC has moved it to - * it's final resting place. - */ - if(0 == flac_return_val) { - char *cptr; - /* get the destination directory, if any */ - if(0 != (p = strchr(argv[to_arg],'\\'))) { - safe_strncpy(from, argv[to_arg], sizeof(from)); - *(strrchr(from,'\\')+1) = '\0'; - } - else { - safe_strncpy(from, "", sizeof(from)); - } - - /* for the full 'from' and 'to' paths for the renamer process */ - p = strrchr(argv[from_arg],'\\'); - safe_strncat(from, p? p+1 : argv[from_arg], sizeof(from)); - safe_strncpy(to, from, sizeof(to)); - - cptr = strrchr(from,'.'); - if(cptr == NULL) - return -3; - cptr [0] = 0; - - switch(codec) { - case SHORTEN: - safe_strncat(from, ".shn", sizeof (from)); - break; - case WAVPACK: - safe_strncat(from, ".wv", sizeof (from)); - break; - case RKAU: - safe_strncpy(from, ".rka", sizeof (from)); - break; - default: - return -4; - } - - cptr = strrchr(to,'.'); - if(cptr == NULL) - return -3; - cptr [0] = 0; - - safe_strncat(to, ".flac", sizeof(to)); - - flac_snprintf(prog, sizeof (prog), "%sflac_ren.exe", macdir); - flac_snprintf(cmdline, sizeof (cmdline), "\"%s\" \"%s\" \"%s\"", prog, from, to); - - flac_return_val = forkit(prog, cmdline); - } - - return flac_return_val; -} - -int execit(char *prog, char *args) -{ - BOOL ok; - STARTUPINFO startup_info; - PROCESS_INFORMATION proc_info; - - GetStartupInfo(&startup_info); - - ok = CreateProcess( - prog, - args, - 0, /*process security attributes*/ - 0, /*thread security attributes*/ - FALSE, - 0, /*dwCreationFlags*/ - 0, /*environment*/ - 0, /*lpCurrentDirectory*/ - &startup_info, - &proc_info - ); - if(ok) { - DWORD dw; - dw = WaitForSingleObject(proc_info.hProcess, INFINITE); - ok = (dw != 0xFFFFFFFF); - CloseHandle(proc_info.hThread); - CloseHandle(proc_info.hProcess); - } - - return ok? 0 : -1; -} - -int forkit(char *prog, char *args) -{ - BOOL ok; - STARTUPINFO startup_info; - PROCESS_INFORMATION proc_info; - - GetStartupInfo(&startup_info); - - ok = CreateProcess( - prog, - args, - 0, /*process security attributes*/ - 0, /*thread security attributes*/ - FALSE, - DETACHED_PROCESS, /*dwCreationFlags*/ - 0, /*environment*/ - 0, /*lpCurrentDirectory*/ - &startup_info, - &proc_info - ); - if(ok) { - CloseHandle(proc_info.hThread); - CloseHandle(proc_info.hProcess); - } - - return ok? 0 : -2; -} diff --git a/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.am b/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.am deleted file mode 100644 index c3efcf312..000000000 --- a/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -# flac_ren - renamer part of utility to add FLAC support to Monkey's Audio -# Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -EXTRA_DIST = \ - flac_ren.vcproj \ - main.c diff --git a/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.in b/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.in deleted file mode 100644 index f70589833..000000000 --- a/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/Makefile.in +++ /dev/null @@ -1,450 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# flac_ren - renamer part of utility to add FLAC support to Monkey's Audio -# Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/monkeys_audio_utilities/flac_ren -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@ -DOXYGEN = @DOXYGEN@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ -FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ -GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ -GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ -GCC_VERSION = @GCC_VERSION@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -NASM = @NASM@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OBJ_FORMAT = @OBJ_FORMAT@ -OGG_CFLAGS = @OGG_CFLAGS@ -OGG_LIBS = @OGG_LIBS@ -OGG_PACKAGE = @OGG_PACKAGE@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -XMMS_CFLAGS = @XMMS_CFLAGS@ -XMMS_CONFIG = @XMMS_CONFIG@ -XMMS_DATA_DIR = @XMMS_DATA_DIR@ -XMMS_EFFECT_PLUGIN_DIR = @XMMS_EFFECT_PLUGIN_DIR@ -XMMS_GENERAL_PLUGIN_DIR = @XMMS_GENERAL_PLUGIN_DIR@ -XMMS_INPUT_PLUGIN_DIR = @XMMS_INPUT_PLUGIN_DIR@ -XMMS_LIBS = @XMMS_LIBS@ -XMMS_OUTPUT_PLUGIN_DIR = @XMMS_OUTPUT_PLUGIN_DIR@ -XMMS_PLUGIN_DIR = @XMMS_PLUGIN_DIR@ -XMMS_VERSION = @XMMS_VERSION@ -XMMS_VISUALIZATION_PLUGIN_DIR = @XMMS_VISUALIZATION_PLUGIN_DIR@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = \ - flac_ren.vcproj \ - main.c - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/monkeys_audio_utilities/flac_ren/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/monkeys_audio_utilities/flac_ren/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/flac_ren.vcproj b/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/flac_ren.vcproj deleted file mode 100644 index 5fc7cbce8..000000000 --- a/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/flac_ren.vcproj +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib-src/libflac/src/plugin_common/Makefile.am b/lib-src/libflac/src/plugin_common/Makefile.am index dcf029845..571e8c618 100644 --- a/lib-src/libflac/src/plugin_common/Makefile.am +++ b/lib-src/libflac/src/plugin_common/Makefile.am @@ -1,6 +1,6 @@ # plugin_common - Routines common to several plugins # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -37,7 +37,9 @@ libplugin_common_la_SOURCES = \ EXTRA_DIST = \ Makefile.lite \ README \ - plugin_common_static.vcproj + plugin_common_static.vcproj \ + plugin_common_static.vcxproj \ + plugin_common_static.vcxproj.filters debug: $(MAKE) all CFLAGS="@DEBUG@" diff --git a/lib-src/libflac/src/plugin_common/Makefile.in b/lib-src/libflac/src/plugin_common/Makefile.in index 142644aea..13518e269 100644 --- a/lib-src/libflac/src/plugin_common/Makefile.in +++ b/lib-src/libflac/src/plugin_common/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # plugin_common - Routines common to several plugins # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -35,23 +34,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,18 +98,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/plugin_common -DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -97,6 +126,19 @@ libplugin_common_la_OBJECTS = $(am_libplugin_common_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -109,20 +151,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libplugin_common_la_SOURCES) DIST_SOURCES = $(libplugin_common_la_SOURCES) am__can_run_installinfo = \ @@ -131,6 +169,23 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -171,7 +226,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -191,8 +245,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -304,13 +356,15 @@ libplugin_common_la_SOURCES = \ EXTRA_DIST = \ Makefile.lite \ README \ - plugin_common_static.vcproj + plugin_common_static.vcproj \ + plugin_common_static.vcxproj \ + plugin_common_static.vcxproj.filters all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -335,20 +389,23 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libplugin_common.la: $(libplugin_common_la_OBJECTS) $(libplugin_common_la_DEPENDENCIES) $(EXTRA_libplugin_common_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libplugin_common_la_OBJECTS) $(libplugin_common_la_LIBADD) $(LIBS) @@ -393,26 +450,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -424,15 +470,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -441,6 +483,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -582,18 +639,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am debug: diff --git a/lib-src/libflac/src/plugin_common/Makefile.lite b/lib-src/libflac/src/plugin_common/Makefile.lite index 5dd05e763..7d9683add 100644 --- a/lib-src/libflac/src/plugin_common/Makefile.lite +++ b/lib-src/libflac/src/plugin_common/Makefile.lite @@ -1,6 +1,6 @@ # plugin_common - Routines common to several plugins # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -24,7 +24,16 @@ topdir = ../.. LIB_NAME = libplugin_common INCLUDES = -I$(topdir)/include -I$(HOME)/local/include -DEFINES = + +ifeq ($(OS),Darwin) + EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm +else + LIBS = -lgrabbag -lreplaygain_analysis -lFLAC $(OGG_LIBS) -lm +endif +endif SRCS_C = \ charset.c \ diff --git a/lib-src/libflac/src/plugin_common/all.h b/lib-src/libflac/src/plugin_common/all.h index 9693361e2..3cc0300b2 100644 --- a/lib-src/libflac/src/plugin_common/all.h +++ b/lib-src/libflac/src/plugin_common/all.h @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/lib-src/libflac/src/plugin_common/charset.c b/lib-src/libflac/src/plugin_common/charset.c index 18f9b802b..6d7dc152b 100644 --- a/lib-src/libflac/src/plugin_common/charset.c +++ b/lib-src/libflac/src/plugin_common/charset.c @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Only slightly modified charset.c from: * EasyTAG - Tag editor for MP3 and OGG files @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/plugin_common/charset.h b/lib-src/libflac/src/plugin_common/charset.h index 365434706..d09ab2d85 100644 --- a/lib-src/libflac/src/plugin_common/charset.h +++ b/lib-src/libflac/src/plugin_common/charset.h @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Only slightly modified charset.h from: * charset.h - 2001/12/04 diff --git a/lib-src/libflac/src/plugin_common/defs.h b/lib-src/libflac/src/plugin_common/defs.h index 149ccd3f6..1fc849d90 100644 --- a/lib-src/libflac/src/plugin_common/defs.h +++ b/lib-src/libflac/src/plugin_common/defs.h @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/lib-src/libflac/src/plugin_common/dither.c b/lib-src/libflac/src/plugin_common/dither.c index cea30cd5b..4e6bc4cc9 100644 --- a/lib-src/libflac/src/plugin_common/dither.c +++ b/lib-src/libflac/src/plugin_common/dither.c @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * dithering routine derived from (other GPLed source): * mad - MPEG audio decoder @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/plugin_common/dither.h b/lib-src/libflac/src/plugin_common/dither.h index 861844f55..382e499d8 100644 --- a/lib-src/libflac/src/plugin_common/dither.h +++ b/lib-src/libflac/src/plugin_common/dither.h @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/lib-src/libflac/src/plugin_common/plugin_common_static.vcproj b/lib-src/libflac/src/plugin_common/plugin_common_static.vcproj index 502b20397..cf0e94134 100644 --- a/lib-src/libflac/src/plugin_common/plugin_common_static.vcproj +++ b/lib-src/libflac/src/plugin_common/plugin_common_static.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc88-c215-11db-8314-0800200c9a66} + plugin_common_static + Win32Proj + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;FLaC__INLINE=_inline;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;FLaC__INLINE=_inline;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbc81-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/plugin_common/plugin_common_static.vcxproj.filters b/lib-src/libflac/src/plugin_common/plugin_common_static.vcxproj.filters new file mode 100644 index 000000000..fb9a7e03c --- /dev/null +++ b/lib-src/libflac/src/plugin_common/plugin_common_static.vcxproj.filters @@ -0,0 +1,47 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/plugin_common/replaygain.c b/lib-src/libflac/src/plugin_common/replaygain.c index 3f6b5ef9e..8c592c93c 100644 --- a/lib-src/libflac/src/plugin_common/replaygain.c +++ b/lib-src/libflac/src/plugin_common/replaygain.c @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * Copyright (C) 2003 Philip Jägenstedt * * This program is free software; you can redistribute it and/or @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/plugin_common/replaygain.h b/lib-src/libflac/src/plugin_common/replaygain.h index a3e93c336..126a0255b 100644 --- a/lib-src/libflac/src/plugin_common/replaygain.h +++ b/lib-src/libflac/src/plugin_common/replaygain.h @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * Copyright (C) 2003 Philip Jägenstedt * * This program is free software; you can redistribute it and/or diff --git a/lib-src/libflac/src/plugin_common/tags.c b/lib-src/libflac/src/plugin_common/tags.c index ac397b556..3d155b617 100644 --- a/lib-src/libflac/src/plugin_common/tags.c +++ b/lib-src/libflac/src/plugin_common/tags.c @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/plugin_common/tags.h b/lib-src/libflac/src/plugin_common/tags.h index 32004314b..b5a10ae88 100644 --- a/lib-src/libflac/src/plugin_common/tags.h +++ b/lib-src/libflac/src/plugin_common/tags.h @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/lib-src/libflac/src/plugin_xmms/Makefile.am b/lib-src/libflac/src/plugin_xmms/Makefile.am index 549d1801c..a1da2a6b5 100644 --- a/lib-src/libflac/src/plugin_xmms/Makefile.am +++ b/lib-src/libflac/src/plugin_xmms/Makefile.am @@ -1,6 +1,6 @@ # libxmms-flac - XMMS FLAC input plugin # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/plugin_xmms/Makefile.in b/lib-src/libflac/src/plugin_xmms/Makefile.in index 3cc8429ec..ef5df731d 100644 --- a/lib-src/libflac/src/plugin_xmms/Makefile.in +++ b/lib-src/libflac/src/plugin_xmms/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # libxmms-flac - XMMS FLAC input plugin # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -39,23 +38,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -75,18 +102,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/plugin_xmms -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -136,10 +165,23 @@ libxmms_flac_la_OBJECTS = $(am_libxmms_flac_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libxmms_flac_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libxmms_flac_la_LDFLAGS) $(LDFLAGS) \ -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -152,20 +194,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libxmms_flac_la_SOURCES) DIST_SOURCES = $(libxmms_flac_la_SOURCES) am__can_run_installinfo = \ @@ -174,6 +212,23 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -214,7 +269,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -234,8 +288,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -371,7 +423,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -396,11 +448,12 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-xmmsinputpluginLTLIBRARIES: $(xmmsinputplugin_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(xmmsinputplugin_LTLIBRARIES)'; test -n "$(xmmsinputplugindir)" || list=; \ @@ -427,12 +480,15 @@ uninstall-xmmsinputpluginLTLIBRARIES: clean-xmmsinputpluginLTLIBRARIES: -test -z "$(xmmsinputplugin_LTLIBRARIES)" || rm -f $(xmmsinputplugin_LTLIBRARIES) - @list='$(xmmsinputplugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(xmmsinputplugin_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libxmms-flac.la: $(libxmms_flac_la_OBJECTS) $(libxmms_flac_la_DEPENDENCIES) $(EXTRA_libxmms_flac_la_DEPENDENCIES) $(AM_V_CCLD)$(libxmms_flac_la_LINK) -rpath $(xmmsinputplugindir) $(libxmms_flac_la_OBJECTS) $(libxmms_flac_la_LIBADD) $(LIBS) @@ -479,26 +535,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -510,15 +555,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -527,6 +568,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -671,19 +727,20 @@ uninstall-am: uninstall-xmmsinputpluginLTLIBRARIES .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-xmmsinputpluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-xmmsinputpluginLTLIBRARIES installcheck \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-xmmsinputpluginLTLIBRARIES cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip \ + install-xmmsinputpluginLTLIBRARIES installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-xmmsinputpluginLTLIBRARIES diff --git a/lib-src/libflac/src/plugin_xmms/Makefile.lite b/lib-src/libflac/src/plugin_xmms/Makefile.lite index 96b1ab1ee..ec101a3d4 100644 --- a/lib-src/libflac/src/plugin_xmms/Makefile.lite +++ b/lib-src/libflac/src/plugin_xmms/Makefile.lite @@ -1,6 +1,6 @@ # libxmms-flac - XMMS FLAC input plugin # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,9 +28,13 @@ INCLUDES = -I./include -I$(topdir)/include -I.. $(shell xmms-config --cflags) # refer to the static libs explicitly ifeq ($(OS),Darwin) LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(OGG_EXPLICIT_LIBS) $(ICONV_LIBS) -lm -lstdc++ -lz +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(libdir)/libwin_utf8_io.a $(OGG_LIBS) -lm -lsupc++ -lz else LIBS = $(libdir)/libFLAC.a $(libdir)/libplugin_common.a $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libreplaygain_synthesis.a $(OGG_LIBS) -lm -lsupc++ -lz endif +endif SRCS_C = \ charset.c \ diff --git a/lib-src/libflac/src/plugin_xmms/charset.c b/lib-src/libflac/src/plugin_xmms/charset.c index 2c5167fc8..6d8684884 100644 --- a/lib-src/libflac/src/plugin_xmms/charset.c +++ b/lib-src/libflac/src/plugin_xmms/charset.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "plugin.h" #include diff --git a/lib-src/libflac/src/plugin_xmms/configure.c b/lib-src/libflac/src/plugin_xmms/configure.c index 6b834352d..58af3d364 100644 --- a/lib-src/libflac/src/plugin_xmms/configure.c +++ b/lib-src/libflac/src/plugin_xmms/configure.c @@ -21,6 +21,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "plugin.h" #include @@ -796,7 +800,7 @@ void FLAC_XMMS__aboutbox(void) "......\n" "and\n" "Daisuke Shimamura\n" - "Visit http://flac.sourceforge.net/"), + "Visit http://xiph.org/flac/"), _("Ok"), FALSE, NULL, NULL); gtk_signal_connect(GTK_OBJECT(about_window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), diff --git a/lib-src/libflac/src/plugin_xmms/fileinfo.c b/lib-src/libflac/src/plugin_xmms/fileinfo.c index e5e5fb15d..54c0c562c 100644 --- a/lib-src/libflac/src/plugin_xmms/fileinfo.c +++ b/lib-src/libflac/src/plugin_xmms/fileinfo.c @@ -18,6 +18,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "plugin.h" #include diff --git a/lib-src/libflac/src/plugin_xmms/http.c b/lib-src/libflac/src/plugin_xmms/http.c index c51f1b83c..2f31576ce 100644 --- a/lib-src/libflac/src/plugin_xmms/http.c +++ b/lib-src/libflac/src/plugin_xmms/http.c @@ -17,6 +17,10 @@ */ /* modified for FLAC support by Steven Richman (2003) */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "plugin.h" #include diff --git a/lib-src/libflac/src/plugin_xmms/locale_hack.h b/lib-src/libflac/src/plugin_xmms/locale_hack.h index f4af05793..293e2460c 100644 --- a/lib-src/libflac/src/plugin_xmms/locale_hack.h +++ b/lib-src/libflac/src/plugin_xmms/locale_hack.h @@ -1,6 +1,6 @@ /* plugin_common - Routines common to several plugins * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Based on: * locale.h - 2000/05/05 13:10 Jerome Couderc diff --git a/lib-src/libflac/src/plugin_xmms/plugin.c b/lib-src/libflac/src/plugin_xmms/plugin.c index c99b52e00..7a7b11b16 100644 --- a/lib-src/libflac/src/plugin_xmms/plugin.c +++ b/lib-src/libflac/src/plugin_xmms/plugin.c @@ -1,6 +1,6 @@ /* libxmms-flac - XMMS FLAC input plugin * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,6 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "plugin.h" #include @@ -140,7 +144,7 @@ static FLAC__bool is_big_endian_host_; static unsigned bitrate_history_[BITRATE_HIST_SIZE]; -InputPlugin *get_iplugin_info(void) +FLAC_API InputPlugin *get_iplugin_info(void) { flac_ip.description = g_strdup_printf("Reference FLAC Player v%s", FLAC__VERSION_STRING); return &flac_ip; diff --git a/lib-src/libflac/src/plugin_xmms/plugin.h b/lib-src/libflac/src/plugin_xmms/plugin.h index dd9d1d978..a85ac006d 100644 --- a/lib-src/libflac/src/plugin_xmms/plugin.h +++ b/lib-src/libflac/src/plugin_xmms/plugin.h @@ -1,6 +1,6 @@ /* libxmms-flac - XMMS FLAC input plugin * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,7 +20,7 @@ #ifndef FLAC__PLUGIN_XMMS__PLUGIN_H #define FLAC__PLUGIN_XMMS__PLUGIN_H -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/plugin_xmms/tag.c b/lib-src/libflac/src/plugin_xmms/tag.c index 19e20ba12..d7b1b9713 100644 --- a/lib-src/libflac/src/plugin_xmms/tag.c +++ b/lib-src/libflac/src/plugin_xmms/tag.c @@ -1,6 +1,6 @@ /* libxmms-flac - XMMS FLAC input plugin * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 Daisuke Shimamura * * Based on FLAC plugin.c and mpg123 plugin @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "plugin.h" #include diff --git a/lib-src/libflac/src/share/Makefile.am b/lib-src/libflac/src/share/Makefile.am index 4abaac912..c2feb6ed0 100644 --- a/lib-src/libflac/src/share/Makefile.am +++ b/lib-src/libflac/src/share/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -18,20 +18,27 @@ AUTOMAKE_OPTIONS = subdir-objects -AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/include/share +AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include EXTRA_DIST = \ Makefile.lite \ README \ getopt/Makefile.lite \ getopt/getopt_static.vcproj \ + getopt/getopt_static.vcxproj \ + getopt/getopt_static.vcxproj.filters \ grabbag/Makefile.lite \ grabbag/grabbag_static.vcproj \ + grabbag/grabbag_static.vcxproj \ + grabbag/grabbag_static.vcxproj.filters \ replaygain_analysis/Makefile.lite \ replaygain_analysis/replaygain_analysis_static.vcproj \ + replaygain_analysis/replaygain_analysis_static.vcxproj \ + replaygain_analysis/replaygain_analysis_static.vcxproj.filters \ replaygain_synthesis/Makefile.lite \ replaygain_synthesis/replaygain_synthesis_static.vcproj \ - replaygain_synthesis/include/private/fast_float_math_hack.h \ + replaygain_synthesis/replaygain_synthesis_static.vcxproj \ + replaygain_synthesis/replaygain_synthesis_static.vcxproj.filters \ utf8/Makefile.lite \ utf8/charmaps.h \ utf8/makemap.c \ @@ -39,7 +46,11 @@ EXTRA_DIST = \ utf8/charsetmap.h \ utf8/iconvert.h \ utf8/utf8_static.vcproj \ - win_utf8_io/win_utf8_io.vcproj + utf8/utf8_static.vcxproj \ + utf8/utf8_static.vcxproj.filters \ + win_utf8_io/win_utf8_io_static.vcproj \ + win_utf8_io/win_utf8_io_static.vcxproj \ + win_utf8_io/win_utf8_io_static.vcxproj.filters noinst_LTLIBRARIES = \ diff --git a/lib-src/libflac/src/share/Makefile.in b/lib-src/libflac/src/share/Makefile.in index 19862604e..8f1f85ba3 100644 --- a/lib-src/libflac/src/share/Makefile.in +++ b/lib-src/libflac/src/share/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -34,23 +33,51 @@ # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -70,17 +97,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/share -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -95,6 +125,7 @@ getopt_libgetopt_la_OBJECTS = $(am_getopt_libgetopt_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = grabbag_libgrabbag_la_LIBADD = am_grabbag_libgrabbag_la_OBJECTS = grabbag/alloc.lo \ grabbag/cuesheet.lo grabbag/file.lo grabbag/picture.lo \ @@ -126,6 +157,18 @@ am__win_utf8_io_libwin_utf8_io_la_SOURCES_DIST = \ win_utf8_io_libwin_utf8_io_la_OBJECTS = \ $(am_win_utf8_io_libwin_utf8_io_la_OBJECTS) @OS_IS_WINDOWS_TRUE@am_win_utf8_io_libwin_utf8_io_la_rpath = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -138,20 +181,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(getopt_libgetopt_la_SOURCES) \ $(grabbag_libgrabbag_la_SOURCES) \ $(replaygain_analysis_libreplaygain_analysis_la_SOURCES) \ @@ -169,6 +208,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -209,7 +265,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -229,8 +284,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -324,19 +377,26 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = subdir-objects -AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/include/share +AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include EXTRA_DIST = \ Makefile.lite \ README \ getopt/Makefile.lite \ getopt/getopt_static.vcproj \ + getopt/getopt_static.vcxproj \ + getopt/getopt_static.vcxproj.filters \ grabbag/Makefile.lite \ grabbag/grabbag_static.vcproj \ + grabbag/grabbag_static.vcxproj \ + grabbag/grabbag_static.vcxproj.filters \ replaygain_analysis/Makefile.lite \ replaygain_analysis/replaygain_analysis_static.vcproj \ + replaygain_analysis/replaygain_analysis_static.vcxproj \ + replaygain_analysis/replaygain_analysis_static.vcxproj.filters \ replaygain_synthesis/Makefile.lite \ replaygain_synthesis/replaygain_synthesis_static.vcproj \ - replaygain_synthesis/include/private/fast_float_math_hack.h \ + replaygain_synthesis/replaygain_synthesis_static.vcxproj \ + replaygain_synthesis/replaygain_synthesis_static.vcxproj.filters \ utf8/Makefile.lite \ utf8/charmaps.h \ utf8/makemap.c \ @@ -344,7 +404,11 @@ EXTRA_DIST = \ utf8/charsetmap.h \ utf8/iconvert.h \ utf8/utf8_static.vcproj \ - win_utf8_io/win_utf8_io.vcproj + utf8/utf8_static.vcxproj \ + utf8/utf8_static.vcxproj.filters \ + win_utf8_io/win_utf8_io_static.vcproj \ + win_utf8_io/win_utf8_io_static.vcxproj \ + win_utf8_io/win_utf8_io_static.vcxproj.filters noinst_LTLIBRARIES = \ getopt/libgetopt.la \ @@ -381,7 +445,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -406,20 +470,22 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } getopt/$(am__dirstamp): @$(MKDIR_P) getopt @: > getopt/$(am__dirstamp) @@ -430,6 +496,7 @@ getopt/getopt.lo: getopt/$(am__dirstamp) \ getopt/$(DEPDIR)/$(am__dirstamp) getopt/getopt1.lo: getopt/$(am__dirstamp) \ getopt/$(DEPDIR)/$(am__dirstamp) + getopt/libgetopt.la: $(getopt_libgetopt_la_OBJECTS) $(getopt_libgetopt_la_DEPENDENCIES) $(EXTRA_getopt_libgetopt_la_DEPENDENCIES) getopt/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(getopt_libgetopt_la_OBJECTS) $(getopt_libgetopt_la_LIBADD) $(LIBS) grabbag/$(am__dirstamp): @@ -452,6 +519,7 @@ grabbag/seektable.lo: grabbag/$(am__dirstamp) \ grabbag/$(DEPDIR)/$(am__dirstamp) grabbag/snprintf.lo: grabbag/$(am__dirstamp) \ grabbag/$(DEPDIR)/$(am__dirstamp) + grabbag/libgrabbag.la: $(grabbag_libgrabbag_la_OBJECTS) $(grabbag_libgrabbag_la_DEPENDENCIES) $(EXTRA_grabbag_libgrabbag_la_DEPENDENCIES) grabbag/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(grabbag_libgrabbag_la_OBJECTS) $(grabbag_libgrabbag_la_LIBADD) $(LIBS) replaygain_analysis/$(am__dirstamp): @@ -463,6 +531,7 @@ replaygain_analysis/$(DEPDIR)/$(am__dirstamp): replaygain_analysis/replaygain_analysis.lo: \ replaygain_analysis/$(am__dirstamp) \ replaygain_analysis/$(DEPDIR)/$(am__dirstamp) + replaygain_analysis/libreplaygain_analysis.la: $(replaygain_analysis_libreplaygain_analysis_la_OBJECTS) $(replaygain_analysis_libreplaygain_analysis_la_DEPENDENCIES) $(EXTRA_replaygain_analysis_libreplaygain_analysis_la_DEPENDENCIES) replaygain_analysis/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(replaygain_analysis_libreplaygain_analysis_la_OBJECTS) $(replaygain_analysis_libreplaygain_analysis_la_LIBADD) $(LIBS) replaygain_synthesis/$(am__dirstamp): @@ -474,6 +543,7 @@ replaygain_synthesis/$(DEPDIR)/$(am__dirstamp): replaygain_synthesis/replaygain_synthesis_libreplaygain_synthesis_la-replaygain_synthesis.lo: \ replaygain_synthesis/$(am__dirstamp) \ replaygain_synthesis/$(DEPDIR)/$(am__dirstamp) + replaygain_synthesis/libreplaygain_synthesis.la: $(replaygain_synthesis_libreplaygain_synthesis_la_OBJECTS) $(replaygain_synthesis_libreplaygain_synthesis_la_DEPENDENCIES) $(EXTRA_replaygain_synthesis_libreplaygain_synthesis_la_DEPENDENCIES) replaygain_synthesis/$(am__dirstamp) $(AM_V_CCLD)$(replaygain_synthesis_libreplaygain_synthesis_la_LINK) $(replaygain_synthesis_libreplaygain_synthesis_la_OBJECTS) $(replaygain_synthesis_libreplaygain_synthesis_la_LIBADD) $(LIBS) utf8/$(am__dirstamp): @@ -485,6 +555,7 @@ utf8/$(DEPDIR)/$(am__dirstamp): utf8/charset.lo: utf8/$(am__dirstamp) utf8/$(DEPDIR)/$(am__dirstamp) utf8/iconvert.lo: utf8/$(am__dirstamp) utf8/$(DEPDIR)/$(am__dirstamp) utf8/utf8.lo: utf8/$(am__dirstamp) utf8/$(DEPDIR)/$(am__dirstamp) + utf8/libutf8.la: $(utf8_libutf8_la_OBJECTS) $(utf8_libutf8_la_DEPENDENCIES) $(EXTRA_utf8_libutf8_la_DEPENDENCIES) utf8/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(utf8_libutf8_la_OBJECTS) $(utf8_libutf8_la_LIBADD) $(LIBS) win_utf8_io/$(am__dirstamp): @@ -495,41 +566,24 @@ win_utf8_io/$(DEPDIR)/$(am__dirstamp): @: > win_utf8_io/$(DEPDIR)/$(am__dirstamp) win_utf8_io/win_utf8_io.lo: win_utf8_io/$(am__dirstamp) \ win_utf8_io/$(DEPDIR)/$(am__dirstamp) + win_utf8_io/libwin_utf8_io.la: $(win_utf8_io_libwin_utf8_io_la_OBJECTS) $(win_utf8_io_libwin_utf8_io_la_DEPENDENCIES) $(EXTRA_win_utf8_io_libwin_utf8_io_la_DEPENDENCIES) win_utf8_io/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_win_utf8_io_libwin_utf8_io_la_rpath) $(win_utf8_io_libwin_utf8_io_la_OBJECTS) $(win_utf8_io_libwin_utf8_io_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f getopt/getopt.$(OBJEXT) - -rm -f getopt/getopt.lo - -rm -f getopt/getopt1.$(OBJEXT) - -rm -f getopt/getopt1.lo - -rm -f grabbag/alloc.$(OBJEXT) - -rm -f grabbag/alloc.lo - -rm -f grabbag/cuesheet.$(OBJEXT) - -rm -f grabbag/cuesheet.lo - -rm -f grabbag/file.$(OBJEXT) - -rm -f grabbag/file.lo - -rm -f grabbag/picture.$(OBJEXT) - -rm -f grabbag/picture.lo - -rm -f grabbag/replaygain.$(OBJEXT) - -rm -f grabbag/replaygain.lo - -rm -f grabbag/seektable.$(OBJEXT) - -rm -f grabbag/seektable.lo - -rm -f grabbag/snprintf.$(OBJEXT) - -rm -f grabbag/snprintf.lo - -rm -f replaygain_analysis/replaygain_analysis.$(OBJEXT) - -rm -f replaygain_analysis/replaygain_analysis.lo - -rm -f replaygain_synthesis/replaygain_synthesis_libreplaygain_synthesis_la-replaygain_synthesis.$(OBJEXT) - -rm -f replaygain_synthesis/replaygain_synthesis_libreplaygain_synthesis_la-replaygain_synthesis.lo - -rm -f utf8/charset.$(OBJEXT) - -rm -f utf8/charset.lo - -rm -f utf8/iconvert.$(OBJEXT) - -rm -f utf8/iconvert.lo - -rm -f utf8/utf8.$(OBJEXT) - -rm -f utf8/utf8.lo - -rm -f win_utf8_io/win_utf8_io.$(OBJEXT) - -rm -f win_utf8_io/win_utf8_io.lo + -rm -f getopt/*.$(OBJEXT) + -rm -f getopt/*.lo + -rm -f grabbag/*.$(OBJEXT) + -rm -f grabbag/*.lo + -rm -f replaygain_analysis/*.$(OBJEXT) + -rm -f replaygain_analysis/*.lo + -rm -f replaygain_synthesis/*.$(OBJEXT) + -rm -f replaygain_synthesis/*.lo + -rm -f utf8/*.$(OBJEXT) + -rm -f utf8/*.lo + -rm -f win_utf8_io/*.$(OBJEXT) + -rm -f win_utf8_io/*.lo distclean-compile: -rm -f *.tab.c @@ -593,26 +647,15 @@ clean-libtool: -rm -rf utf8/.libs utf8/_libs -rm -rf win_utf8_io/.libs win_utf8_io/_libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -624,15 +667,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -641,6 +680,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -794,18 +848,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am debug: diff --git a/lib-src/libflac/src/share/Makefile.lite b/lib-src/libflac/src/share/Makefile.lite index a9b56408a..c4558d607 100644 --- a/lib-src/libflac/src/share/Makefile.lite +++ b/lib-src/libflac/src/share/Makefile.lite @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -46,9 +46,13 @@ replaygain_synthesis: utf8: (cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG)) +win_utf8_io: + (cd $@ ; $(MAKE) -f Makefile.lite $(CONFIG)) + clean: -(cd getopt ; $(MAKE) -f Makefile.lite clean) -(cd grabbag ; $(MAKE) -f Makefile.lite clean) -(cd replaygain_analysis ; $(MAKE) -f Makefile.lite clean) -(cd replaygain_synthesis ; $(MAKE) -f Makefile.lite clean) -(cd utf8 ; $(MAKE) -f Makefile.lite clean) + -(cd win_utf8_io ; $(MAKE) -f Makefile.lite clean) diff --git a/lib-src/libflac/src/share/getopt/Makefile.lite b/lib-src/libflac/src/share/getopt/Makefile.lite index e36f341d3..b4df6ec6c 100644 --- a/lib-src/libflac/src/share/getopt/Makefile.lite +++ b/lib-src/libflac/src/share/getopt/Makefile.lite @@ -5,7 +5,7 @@ topdir = ../../.. LIB_NAME = libgetopt -INCLUDES = -I$(topdir)/include -I$(topdir)/include/share +INCLUDES = -I$(topdir)/include SRCS_C = \ getopt.c \ diff --git a/lib-src/libflac/src/share/getopt/getopt.c b/lib-src/libflac/src/share/getopt/getopt.c index 968bf2f5c..e8a13aa40 100644 --- a/lib-src/libflac/src/share/getopt/getopt.c +++ b/lib-src/libflac/src/share/getopt/getopt.c @@ -6,7 +6,7 @@ of code with the ELIDE_CODE #define is not accurate enough on systems that are POSIX but not glibc. If someone has a patch that works on GNU/Linux, Darwin, AND Solaris please submit it on the project page: - http://sourceforge.net/projects/flac + https://sourceforge.net/p/flac/patches/ In the meantime I have munged the global symbols and removed gates around code, while at the same time trying to touch the original as @@ -41,7 +41,7 @@ # define _NO_PROTO #endif -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/share/getopt/getopt1.c b/lib-src/libflac/src/share/getopt/getopt1.c index a4b639ab5..740e498b3 100644 --- a/lib-src/libflac/src/share/getopt/getopt1.c +++ b/lib-src/libflac/src/share/getopt/getopt1.c @@ -6,7 +6,7 @@ of code with the ELIDE_CODE #define is not accurate enough on systems that are POSIX but not glibc. If someone has a patch that works on GNU/Linux, Darwin, AND Solaris please submit it on the project page: - http://sourceforge.net/projects/flac + https://sourceforge.net/p/flac/patches/ In the meantime I have munged the global symbols and removed gates around code, while at the same time trying to touch the original as @@ -32,7 +32,7 @@ write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/share/getopt/getopt_static.vcproj b/lib-src/libflac/src/share/getopt/getopt_static.vcproj index 6f0c7a770..7a95af25b 100644 --- a/lib-src/libflac/src/share/getopt/getopt_static.vcproj +++ b/lib-src/libflac/src/share/getopt/getopt_static.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc80-c215-11db-8314-0800200c9a66} + getopt_static + Win32Proj + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/getopt/getopt_static.vcxproj.filters b/lib-src/libflac/src/share/getopt/getopt_static.vcxproj.filters new file mode 100644 index 000000000..b528a7df0 --- /dev/null +++ b/lib-src/libflac/src/share/getopt/getopt_static.vcxproj.filters @@ -0,0 +1,29 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {98dc8c56-677d-4f5b-9c7e-031634c635f0} + + + + + Source Files + + + Source Files + + + + + Public Header Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/grabbag/Makefile.lite b/lib-src/libflac/src/share/grabbag/Makefile.lite index 81f7d5c52..4eac54beb 100644 --- a/lib-src/libflac/src/share/grabbag/Makefile.lite +++ b/lib-src/libflac/src/share/grabbag/Makefile.lite @@ -7,9 +7,13 @@ libdir = $(topdir)/objs/$(BUILD)/lib ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lFLAC -lreplaygain_analysis -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lFLAC -lreplaygain_analysis $(OGG_LIBS) -lm endif +endif LIB_NAME = libgrabbag INCLUDES = -I$(topdir)/include @@ -20,7 +24,8 @@ SRCS_C = \ file.c \ picture.c \ replaygain.c \ - seektable.c + seektable.c \ + snprintf.c include $(topdir)/build/lib.mk diff --git a/lib-src/libflac/src/share/grabbag/alloc.c b/lib-src/libflac/src/share/grabbag/alloc.c index f514bd751..37d994057 100644 --- a/lib-src/libflac/src/share/grabbag/alloc.c +++ b/lib-src/libflac/src/share/grabbag/alloc.c @@ -1,6 +1,6 @@ /* alloc - Convenience routines for safely allocating memory * Copyright (C) 2007-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,6 +30,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include "share/alloc.h" diff --git a/lib-src/libflac/src/share/grabbag/cuesheet.c b/lib-src/libflac/src/share/grabbag/cuesheet.c index daa67c8fd..a6e4c68cc 100644 --- a/lib-src/libflac/src/share/grabbag/cuesheet.c +++ b/lib-src/libflac/src/share/grabbag/cuesheet.c @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -242,11 +242,6 @@ static char *local__get_field_(char **s, FLAC__bool allow_quotes) static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message, unsigned *last_line_read, FLAC__StreamMetadata *cuesheet, unsigned sample_rate, FLAC__bool is_cdda, FLAC__uint64 lead_out_offset) { -#if defined _MSC_VER || defined __MINGW32__ -#define FLAC__STRCASECMP stricmp -#else -#define FLAC__STRCASECMP strcasecmp -#endif char buffer[4096], *line, *field; unsigned forced_leadout_track_num = 0; FLAC__uint64 forced_leadout_track_offset = 0; @@ -590,7 +585,6 @@ static FLAC__bool local__cuesheet_parse_(FILE *file, const char **error_message, return false; } return true; -#undef FLAC__STRCASECMP } FLAC__StreamMetadata *grabbag__cuesheet_parse(FILE *file, const char **error_message, unsigned *last_line_read, unsigned sample_rate, FLAC__bool is_cdda, FLAC__uint64 lead_out_offset) diff --git a/lib-src/libflac/src/share/grabbag/file.c b/lib-src/libflac/src/share/grabbag/file.c index f92ff154f..73f7fca6b 100644 --- a/lib-src/libflac/src/share/grabbag/file.c +++ b/lib-src/libflac/src/share/grabbag/file.c @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/share/grabbag/grabbag_static.vcproj b/lib-src/libflac/src/share/grabbag/grabbag_static.vcproj index 284bbb852..bb707060f 100644 --- a/lib-src/libflac/src/share/grabbag/grabbag_static.vcproj +++ b/lib-src/libflac/src/share/grabbag/grabbag_static.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc81-c215-11db-8314-0800200c9a66} + grabbag_static + Win32Proj + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbc89-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/grabbag/grabbag_static.vcxproj.filters b/lib-src/libflac/src/share/grabbag/grabbag_static.vcxproj.filters new file mode 100644 index 000000000..421b6d518 --- /dev/null +++ b/lib-src/libflac/src/share/grabbag/grabbag_static.vcxproj.filters @@ -0,0 +1,62 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {d4e83ff0-6406-4b76-bd64-6192e6b8e47a} + + + {82df5da8-3a2c-402e-a7cd-a88de1a7be91} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Public Header Files + + + Public Header Files\grabbag + + + Public Header Files\grabbag + + + Public Header Files\grabbag + + + Public Header Files\grabbag + + + Public Header Files\grabbag + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/grabbag/picture.c b/lib-src/libflac/src/share/grabbag/picture.c index ef35bf41e..1bf96cfc8 100644 --- a/lib-src/libflac/src/share/grabbag/picture.c +++ b/lib-src/libflac/src/share/grabbag/picture.c @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2006-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/share/grabbag/replaygain.c b/lib-src/libflac/src/share/grabbag/replaygain.c index a5cdc1b8b..057309614 100644 --- a/lib-src/libflac/src/share/grabbag/replaygain.c +++ b/lib-src/libflac/src/share/grabbag/replaygain.c @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -129,7 +129,7 @@ FLAC__bool grabbag__replaygain_init(unsigned sample_frequency) FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__bool is_stereo, unsigned bps, unsigned samples) { /* using a small buffer improves data locality; we'd like it to fit easily in the dcache */ - static Float_t lbuffer[2048], rbuffer[2048]; + static flac_float_t lbuffer[2048], rbuffer[2048]; static const unsigned nbuffer = sizeof(lbuffer) / sizeof(lbuffer[0]); FLAC__int32 block_peak = 0, s; unsigned i, j; @@ -150,12 +150,12 @@ FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__ const unsigned n = local_min(samples, nbuffer); for(i = 0; i < n; i++, j++) { s = input[0][j]; - lbuffer[i] = (Float_t)s; + lbuffer[i] = (flac_float_t)s; s = abs(s); block_peak = local_max(block_peak, s); s = input[1][j]; - rbuffer[i] = (Float_t)s; + rbuffer[i] = (flac_float_t)s; s = abs(s); block_peak = local_max(block_peak, s); } @@ -170,7 +170,7 @@ FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__ const unsigned n = local_min(samples, nbuffer); for(i = 0; i < n; i++, j++) { s = input[0][j]; - lbuffer[i] = (Float_t)s; + lbuffer[i] = (flac_float_t)s; s = abs(s); block_peak = local_max(block_peak, s); } @@ -193,12 +193,12 @@ FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__ const unsigned n = local_min(samples, nbuffer); for(i = 0; i < n; i++, j++) { s = input[0][j]; - lbuffer[i] = (Float_t)(scale * (double)s); + lbuffer[i] = (flac_float_t)(scale * (double)s); s = abs(s); block_peak = local_max(block_peak, s); s = input[1][j]; - rbuffer[i] = (Float_t)(scale * (double)s); + rbuffer[i] = (flac_float_t)(scale * (double)s); s = abs(s); block_peak = local_max(block_peak, s); } @@ -213,7 +213,7 @@ FLAC__bool grabbag__replaygain_analyze(const FLAC__int32 * const input[], FLAC__ const unsigned n = local_min(samples, nbuffer); for(i = 0; i < n; i++, j++) { s = input[0][j]; - lbuffer[i] = (Float_t)(scale * (double)s); + lbuffer[i] = (flac_float_t)(scale * (double)s); s = abs(s); block_peak = local_max(block_peak, s); } @@ -503,7 +503,7 @@ static const char *store_to_file_post_(const char *filename, FLAC__Metadata_Chai const char *grabbag__replaygain_store_to_file(const char *filename, float album_gain, float album_peak, float title_gain, float title_peak, FLAC__bool preserve_modtime) { FLAC__Metadata_Chain *chain; - FLAC__StreamMetadata *block; + FLAC__StreamMetadata *block = NULL; const char *error; if(0 != (error = store_to_file_pre_(filename, &chain, &block))) @@ -523,7 +523,7 @@ const char *grabbag__replaygain_store_to_file(const char *filename, float album_ const char *grabbag__replaygain_store_to_file_reference(const char *filename, FLAC__bool preserve_modtime) { FLAC__Metadata_Chain *chain; - FLAC__StreamMetadata *block; + FLAC__StreamMetadata *block = NULL; const char *error; if(0 != (error = store_to_file_pre_(filename, &chain, &block))) @@ -543,7 +543,7 @@ const char *grabbag__replaygain_store_to_file_reference(const char *filename, FL const char *grabbag__replaygain_store_to_file_album(const char *filename, float album_gain, float album_peak, FLAC__bool preserve_modtime) { FLAC__Metadata_Chain *chain; - FLAC__StreamMetadata *block; + FLAC__StreamMetadata *block = NULL; const char *error; if(0 != (error = store_to_file_pre_(filename, &chain, &block))) @@ -563,7 +563,7 @@ const char *grabbag__replaygain_store_to_file_album(const char *filename, float const char *grabbag__replaygain_store_to_file_title(const char *filename, float title_gain, float title_peak, FLAC__bool preserve_modtime) { FLAC__Metadata_Chain *chain; - FLAC__StreamMetadata *block; + FLAC__StreamMetadata *block = NULL; const char *error; if(0 != (error = store_to_file_pre_(filename, &chain, &block))) @@ -623,7 +623,7 @@ FLAC__bool grabbag__replaygain_load_from_vorbiscomment(const FLAC__StreamMetadat /* * We need to save the old locale and switch to "C" because the locale - * influences the formatting of %f and we want it a certain way. + * influences the behaviour of strtod and we want it a certain way. */ saved_locale = strdup(setlocale(LC_ALL, 0)); if (0 == saved_locale) diff --git a/lib-src/libflac/src/share/grabbag/seektable.c b/lib-src/libflac/src/share/grabbag/seektable.c index 29a774a03..bc9a9b722 100644 --- a/lib-src/libflac/src/share/grabbag/seektable.c +++ b/lib-src/libflac/src/share/grabbag/seektable.c @@ -1,6 +1,6 @@ /* grabbag - Convenience lib for various routines common to several tools * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/share/grabbag/snprintf.c b/lib-src/libflac/src/share/grabbag/snprintf.c index a7d59d74e..fcae16230 100644 --- a/lib-src/libflac/src/share/grabbag/snprintf.c +++ b/lib-src/libflac/src/share/grabbag/snprintf.c @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2013 Xiph.org Foundation + * Copyright (C) 2013-2014 Xiph.org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -39,7 +39,7 @@ #include "share/compat.h" /* - * FLAC needs to compile and work correctly on systems with a norrmal ISO C99 + * FLAC needs to compile and work correctly on systems with a normal ISO C99 * snprintf as well as Microsoft Visual Studio which has an non-standards * conformant snprint_s function. * @@ -49,7 +49,7 @@ * does not over-write the end of the buffer. MS's snprintf_s in this case * returns -1. * - * The _MSC_VER code below attempts to modify the return code for snprintf_s + * The _MSC_VER code below attempts to modify the return code for vsnprintf_s * to something that is more compatible with the behaviour of the ISO C version. */ @@ -57,13 +57,18 @@ int flac_snprintf(char *str, size_t size, const char *fmt, ...) { va_list va; - int rc ; + int rc; va_start (va, fmt); -#ifdef _MSC_VER +#if defined _MSC_VER + if (size == 0) + return 1024; rc = vsnprintf_s (str, size, _TRUNCATE, fmt, va); - rc = (rc > 0) ? rc : (size == 0 ? 1024 : size * 2); + if (rc < 0) + rc = size - 1; +#elif defined __MINGW32__ + rc = __mingw_vsnprintf (str, size, fmt, va); #else rc = vsnprintf (str, size, fmt, va); #endif @@ -71,3 +76,23 @@ flac_snprintf(char *str, size_t size, const char *fmt, ...) return rc; } + +int +flac_vsnprintf(char *str, size_t size, const char *fmt, va_list va) +{ + int rc; + +#if defined _MSC_VER + if (size == 0) + return 1024; + rc = vsnprintf_s (str, size, _TRUNCATE, fmt, va); + if (rc < 0) + rc = size - 1; +#elif defined __MINGW32__ + rc = __mingw_vsnprintf (str, size, fmt, va); +#else + rc = vsnprintf (str, size, fmt, va); +#endif + + return rc; +} diff --git a/lib-src/libflac/src/share/replaygain_analysis/Makefile.lite b/lib-src/libflac/src/share/replaygain_analysis/Makefile.lite index 8c4c69826..4fa2cc90c 100644 --- a/lib-src/libflac/src/share/replaygain_analysis/Makefile.lite +++ b/lib-src/libflac/src/share/replaygain_analysis/Makefile.lite @@ -5,7 +5,7 @@ topdir = ../../.. LIB_NAME = libreplaygain_analysis -INCLUDES = -I$(topdir)/include/share +INCLUDES = -I$(topdir)/include SRCS_C = \ replaygain_analysis.c diff --git a/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis.c b/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis.c index 5faafc2cc..9c0528b43 100644 --- a/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis.c +++ b/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis.c @@ -38,8 +38,8 @@ * * to initialize everything. Call * - * AnalyzeSamples ( const Float_t* left_samples, - * const Float_t* right_samples, + * AnalyzeSamples ( const flac_float_t* left_samples, + * const flac_float_t* right_samples, * size_t num_samples, * int num_channels ); * @@ -59,8 +59,8 @@ * * Pseudo-code to process an album: * - * Float_t l_samples [4096]; - * Float_t r_samples [4096]; + * flac_float_t l_samples [4096]; + * flac_float_t r_samples [4096]; * size_t num_samples; * unsigned int num_songs; * unsigned int i; @@ -89,7 +89,7 @@ * Optimization/clarity suggestions are welcome. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -97,15 +97,10 @@ #include #include #include +#include "share/compat.h" +#include "share/replaygain_analysis.h" -#include "replaygain_analysis.h" - -Float_t ReplayGainReferenceLoudness = 89.0; /* in dB SPL */ - -typedef unsigned short Uint16_t; -typedef signed short Int16_t; -typedef unsigned int Uint32_t; -typedef signed int Int32_t; +flac_float_t ReplayGainReferenceLoudness = 89.0; /* in dB SPL */ #define YULE_ORDER 10 #define BUTTER_ORDER 2 @@ -117,29 +112,29 @@ typedef signed int Int32_t; #define MAX_ORDER (BUTTER_ORDER > YULE_ORDER ? BUTTER_ORDER : YULE_ORDER) #define PINK_REF 64.82 /* 298640883795 */ /* calibration value */ -static Float_t linprebuf [MAX_ORDER * 2]; -static Float_t* linpre; /* left input samples, with pre-buffer */ -static Float_t* lstepbuf; -static Float_t* lstep; /* left "first step" (i.e. post first filter) samples */ -static Float_t* loutbuf; -static Float_t* lout; /* left "out" (i.e. post second filter) samples */ -static Float_t rinprebuf [MAX_ORDER * 2]; -static Float_t* rinpre; /* right input samples ... */ -static Float_t* rstepbuf; -static Float_t* rstep; -static Float_t* routbuf; -static Float_t* rout; +static flac_float_t linprebuf [MAX_ORDER * 2]; +static flac_float_t* linpre; /* left input samples, with pre-buffer */ +static flac_float_t* lstepbuf; +static flac_float_t* lstep; /* left "first step" (i.e. post first filter) samples */ +static flac_float_t* loutbuf; +static flac_float_t* lout; /* left "out" (i.e. post second filter) samples */ +static flac_float_t rinprebuf [MAX_ORDER * 2]; +static flac_float_t* rinpre; /* right input samples ... */ +static flac_float_t* rstepbuf; +static flac_float_t* rstep; +static flac_float_t* routbuf; +static flac_float_t* rout; static unsigned int sampleWindow; /* number of samples required to reach number of milliseconds required for RMS window */ static unsigned long totsamp; static double lsum; static double rsum; #if 0 -static Uint32_t A [(size_t)(STEPS_per_dB * MAX_dB)]; -static Uint32_t B [(size_t)(STEPS_per_dB * MAX_dB)]; +static uint32_t A [(size_t)(STEPS_per_dB * MAX_dB)]; +static uint32_t B [(size_t)(STEPS_per_dB * MAX_dB)]; #else /* [JEC] Solaris Forte compiler doesn't like float calc in array indices */ -static Uint32_t A [120 * 100]; -static Uint32_t B [120 * 100]; +static uint32_t A [120 * 100]; +static uint32_t B [120 * 100]; #endif #ifdef _MSC_VER @@ -149,10 +144,10 @@ static Uint32_t B [120 * 100]; struct ReplayGainFilter { long rate; unsigned downsample; - Float_t BYule[YULE_ORDER+1]; - Float_t AYule[YULE_ORDER+1]; - Float_t BButter[BUTTER_ORDER+1]; - Float_t AButter[BUTTER_ORDER+1]; + flac_float_t BYule[YULE_ORDER+1]; + flac_float_t AYule[YULE_ORDER+1]; + flac_float_t BButter[BUTTER_ORDER+1]; + flac_float_t AButter[BUTTER_ORDER+1]; }; static struct ReplayGainFilter *replaygainfilter; @@ -273,17 +268,17 @@ static const struct ReplayGainFilter ReplayGainFilters[] = { /* When calling this procedure, make sure that ip[-order] and op[-order] point to real data! */ static void -filter ( const Float_t* input, Float_t* output, size_t nSamples, const Float_t* a, const Float_t* b, size_t order, unsigned downsample ) +filter ( const flac_float_t* input, flac_float_t* output, size_t nSamples, const flac_float_t* a, const flac_float_t* b, size_t order, unsigned downsample ) { double y; size_t i; size_t k; - const Float_t* input_head = input; - const Float_t* input_tail; + const flac_float_t* input_head = input; + const flac_float_t* input_tail; - Float_t* output_head = output; - Float_t* output_tail; + flac_float_t* output_head = output; + flac_float_t* output_tail; for ( i = 0; i < nSamples; i++, input_head += downsample, ++output_head ) { @@ -298,7 +293,7 @@ filter ( const Float_t* input, Float_t* output, size_t nSamples, const Float_t* y += *input_tail * b[k] - *output_tail * a[k]; } - output[i] = (Float_t)y; + output[i] = (flac_float_t)y; } } @@ -342,7 +337,7 @@ CreateGainFilter ( long samplefreq ) } static void* -ReallocateWindowBuffer(unsigned window_size, Float_t **window_buffer) +ReallocateWindowBuffer(unsigned window_size, flac_float_t **window_buffer) { void *p = realloc( *window_buffer, sizeof(**window_buffer) * (window_size + MAX_ORDER)); @@ -421,11 +416,11 @@ InitGainAnalysis ( long samplefreq ) /* returns GAIN_ANALYSIS_OK if successful, GAIN_ANALYSIS_ERROR if not */ int -AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size_t num_samples, int num_channels ) +AnalyzeSamples ( const flac_float_t* left_samples, const flac_float_t* right_samples, size_t num_samples, int num_channels ) { unsigned downsample = replaygainfilter->downsample; - const Float_t* curleft; - const Float_t* curright; + const flac_float_t* curleft; + const flac_float_t* curright; long prebufsamples; long batchsamples; long cursamples; @@ -491,10 +486,10 @@ AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size if ( ival >= (int)(sizeof(A)/sizeof(*A)) ) ival = (int)(sizeof(A)/sizeof(*A)) - 1; A [ival]++; lsum = rsum = 0.; - memmove ( loutbuf , loutbuf + totsamp, MAX_ORDER * sizeof(Float_t) ); - memmove ( routbuf , routbuf + totsamp, MAX_ORDER * sizeof(Float_t) ); - memmove ( lstepbuf, lstepbuf + totsamp, MAX_ORDER * sizeof(Float_t) ); - memmove ( rstepbuf, rstepbuf + totsamp, MAX_ORDER * sizeof(Float_t) ); + memmove ( loutbuf , loutbuf + totsamp, MAX_ORDER * sizeof(flac_float_t) ); + memmove ( routbuf , routbuf + totsamp, MAX_ORDER * sizeof(flac_float_t) ); + memmove ( lstepbuf, lstepbuf + totsamp, MAX_ORDER * sizeof(flac_float_t) ); + memmove ( rstepbuf, rstepbuf + totsamp, MAX_ORDER * sizeof(flac_float_t) ); totsamp = 0; } if ( totsamp > sampleWindow ) /* somehow I really screwed up: Error in programming! Contact author about totsamp > sampleWindow */ @@ -502,10 +497,10 @@ AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size } if ( num_samples < MAX_ORDER ) { - memmove ( linprebuf, linprebuf + num_samples, (MAX_ORDER-num_samples) * sizeof(Float_t) ); - memmove ( rinprebuf, rinprebuf + num_samples, (MAX_ORDER-num_samples) * sizeof(Float_t) ); - memcpy ( linprebuf + MAX_ORDER - num_samples, left_samples, num_samples * sizeof(Float_t) ); - memcpy ( rinprebuf + MAX_ORDER - num_samples, right_samples, num_samples * sizeof(Float_t) ); + memmove ( linprebuf, linprebuf + num_samples, (MAX_ORDER-num_samples) * sizeof(flac_float_t) ); + memmove ( rinprebuf, rinprebuf + num_samples, (MAX_ORDER-num_samples) * sizeof(flac_float_t) ); + memcpy ( linprebuf + MAX_ORDER - num_samples, left_samples, num_samples * sizeof(flac_float_t) ); + memcpy ( rinprebuf + MAX_ORDER - num_samples, right_samples, num_samples * sizeof(flac_float_t) ); } else { downsample = replaygainfilter->downsample; @@ -523,11 +518,11 @@ AnalyzeSamples ( const Float_t* left_samples, const Float_t* right_samples, size } -static Float_t -analyzeResult ( Uint32_t* Array, size_t len ) +static flac_float_t +analyzeResult ( uint32_t* Array, size_t len ) { - Uint32_t elems; - Int32_t upper; + uint32_t elems; + int32_t upper; size_t i; elems = 0; @@ -536,20 +531,25 @@ analyzeResult ( Uint32_t* Array, size_t len ) if ( elems == 0 ) return GAIN_NOT_ENOUGH_SAMPLES; - upper = (Int32_t) ceil (elems * (1. - RMS_PERCENTILE)); +/* workaround for GCC bug #61423: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61423 */ +#if 0 + upper = (int32_t) ceil (elems * (1. - RMS_PERCENTILE)); +#else + upper = (int32_t) (elems / 20 + ((elems % 20) ? 1 : 0)); +#endif for ( i = len; i-- > 0; ) { if ( (upper -= Array[i]) <= 0 ) break; } - return (Float_t) ((Float_t)PINK_REF - (Float_t)i / (Float_t)STEPS_per_dB); + return (flac_float_t) ((flac_float_t)PINK_REF - (flac_float_t)i / (flac_float_t)STEPS_per_dB); } -Float_t +flac_float_t GetTitleGain ( void ) { - Float_t retval; + flac_float_t retval; unsigned int i; retval = analyzeResult ( A, sizeof(A)/sizeof(*A) ); @@ -568,7 +568,7 @@ GetTitleGain ( void ) } -Float_t +flac_float_t GetAlbumGain ( void ) { return analyzeResult ( B, sizeof(B)/sizeof(*B) ); diff --git a/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis_static.vcproj b/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis_static.vcproj index 38846d9a5..152d82715 100644 --- a/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis_static.vcproj +++ b/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis_static.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc89-c215-11db-8314-0800200c9a66} + replaygain_analysis_static + Win32Proj + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + + + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis_static.vcxproj.filters b/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis_static.vcxproj.filters new file mode 100644 index 000000000..f1207d35d --- /dev/null +++ b/lib-src/libflac/src/share/replaygain_analysis/replaygain_analysis_static.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {9e16659d-14e5-4477-be88-76193fff5d31} + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Public Header Files + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/replaygain_synthesis/Makefile.lite b/lib-src/libflac/src/share/replaygain_synthesis/Makefile.lite index e58e70882..a944234a3 100644 --- a/lib-src/libflac/src/share/replaygain_synthesis/Makefile.lite +++ b/lib-src/libflac/src/share/replaygain_synthesis/Makefile.lite @@ -5,7 +5,7 @@ topdir = ../../.. LIB_NAME = libreplaygain_synthesis -INCLUDES = -I./include -I$(topdir)/include -I$(topdir)/include/share +INCLUDES = -I./include -I$(topdir)/include SRCS_C = \ replaygain_synthesis.c diff --git a/lib-src/libflac/src/share/replaygain_synthesis/include/private/fast_float_math_hack.h b/lib-src/libflac/src/share/replaygain_synthesis/include/private/fast_float_math_hack.h deleted file mode 100644 index d8608fc44..000000000 --- a/lib-src/libflac/src/share/replaygain_synthesis/include/private/fast_float_math_hack.h +++ /dev/null @@ -1,39 +0,0 @@ -# ifdef __ICL /* only Intel C compiler has fmath ??? */ - - #include - -/* Nearest integer, absolute value, etc. */ - - #define ceil ceilf - #define fabs fabsf - #define floor floorf - #define fmod fmodf - #define rint rintf - #define hypot hypotf - -/* Power functions */ - - #define pow powf - #define sqrt sqrtf - -/* Exponential and logarithmic functions */ - - #define exp expf - #define log logf - #define log10 log10f - -/* Trigonometric functions */ - - #define acos acosf - #define asin asinf - #define atan atanf - #define cos cosf - #define sin sinf - #define tan tanf - -/* Hyperbolic functions */ - #define cosh coshf - #define sinh sinhf - #define tanh tanhf - -# endif diff --git a/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis.c b/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis.c index 59a37e753..0224d04b6 100644 --- a/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis.c +++ b/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis.c @@ -1,6 +1,6 @@ /* replaygain_synthesis - Routines for applying ReplayGain to a signal * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,22 +35,16 @@ * Additional code by Magnus Holmgren and Gian-Carlo Pascutto */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #include /* for memset() */ #include -#include "private/fast_float_math_hack.h" -#include "replaygain_synthesis.h" +#include "share/replaygain_synthesis.h" #include "FLAC/assert.h" -/* adjust for compilers that can't understand using LL suffix for int64_t literals */ -#ifdef _MSC_VER -#define FLAC__I64L(x) x -#else #define FLAC__I64L(x) x##LL -#endif /* @@ -300,41 +294,6 @@ static FLAC__int64 dither_output_(DitherContext *d, FLAC__bool do_dithering, int size_t FLAC__replaygain_synthesis__apply_gain(FLAC__byte *data_out, FLAC__bool little_endian_data_out, FLAC__bool unsigned_data_out, const FLAC__int32 * const input[], unsigned wide_samples, unsigned channels, const unsigned source_bps, const unsigned target_bps, const double scale, const FLAC__bool hard_limit, FLAC__bool do_dithering, DitherContext *dither_context) { - static const FLAC__int32 conv_factors_[33] = { - -1, /* 0 bits-per-sample (not supported) */ - -1, /* 1 bits-per-sample (not supported) */ - -1, /* 2 bits-per-sample (not supported) */ - -1, /* 3 bits-per-sample (not supported) */ - 268435456, /* 4 bits-per-sample */ - 134217728, /* 5 bits-per-sample */ - 67108864, /* 6 bits-per-sample */ - 33554432, /* 7 bits-per-sample */ - 16777216, /* 8 bits-per-sample */ - 8388608, /* 9 bits-per-sample */ - 4194304, /* 10 bits-per-sample */ - 2097152, /* 11 bits-per-sample */ - 1048576, /* 12 bits-per-sample */ - 524288, /* 13 bits-per-sample */ - 262144, /* 14 bits-per-sample */ - 131072, /* 15 bits-per-sample */ - 65536, /* 16 bits-per-sample */ - 32768, /* 17 bits-per-sample */ - 16384, /* 18 bits-per-sample */ - 8192, /* 19 bits-per-sample */ - 4096, /* 20 bits-per-sample */ - 2048, /* 21 bits-per-sample */ - 1024, /* 22 bits-per-sample */ - 512, /* 23 bits-per-sample */ - 256, /* 24 bits-per-sample */ - 128, /* 25 bits-per-sample */ - 64, /* 26 bits-per-sample */ - 32, /* 27 bits-per-sample */ - 16, /* 28 bits-per-sample */ - 8, /* 29 bits-per-sample */ - 4, /* 30 bits-per-sample */ - 2, /* 31 bits-per-sample */ - 1 /* 32 bits-per-sample */ - }; static const FLAC__int64 hard_clip_factors_[33] = { 0, /* 0 bits-per-sample (not supported) */ 0, /* 1 bits-per-sample (not supported) */ @@ -370,7 +329,7 @@ size_t FLAC__replaygain_synthesis__apply_gain(FLAC__byte *data_out, FLAC__bool l -1073741824, /* 31 bits-per-sample */ (FLAC__int64)(-1073741824) * 2 /* 32 bits-per-sample */ }; - const FLAC__int32 conv_factor = conv_factors_[target_bps]; + const FLAC__int32 conv_shift = 32 - target_bps; const FLAC__int64 hard_clip_factor = hard_clip_factors_[target_bps]; /* * The integer input coming in has a varying range based on the @@ -413,9 +372,9 @@ size_t FLAC__replaygain_synthesis__apply_gain(FLAC__byte *data_out, FLAC__bool l else if(sample > 0.5) sample = tanh((sample - 0.5) / (1-0.5)) * (1-0.5) + 0.5; } - sample *= 2147483647.f; + sample *= 2147483647.; - val64 = dither_output_(dither_context, do_dithering, noise_shaping, (i + last_history_index) % 32, sample, channel) / conv_factor; + val64 = dither_output_(dither_context, do_dithering, noise_shaping, (i + last_history_index) % 32, sample, channel) >> conv_shift; val32 = (FLAC__int32)val64; if(val64 >= -hard_clip_factor) diff --git a/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj b/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj index 6c50b1e04..1e28a9b39 100644 --- a/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj +++ b/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj @@ -17,8 +17,8 @@ - - + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc8a-c215-11db-8314-0800200c9a66} + replaygain_synthesis_static + Win32Proj + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + + + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis_static.vcxproj.filters b/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis_static.vcxproj.filters new file mode 100644 index 000000000..ace3776b4 --- /dev/null +++ b/lib-src/libflac/src/share/replaygain_synthesis/replaygain_synthesis_static.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {47ae72f8-630b-4044-b8ce-f4d560d70f4f} + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Public Header Files + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/utf8/Makefile.lite b/lib-src/libflac/src/share/utf8/Makefile.lite index 914173539..ad504921b 100644 --- a/lib-src/libflac/src/share/utf8/Makefile.lite +++ b/lib-src/libflac/src/share/utf8/Makefile.lite @@ -13,7 +13,7 @@ else LIBS = -lgrabbag $(ICONV_LIBS) endif -INCLUDES = -I$(topdir)/include -I$(topdir)/include/share +INCLUDES = -I$(topdir)/include SRCS_C = \ charset.c \ diff --git a/lib-src/libflac/src/share/utf8/charset.c b/lib-src/libflac/src/share/utf8/charset.c index cfde5621d..3e8d8ec2d 100644 --- a/lib-src/libflac/src/share/utf8/charset.c +++ b/lib-src/libflac/src/share/utf8/charset.c @@ -27,7 +27,7 @@ * 8-bit char, 16-bit short and 32-bit int. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -56,7 +56,7 @@ static int ascii_strcasecmp(const char *s1, const char *s2) char c1, c2; for (;; s1++, s2++) { - if (!*s1 || !*s1) + if (!*s1 || !*s2) break; if (*s1 == *s2) continue; diff --git a/lib-src/libflac/src/share/utf8/charset_test.c b/lib-src/libflac/src/share/utf8/charset_test.c index 82b6b3f2f..461677e08 100644 --- a/lib-src/libflac/src/share/utf8/charset_test.c +++ b/lib-src/libflac/src/share/utf8/charset_test.c @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/share/utf8/iconvert.c b/lib-src/libflac/src/share/utf8/iconvert.c index d52deab56..f76c18b1a 100644 --- a/lib-src/libflac/src/share/utf8/iconvert.c +++ b/lib-src/libflac/src/share/utf8/iconvert.c @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/share/utf8/iconvert.h b/lib-src/libflac/src/share/utf8/iconvert.h index 2da8f5088..c0bcd80b6 100644 --- a/lib-src/libflac/src/share/utf8/iconvert.h +++ b/lib-src/libflac/src/share/utf8/iconvert.h @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/share/utf8/makemap.c b/lib-src/libflac/src/share/utf8/makemap.c index bd3a5c291..e3dab3e88 100644 --- a/lib-src/libflac/src/share/utf8/makemap.c +++ b/lib-src/libflac/src/share/utf8/makemap.c @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/share/utf8/utf8.c b/lib-src/libflac/src/share/utf8/utf8.c index 18495fefc..fbac9323c 100644 --- a/lib-src/libflac/src/share/utf8/utf8.c +++ b/lib-src/libflac/src/share/utf8/utf8.c @@ -23,7 +23,7 @@ * Convert a string between UTF-8 and the locale's charset. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -32,7 +32,7 @@ #include "share/alloc.h" #include "share/safe_str.h" -#include "utf8.h" +#include "share/utf8.h" #include "charset.h" diff --git a/lib-src/libflac/src/share/utf8/utf8_static.vcproj b/lib-src/libflac/src/share/utf8/utf8_static.vcproj index 9fe4f8aac..9f8781090 100644 --- a/lib-src/libflac/src/share/utf8/utf8_static.vcproj +++ b/lib-src/libflac/src/share/utf8/utf8_static.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc92-c215-11db-8314-0800200c9a66} + utf8_static + Win32Proj + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/utf8/utf8_static.vcxproj.filters b/lib-src/libflac/src/share/utf8/utf8_static.vcxproj.filters new file mode 100644 index 000000000..78ba12b6a --- /dev/null +++ b/lib-src/libflac/src/share/utf8/utf8_static.vcxproj.filters @@ -0,0 +1,41 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {c96e2c5d-a952-4c1d-b3d7-294a5b216154} + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + Public Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/win_utf8_io/win_utf8_io.c b/lib-src/libflac/src/share/win_utf8_io/win_utf8_io.c index af4912b72..ceb535330 100644 --- a/lib-src/libflac/src/share/win_utf8_io/win_utf8_io.c +++ b/lib-src/libflac/src/share/win_utf8_io/win_utf8_io.c @@ -1,5 +1,5 @@ /* libFLAC - Free Lossless Audio Codec library - * Copyright (C) 2013 Xiph.Org Foundation + * Copyright (C) 2013-2014 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -40,11 +40,32 @@ #include #include #include +#define WIN32_LEAN_AND_MEAN #include /* for WideCharToMultiByte and MultiByteToWideChar */ -#include "share/compat.h" #include "share/win_utf8_io.h" -#include "share/compat.h" + +#define UTF8_BUFFER_SIZE 32768 + +static +int local_vsnprintf(char *str, size_t size, const char *fmt, va_list va) +{ + int rc; + +#if defined _MSC_VER + if (size == 0) + return 1024; + rc = vsnprintf_s (str, size, _TRUNCATE, fmt, va); + if (rc < 0) + rc = size - 1; +#elif defined __MINGW32__ + rc = __mingw_vsnprintf (str, size, fmt, va); +#else + rc = vsnprintf (str, size, fmt, va); +#endif + + return rc; +} static UINT win_utf8_io_codepage = CP_ACP; @@ -90,8 +111,8 @@ wchar_t *wchar_from_utf8(const char *str) /* retrieve WCHAR commandline, expand wildcards and convert everything to UTF-8 */ int get_utf8_argv(int *argc, char ***argv) { - typedef int (__cdecl *__wgetmainargs_)(int*, wchar_t***, wchar_t***, int, int*); - __wgetmainargs_ __wgetmainargs; + typedef int (__cdecl *wgetmainargs_t)(int*, wchar_t***, wchar_t***, int, int*); + wgetmainargs_t wgetmainargs; HMODULE handle; int wargc; wchar_t **wargv; @@ -100,10 +121,11 @@ int get_utf8_argv(int *argc, char ***argv) int ret, i; if ((handle = LoadLibrary("msvcrt.dll")) == NULL) return 1; - if ((__wgetmainargs = (__wgetmainargs_)GetProcAddress(handle, "__wgetmainargs")) == NULL) return 1; + if ((wgetmainargs = (wgetmainargs_t)GetProcAddress(handle, "__wgetmainargs")) == NULL) return 1; i = 0; - if (__wgetmainargs(&wargc, &wargv, &wenv, 1, &i) != 0) return 1; - if ((utf8argv = (char **)malloc(wargc*sizeof(char*))) == NULL) return 1; + /* if __wgetmainargs expands wildcards then it also erroneously converts \\?\c:\path\to\file.flac to \\file.flac */ + if (wgetmainargs(&wargc, &wargv, &wenv, 1, &i) != 0) return 1; + if ((utf8argv = (char **)calloc(wargc, sizeof(char*))) == NULL) return 1; ret = 0; for (i=0; i @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbe02-c215-11db-8314-0800200c9a66} + win_utf8_io_static + Win32Proj + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + Disabled + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + + + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/share/win_utf8_io/win_utf8_io_static.vcxproj.filters b/lib-src/libflac/src/share/win_utf8_io/win_utf8_io_static.vcxproj.filters new file mode 100644 index 000000000..e44a0c7aa --- /dev/null +++ b/lib-src/libflac/src/share/win_utf8_io/win_utf8_io_static.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {6469e7f2-0837-4004-9f36-27d45ed62336} + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Public Header Files + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_grabbag/Makefile.am b/lib-src/libflac/src/test_grabbag/Makefile.am index faf6590b8..eef3985c7 100644 --- a/lib-src/libflac/src/test_grabbag/Makefile.am +++ b/lib-src/libflac/src/test_grabbag/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/src/test_grabbag/Makefile.in b/lib-src/libflac/src/test_grabbag/Makefile.in index a8f2326df..2d618e33a 100644 --- a/lib-src/libflac/src/test_grabbag/Makefile.in +++ b/lib-src/libflac/src/test_grabbag/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/test_grabbag -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +144,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -298,7 +351,7 @@ EXTRA_DIST = \ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -323,9 +376,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -336,22 +389,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -366,57 +422,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -432,12 +443,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -449,15 +455,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -466,6 +468,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -626,22 +643,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/test_grabbag/Makefile.lite b/lib-src/libflac/src/test_grabbag/Makefile.lite index c09bdeab1..be80d48a8 100644 --- a/lib-src/libflac/src/test_grabbag/Makefile.lite +++ b/lib-src/libflac/src/test_grabbag/Makefile.lite @@ -1,6 +1,6 @@ # test_grabbag - Simple testers for the grabbag library # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.am b/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.am index a7fc5c50b..9241dd618 100644 --- a/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.am +++ b/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.am @@ -1,6 +1,6 @@ # test_cuesheet - Simple tester for cuesheet routines in grabbag # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_cuesheet.vcproj + test_cuesheet.vcproj \ + test_cuesheet.vcxproj \ + test_cuesheet.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = test_cuesheet diff --git a/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.in b/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.in index b485c51d0..34cc407bc 100644 --- a/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.in +++ b/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # test_cuesheet - Simple tester for cuesheet routines in grabbag # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = test_cuesheet$(EXEEXT) subdir = src/test_grabbag/cuesheet -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -98,6 +128,19 @@ test_cuesheet_DEPENDENCIES = \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -110,20 +153,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(test_cuesheet_SOURCES) DIST_SOURCES = $(test_cuesheet_SOURCES) am__can_run_installinfo = \ @@ -131,6 +170,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -171,7 +227,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -191,8 +246,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -287,7 +340,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ - test_cuesheet.vcproj + test_cuesheet.vcproj \ + test_cuesheet.vcxproj \ + test_cuesheet.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include test_cuesheet_SOURCES = \ @@ -303,7 +358,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -328,9 +383,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -342,6 +397,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test_cuesheet$(EXEEXT): $(test_cuesheet_OBJECTS) $(test_cuesheet_DEPENDENCIES) $(EXTRA_test_cuesheet_DEPENDENCIES) @rm -f test_cuesheet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_cuesheet_OBJECTS) $(test_cuesheet_LDADD) $(LIBS) @@ -384,26 +440,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -415,15 +460,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -432,6 +473,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -574,18 +630,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.lite b/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.lite index df40536eb..1808d274a 100644 --- a/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.lite +++ b/lib-src/libflac/src/test_grabbag/cuesheet/Makefile.lite @@ -1,6 +1,6 @@ # test_cuesheet - Simple tester for cuesheet routines in grabbag # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I./include -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lgrabbag -lreplaygain_analysis -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_C = \ main.c diff --git a/lib-src/libflac/src/test_grabbag/cuesheet/main.c b/lib-src/libflac/src/test_grabbag/cuesheet/main.c index 3ab23f200..0e3c91620 100644 --- a/lib-src/libflac/src/test_grabbag/cuesheet/main.c +++ b/lib-src/libflac/src/test_grabbag/cuesheet/main.c @@ -1,6 +1,6 @@ /* test_cuesheet - Simple tester for cuesheet routines in grabbag * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/test_grabbag/cuesheet/test_cuesheet.vcproj b/lib-src/libflac/src/test_grabbag/cuesheet/test_cuesheet.vcproj index 0d72363c1..8644a23b7 100644 --- a/lib-src/libflac/src/test_grabbag/cuesheet/test_cuesheet.vcproj +++ b/lib-src/libflac/src/test_grabbag/cuesheet/test_cuesheet.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc8b-c215-11db-8314-0800200c9a66} + test_cuesheet + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + {4cefbc81-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_grabbag/cuesheet/test_cuesheet.vcxproj.filters b/lib-src/libflac/src/test_grabbag/cuesheet/test_cuesheet.vcxproj.filters new file mode 100644 index 000000000..5c9040b89 --- /dev/null +++ b/lib-src/libflac/src/test_grabbag/cuesheet/test_cuesheet.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_grabbag/picture/Makefile.am b/lib-src/libflac/src/test_grabbag/picture/Makefile.am index 677fe5c0e..135a33611 100644 --- a/lib-src/libflac/src/test_grabbag/picture/Makefile.am +++ b/lib-src/libflac/src/test_grabbag/picture/Makefile.am @@ -1,6 +1,6 @@ # test_picture - Simple tester for picture routines in grabbag # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_picture.vcproj + test_picture.vcproj \ + test_picture.vcxproj \ + test_picture.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = test_picture diff --git a/lib-src/libflac/src/test_grabbag/picture/Makefile.in b/lib-src/libflac/src/test_grabbag/picture/Makefile.in index 312e8fbeb..a1908fd75 100644 --- a/lib-src/libflac/src/test_grabbag/picture/Makefile.in +++ b/lib-src/libflac/src/test_grabbag/picture/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # test_picture - Simple tester for picture routines in grabbag # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = test_picture$(EXEEXT) subdir = src/test_grabbag/picture -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -97,6 +127,19 @@ test_picture_DEPENDENCIES = \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -109,20 +152,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(test_picture_SOURCES) DIST_SOURCES = $(test_picture_SOURCES) am__can_run_installinfo = \ @@ -130,6 +169,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -170,7 +226,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -190,8 +245,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -286,7 +339,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ - test_picture.vcproj + test_picture.vcproj \ + test_picture.vcxproj \ + test_picture.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include test_picture_SOURCES = \ @@ -301,7 +356,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -326,9 +381,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -340,6 +395,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test_picture$(EXEEXT): $(test_picture_OBJECTS) $(test_picture_DEPENDENCIES) $(EXTRA_test_picture_DEPENDENCIES) @rm -f test_picture$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_picture_OBJECTS) $(test_picture_LDADD) $(LIBS) @@ -382,26 +438,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -413,15 +458,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -430,6 +471,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -572,18 +628,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/test_grabbag/picture/Makefile.lite b/lib-src/libflac/src/test_grabbag/picture/Makefile.lite index a95fc530d..0ad17bce2 100644 --- a/lib-src/libflac/src/test_grabbag/picture/Makefile.lite +++ b/lib-src/libflac/src/test_grabbag/picture/Makefile.lite @@ -1,6 +1,6 @@ # test_picture - Simple tester for picture routines in grabbag # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I./include -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lgrabbag -lreplaygain_analysis -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lgrabbag -lreplaygain_analysis -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_C = \ main.c diff --git a/lib-src/libflac/src/test_grabbag/picture/main.c b/lib-src/libflac/src/test_grabbag/picture/main.c index f7348192d..ea7ad7289 100644 --- a/lib-src/libflac/src/test_grabbag/picture/main.c +++ b/lib-src/libflac/src/test_grabbag/picture/main.c @@ -1,6 +1,6 @@ /* test_picture - Simple tester for picture routines in grabbag * Copyright (C) 2006-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/test_grabbag/picture/test_picture.vcproj b/lib-src/libflac/src/test_grabbag/picture/test_picture.vcproj index 6f73d078e..1ada2edb8 100644 --- a/lib-src/libflac/src/test_grabbag/picture/test_picture.vcproj +++ b/lib-src/libflac/src/test_grabbag/picture/test_picture.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc8f-c215-11db-8314-0800200c9a66} + test_picture + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + {4cefbc81-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_grabbag/picture/test_picture.vcxproj.filters b/lib-src/libflac/src/test_grabbag/picture/test_picture.vcxproj.filters new file mode 100644 index 000000000..5c9040b89 --- /dev/null +++ b/lib-src/libflac/src/test_grabbag/picture/test_picture.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_libFLAC++/Makefile.am b/lib-src/libflac/src/test_libFLAC++/Makefile.am index 281557d07..92127ac46 100644 --- a/lib-src/libflac/src/test_libFLAC++/Makefile.am +++ b/lib-src/libflac/src/test_libFLAC++/Makefile.am @@ -1,6 +1,6 @@ # test_libFLAC++ - Unit tester for libFLAC++ # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_libFLAC++.vcproj + test_libFLAC++.vcproj \ + test_libFLAC++.vcxproj \ + test_libFLAC++.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = test_libFLAC++ diff --git a/lib-src/libflac/src/test_libFLAC++/Makefile.in b/lib-src/libflac/src/test_libFLAC++/Makefile.in index fa2028e55..77e552b4e 100644 --- a/lib-src/libflac/src/test_libFLAC++/Makefile.in +++ b/lib-src/libflac/src/test_libFLAC++/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # test_libFLAC++ - Unit tester for libFLAC++ # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = test_libFLAC++$(EXEEXT) subdir = src/test_libFLAC++ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -102,6 +132,19 @@ test_libFLAC___DEPENDENCIES = \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -114,17 +157,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) AM_V_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -133,17 +175,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(test_libFLAC___SOURCES) DIST_SOURCES = $(test_libFLAC___SOURCES) am__can_run_installinfo = \ @@ -151,6 +192,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -191,7 +249,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -211,8 +268,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -307,7 +362,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ - test_libFLAC++.vcproj + test_libFLAC++.vcproj \ + test_libFLAC++.vcxproj \ + test_libFLAC++.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include test_libFLAC___LDADD = \ @@ -335,7 +392,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .cpp .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -360,9 +417,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -374,6 +431,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test_libFLAC++$(EXEEXT): $(test_libFLAC___OBJECTS) $(test_libFLAC___DEPENDENCIES) $(EXTRA_test_libFLAC___DEPENDENCIES) @rm -f test_libFLAC++$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(test_libFLAC___OBJECTS) $(test_libFLAC___LDADD) $(LIBS) @@ -421,26 +479,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -452,15 +499,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -469,6 +512,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -611,18 +669,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/test_libFLAC++/Makefile.lite b/lib-src/libflac/src/test_libFLAC++/Makefile.lite index b8ea0beed..c0b43dbfc 100644 --- a/lib-src/libflac/src/test_libFLAC++/Makefile.lite +++ b/lib-src/libflac/src/test_libFLAC++/Makefile.lite @@ -1,6 +1,6 @@ # test_libFLAC++ - Unit tester for libFLAC++ # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libtest_libs_common.a $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC++ -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_CPP = \ decoders.cpp \ diff --git a/lib-src/libflac/src/test_libFLAC++/decoders.cpp b/lib-src/libflac/src/test_libFLAC++/decoders.cpp index 23a677821..3decc08d3 100644 --- a/lib-src/libflac/src/test_libFLAC++/decoders.cpp +++ b/lib-src/libflac/src/test_libFLAC++/decoders.cpp @@ -1,6 +1,6 @@ /* test_libFLAC++ - Unit tester for libFLAC++ * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -125,6 +125,7 @@ public: bool error_occurred_; DecoderCommon(Layer layer): layer_(layer), current_metadata_number_(0), ignore_errors_(false), error_occurred_(false) { } + virtual ~DecoderCommon(void) { } ::FLAC__StreamDecoderWriteStatus common_write_callback_(const ::FLAC__Frame *frame); void common_metadata_callback_(const ::FLAC__StreamMetadata *metadata); void common_error_callback_(::FLAC__StreamDecoderErrorStatus status); @@ -193,6 +194,9 @@ public: void error_callback(::FLAC__StreamDecoderErrorStatus status); bool test_respond(bool is_ogg); +private: + StreamDecoder(const StreamDecoder&); + StreamDecoder&operator=(const StreamDecoder&); }; ::FLAC__StreamDecoderReadStatus StreamDecoder::read_callback(FLAC__byte buffer[], size_t *bytes) diff --git a/lib-src/libflac/src/test_libFLAC++/decoders.h b/lib-src/libflac/src/test_libFLAC++/decoders.h index ed0c51b0f..6b47ebf5c 100644 --- a/lib-src/libflac/src/test_libFLAC++/decoders.h +++ b/lib-src/libflac/src/test_libFLAC++/decoders.h @@ -1,6 +1,6 @@ /* test_libFLAC++ - Unit tester for libFLAC++ * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/test_libFLAC++/encoders.cpp b/lib-src/libflac/src/test_libFLAC++/encoders.cpp index 309d7afba..ddd5a6e70 100644 --- a/lib-src/libflac/src/test_libFLAC++/encoders.cpp +++ b/lib-src/libflac/src/test_libFLAC++/encoders.cpp @@ -1,6 +1,6 @@ /* test_libFLAC++ - Unit tester for libFLAC++ * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,6 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "encoders.h" #include "FLAC/assert.h" #include "FLAC++/encoder.h" @@ -31,6 +35,11 @@ extern "C" { #include #include "share/compat.h" +#ifdef _MSC_VER +// warning C4800: 'int' : forcing to bool 'true' or 'false' (performance warning) +#pragma warning ( disable : 4800 ) +#endif + typedef enum { LAYER_STREAM = 0, /* FLAC__stream_encoder_init_stream() without seeking */ LAYER_SEEKABLE_STREAM, /* FLAC__stream_encoder_init_stream() with seeking */ @@ -102,6 +111,9 @@ public: ::FLAC__StreamEncoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset); ::FLAC__StreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset); void metadata_callback(const ::FLAC__StreamMetadata *metadata); +private: + StreamEncoder(const StreamEncoder&); + StreamEncoder&operator=(const StreamEncoder&); }; ::FLAC__StreamEncoderReadStatus StreamEncoder::read_callback(FLAC__byte buffer[], size_t *bytes) diff --git a/lib-src/libflac/src/test_libFLAC++/encoders.h b/lib-src/libflac/src/test_libFLAC++/encoders.h index 53ae5f915..90f4c9c5e 100644 --- a/lib-src/libflac/src/test_libFLAC++/encoders.h +++ b/lib-src/libflac/src/test_libFLAC++/encoders.h @@ -1,6 +1,6 @@ /* test_libFLAC++ - Unit tester for libFLAC++ * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/test_libFLAC++/main.cpp b/lib-src/libflac/src/test_libFLAC++/main.cpp index 78301b26c..ab4838f31 100644 --- a/lib-src/libflac/src/test_libFLAC++/main.cpp +++ b/lib-src/libflac/src/test_libFLAC++/main.cpp @@ -1,6 +1,6 @@ /* test_libFLAC++ - Unit tester for libFLAC++ * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,6 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "decoders.h" #include "encoders.h" #include "metadata.h" diff --git a/lib-src/libflac/src/test_libFLAC++/metadata.cpp b/lib-src/libflac/src/test_libFLAC++/metadata.cpp index 745676290..c8280fe49 100644 --- a/lib-src/libflac/src/test_libFLAC++/metadata.cpp +++ b/lib-src/libflac/src/test_libFLAC++/metadata.cpp @@ -1,6 +1,6 @@ /* test_libFLAC++ - Unit tester for libFLAC++ * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,6 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "metadata.h" #include diff --git a/lib-src/libflac/src/test_libFLAC++/metadata.h b/lib-src/libflac/src/test_libFLAC++/metadata.h index d057fd092..252e05038 100644 --- a/lib-src/libflac/src/test_libFLAC++/metadata.h +++ b/lib-src/libflac/src/test_libFLAC++/metadata.h @@ -1,6 +1,6 @@ /* test_libFLAC++ - Unit tester for libFLAC++ * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/test_libFLAC++/metadata_manip.cpp b/lib-src/libflac/src/test_libFLAC++/metadata_manip.cpp index afb79a435..336fdd700 100644 --- a/lib-src/libflac/src/test_libFLAC++/metadata_manip.cpp +++ b/lib-src/libflac/src/test_libFLAC++/metadata_manip.cpp @@ -1,6 +1,6 @@ /* test_libFLAC++ - Unit tester for libFLAC++ * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/test_libFLAC++/metadata_object.cpp b/lib-src/libflac/src/test_libFLAC++/metadata_object.cpp index 7e5ae20c5..eb36dd3b5 100644 --- a/lib-src/libflac/src/test_libFLAC++/metadata_object.cpp +++ b/lib-src/libflac/src/test_libFLAC++/metadata_object.cpp @@ -1,6 +1,6 @@ /* test_libFLAC++ - Unit tester for libFLAC++ * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,6 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include /* for malloc() */ #include /* for memcmp() */ diff --git a/lib-src/libflac/src/test_libFLAC++/test_libFLAC++.vcproj b/lib-src/libflac/src/test_libFLAC++/test_libFLAC++.vcproj index 46e44c731..0c8e55c59 100644 --- a/lib-src/libflac/src/test_libFLAC++/test_libFLAC++.vcproj +++ b/lib-src/libflac/src/test_libFLAC++/test_libFLAC++.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc8d-c215-11db-8314-0800200c9a66} + test_libFLAC++ + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + + + + + + + + + + + {4cefbc86-c215-11db-8314-0800200c9a66} + false + + + {4cefbc81-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + {4cefbc8e-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_libFLAC++/test_libFLAC++.vcxproj.filters b/lib-src/libflac/src/test_libFLAC++/test_libFLAC++.vcxproj.filters new file mode 100644 index 000000000..f11af8d60 --- /dev/null +++ b/lib-src/libflac/src/test_libFLAC++/test_libFLAC++.vcxproj.filters @@ -0,0 +1,44 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_libFLAC/Makefile.am b/lib-src/libflac/src/test_libFLAC/Makefile.am index d82651f1b..b1bab0294 100644 --- a/lib-src/libflac/src/test_libFLAC/Makefile.am +++ b/lib-src/libflac/src/test_libFLAC/Makefile.am @@ -1,6 +1,6 @@ # test_libFLAC - Unit tester for libFLAC # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_libFLAC.vcproj + test_libFLAC.vcproj \ + test_libFLAC.vcxproj \ + test_libFLAC.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src/libFLAC/include @@ -40,15 +42,19 @@ test_libFLAC_SOURCES = \ bitwriter.c \ decoders.c \ encoders.c \ + endswap.c \ format.c \ main.c \ metadata.c \ metadata_manip.c \ metadata_object.c \ + md5.c \ bitwriter.h \ decoders.h \ encoders.h \ + endswap.h \ format.h \ - metadata.h + metadata.h \ + md5.h CLEANFILES = test_libFLAC.exe diff --git a/lib-src/libflac/src/test_libFLAC/Makefile.in b/lib-src/libflac/src/test_libFLAC/Makefile.in index e85f2ec96..e7057178e 100644 --- a/lib-src/libflac/src/test_libFLAC/Makefile.in +++ b/lib-src/libflac/src/test_libFLAC/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # test_libFLAC - Unit tester for libFLAC # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = test_libFLAC$(EXEEXT) subdir = src/test_libFLAC -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -90,9 +120,9 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) am_test_libFLAC_OBJECTS = bitwriter.$(OBJEXT) decoders.$(OBJEXT) \ - encoders.$(OBJEXT) format.$(OBJEXT) main.$(OBJEXT) \ - metadata.$(OBJEXT) metadata_manip.$(OBJEXT) \ - metadata_object.$(OBJEXT) + encoders.$(OBJEXT) endswap.$(OBJEXT) format.$(OBJEXT) \ + main.$(OBJEXT) metadata.$(OBJEXT) metadata_manip.$(OBJEXT) \ + metadata_object.$(OBJEXT) md5.$(OBJEXT) test_libFLAC_OBJECTS = $(am_test_libFLAC_OBJECTS) test_libFLAC_DEPENDENCIES = \ $(top_builddir)/src/share/grabbag/libgrabbag.la \ @@ -102,6 +132,19 @@ test_libFLAC_DEPENDENCIES = \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -114,20 +157,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(test_libFLAC_SOURCES) DIST_SOURCES = $(test_libFLAC_SOURCES) am__can_run_installinfo = \ @@ -135,6 +174,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -175,7 +231,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -195,8 +250,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -291,7 +344,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ - test_libFLAC.vcproj + test_libFLAC.vcproj \ + test_libFLAC.vcxproj \ + test_libFLAC.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src/libFLAC/include @OS_IS_WINDOWS_TRUE@win_utf8_lib = $(top_builddir)/src/share/win_utf8_io/libwin_utf8_io.la @@ -307,23 +362,27 @@ test_libFLAC_SOURCES = \ bitwriter.c \ decoders.c \ encoders.c \ + endswap.c \ format.c \ main.c \ metadata.c \ metadata_manip.c \ metadata_object.c \ + md5.c \ bitwriter.h \ decoders.h \ encoders.h \ + endswap.h \ format.h \ - metadata.h + metadata.h \ + md5.h CLEANFILES = test_libFLAC.exe all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -348,9 +407,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -362,6 +421,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test_libFLAC$(EXEEXT): $(test_libFLAC_OBJECTS) $(test_libFLAC_DEPENDENCIES) $(EXTRA_test_libFLAC_DEPENDENCIES) @rm -f test_libFLAC$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_libFLAC_OBJECTS) $(test_libFLAC_LDADD) $(LIBS) @@ -375,8 +435,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitwriter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decoders.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/encoders.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/endswap.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/format.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata_manip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metadata_object.Po@am__quote@ @@ -411,26 +473,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -442,15 +493,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -459,6 +506,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -601,18 +663,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/test_libFLAC/Makefile.lite b/lib-src/libflac/src/test_libFLAC/Makefile.lite index 42e9dce16..be7c595ca 100644 --- a/lib-src/libflac/src/test_libFLAC/Makefile.lite +++ b/lib-src/libflac/src/test_libFLAC/Makefile.lite @@ -1,6 +1,6 @@ # test_libFLAC - Unit tester for libFLAC # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,16 +29,22 @@ INCLUDES = -I../libFLAC/include -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libgrabbag.a $(libdir)/libreplaygain_analysis.a $(libdir)/libtest_libs_common.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lgrabbag -lreplaygain_analysis -ltest_libs_common -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_C = \ bitwriter.c \ decoders.c \ encoders.c \ + endswap.c \ format.c \ main.c \ + md5.c \ metadata.c \ metadata_manip.c \ metadata_object.c diff --git a/lib-src/libflac/src/test_libFLAC/bitwriter.c b/lib-src/libflac/src/test_libFLAC/bitwriter.c index fb6b9996c..a9bd62fb7 100644 --- a/lib-src/libflac/src/test_libFLAC/bitwriter.c +++ b/lib-src/libflac/src/test_libFLAC/bitwriter.c @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/test_libFLAC/bitwriter.h b/lib-src/libflac/src/test_libFLAC/bitwriter.h index 0e7f5228a..4cb7f292d 100644 --- a/lib-src/libflac/src/test_libFLAC/bitwriter.h +++ b/lib-src/libflac/src/test_libFLAC/bitwriter.h @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/test_libFLAC/decoders.c b/lib-src/libflac/src/test_libFLAC/decoders.c index 0c9acad7f..6d8254b7e 100644 --- a/lib-src/libflac/src/test_libFLAC/decoders.c +++ b/lib-src/libflac/src/test_libFLAC/decoders.c @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -281,9 +281,15 @@ static void stream_decoder_metadata_callback_(const FLAC__StreamDecoder *decoder if(dcd->error_occurred) return; - printf("%d... ", dcd->current_metadata_number); + if (metadata->type == FLAC__METADATA_TYPE_APPLICATION) { + printf ("%d ('%c%c%c%c')... ", dcd->current_metadata_number, metadata->data.application.id [0], metadata->data.application.id [1], metadata->data.application.id [2], metadata->data.application.id [3]); + } + else { + printf("%d... ", dcd->current_metadata_number); + } fflush(stdout); + if(dcd->current_metadata_number >= num_expected_) { (void)die_("got more metadata blocks than expected"); dcd->error_occurred = true; diff --git a/lib-src/libflac/src/test_libFLAC/decoders.h b/lib-src/libflac/src/test_libFLAC/decoders.h index 1203b67c4..d644aec6c 100644 --- a/lib-src/libflac/src/test_libFLAC/decoders.h +++ b/lib-src/libflac/src/test_libFLAC/decoders.h @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/test_libFLAC/encoders.c b/lib-src/libflac/src/test_libFLAC/encoders.c index 9f24063a0..17318dca1 100644 --- a/lib-src/libflac/src/test_libFLAC/encoders.c +++ b/lib-src/libflac/src/test_libFLAC/encoders.c @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/test_libFLAC/encoders.h b/lib-src/libflac/src/test_libFLAC/encoders.h index 600af8e2f..d8583a3c7 100644 --- a/lib-src/libflac/src/test_libFLAC/encoders.h +++ b/lib-src/libflac/src/test_libFLAC/encoders.h @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/test_libFLAC/endswap.c b/lib-src/libflac/src/test_libFLAC/endswap.c new file mode 100644 index 000000000..2fd6d5213 --- /dev/null +++ b/lib-src/libflac/src/test_libFLAC/endswap.c @@ -0,0 +1,111 @@ +/* test_libFLAC - Unit tester for libFLAC + * Copyright (C) 2014 Xiph.Org Foundation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + +#include "share/compat.h" +#include "FLAC/assert.h" +#include "share/endswap.h" +#include "private/md5.h" +#include "endswap.h" + + +FLAC__bool test_endswap(void) +{ + int16_t i16 = 0x1234; + uint16_t u16 = 0xabcd; + int32_t i32 = 0x12345678; + uint32_t u32 = 0xabcdef01; + + union { + unsigned char bytes[4]; + uint16_t u16; + uint32_t u32; + } data; + + printf("\n+++ libFLAC unit test: endswap (%s endian host)\n\n", CPU_IS_LITTLE_ENDIAN ? "little" : "big"); + + printf("testing ENDSWAP_16 on int16_t ... "); + if (((int16_t) ENDSWAP_16(i16)) == i16) { + printf("\nFAILED, ENDSWAP_16(0x%04x) -> 0x%04x == 0x%04x\n", i16, ENDSWAP_16(i16), i16); + return false; + } + if (((int16_t) ENDSWAP_16(ENDSWAP_16(i16))) != i16) { + printf("\nFAILED, ENDSWAP_16(ENDSWAP_16(0x%04x)) -> 0x%04x != 0x%04x\n", i16, ENDSWAP_16(ENDSWAP_16(i16)), i16); + return false; + } + puts("OK"); + + printf("testing ENDSWAP_16 on uint16_t ... "); + if (((uint16_t) ENDSWAP_16(u16)) == u16) { + printf("\nFAILED, ENDSWAP_16(0x%04x) -> 0x%04x == 0x%04x\n", u16, ENDSWAP_16(u16), u16); + return false; + } + if (((uint16_t) ENDSWAP_16(ENDSWAP_16(u16))) != u16) { + printf("\nFAILED, ENDSWAP_16(ENDSWAP_16(0x%04x)) -> 0x%04x != 0x%04x\n", u16, ENDSWAP_16(ENDSWAP_16(u16)), u16); + return false; + } + puts("OK"); + + printf("testing ENDSWAP_32 on int32_t ... "); + if (((int32_t) ENDSWAP_32 (i32)) == i32) { + printf("\nFAILED, ENDSWAP_32(0x%08x) -> 0x%08x == 0x%08x\n", i32, (unsigned) ENDSWAP_32 (i32), i32); + return false; + } + if (((int32_t) ENDSWAP_32 (ENDSWAP_32 (i32))) != i32) { + printf("\nFAILED, ENDSWAP_32(ENDSWAP_32(0x%08x)) -> 0x%08x != 0x%08x\n", i32, (unsigned) ENDSWAP_32(ENDSWAP_32 (i32)), i32); + return false; + } + puts("OK"); + + printf("testing ENDSWAP_32 on uint32_t ... "); + if (((uint32_t) ENDSWAP_32(u32)) == u32) { + printf("\nFAILED, ENDSWAP_32(0x%08x) -> 0x%08x == 0x%08x\n", u32, (unsigned) ENDSWAP_32(u32), u32); + return false; + } + if (((uint32_t) ENDSWAP_32 (ENDSWAP_32(u32))) != u32) { + printf("\nFAILED, ENDSWAP_32(ENDSWAP_32(0x%08x)) -> 0x%08x != 0%08x\n", u32, (unsigned) ENDSWAP_32(ENDSWAP_32(u32)), u32); + return false; + } + puts("OK"); + + printf("testing H2LE_16 on uint16_t ... "); + data.u16 = H2LE_16(0x1234); + if (data.bytes [0] != 0x34 || data.bytes [1] != 0x12) { + printf("\nFAILED, H2LE_16(0x%04x) -> { 0x%02x, 0x%02x }\n", data.u16, data.bytes [0] & 0xff, data.bytes [1] & 0xff); + return false; + } + puts("OK"); + + printf("testing H2LE_32 on uint32_t ... "); + data.u32 = H2LE_32(0x12345678); + if (data.bytes [0] != 0x78 || data.bytes [1] != 0x56 || data.bytes [2] != 0x34 || data.bytes [3] != 0x12) { + printf("\nFAILED, H2LE_32(0x%08x) -> { 0x%02x, 0x%02x, 0x%02x, 0x%02x }\n", + data.u32, data.bytes [0] & 0xff, data.bytes [1] & 0xff, data.bytes [2] & 0xff, data.bytes [3] & 0xff); + return false; + } + puts("OK"); + + printf("\nPASSED!\n"); + return true; +} diff --git a/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/main.c b/lib-src/libflac/src/test_libFLAC/endswap.h similarity index 58% rename from lib-src/libflac/src/monkeys_audio_utilities/flac_ren/main.c rename to lib-src/libflac/src/test_libFLAC/endswap.h index e201b6937..57f830424 100644 --- a/lib-src/libflac/src/monkeys_audio_utilities/flac_ren/main.c +++ b/lib-src/libflac/src/test_libFLAC/endswap.h @@ -1,6 +1,5 @@ -/* flac_ren - renamer part of utility to add FLAC support to Monkey's Audio - * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation +/* test_libFLAC - Unit tester for libFLAC + * Copyright (C) 2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,24 +16,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include +#ifndef FLAC__TEST_LIBFLAC_ENDSWAP_H +#define FLAC__TEST_LIBFLAC_ENDSWAP_H + +#include "FLAC/ordinals.h" + +FLAC__bool test_endswap(void); + #endif - -#include -#include -#include -#include - -int main(int argc, char *argv[]) -{ - struct stat s; - - /* wait till the 'from' file has reached its final destination */ - do { - Sleep(2000); - } while(stat(argv[1], &s) < 0); - - /* now rename it */ - return rename(argv[1], argv[2]); -} diff --git a/lib-src/libflac/src/test_libFLAC/format.c b/lib-src/libflac/src/test_libFLAC/format.c index fd4effda2..3e6bf9a65 100644 --- a/lib-src/libflac/src/test_libFLAC/format.c +++ b/lib-src/libflac/src/test_libFLAC/format.c @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/test_libFLAC/format.h b/lib-src/libflac/src/test_libFLAC/format.h index 13d9458de..55b9ec144 100644 --- a/lib-src/libflac/src/test_libFLAC/format.h +++ b/lib-src/libflac/src/test_libFLAC/format.h @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/test_libFLAC/main.c b/lib-src/libflac/src/test_libFLAC/main.c index b0c9febcd..c1772ba2f 100644 --- a/lib-src/libflac/src/test_libFLAC/main.c +++ b/lib-src/libflac/src/test_libFLAC/main.c @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,19 +17,25 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif #include "bitwriter.h" #include "decoders.h" #include "encoders.h" +#include "endswap.h" #include "format.h" #include "metadata.h" +#include "md5.h" -int main(int argc, char *argv[]) +int main(void) { - (void)argc, (void)argv; + if(!test_endswap()) + return 1; + + if(!test_md5()) + return 1; if(!test_bitwriter()) return 1; diff --git a/lib-src/libflac/src/test_libFLAC/md5.c b/lib-src/libflac/src/test_libFLAC/md5.c new file mode 100644 index 000000000..88b72c01b --- /dev/null +++ b/lib-src/libflac/src/test_libFLAC/md5.c @@ -0,0 +1,222 @@ +/* test_libFLAC - Unit tester for libFLAC + * Copyright (C) 2014 Xiph.Org Foundation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + +#include "FLAC/assert.h" +#include "share/compat.h" +#include "private/md5.h" +#include "md5.h" + + +static FLAC__bool test_md5_clear_context(void); +static FLAC__bool test_md5_codec(void); +static FLAC__bool test_md5_accumulate(const FLAC__int32 * const * signal,unsigned channels, unsigned samples, unsigned bytes_per_sample, const FLAC__byte target_digest [16]); + +FLAC__bool test_md5(void) +{ + printf("\n+++ libFLAC unit test: md5\n\n"); + + if (! test_md5_clear_context()) + return false; + + if (! test_md5_codec()) + return false; + + printf("\nPASSED!\n"); + return true; +} + +/*----------------------------------------------------------------------------*/ + +static FLAC__bool test_md5_clear_context(void) +{ + FLAC__MD5Context ctx; + FLAC__byte digest[16]; + FLAC__byte target[16] = { 0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04, 0xe9, 0x80, 0x09, 0x98, 0xec, 0xf8, 0x42, 0x7e }; + unsigned k ; + char * cptr; + + printf("testing FLAC__MD5Init ... "); + FLAC__MD5Init (&ctx); + if (ctx.buf[0] != 0x67452301) { + printf("FAILED!\n"); + return false; + } + printf("OK\n"); + + printf("testing that FLAC__MD5Final clears the MD5Context ... "); + FLAC__MD5Final(digest, &ctx); + cptr = (char*) &ctx ; + for (k = 0 ; k < sizeof (ctx) ; k++) { + if (cptr [k]) { + printf("FAILED, MD5 ctx has not been cleared after FLAC__MD5Final\n"); + return false; + } + } + printf("OK\n"); + + printf("testing digest correct for zero data ... "); + if (memcmp(digest, target, sizeof (digest))) { + printf("\nFAILED, expected MD5 sum "); + for (k = 0 ; k < 16 ; k++) + printf("%02x", (target [k] & 0xff)); + printf (" but got "); + for (k = 0 ; k < 16 ; k++) + printf("%02x", (digest [k] & 0xff)); + puts("\n"); + return false; + } + puts("OK"); + + return true; +} + +static FLAC__byte target_digests [8][4][16] = +{ /* 1 channel */ + { /* 1 byte per sample */ + { 0xc1, 0x9a, 0x5b, 0xeb, 0x57, 0x8f, 0x26, 0xeb, 0xfb, 0x34, 0x7c, 0xef, 0x04, 0x31, 0x6d, 0x7d }, + /* 2 bytes per sample */ + { 0xd4, 0x78, 0x90, 0xd3, 0xa9, 0x17, 0x4e, 0x76, 0xca, 0x4d, 0x27, 0x20, 0x98, 0x36, 0x8b, 0x2e }, + /* 3 bytes per sample */ + { 0x5a, 0x4b, 0xd6, 0xac, 0xa1, 0x70, 0x84, 0x19, 0x7c, 0x0d, 0xfb, 0x5b, 0xa9, 0x7b, 0xcb, 0x54 }, + /* 4 bytes per sample */ + { 0x79, 0xd5, 0x7a, 0x32, 0x06, 0x0b, 0xfe, 0x46, 0xa3, 0xe7, 0xba, 0xc5, 0xf7, 0x48, 0x6f, 0x50 } + }, + + /* 2 channels */ + { + { 0x89, 0xac, 0xcf, 0x91, 0xf1, 0x8c, 0xea, 0xab, 0x46, 0x12, 0x74, 0xbc, 0x4e, 0x82, 0xbe, 0x7d }, + { 0xb9, 0x17, 0x16, 0x5b, 0xd8, 0x1c, 0xc8, 0x4e, 0x5a, 0x28, 0xfb, 0xba, 0x87, 0x74, 0x76, 0x44 }, + { 0xec, 0x63, 0x92, 0xca, 0x4f, 0x6b, 0x9e, 0xb1, 0x9f, 0xec, 0x3b, 0x2c, 0x15, 0x30, 0xfd, 0x2a }, + { 0x05, 0x4d, 0xfd, 0xb8, 0x9d, 0x8a, 0xa2, 0xdd, 0x26, 0x47, 0xc6, 0xfb, 0x4f, 0x23, 0x67, 0x6d } + }, + + /* 3 channels */ + { + { 0xad, 0x05, 0xda, 0xf3, 0x7a, 0xa1, 0x94, 0xdb, 0x0c, 0x61, 0x06, 0xb2, 0x94, 0x39, 0x6c, 0xa9 }, + { 0x8b, 0xcc, 0x41, 0x4d, 0xe9, 0xe3, 0xc2, 0x61, 0x61, 0x8a, 0x8b, 0x22, 0xc6, 0x4e, 0xac, 0xa7 }, + { 0x8a, 0xce, 0x97, 0xc1, 0x86, 0xae, 0xbc, 0x73, 0x88, 0x8b, 0x35, 0x5a, 0x37, 0x33, 0xf9, 0xcf }, + { 0x69, 0x59, 0xe8, 0x38, 0x29, 0x80, 0x80, 0x21, 0xb1, 0xd2, 0xba, 0xf6, 0x28, 0xd6, 0x6a, 0x83 } + }, + + /* 4 channels */ + { + { 0x61, 0x40, 0x75, 0xef, 0x22, 0xf1, 0x0f, 0xa6, 0x08, 0x6c, 0x88, 0xff, 0x2c, 0x4e, 0x98, 0x0b }, + { 0xa0, 0x77, 0x3a, 0x59, 0x4a, 0xbf, 0xd0, 0x5c, 0xcc, 0xe3, 0xb9, 0x83, 0x2b, 0xf3, 0xdf, 0x1a }, + { 0xdb, 0xd7, 0xf1, 0x82, 0x13, 0x60, 0x42, 0x7c, 0x84, 0xe6, 0xcf, 0x30, 0xab, 0xa2, 0x64, 0xf1 }, + { 0x4a, 0x9a, 0xad, 0x53, 0x05, 0x74, 0xb1, 0x1c, 0xb8, 0xd4, 0xae, 0x78, 0x13, 0xf6, 0x2a, 0x11 } + }, + + /* 5 channels */ + { + { 0xcc, 0xca, 0x44, 0xc0, 0x54, 0xe2, 0xc9, 0xba, 0x99, 0x32, 0xc9, 0x65, 0xf3, 0x3e, 0x44, 0x34}, + { 0x40, 0x38, 0x6a, 0xdd, 0xde, 0x89, 0x10, 0x3c, 0x8e, 0xec, 0xdf, 0x15, 0x53, 0x4c, 0x2c, 0x92 }, + { 0xc8, 0x95, 0x0a, 0x7c, 0x17, 0x30, 0xc0, 0xac, 0x8e, 0x34, 0xdb, 0x79, 0x76, 0x64, 0x7c, 0x6e }, + { 0x3f, 0x06, 0x11, 0x8a, 0x8d, 0x80, 0xb5, 0x4f, 0x8b, 0xb5, 0x8e, 0xb3, 0x27, 0x3e, 0x41, 0xe8 } + }, + + /* 6 channels */ + { + { 0x61, 0xe4, 0xbd, 0xb1, 0xc0, 0x2f, 0xf4, 0x4c, 0x6e, 0x09, 0x5a, 0xbd, 0x90, 0x18, 0x8b, 0x62 }, + { 0x47, 0xe7, 0x6e, 0x3b, 0x18, 0x86, 0x60, 0x1b, 0x09, 0x62, 0xc6, 0xc9, 0x7c, 0x4c, 0x03, 0xb5 }, + { 0x70, 0x57, 0xbf, 0x67, 0x66, 0x0f, 0xe3, 0x0a, 0x6c, 0xd2, 0x97, 0x66, 0xa2, 0xd2, 0xe4, 0x79 }, + { 0xaa, 0x3f, 0xc7, 0xf5, 0x7a, 0xa5, 0x46, 0xf7, 0xea, 0xe3, 0xd5, 0x1a, 0xa4, 0x62, 0xbe, 0xfa } + }, + + /* 7 channels */ + { + { 0x7c, 0x8d, 0xd2, 0x8c, 0xfd, 0x91, 0xbb, 0x77, 0x6f, 0x0e, 0xf0, 0x39, 0x1f, 0x39, 0xc4, 0xac }, + { 0xfb, 0xab, 0x18, 0x3f, 0x1e, 0x1d, 0xa5, 0x77, 0xe0, 0x5c, 0xea, 0x45, 0x6f, 0x64, 0xa4, 0x64 }, + { 0xe3, 0xac, 0x33, 0x50, 0xc1, 0xb1, 0x93, 0xfb, 0xca, 0x4b, 0x15, 0xcb, 0x2d, 0xcd, 0xd5, 0xef }, + { 0x10, 0xfb, 0x02, 0x83, 0x76, 0x0d, 0xe5, 0xd2, 0x3b, 0xb1, 0x4c, 0x78, 0x3b, 0x73, 0xf7, 0x1a } + }, + + /* 8 channels */ + { + { 0x65, 0x7b, 0xe5, 0x92, 0xe2, 0x1c, 0x95, 0x3e, 0xd7, 0x2f, 0x64, 0xa0, 0x86, 0xec, 0x1a, 0xed }, + { 0x9d, 0x04, 0x8f, 0xa4, 0xea, 0x10, 0xec, 0xb8, 0xa3, 0x88, 0xe2, 0x5d, 0x3c, 0xe2, 0xfb, 0x94 }, + { 0x5a, 0xd3, 0xd2, 0x75, 0x6a, 0xfa, 0xa7, 0x42, 0xf3, 0xbf, 0x0e, 0xbc, 0x90, 0x2a, 0xf8, 0x5f }, + { 0x76, 0xe1, 0xe5, 0xf6, 0xe3, 0x44, 0x08, 0x29, 0xae, 0x79, 0x19, 0xeb, 0xa8, 0x57, 0x16, 0x2a } + } +}; + +#define MAX_CHANNEL_COUNT 8 +#define MD5_SAMPLE_COUNT 64 + +static FLAC__bool test_md5_codec(void) +{ + FLAC__int32 arrays[MAX_CHANNEL_COUNT][MD5_SAMPLE_COUNT], *pointer[MAX_CHANNEL_COUNT], **signal; + FLAC__int32 seed = 0x12345679; + unsigned chan, byte_size; + + /* Set up signal data using a trival Linear Congruent PRNG. */ + signal = &pointer[0]; + for (chan = 0 ; chan < MAX_CHANNEL_COUNT ; chan ++) { + unsigned k; + pointer[chan] = arrays [chan]; + for (k = 0 ; k < MD5_SAMPLE_COUNT ; k++) { + seed = seed * 1103515245 + 12345; + arrays[chan][k] = seed; + } + } + + for (chan = 1 ; chan <= MAX_CHANNEL_COUNT ; chan ++) { + for (byte_size = 1 ; byte_size <= 4 ; byte_size ++) { + if (! test_md5_accumulate((const FLAC__int32 * const *) signal, chan, MD5_SAMPLE_COUNT, byte_size, target_digests[chan-1][byte_size-1])) + return false; + } + } + + return true; +} + +static FLAC__bool test_md5_accumulate(const FLAC__int32 * const * signal, unsigned channels, unsigned samples, unsigned bytes_per_sample, const FLAC__byte target_digest [16]) +{ + FLAC__MD5Context ctx; + FLAC__byte digest[16]; + + memset(&ctx, 0, sizeof (ctx)); + + printf("testing FLAC__MD5Accumulate (samples=%u, channels=%u, bytes_per_sample=%u) ... ", samples, channels, bytes_per_sample); + + FLAC__MD5Init(&ctx); + FLAC__MD5Accumulate(&ctx, signal, channels, samples, bytes_per_sample); + FLAC__MD5Final(digest, &ctx); + + if (memcmp(digest, target_digest, sizeof (digest))) { + int k ; + + printf("\nFAILED, expected MD5 sum "); + for (k = 0 ; k < 16 ; k++) + printf("%02x", (target_digest [k] & 0xff)); + printf (" but got "); + for (k = 0 ; k < 16 ; k++) + printf("%02x", (digest [k] & 0xff)); + puts("\n"); + return false; + } + + printf("OK\n"); + return true; +} diff --git a/lib-src/libflac/src/test_libFLAC/md5.h b/lib-src/libflac/src/test_libFLAC/md5.h new file mode 100644 index 000000000..b7ed057f9 --- /dev/null +++ b/lib-src/libflac/src/test_libFLAC/md5.h @@ -0,0 +1,26 @@ +/* test_libFLAC - Unit tester for libFLAC + * Copyright (C) 2014 Xiph.Org Foundation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef FLAC__TEST_LIBFLAC_MD5_H +#define FLAC__TEST_LIBFLAC_MD5_H + +#include "FLAC/ordinals.h" + +FLAC__bool test_md5(void); + +#endif diff --git a/lib-src/libflac/src/test_libFLAC/metadata.c b/lib-src/libflac/src/test_libFLAC/metadata.c index 5516f98aa..6b6528d6f 100644 --- a/lib-src/libflac/src/test_libFLAC/metadata.c +++ b/lib-src/libflac/src/test_libFLAC/metadata.c @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/test_libFLAC/metadata.h b/lib-src/libflac/src/test_libFLAC/metadata.h index 3cbc3137e..798d3adfc 100644 --- a/lib-src/libflac/src/test_libFLAC/metadata.h +++ b/lib-src/libflac/src/test_libFLAC/metadata.h @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/lib-src/libflac/src/test_libFLAC/metadata_manip.c b/lib-src/libflac/src/test_libFLAC/metadata_manip.c index 04d51c375..988ac71ee 100644 --- a/lib-src/libflac/src/test_libFLAC/metadata_manip.c +++ b/lib-src/libflac/src/test_libFLAC/metadata_manip.c @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/test_libFLAC/metadata_object.c b/lib-src/libflac/src/test_libFLAC/metadata_object.c index b190ce740..61be89cfd 100644 --- a/lib-src/libflac/src/test_libFLAC/metadata_object.c +++ b/lib-src/libflac/src/test_libFLAC/metadata_object.c @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/test_libFLAC/test_libFLAC.vcproj b/lib-src/libflac/src/test_libFLAC/test_libFLAC.vcproj index 6a4097d5d..c31c366a3 100644 --- a/lib-src/libflac/src/test_libFLAC/test_libFLAC.vcproj +++ b/lib-src/libflac/src/test_libFLAC/test_libFLAC.vcproj @@ -17,8 +17,8 @@ + + + + @@ -219,6 +228,10 @@ RelativePath=".\encoders.c" > + + @@ -227,6 +240,10 @@ RelativePath=".\main.c" > + + diff --git a/lib-src/libflac/src/test_libFLAC/test_libFLAC.vcxproj b/lib-src/libflac/src/test_libFLAC/test_libFLAC.vcxproj new file mode 100644 index 000000000..31517695b --- /dev/null +++ b/lib-src/libflac/src/test_libFLAC/test_libFLAC.vcxproj @@ -0,0 +1,209 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc8c-c215-11db-8314-0800200c9a66} + test_libFLAC + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + .;..\libFLAC\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;CPU_IS_LITTLE_ENDIAN=1;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\libFLAC\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;CPU_IS_LITTLE_ENDIAN=1;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\libFLAC\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;CPU_IS_LITTLE_ENDIAN=1;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\libFLAC\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;CPU_IS_LITTLE_ENDIAN=1;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + + + + + + + + + + + + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbc81-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + {4cefbc8e-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_libFLAC/test_libFLAC.vcxproj.filters b/lib-src/libflac/src/test_libFLAC/test_libFLAC.vcxproj.filters new file mode 100644 index 000000000..b060355a8 --- /dev/null +++ b/lib-src/libflac/src/test_libFLAC/test_libFLAC.vcxproj.filters @@ -0,0 +1,68 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_libs_common/Makefile.am b/lib-src/libflac/src/test_libs_common/Makefile.am index 3077235d8..0b77388c9 100644 --- a/lib-src/libflac/src/test_libs_common/Makefile.am +++ b/lib-src/libflac/src/test_libs_common/Makefile.am @@ -1,6 +1,6 @@ # test_libs_common - Common code to library unit tests # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -27,4 +27,6 @@ libtest_libs_common_la_SOURCES = \ EXTRA_DIST = \ Makefile.lite \ README \ - test_libs_common_static.vcproj + test_libs_common_static.vcproj \ + test_libs_common_static.vcxproj \ + test_libs_common_static.vcxproj.filters diff --git a/lib-src/libflac/src/test_libs_common/Makefile.in b/lib-src/libflac/src/test_libs_common/Makefile.in index 3088a1eaa..b437a901d 100644 --- a/lib-src/libflac/src/test_libs_common/Makefile.in +++ b/lib-src/libflac/src/test_libs_common/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # test_libs_common - Common code to library unit tests # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -70,17 +97,20 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/test_libs_common -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -95,6 +125,19 @@ libtest_libs_common_la_OBJECTS = $(am_libtest_libs_common_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -107,20 +150,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtest_libs_common_la_SOURCES) DIST_SOURCES = $(libtest_libs_common_la_SOURCES) am__can_run_installinfo = \ @@ -128,6 +167,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -168,7 +224,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -188,8 +243,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -291,13 +344,15 @@ libtest_libs_common_la_SOURCES = \ EXTRA_DIST = \ Makefile.lite \ README \ - test_libs_common_static.vcproj + test_libs_common_static.vcproj \ + test_libs_common_static.vcxproj \ + test_libs_common_static.vcxproj.filters all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -322,20 +377,23 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtest_libs_common.la: $(libtest_libs_common_la_OBJECTS) $(libtest_libs_common_la_DEPENDENCIES) $(EXTRA_libtest_libs_common_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libtest_libs_common_la_OBJECTS) $(libtest_libs_common_la_LIBADD) $(LIBS) @@ -378,26 +436,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -409,15 +456,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -426,6 +469,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -567,18 +625,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/test_libs_common/Makefile.lite b/lib-src/libflac/src/test_libs_common/Makefile.lite index 45f932e16..abf2f1e93 100644 --- a/lib-src/libflac/src/test_libs_common/Makefile.lite +++ b/lib-src/libflac/src/test_libs_common/Makefile.lite @@ -1,6 +1,6 @@ # test_libs_common - Common code to library unit tests # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -27,9 +27,13 @@ LIB_NAME = libtest_libs_common ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lFLAC $(OGG_LIBS) -lm endif +endif INCLUDES = -I$(topdir)/include diff --git a/lib-src/libflac/src/test_libs_common/file_utils_flac.c b/lib-src/libflac/src/test_libs_common/file_utils_flac.c index 892e2bd2f..90b7d0048 100644 --- a/lib-src/libflac/src/test_libs_common/file_utils_flac.c +++ b/lib-src/libflac/src/test_libs_common/file_utils_flac.c @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/test_libs_common/metadata_utils.c b/lib-src/libflac/src/test_libs_common/metadata_utils.c index fdeb5df49..cef32220c 100644 --- a/lib-src/libflac/src/test_libs_common/metadata_utils.c +++ b/lib-src/libflac/src/test_libs_common/metadata_utils.c @@ -1,6 +1,6 @@ /* test_libFLAC - Unit tester for libFLAC * Copyright (C) 2002-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +21,7 @@ * These are not tests, just utility functions used by the metadata tests */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -487,14 +487,14 @@ void mutils__init_metadata_blocks( application1->is_last = false; application1->type = FLAC__METADATA_TYPE_APPLICATION; application1->length = 8; - memcpy(application1->data.application.id, "\xfe\xdc\xba\x98", 4); + memcpy(application1->data.application.id, "This", 4); application1->data.application.data = malloc_or_die_(4); memcpy(application1->data.application.data, "\xf0\xe1\xd2\xc3", 4); application2->is_last = false; application2->type = FLAC__METADATA_TYPE_APPLICATION; application2->length = 4; - memcpy(application2->data.application.id, "\x76\x54\x32\x10", 4); + memcpy(application2->data.application.id, "Here", 4); application2->data.application.data = 0; { diff --git a/lib-src/libflac/src/test_libs_common/test_libs_common_static.vcproj b/lib-src/libflac/src/test_libs_common/test_libs_common_static.vcproj index bac24b441..0f1d37c6a 100644 --- a/lib-src/libflac/src/test_libs_common/test_libs_common_static.vcproj +++ b/lib-src/libflac/src/test_libs_common/test_libs_common_static.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc8e-c215-11db-8314-0800200c9a66} + test_libs_common_static + Win32Proj + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Configuration)\lib\ + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\ + + + + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + Disabled + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + true + Speed + true + true + .\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_libs_common/test_libs_common_static.vcxproj.filters b/lib-src/libflac/src/test_libs_common/test_libs_common_static.vcxproj.filters new file mode 100644 index 000000000..2d941fb6e --- /dev/null +++ b/lib-src/libflac/src/test_libs_common/test_libs_common_static.vcxproj.filters @@ -0,0 +1,21 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_seeking/Makefile.am b/lib-src/libflac/src/test_seeking/Makefile.am index 87ddb3601..4b7761cf4 100644 --- a/lib-src/libflac/src/test_seeking/Makefile.am +++ b/lib-src/libflac/src/test_seeking/Makefile.am @@ -1,6 +1,6 @@ # test_seeking - Seeking tester for libFLAC # Copyright (C) 2004-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_seeking.vcproj + test_seeking.vcproj \ + test_seeking.vcxproj \ + test_seeking.vcxproj.filters AM_CFLAGS = @OGG_CFLAGS@ diff --git a/lib-src/libflac/src/test_seeking/Makefile.in b/lib-src/libflac/src/test_seeking/Makefile.in index ef2c3ef28..935e26d73 100644 --- a/lib-src/libflac/src/test_seeking/Makefile.in +++ b/lib-src/libflac/src/test_seeking/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # test_seeking - Seeking tester for libFLAC # Copyright (C) 2004-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = test_seeking$(EXEEXT) subdir = src/test_seeking -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -95,6 +125,19 @@ test_seeking_DEPENDENCIES = $(top_builddir)/src/libFLAC/libFLAC.la AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -107,20 +150,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(test_seeking_SOURCES) DIST_SOURCES = $(test_seeking_SOURCES) am__can_run_installinfo = \ @@ -128,6 +167,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -168,7 +224,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -188,8 +243,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -284,7 +337,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ - test_seeking.vcproj + test_seeking.vcproj \ + test_seeking.vcxproj \ + test_seeking.vcxproj.filters AM_CFLAGS = @OGG_CFLAGS@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include @@ -299,7 +354,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -324,9 +379,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -338,6 +393,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test_seeking$(EXEEXT): $(test_seeking_OBJECTS) $(test_seeking_DEPENDENCIES) $(EXTRA_test_seeking_DEPENDENCIES) @rm -f test_seeking$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_seeking_OBJECTS) $(test_seeking_LDADD) $(LIBS) @@ -380,26 +436,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -411,15 +456,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -428,6 +469,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -570,18 +626,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/test_seeking/Makefile.lite b/lib-src/libflac/src/test_seeking/Makefile.lite index 854586374..f18ca3ca2 100644 --- a/lib-src/libflac/src/test_seeking/Makefile.lite +++ b/lib-src/libflac/src/test_seeking/Makefile.lite @@ -1,6 +1,6 @@ # test_seeking - Seeking tester for libFLAC # Copyright (C) 2004-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I../libFLAC/include -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_C = \ main.c diff --git a/lib-src/libflac/src/test_seeking/main.c b/lib-src/libflac/src/test_seeking/main.c index 729d813c8..6a0228c90 100644 --- a/lib-src/libflac/src/test_seeking/main.c +++ b/lib-src/libflac/src/test_seeking/main.c @@ -1,6 +1,6 @@ /* test_seeking - Seeking tester for libFLAC * Copyright (C) 2004-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -389,23 +389,6 @@ static FLAC__bool seek_barrage(FLAC__bool is_ogg, const char *filename, FLAC__of return true; } -#ifdef _MSC_VER -/* There's no strtoull() in MSVC6 so we just write a specialized one */ -static FLAC__uint64 local__strtoull(const char *src) -{ - FLAC__uint64 ret = 0; - int c; - FLAC__ASSERT(0 != src); - while(0 != (c = *src++)) { - c -= '0'; - if(c >= 0 && c <= 9) - ret = (ret * 10) + c; - else - break; - } - return ret; -} -#endif int main(int argc, char *argv[]) { @@ -428,11 +411,7 @@ int main(int argc, char *argv[]) if (argc > 2) count = strtoul(argv[2], 0, 10); if (argc > 3) -#ifdef _MSC_VER - samples = local__strtoull(argv[3]); -#else samples = strtoull(argv[3], 0, 10); -#endif if (argc > 4) rawfilename = argv[4]; diff --git a/lib-src/libflac/src/test_seeking/test_seeking.vcproj b/lib-src/libflac/src/test_seeking/test_seeking.vcproj index f5939c62c..bfeeef729 100644 --- a/lib-src/libflac/src/test_seeking/test_seeking.vcproj +++ b/lib-src/libflac/src/test_seeking/test_seeking.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc90-c215-11db-8314-0800200c9a66} + test_seeking + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__HAS_OGG;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + {4cefbc84-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_seeking/test_seeking.vcxproj.filters b/lib-src/libflac/src/test_seeking/test_seeking.vcxproj.filters new file mode 100644 index 000000000..5c9040b89 --- /dev/null +++ b/lib-src/libflac/src/test_seeking/test_seeking.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_streams/Makefile.am b/lib-src/libflac/src/test_streams/Makefile.am index 75ee684e8..ea9f19ded 100644 --- a/lib-src/libflac/src/test_streams/Makefile.am +++ b/lib-src/libflac/src/test_streams/Makefile.am @@ -1,6 +1,6 @@ # test_streams - Simple test pattern generator # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,9 @@ EXTRA_DIST = \ Makefile.lite \ - test_streams.vcproj + test_streams.vcproj \ + test_streams.vcxproj \ + test_streams.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include noinst_PROGRAMS = test_streams diff --git a/lib-src/libflac/src/test_streams/Makefile.in b/lib-src/libflac/src/test_streams/Makefile.in index bedcaf20f..38f119c0d 100644 --- a/lib-src/libflac/src/test_streams/Makefile.in +++ b/lib-src/libflac/src/test_streams/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # test_streams - Simple test pattern generator # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,23 +33,51 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,17 +98,20 @@ build_triplet = @build@ host_triplet = @host@ noinst_PROGRAMS = test_streams$(EXEEXT) subdir = src/test_streams -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -96,6 +126,19 @@ test_streams_DEPENDENCIES = $(win_utf8_lib) \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -108,20 +151,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(test_streams_SOURCES) DIST_SOURCES = $(test_streams_SOURCES) am__can_run_installinfo = \ @@ -129,6 +168,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -169,7 +225,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -189,8 +244,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -285,7 +338,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ - test_streams.vcproj + test_streams.vcproj \ + test_streams.vcxproj \ + test_streams.vcxproj.filters AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include test_streams_SOURCES = \ @@ -298,7 +353,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -323,9 +378,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -337,6 +392,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test_streams$(EXEEXT): $(test_streams_OBJECTS) $(test_streams_DEPENDENCIES) $(EXTRA_test_streams_DEPENDENCIES) @rm -f test_streams$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_streams_OBJECTS) $(test_streams_LDADD) $(LIBS) @@ -379,26 +435,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -410,15 +455,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -427,6 +468,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -569,18 +625,19 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/test_streams/Makefile.lite b/lib-src/libflac/src/test_streams/Makefile.lite index e9502d0a0..636850162 100644 --- a/lib-src/libflac/src/test_streams/Makefile.lite +++ b/lib-src/libflac/src/test_streams/Makefile.lite @@ -1,6 +1,6 @@ # test_streams - Simple test pattern generator # Copyright (C) 2000-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -27,7 +27,15 @@ PROGRAM_NAME = test_streams INCLUDES = -I./include -I$(topdir)/include -LIBS = -lm +ifeq ($(OS),Darwin) + EXPLICIT_LIBS = $(libdir)/libgrabbag.a -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lgrabbag -lwin_utf8_io -lm +else + LIBS = -lgrabbag -lm +endif +endif SRCS_C = \ main.c diff --git a/lib-src/libflac/src/test_streams/main.c b/lib-src/libflac/src/test_streams/main.c index b12425059..93b1eaf79 100644 --- a/lib-src/libflac/src/test_streams/main.c +++ b/lib-src/libflac/src/test_streams/main.c @@ -1,6 +1,6 @@ /* test_streams - Simple test pattern generator * Copyright (C) 2000-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif @@ -34,11 +34,6 @@ #include "FLAC/ordinals.h" #include "share/compat.h" -#ifndef M_PI -/* math.h in VC++ doesn't seem to have this (how Microsoft is that?) */ -#define M_PI 3.14159265358979323846 -#endif - #if !defined _MSC_VER && !defined __MINGW32__ #define GET_RANDOM_BYTE (((unsigned)random()) & 0xff) #else diff --git a/lib-src/libflac/src/test_streams/test_streams.vcproj b/lib-src/libflac/src/test_streams/test_streams.vcproj index 9b27738c2..415ecc061 100644 --- a/lib-src/libflac/src/test_streams/test_streams.vcproj +++ b/lib-src/libflac/src/test_streams/test_streams.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc91-c215-11db-8314-0800200c9a66} + test_streams + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + Default + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + {4cefbc81-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/test_streams/test_streams.vcxproj.filters b/lib-src/libflac/src/test_streams/test_streams.vcxproj.filters new file mode 100644 index 000000000..5c9040b89 --- /dev/null +++ b/lib-src/libflac/src/test_streams/test_streams.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/utils/Makefile.am b/lib-src/libflac/src/utils/Makefile.am index 45daadc55..4aad71c0b 100644 --- a/lib-src/libflac/src/utils/Makefile.am +++ b/lib-src/libflac/src/utils/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/src/utils/Makefile.in b/lib-src/libflac/src/utils/Makefile.in index 4dedefa23..02680f18d 100644 --- a/lib-src/libflac/src/utils/Makefile.in +++ b/lib-src/libflac/src/utils/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,47 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/utils -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +144,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -177,7 +233,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +252,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -295,7 +348,7 @@ SUBDIRS = flacdiff flactimer all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -320,9 +373,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -333,22 +386,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -363,57 +419,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -429,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -446,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -463,6 +465,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -623,22 +640,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/utils/flacdiff/Makefile.am b/lib-src/libflac/src/utils/flacdiff/Makefile.am index 6431bb4ac..670529f19 100644 --- a/lib-src/libflac/src/utils/flacdiff/Makefile.am +++ b/lib-src/libflac/src/utils/flacdiff/Makefile.am @@ -1,6 +1,6 @@ # flacdiff - Displays where two FLAC streams differ # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -19,4 +19,6 @@ EXTRA_DIST = \ Makefile.lite \ flacdiff.vcproj \ + flacdiff.vcxproj \ + flacdiff.vcxproj.filters \ main.cpp diff --git a/lib-src/libflac/src/utils/flacdiff/Makefile.in b/lib-src/libflac/src/utils/flacdiff/Makefile.in index 18f0d82d4..94fa5cf0b 100644 --- a/lib-src/libflac/src/utils/flacdiff/Makefile.in +++ b/lib-src/libflac/src/utils/flacdiff/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # flacdiff - Displays where two FLAC streams differ # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -33,23 +32,51 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,29 +96,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/utils/flacdiff -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -99,6 +134,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -137,7 +173,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -157,8 +192,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -254,12 +287,14 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ Makefile.lite \ flacdiff.vcproj \ + flacdiff.vcxproj \ + flacdiff.vcxproj.filters \ main.cpp all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -284,9 +319,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -295,11 +330,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -435,15 +470,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/utils/flacdiff/Makefile.lite b/lib-src/libflac/src/utils/flacdiff/Makefile.lite index 47a2141c8..e804723fc 100644 --- a/lib-src/libflac/src/utils/flacdiff/Makefile.lite +++ b/lib-src/libflac/src/utils/flacdiff/Makefile.lite @@ -1,6 +1,6 @@ # flacdiff - Displays where two FLAC streams differ # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -29,9 +29,13 @@ INCLUDES = -I$(topdir)/include ifeq ($(OS),Darwin) EXPLICIT_LIBS = $(libdir)/libFLAC++.a $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm +else +ifeq ($(findstring Windows,$(OS)),Windows) + LIBS = -lFLAC++ -lFLAC -lwin_utf8_io $(OGG_LIBS) -lm else LIBS = -lFLAC++ -lFLAC $(OGG_LIBS) -lm endif +endif SRCS_CPP = \ main.cpp diff --git a/lib-src/libflac/src/utils/flacdiff/flacdiff.vcproj b/lib-src/libflac/src/utils/flacdiff/flacdiff.vcproj index b5c7d39bc..0c79b2fd0 100644 --- a/lib-src/libflac/src/utils/flacdiff/flacdiff.vcproj +++ b/lib-src/libflac/src/utils/flacdiff/flacdiff.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc93-c215-11db-8314-0800200c9a66} + flacdiff + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FLAC__NO_DLL;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FLAC__NO_DLL;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + $(SolutionDir)objs\$(Platform)\$(Configuration)\lib\libogg_static.lib;%(AdditionalDependencies) + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + {4cefbc86-c215-11db-8314-0800200c9a66} + false + + + {4cefbe02-c215-11db-8314-0800200c9a66} + false + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/utils/flacdiff/flacdiff.vcxproj.filters b/lib-src/libflac/src/utils/flacdiff/flacdiff.vcxproj.filters new file mode 100644 index 000000000..61a7d1290 --- /dev/null +++ b/lib-src/libflac/src/utils/flacdiff/flacdiff.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/utils/flacdiff/main.cpp b/lib-src/libflac/src/utils/flacdiff/main.cpp index 7925a33f8..87a308998 100644 --- a/lib-src/libflac/src/utils/flacdiff/main.cpp +++ b/lib-src/libflac/src/utils/flacdiff/main.cpp @@ -1,6 +1,6 @@ /* flacdiff - Displays where two FLAC streams differ * Copyright (C) 2007-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif diff --git a/lib-src/libflac/src/utils/flactimer/Makefile.am b/lib-src/libflac/src/utils/flactimer/Makefile.am index e225d9688..121475f82 100644 --- a/lib-src/libflac/src/utils/flactimer/Makefile.am +++ b/lib-src/libflac/src/utils/flactimer/Makefile.am @@ -1,6 +1,6 @@ # flactimer - Runs a command and prints timing information # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,4 +18,6 @@ EXTRA_DIST = \ flactimer.vcproj \ + flactimer.vcxproj \ + flactimer.vcxproj.filters \ main.cpp diff --git a/lib-src/libflac/src/utils/flactimer/Makefile.in b/lib-src/libflac/src/utils/flactimer/Makefile.in index dc520ea67..9c0f1e48c 100644 --- a/lib-src/libflac/src/utils/flactimer/Makefile.in +++ b/lib-src/libflac/src/utils/flactimer/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # flactimer - Runs a command and prints timing information # Copyright (C) 2007-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -33,23 +32,51 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,29 +96,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/utils/flactimer -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -99,6 +134,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -137,7 +173,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -157,8 +192,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -253,12 +286,14 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = \ flactimer.vcproj \ + flactimer.vcxproj \ + flactimer.vcxproj.filters \ main.cpp all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -283,9 +318,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -294,11 +329,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -434,15 +469,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/src/utils/flactimer/flactimer.vcproj b/lib-src/libflac/src/utils/flactimer/flactimer.vcproj index 36fe55a0a..edcc40daa 100644 --- a/lib-src/libflac/src/utils/flactimer/flactimer.vcproj +++ b/lib-src/libflac/src/utils/flactimer/flactimer.vcproj @@ -17,8 +17,8 @@ + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {4cefbc95-c215-11db-8314-0800200c9a66} + flactimer + Win32Proj + + + + Application + true + + + Application + true + + + Application + + + Application + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + $(SolutionDir)objs\$(Configuration)\bin\ + true + + + true + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + $(SolutionDir)objs\$(Configuration)\bin\ + false + + + false + $(SolutionDir)objs\$(Platform)\$(Configuration)\bin\ + + + + Disabled + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + MachineX86 + + + + + Disabled + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + + + + + true + Speed + true + true + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + MachineX86 + + + + + true + Speed + true + true + .;..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + false + Level3 + ProgramDatabase + 4267;4996;%(DisableSpecificWarnings) + + + uuid.lib;%(IgnoreSpecificDefaultLibraries) + true + Console + true + true + UseLinkTimeCodeGeneration + + + + + + + + + \ No newline at end of file diff --git a/lib-src/libflac/src/utils/flactimer/flactimer.vcxproj.filters b/lib-src/libflac/src/utils/flactimer/flactimer.vcxproj.filters new file mode 100644 index 000000000..bc32d5450 --- /dev/null +++ b/lib-src/libflac/src/utils/flactimer/flactimer.vcxproj.filters @@ -0,0 +1,18 @@ + + + + + {93993580-89BD-4b40-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4CF737F1-C7A5-4367-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/lib-src/libflac/src/utils/flactimer/main.cpp b/lib-src/libflac/src/utils/flactimer/main.cpp index c85c3ce71..dfc9ab798 100644 --- a/lib-src/libflac/src/utils/flactimer/main.cpp +++ b/lib-src/libflac/src/utils/flactimer/main.cpp @@ -1,6 +1,6 @@ /* flactimer - Runs a command and prints timing information * Copyright (C) 2007-2009 Josh Coalson - * Copyright (C) 2011-2013 Xiph.Org Foundation + * Copyright (C) 2011-2014 Xiph.Org Foundation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,15 +17,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include #include #include "share/compat.h" #include "share/safe_str.h" -#define int64_t __int64 -#define uint64_t unsigned int64_t - static inline uint64_t time2nsec(const FILETIME &t) { uint64_t n = t.dwHighDateTime; @@ -36,7 +37,7 @@ static inline uint64_t time2nsec(const FILETIME &t) static void printtime(FILE *fout, uint64_t nsec, uint64_t total) { - unsigned pct = (unsigned)(100.0 * ((double)(int64_t)nsec / (double)(int64_t)total)); + unsigned pct = (unsigned)(100.0 * ((double)nsec / (double)total)); uint64_t msec = nsec / 1000000; nsec -= msec * 1000000; uint64_t sec = msec / 1000; msec -= sec * 1000; uint64_t min = sec / 60; sec -= min * 60; diff --git a/lib-src/libflac/test/Makefile.am b/lib-src/libflac/test/Makefile.am index b71eec2c1..cd36e9b55 100644 --- a/lib-src/libflac/test/Makefile.am +++ b/lib-src/libflac/test/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -26,6 +26,7 @@ check_SCRIPTS = \ test_grabbag.sh \ test_flac.sh \ test_metaflac.sh \ + test_replaygain.sh \ test_seeking.sh \ test_streams.sh \ test_compression.sh @@ -54,6 +55,7 @@ endif $(TESTS_ENVIRONMENT) ./test_grabbag.sh $(TESTS_ENVIRONMENT) ./test_flac.sh $(TESTS_ENVIRONMENT) ./test_metaflac.sh + $(TESTS_ENVIRONMENT) ./test_replaygain.sh $(TESTS_ENVIRONMENT) ./test_seeking.sh $(TESTS_ENVIRONMENT) ./test_streams.sh $(TESTS_ENVIRONMENT) ./test_compression.sh diff --git a/lib-src/libflac/test/Makefile.in b/lib-src/libflac/test/Makefile.in index f06e53752..9ed838c01 100644 --- a/lib-src/libflac/test/Makefile.in +++ b/lib-src/libflac/test/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,38 +96,48 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = test -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/common.sh.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = common.sh CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -108,9 +145,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -177,7 +234,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -197,8 +253,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -299,6 +353,7 @@ check_SCRIPTS = \ test_grabbag.sh \ test_flac.sh \ test_metaflac.sh \ + test_replaygain.sh \ test_seeking.sh \ test_streams.sh \ test_compression.sh @@ -317,7 +372,7 @@ EXTRA_DIST = \ all: all-recursive .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -342,11 +397,13 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +common.sh: $(top_builddir)/config.status $(srcdir)/common.sh.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo @@ -355,22 +412,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -385,57 +445,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -451,12 +466,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -468,15 +478,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -485,6 +491,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -646,12 +667,11 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-local ctags ctags-recursive distclean distclean-generic \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool clean-local \ + cscopelist-am ctags ctags-am distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -660,8 +680,8 @@ uninstall-am: install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am # This one should pass when building out-of-tree (eg 'make distcheck'). @@ -684,6 +704,7 @@ fullcheck: $(check_SCRIPTS) $(TESTS_ENVIRONMENT) ./test_grabbag.sh $(TESTS_ENVIRONMENT) ./test_flac.sh $(TESTS_ENVIRONMENT) ./test_metaflac.sh + $(TESTS_ENVIRONMENT) ./test_replaygain.sh $(TESTS_ENVIRONMENT) ./test_seeking.sh $(TESTS_ENVIRONMENT) ./test_streams.sh $(TESTS_ENVIRONMENT) ./test_compression.sh diff --git a/lib-src/libflac/test/Makefile.lite b/lib-src/libflac/test/Makefile.lite index 7f3f83cfe..b83d9c5cc 100644 --- a/lib-src/libflac/test/Makefile.lite +++ b/lib-src/libflac/test/Makefile.lite @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/test/common.sh.in b/lib-src/libflac/test/common.sh.in new file mode 100644 index 000000000..ffe621789 --- /dev/null +++ b/lib-src/libflac/test/common.sh.in @@ -0,0 +1,71 @@ +# FLAC - Free Lossless Audio Codec +# Copyright (C) 2001-2009 Josh Coalson +# Copyright (C) 2011-2014 Xiph.Org Foundation +# +# This file is part the FLAC project. FLAC is comprised of several +# components distributed under different licenses. The codec libraries +# are distributed under Xiph.Org's BSD-like license (see the file +# COPYING.Xiph in this distribution). All other programs, libraries, and +# plugins are distributed under the GPL (see COPYING.GPL). The documentation +# is distributed under the Gnu FDL (see COPYING.FDL). Each file in the +# FLAC distribution contains at the top the terms under which it may be +# distributed. +# +# Since this particular file is relevant to all components of FLAC, +# it may be distributed under the Xiph.Org license, which is the least +# restrictive of those mentioned above. See the file COPYING.Xiph in this +# distribution. + +export MALLOC_CHECK_=3 +export MALLOC_PERTURB_=$((RANDOM % 255 + 1)) + +if [ x = x"$1" ] ; then + BUILD=debug +else + BUILD="$1" +fi + +LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=`pwd`/../src/libFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=`pwd`/../src/share/getopt/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=`pwd`/../src/share/grabbag/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/libFLAC++/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH + +export LD_LIBRARY_PATH + +EXE=@EXEEXT@ + +# change to 'false' to show all flac/metaflac output (useful for debugging) +if true ; then + SILENT='--silent' + TOTALLY_SILENT='--totally-silent' +else + SILENT='' + TOTALLY_SILENT='' +fi + +# Functions + +die () +{ + echo $* 1>&2 + exit 1 +} + +make_streams () +{ + echo "Generating streams..." + if [ ! -f wacky1.wav ] ; then + test_streams${EXE} || die "ERROR during test_streams" + fi +} diff --git a/lib-src/libflac/test/cuesheets/Makefile.am b/lib-src/libflac/test/cuesheets/Makefile.am index 5d6a7706a..a2abdcd3f 100644 --- a/lib-src/libflac/test/cuesheets/Makefile.am +++ b/lib-src/libflac/test/cuesheets/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/test/cuesheets/Makefile.in b/lib-src/libflac/test/cuesheets/Makefile.in index 14177553a..cd69dd54d 100644 --- a/lib-src/libflac/test/cuesheets/Makefile.in +++ b/lib-src/libflac/test/cuesheets/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,29 +96,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = test/cuesheets -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -99,6 +134,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -137,7 +173,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -157,8 +192,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -305,7 +338,7 @@ EXTRA_DIST = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -330,9 +363,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -341,11 +374,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -481,15 +514,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/test/flac-to-flac-metadata-test-files/Makefile.am b/lib-src/libflac/test/flac-to-flac-metadata-test-files/Makefile.am index 74f847ecc..b6168709c 100644 --- a/lib-src/libflac/test/flac-to-flac-metadata-test-files/Makefile.am +++ b/lib-src/libflac/test/flac-to-flac-metadata-test-files/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/test/flac-to-flac-metadata-test-files/Makefile.in b/lib-src/libflac/test/flac-to-flac-metadata-test-files/Makefile.in index edcbd35f9..3fa6894f4 100644 --- a/lib-src/libflac/test/flac-to-flac-metadata-test-files/Makefile.in +++ b/lib-src/libflac/test/flac-to-flac-metadata-test-files/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,29 +96,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = test/flac-to-flac-metadata-test-files -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -99,6 +134,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -137,7 +173,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -157,8 +192,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -280,7 +313,7 @@ EXTRA_DIST = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -305,9 +338,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -316,11 +349,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -456,16 +489,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-local cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + tags-am uninstall uninstall-am clean-local: diff --git a/lib-src/libflac/test/metaflac-test-files/Makefile.am b/lib-src/libflac/test/metaflac-test-files/Makefile.am index 900f49473..20f64d103 100644 --- a/lib-src/libflac/test/metaflac-test-files/Makefile.am +++ b/lib-src/libflac/test/metaflac-test-files/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/test/metaflac-test-files/Makefile.in b/lib-src/libflac/test/metaflac-test-files/Makefile.in index 7f8497cf7..9689e2c43 100644 --- a/lib-src/libflac/test/metaflac-test-files/Makefile.in +++ b/lib-src/libflac/test/metaflac-test-files/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,29 +96,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = test/metaflac-test-files -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -99,6 +134,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -137,7 +173,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -157,8 +192,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -319,7 +352,7 @@ EXTRA_DIST = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -344,9 +377,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -355,11 +388,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -495,16 +528,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - clean-local distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ + clean-local cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am + tags-am uninstall uninstall-am clean-local: diff --git a/lib-src/libflac/test/metaflac-test-files/case07-expect.meta b/lib-src/libflac/test/metaflac-test-files/case07-expect.meta index 1463b165e..ce9382ad6 100644 --- a/lib-src/libflac/test/metaflac-test-files/case07-expect.meta +++ b/lib-src/libflac/test/metaflac-test-files/case07-expect.meta @@ -1,4 +1,4 @@ -reference libFLAC 1.3.0 20130526 +reference libFLAC 1.3.1 20141125 ARTIST=The_artist_formerly_known_as_the_artist... ARTIST=Chuck_Woolery ARTIST=Vern diff --git a/lib-src/libflac/test/pictures/Makefile.am b/lib-src/libflac/test/pictures/Makefile.am index 53a83ca95..a4a11ffc1 100644 --- a/lib-src/libflac/test/pictures/Makefile.am +++ b/lib-src/libflac/test/pictures/Makefile.am @@ -1,6 +1,6 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries diff --git a/lib-src/libflac/test/pictures/Makefile.in b/lib-src/libflac/test/pictures/Makefile.in index 60b5901fd..72dc5b700 100644 --- a/lib-src/libflac/test/pictures/Makefile.in +++ b/lib-src/libflac/test/pictures/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,7 +16,7 @@ # FLAC - Free Lossless Audio Codec # Copyright (C) 2006-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -33,23 +32,51 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,29 +96,37 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = test/pictures -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \ - $(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \ + $(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \ $(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \ - $(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \ + $(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -99,6 +134,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -137,7 +173,6 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@ -GAS = @GAS@ GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@ GCC_MINOR_VERSION = @GCC_MINOR_VERSION@ GCC_VERSION = @GCC_VERSION@ @@ -157,8 +192,6 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBICONV = @LTLIBICONV@ LTLIBOBJS = @LTLIBOBJS@ -LT_NO_UNDEFINED = @LT_NO_UNDEFINED@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -270,7 +303,7 @@ EXTRA_DIST = \ all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -295,9 +328,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -306,11 +339,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -446,15 +479,16 @@ uninstall-am: .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib-src/libflac/test/test_bins.sh b/lib-src/libflac/test/test_bins.sh index a277a5547..26445b248 100755 --- a/lib-src/libflac/test/test_bins.sh +++ b/lib-src/libflac/test/test_bins.sh @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/sh -e # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -18,28 +18,8 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. -die () -{ - echo $* 1>&2 - exit 1 -} +. ./common.sh -if [ x = x"$1" ] ; then - BUILD=debug -else - BUILD="$1" -fi - -LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -export MALLOC_CHECK_=3 -export MALLOC_PERTURB_==$(($(date +%s) % 255 + 1)) PATH=../src/flac:$PATH PATH=../objs/$BUILD/bin:$PATH BINS_PATH=../../test_files/bins @@ -48,15 +28,15 @@ if [ x"$FLAC__TEST_LEVEL" = x ] ; then FLAC__TEST_LEVEL=1 fi -flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" +flac${EXE} --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" run_flac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_bins.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_bins.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac${EXE} $* 4>>test_bins.valgrind.log else - flac $* + flac${EXE} $* fi } diff --git a/lib-src/libflac/test/test_compression.sh b/lib-src/libflac/test/test_compression.sh index 073f44118..d53e67d4b 100755 --- a/lib-src/libflac/test/test_compression.sh +++ b/lib-src/libflac/test/test_compression.sh @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/sh -e # FLAC - Free Lossless Audio Codec -# Copyright (C) 2012 Xiph.Org Foundation +# Copyright (C) 2012-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -17,14 +17,8 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. -LD_LIBRARY_PATH=`pwd`/../src/libFLAC/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/grabbag/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/getopt/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH +. ./common.sh + PATH=`pwd`/../src/flac:$PATH echo "Using FLAC binary :" $(which flac) @@ -38,14 +32,15 @@ last_size=$(wc -c < noisy-sine.wav) echo "Original file size ${last_size} bytes." for k in 0 1 2 3 4 5 6 7 8 ; do - flac -${k} --silent noisy-sine.wav -o ${fname} + flac${EXE} -${k} --silent noisy-sine.wav -o ${fname} size=$(wc -c < ${fname}) echo "Compression level ${k}, file size ${size} bytes." if test ${last_size} -lt ${size} ; then - echo "Error : Compression ${last_k} size $last_size >= compression $k size $size." + echo "Error : Compression ${last_k} size ${last_size} >= compression ${k} size ${size}." exit 1 fi - last_size=${size} + # Need this because OSX's 'wc -c' returns a number with leading whitespace. + last_size=$((${size}+10)) last_k=${k} rm -f ${fname} done diff --git a/lib-src/libflac/test/test_flac.sh b/lib-src/libflac/test/test_flac.sh index f24893f4d..4ea7235e9 100755 --- a/lib-src/libflac/test/test_flac.sh +++ b/lib-src/libflac/test/test_flac.sh @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/sh -e # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -18,56 +18,27 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. +. ./common.sh + # we use '.' as decimal separator in --skip/--until tests export LANG=C LC_ALL=C -die () -{ - echo $* 1>&2 - exit 1 -} - dddie="die ERROR: creating files with dd" -if [ x = x"$1" ] ; then - BUILD=debug -else - BUILD="$1" -fi - -# change to 'false' to show flac output (useful for debugging) -if true ; then - SILENT='--silent' - TOTALLY_SILENT='--totally-silent' -else - SILENT='' - TOTALLY_SILENT='' -fi - -LD_LIBRARY_PATH=`pwd`/../src/libFLAC/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/grabbag/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/getopt/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -export MALLOC_CHECK_=3 -export MALLOC_PERTURB_=$(($(date +%s) % 255 + 1)) PATH=`pwd`/../src/flac:$PATH PATH=`pwd`/../src/metaflac:$PATH PATH=`pwd`/../src/test_streams:$PATH PATH=`pwd`/../objs/$BUILD/bin:$PATH -flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" +flac${EXE} --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" run_flac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_flac.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_flac.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac${EXE} --no-error-on-compression-fail $* 4>>test_flac.valgrind.log else - flac $* + flac${EXE} --no-error-on-compression-fail $* fi } @@ -75,16 +46,15 @@ run_metaflac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_flac.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac $* 4>>test_flac.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac${EXE} $* 4>>test_flac.valgrind.log else - metaflac $* + metaflac${EXE} $* fi } md5cmp () { - #n=`( [ -f "$1" ] && [ -f "$2" ] && metaflac --show-md5sum --no-filename "$1" "$2" 2>/dev/null || die "ERROR: comparing FLAC files $1 and $2 by MD5 sum" ) | uniq | wc -l` - n=`( [ -f "$1" ] && [ -f "$2" ] && metaflac --show-md5sum --no-filename "$1" "$2" 2>/dev/null || exit 1 ) | uniq | wc -l` + n=`( [ -f "$1" ] && [ -f "$2" ] && metaflac${EXE} --show-md5sum --no-filename "$1" "$2" 2>/dev/null || exit 1 ) | uniq | wc -l` [ "$n" != "" ] && [ $n = 1 ] } @@ -95,7 +65,7 @@ else fi echo "Checking for --ogg support in flac..." -if flac --ogg $SILENT --force-raw-format --endian=little --sign=signed --channels=1 --bps=8 --sample-rate=44100 -c $0 1>/dev/null 2>&1 ; then +if flac${EXE} --ogg $SILENT --force-raw-format --endian=little --sign=signed --channels=1 --bps=8 --sample-rate=44100 -c $0 1>/dev/null 2>&1 ; then has_ogg=yes; echo "flac --ogg works" else @@ -1058,13 +1028,13 @@ dd if=/dev/zero ibs=4 count=$file2_remainder of=z.raw 2>/dev/null || $dddie cat z.raw >> file2s.raw || die "ERROR: cat-ing sector-aligned files" rm -f z.raw -convert_to_wav file0s "$multifile_format_encode --force" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned WAVE" -convert_to_wav file1s "$multifile_format_encode --force" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned WAVE" -convert_to_wav file2s "$multifile_format_encode --force" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned WAVE" +convert_to_wav file0s "$multifile_format_encode --force --force-raw-format" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned WAVE" +convert_to_wav file1s "$multifile_format_encode --force --force-raw-format" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned WAVE" +convert_to_wav file2s "$multifile_format_encode --force --force-raw-format" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned WAVE" -convert_to_aiff file0s "$multifile_format_encode --force" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned AIFF" -convert_to_aiff file1s "$multifile_format_encode --force" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned AIFF" -convert_to_aiff file2s "$multifile_format_encode --force" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned AIFF" +convert_to_aiff file0s "$multifile_format_encode --force --force-raw-format" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned AIFF" +convert_to_aiff file1s "$multifile_format_encode --force --force-raw-format" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned AIFF" +convert_to_aiff file2s "$multifile_format_encode --force --force-raw-format" "$SILENT --force --decode" || die "ERROR creating authoritative sector-aligned AIFF" test_multifile () { diff --git a/lib-src/libflac/test/test_grabbag.sh b/lib-src/libflac/test/test_grabbag.sh index 12b3e9cff..5156a2681 100755 --- a/lib-src/libflac/test/test_grabbag.sh +++ b/lib-src/libflac/test/test_grabbag.sh @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/sh -e # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -18,25 +18,8 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. -die () -{ - echo $* 1>&2 - exit 1 -} +. ./common.sh -if [ x = x"$1" ] ; then - BUILD=debug -else - BUILD="$1" -fi - -LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -export MALLOC_CHECK_=3 -export MALLOC_PERTURB_=$(($(date +%s) % 255 + 1)) PATH=../src/test_grabbag/cuesheet:$PATH PATH=../src/test_grabbag/picture:$PATH PATH=../objs/$BUILD/bin:$PATH @@ -48,9 +31,9 @@ run_test_cuesheet () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 test_cuesheet $*" >>test_grabbag.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_cuesheet $* 4>>test_grabbag.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_cuesheet${EXE} $* 4>>test_grabbag.valgrind.log else - test_cuesheet $* + test_cuesheet${EXE} $* fi } @@ -58,9 +41,9 @@ run_test_picture () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 test_picture $*" >>test_grabbag.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_picture $* 4>>test_grabbag.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_picture${EXE} $* 4>>test_grabbag.valgrind.log else - test_picture $* + test_picture${EXE} $* fi } @@ -114,8 +97,7 @@ rm -f $log # for cuesheet in $bad_cuesheets ; do echo "NEGATIVE $cuesheet" >> $log 2>&1 - run_test_cuesheet $cuesheet $good_leadout 44100 cdda >> $log 2>&1 - exit_code=$? + run_test_cuesheet $cuesheet $good_leadout 44100 cdda >> $log 2>&1 || exit_code=$? if [ "$exit_code" = 255 ] ; then die "Error: test script is broken" fi diff --git a/lib-src/libflac/test/test_libFLAC++.sh b/lib-src/libflac/test/test_libFLAC++.sh index faa6203b6..3d82e0de7 100755 --- a/lib-src/libflac/test/test_libFLAC++.sh +++ b/lib-src/libflac/test/test_libFLAC++.sh @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/sh -e # FLAC - Free Lossless Audio Codec # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -18,35 +18,17 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. -die () -{ - echo $* 1>&2 - exit 1 -} +. ./common.sh -if [ x = x"$1" ] ; then - BUILD=debug -else - BUILD="$1" -fi - -LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/libFLAC++/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -export MALLOC_CHECK_=3 -export MALLOC_PERTURB_=$((RANDOM % 255 + 1)) PATH=../src/test_libFLAC++:$PATH PATH=../objs/$BUILD/bin:$PATH run_test_libFLACpp () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_libFLAC++ $* 4>>test_libFLAC++.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_libFLAC++${EXE} $* 4>>test_libFLAC++.valgrind.log else - test_libFLAC++ $* + test_libFLAC++${EXE} $* fi } diff --git a/lib-src/libflac/test/test_libFLAC.sh b/lib-src/libflac/test/test_libFLAC.sh index 1be373ddd..e17bcac2e 100755 --- a/lib-src/libflac/test/test_libFLAC.sh +++ b/lib-src/libflac/test/test_libFLAC.sh @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/sh -e # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -18,25 +18,7 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. -die () -{ - echo $* 1>&2 - exit 1 -} - -if [ x = x"$1" ] ; then - BUILD=debug -else - BUILD="$1" -fi - -LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -export MALLOC_CHECK_=3 -export MALLOC_PERTURB_=$((RANDOM % 255 + 1)) +. ./common.sh PATH=../src/test_libFLAC:$PATH PATH=../objs/$BUILD/bin:$PATH @@ -44,9 +26,9 @@ PATH=../objs/$BUILD/bin:$PATH run_test_libFLAC () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_libFLAC $* 4>>test_libFLAC.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_libFLAC${EXE} $* 4>>test_libFLAC.valgrind.log else - test_libFLAC $* + test_libFLAC${EXE} $* fi } diff --git a/lib-src/libflac/test/test_metaflac.sh b/lib-src/libflac/test/test_metaflac.sh index c6f7ed163..f5fc7102e 100755 --- a/lib-src/libflac/test/test_metaflac.sh +++ b/lib-src/libflac/test/test_metaflac.sh @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/sh -e # FLAC - Free Lossless Audio Codec # Copyright (C) 2002-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -18,37 +18,8 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. -die () -{ - echo $* 1>&2 - exit 1 -} +. ./common.sh -if [ x = x"$1" ] ; then - BUILD=debug -else - BUILD="$1" -fi - -# change to 'false' to show all flac/metaflac output (useful for debugging) -if true ; then - SILENT='--silent' - TOTALLY_SILENT='--totally-silent' -else - SILENT='' - TOTALLY_SILENT='' -fi - -LD_LIBRARY_PATH=`pwd`/../src/libFLAC/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/grabbag/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/getopt/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -export MALLOC_CHECK_=3 -export MALLOC_PERTURB_=$(($(date +%s) % 255 + 1)) PATH=`pwd`/../src/flac:$PATH PATH=`pwd`/../src/metaflac:$PATH PATH=`pwd`/../objs/$BUILD/bin:$PATH @@ -61,16 +32,16 @@ fi testdir="metaflac-test-files" flacfile="metaflac.flac" -flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" -metaflac --help 1>/dev/null 2>/dev/null || die "ERROR can't find metaflac executable" +flac${EXE} --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" +metaflac${EXE} --help 1>/dev/null 2>/dev/null || die "ERROR can't find metaflac executable" run_flac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_metaflac.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_metaflac.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac${EXE} --no-error-on-compression-fail $* 4>>test_metaflac.valgrind.log else - flac $* + flac${EXE} --no-error-on-compression-fail $* fi } @@ -78,9 +49,9 @@ run_metaflac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_metaflac.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac $* 4>>test_metaflac.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac${EXE} $* 4>>test_metaflac.valgrind.log else - metaflac $* + metaflac${EXE} $* fi } @@ -91,9 +62,9 @@ run_metaflac_silent () else if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_metaflac.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac $* 2>/dev/null 4>>test_metaflac.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac${EXE} $* 2>/dev/null 4>>test_metaflac.valgrind.log else - metaflac $* 2>/dev/null + metaflac${EXE} $* 2>/dev/null fi fi } @@ -105,7 +76,7 @@ check_flac () echo "Generating stream..." bytes=80000 -if dd if=/dev/zero ibs=1 count=$bytes | flac --force --verify -0 --input-size=$bytes --output-name=$flacfile --force-raw-format --endian=big --sign=signed --channels=1 --bps=8 --sample-rate=8000 - ; then +if dd if=/dev/zero ibs=1 count=$bytes | flac${EXE} --force --verify -0 --input-size=$bytes --output-name=$flacfile --force-raw-format --endian=big --sign=signed --channels=1 --bps=8 --sample-rate=8000 - ; then chmod +w $flacfile else die "ERROR during generation" @@ -394,101 +365,3 @@ cp -p metaflac.flac.in $flacfile run_metaflac --remove --block-type=VORBIS_COMMENT --dont-use-padding $flacfile cmp $flacfile metaflac.flac.ok || die "ERROR, $flacfile and metaflac.flac.ok differ" echo OK - -# Replay gain tests - Test the rates which have specific filter table entries -# and verify that harmonics can be processed correctly. - -tonegenerator () -{ - # When using GAWK, use --lint=posix to identify non-POSIX awk usages. - awk -- ' - BEGIN { - samplerate = '$1'; - - tone = 1000; - duration = 1; - bitspersample = 24; - - samplemidpoint = 1; - for (sps = 0 ; sps < bitspersample - 1 ; sps++) { - samplemidpoint *= 2; - } - - samplerange = samplemidpoint - 1; - - pi = 4 * atan2(1,1); - - for (ix = 0; ix < duration * samplerate; ++ix) { - sample = sin(2 * pi * tone * ix / samplerate); - sample *= samplerange; - sample += samplemidpoint; - sample = int(sample); - for (bx = 0; bx < bitspersample/8; ++bx) { - byte[bx] = sample % 256; - sample /= 256; - } - while (bx--) { - printf("%c", byte[bx]); - } - } - - }' /dev/null | - flac --silent \ - --endian=big --channels=1 --bps=24 --sample-rate=$1 --sign=unsigned - -} - -REPLAYGAIN_FREQ= -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 8000/-12.73" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 11025/-12.93" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 11025/-12.93" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 12000/-12.98" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 16000/-13.27" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 18900/-13.41" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 22050/-13.77" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 24000/-13.82" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 28000/-14.06" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 32000/-14.08" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 36000/-14.12" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 37800/-14.18" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 44100/-14.17" -REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 48000/-14.16:1:2:4" - -set -e - -for ACTION in $REPLAYGAIN_FREQ ; do - if [ -n "${ACTION##*:*}" ] ; then - HARMONICS=1 - else - HARMONICS="${ACTION#*:}" - fi - FREQ="${ACTION%%/*}" - GAIN="${ACTION#*/}" - GAIN="${GAIN%%:*}" - while [ -n "$HARMONICS" ] ; do - MULTIPLE="${HARMONICS%%:*}" - if [ x"$MULTIPLE" = x"$HARMONICS" ] ; then - HARMONICS= - else - HARMONICS="${HARMONICS#*:}" - fi - RATE=$(($MULTIPLE * FREQ)) - [ $MULTIPLE -eq 1 -o -n "${REPLAYGAIN_FREQ##* $RATE/*}" ] || break - echo -n "Testing FLAC replaygain $RATE ($FREQ x $MULTIPLE) ... " - tonegenerator $RATE > $flacfile - run_metaflac --add-replay-gain $flacfile - run_metaflac --list $flacfile | grep REPLAYGAIN.*GAIN= | - while read -r REPLAYGAIN ; do - MEASUREDGAIN="${REPLAYGAIN##*=}" - MEASUREDGAIN="${MEASUREDGAIN%% *}" - if [ x"$MEASUREDGAIN" != x"$GAIN" ] ; then - die "ERROR, Expected $GAIN db instead of $REPLAYGAIN" - fi - done - echo OK - done -done - - -rm -f $testdir/out.flac $testdir/out.meta - -exit 0 diff --git a/lib-src/libflac/test/test_replaygain.sh b/lib-src/libflac/test/test_replaygain.sh new file mode 100755 index 000000000..eb0b0ef95 --- /dev/null +++ b/lib-src/libflac/test/test_replaygain.sh @@ -0,0 +1,188 @@ +#!/bin/sh -e + +# FLAC - Free Lossless Audio Codec +# Copyright (C) 2002-2009 Josh Coalson +# Copyright (C) 2011-2014 Xiph.Org Foundation +# +# This file is part the FLAC project. FLAC is comprised of several +# components distributed under different licenses. The codec libraries +# are distributed under Xiph.Org's BSD-like license (see the file +# COPYING.Xiph in this distribution). All other programs, libraries, and +# plugins are distributed under the GPL (see COPYING.GPL). The documentation +# is distributed under the Gnu FDL (see COPYING.FDL). Each file in the +# FLAC distribution contains at the top the terms under which it may be +# distributed. +# +# Since this particular file is relevant to all components of FLAC, +# it may be distributed under the Xiph.Org license, which is the least +# restrictive of those mentioned above. See the file COPYING.Xiph in this +# distribution. + +. ./common.sh + +PATH=`pwd`/../src/flac:$PATH +PATH=`pwd`/../src/metaflac:$PATH +PATH=`pwd`/../objs/$BUILD/bin:$PATH + +if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then EGREP='grep -E' + else EGREP='egrep' +fi + +testdir="metaflac-test-files" +flacfile="replaygain.flac" + +run_flac () +{ + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_replaygain.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac --no-error-on-compression-fail $* 4>>test_replaygain.valgrind.log + else + flac${EXE} --no-error-on-compression-fail $* + fi +} + +run_metaflac () +{ + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_replaygain.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac $* 4>>test_replaygain.valgrind.log + else + metaflac${EXE} $* + fi +} + +run_metaflac_silent () +{ + if [ -z "$SILENT" ] ; then + run_metaflac $* + else + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_replaygain.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac $* 2>/dev/null 4>>test_replaygain.valgrind.log + else + metaflac${EXE} $* 2>/dev/null + fi + fi +} + +check_flac () +{ + run_flac --silent --test $flacfile || die "ERROR in $flacfile" 1>&2 +} + +echo "Generating stream..." +bytes=80000 +if dd if=/dev/zero ibs=1 count=$bytes | flac${EXE} --force --verify -0 --input-size=$bytes --output-name=$flacfile --force-raw-format --endian=big --sign=signed --channels=1 --bps=8 --sample-rate=8000 - ; then + chmod +w $flacfile +else + die "ERROR during generation" +fi + +check_flac + + +if mawk ; then + AWK=mawk +else + # Really hope awk is not gawk, because the following AWK script doesn't + # work correctly with gawk 4.0.1 but did with earlier versions. + AWK=awk + fi + +# Replay gain tests - Test the rates which have specific filter table entries +# and verify that harmonics can be processed correctly. + +tonegenerator () +{ + # When using GAWK, use --lint=posix to identify non-POSIX awk usages. + $AWK -- ' + BEGIN { + samplerate = '$1'; + + tone = 1000; + duration = 1; + bitspersample = 24; + + samplemidpoint = 1; + for (sps = 0 ; sps < bitspersample - 1 ; sps++) { + samplemidpoint *= 2; + } + + samplerange = samplemidpoint - 1; + + pi = 4 * atan2(1,1); + + for (ix = 0; ix < duration * samplerate; ++ix) { + sample = sin(2 * pi * tone * ix / samplerate); + sample *= samplerange; + sample += samplemidpoint; + sample = int(sample); + for (bx = 0; bx < bitspersample/8; ++bx) { + byte[bx] = sample % 256; + sample /= 256; + } + while (bx--) { + printf("%c", byte[bx]); + } + } + + }' /dev/null | + flac${EXE} --silent --no-error-on-compression-fail --force-raw-format \ + --endian=big --channels=1 --bps=24 --sample-rate=$1 --sign=unsigned - +} + +REPLAYGAIN_FREQ= +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 8000/-12.76" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 11025/-12.93" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 12000/-13.00" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 16000/-13.29" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 18900/-13.43" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 22050/-13.77" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 24000/-13.83" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 28000/-14.06" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 32000/-14.08" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 36000/-14.12" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 37800/-14.18" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 44100/-14.17" +REPLAYGAIN_FREQ="$REPLAYGAIN_FREQ 48000/-14.16:1:2:4" + +set -e + +for ACTION in $REPLAYGAIN_FREQ ; do + if [ -n "${ACTION##*:*}" ] ; then + HARMONICS=1 + else + HARMONICS="${ACTION#*:}" + fi + FREQ="${ACTION%%/*}" + GAIN="${ACTION#*/}" + GAIN="${GAIN%%:*}" + while [ -n "$HARMONICS" ] ; do + MULTIPLE="${HARMONICS%%:*}" + if [ x"$MULTIPLE" = x"$HARMONICS" ] ; then + HARMONICS= + else + HARMONICS="${HARMONICS#*:}" + fi + RATE=$(($MULTIPLE * FREQ)) + [ $MULTIPLE -eq 1 -o -n "${REPLAYGAIN_FREQ##* $RATE/*}" ] || break + echo -n "Testing FLAC replaygain $RATE ($FREQ x $MULTIPLE) ... " + tonegenerator $RATE > $flacfile + run_metaflac --add-replay-gain $flacfile + run_metaflac --list $flacfile | grep REPLAYGAIN.*GAIN= | + while read -r REPLAYGAIN ; do + MEASUREDGAIN="${REPLAYGAIN##*=}" + MEASUREDGAIN="${MEASUREDGAIN%% *}" + if [ x"$MEASUREDGAIN" != x"$GAIN" ] ; then + die "ERROR, Expected $GAIN db instead of $REPLAYGAIN" + fi + done + echo OK + done +done + + +rm -f $testdir/out.flac $testdir/out.meta + +exit 0 diff --git a/lib-src/libflac/test/test_seeking.sh b/lib-src/libflac/test/test_seeking.sh index ce76de075..8c433050d 100755 --- a/lib-src/libflac/test/test_seeking.sh +++ b/lib-src/libflac/test/test_seeking.sh @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/sh -e # FLAC - Free Lossless Audio Codec # Copyright (C) 2004-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -18,23 +18,8 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. -die () -{ - echo $* 1>&2 - exit 1 -} +. ./common.sh -if [ x = x"$1" ] ; then - BUILD=debug -else - BUILD="$1" -fi - -LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH -LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -export MALLOC_CHECK_=3 -export MALLOC_PERTURB_=$((RANDOM % 255 + 1)) PATH=../src/flac:$PATH PATH=../src/metaflac:$PATH PATH=../src/test_seeking:$PATH @@ -45,16 +30,16 @@ if [ x"$FLAC__TEST_LEVEL" = x ] ; then FLAC__TEST_LEVEL=1 fi -flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" -metaflac --help 1>/dev/null 2>/dev/null || die "ERROR can't find metaflac executable" +flac${EXE} --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" +metaflac${EXE} --help 1>/dev/null 2>/dev/null || die "ERROR can't find metaflac executable" run_flac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_seeking.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_seeking.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac${EXE} --no-error-on-compression-fail $* 4>>test_seeking.valgrind.log else - flac $* + flac${EXE} --no-error-on-compression-fail $* fi } @@ -62,9 +47,9 @@ run_metaflac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_seeking.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac $* 4>>test_seeking.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac${EXE} $* 4>>test_seeking.valgrind.log else - metaflac $* + metaflac${EXE} $* fi } @@ -74,19 +59,17 @@ run_test_seeking () echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 test_seeking $*" >>test_seeking.valgrind.log valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_seeking $* 4>>test_seeking.valgrind.log else - test_seeking $* + test_seeking${EXE} $* fi } -echo "Checking for --ogg support in flac..." -if flac --ogg --silent --force-raw-format --endian=little --sign=signed --channels=1 --bps=8 --sample-rate=44100 -c $0 1>/dev/null 2>&1 ; then +echo -n "Checking for --ogg support in flac ... " +if flac${EXE} --ogg --no-error-on-compression-fail --silent --force-raw-format --endian=little --sign=signed --channels=1 --bps=8 --sample-rate=44100 -c $0 1>/dev/null 2>&1 ; then has_ogg=yes; - echo "flac --ogg works" else has_ogg=no; - echo "flac --ogg doesn't work" fi - +echo ${has_ogg} echo "Generating streams..." if [ ! -f noise.raw ] ; then @@ -99,8 +82,8 @@ run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=8 --channels=1 --blocksize=576 -S10x --output-name=tiny-s.flac noise8m32.raw || die "ERROR generating FLAC file" run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 -S10x --output-name=small-s.flac noise.raw || die "ERROR generating FLAC file" -tiny_samples=`metaflac --show-total-samples tiny.flac` -small_samples=`metaflac --show-total-samples small.flac` +tiny_samples=`metaflac${EXE} --show-total-samples tiny.flac` +small_samples=`metaflac${EXE} --show-total-samples small.flac` tiny_seek_count=100 if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then diff --git a/lib-src/libflac/test/test_streams.sh b/lib-src/libflac/test/test_streams.sh index 78497820e..9ba922712 100755 --- a/lib-src/libflac/test/test_streams.sh +++ b/lib-src/libflac/test/test_streams.sh @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/sh -e # FLAC - Free Lossless Audio Codec # Copyright (C) 2001-2009 Josh Coalson -# Copyright (C) 2011-2013 Xiph.Org Foundation +# Copyright (C) 2011-2014 Xiph.Org Foundation # # This file is part the FLAC project. FLAC is comprised of several # components distributed under different licenses. The codec libraries @@ -18,22 +18,8 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. -die () -{ - echo $* 1>&2 - exit 1 -} +. ./common.sh -if [ x = x"$1" ] ; then - BUILD=debug -else - BUILD="$1" -fi - -LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -export MALLOC_CHECK_=3 -export MALLOC_PERTURB_=$((RANDOM % 255 + 1)) PATH=../src/flac:$PATH PATH=../src/test_streams:$PATH PATH=../objs/$BUILD/bin:$PATH @@ -42,15 +28,15 @@ if [ x"$FLAC__TEST_LEVEL" = x ] ; then FLAC__TEST_LEVEL=1 fi -flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" +flac${EXE} --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" run_flac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_streams.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_streams.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac --no-error-on-compression-fail $* 4>>test_streams.valgrind.log else - flac $* + flac${EXE} --no-error-on-compression-fail $* fi } diff --git a/lib-src/libflac/test/test_wrapper.sh b/lib-src/libflac/test/test_wrapper.sh index 3832a9223..74be77d8e 100755 --- a/lib-src/libflac/test/test_wrapper.sh +++ b/lib-src/libflac/test/test_wrapper.sh @@ -7,5 +7,6 @@ ./test_grabbag.sh ./test_flac.sh ./test_metaflac.sh +./test_replaygain.sh ./test_seeking.sh ./test_streams.sh