Bug 2457 - Windows: WAV Export runs 6 to 7 times slower than on 2.3.3 (and 12-14 times slower than 2.2.2)

This commit is contained in:
Leland Lucius 2020-05-29 08:31:15 -05:00
parent ef98e5d25f
commit 5bede69d11
2 changed files with 16 additions and 22 deletions

View File

@ -1128,10 +1128,6 @@ if( CMAKE_SYSTEM_NAME MATCHES "Windows" )
../win/audacity.rc
)
# Force use of our versions
set( HAVE_LRINT NO )
set( HAVE_LRINTF NO )
# Create the config file
configure_file( audacity_config.h.in private/configwin.h )

View File

@ -42,24 +42,7 @@
** the config.h file.
*/
#if (HAVE_LRINT && HAVE_LRINTF)
/* These defines enable functionality introduced with the 1999 ISO C
** standard. They must be defined before the inclusion of math.h to
** engage them. If optimisation is enabled, these functions will be
** inlined. With optimisation switched off, you have to link in the
** maths library using -lm.
*/
#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
#define __USE_ISOC9X 1
#define __USE_ISOC99 1
#include <math.h>
#elif (defined (WIN32) || defined (_WIN32))
#if (defined (WIN32) || defined (_WIN32))
// Including math.h allows us to use the inline assembler versions without
// producing errors in newer Visual Studio versions.
@ -120,7 +103,22 @@
return intgr ;
}
#elif (HAVE_LRINT && HAVE_LRINTF)
/* These defines enable functionality introduced with the 1999 ISO C
** standard. They must be defined before the inclusion of math.h to
** engage them. If optimisation is enabled, these functions will be
** inlined. With optimisation switched off, you have to link in the
** maths library using -lm.
*/
#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
#define __USE_ISOC9X 1
#define __USE_ISOC99 1
#include <math.h>
#else
/* dmazzoni: modified these to do a proper rounding, even though