diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 1453c1c0f9..03cae62e5e 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -97254,15 +97254,13 @@ END_JUCE_NAMESPACE namespace FlacNamespace { - extern "C" - { - #define FLAC__NO_DLL 1 +#define FLAC__NO_DLL 1 - #if ! defined (SIZE_MAX) - #define SIZE_MAX 0xffffffff - #endif +#if ! defined (SIZE_MAX) + #define SIZE_MAX 0xffffffff +#endif - #define __STDC_LIMIT_MACROS 1 +#define __STDC_LIMIT_MACROS 1 /********* Start of inlined file: all.h *********/ #ifndef FLAC__ALL_H @@ -119943,7 +119941,6 @@ void FLAC__window_welch(FLAC__real *window, const FLAC__int32 L) #endif /********* End of inlined file: window_flac.c *********/ - } } #ifdef _MSC_VER @@ -120452,8 +120449,6 @@ END_JUCE_NAMESPACE namespace OggVorbisNamespace { - extern "C" - { /********* Start of inlined file: vorbisenc.h *********/ #ifndef _OV_ENC_H_ @@ -130183,6 +130178,16 @@ static void mapping0_free_info(vorbis_info_mapping *i){ } } +static int ilog3(unsigned int v){ + int ret=0; + if(v)--v; + while(v){ + ret++; + v>>=1; + } + return(ret); +} + static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm, oggpack_buffer *opb){ int i; @@ -130206,8 +130211,8 @@ static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm, oggpack_write(opb,info->coupling_steps-1,8); for(i=0;icoupling_steps;i++){ - oggpack_write(opb,info->coupling_mag[i],ilog(vi->channels)); - oggpack_write(opb,info->coupling_ang[i],ilog(vi->channels)); + oggpack_write(opb,info->coupling_mag[i],ilog3(vi->channels)); + oggpack_write(opb,info->coupling_ang[i],ilog3(vi->channels)); } }else oggpack_write(opb,0,1); @@ -130242,8 +130247,8 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb) info->coupling_steps=oggpack_read(opb,8)+1; for(i=0;icoupling_steps;i++){ - int testM=info->coupling_mag[i]=oggpack_read(opb,ilog(vi->channels)); - int testA=info->coupling_ang[i]=oggpack_read(opb,ilog(vi->channels)); + int testM=info->coupling_mag[i]=oggpack_read(opb,ilog3(vi->channels)); + int testA=info->coupling_ang[i]=oggpack_read(opb,ilog3(vi->channels)); if(testM<0 || testA<0 || @@ -178995,7 +179000,6 @@ void _vorbis_apply_window(float *d,int *winno,long *blocksizes, #endif /********* End of inlined file: window.c *********/ - } } BEGIN_JUCE_NAMESPACE @@ -249018,7 +249022,7 @@ private: unsigned long flags; unsigned long functions; unsigned long decorations; - ::INT32 input_mode; + long input_mode; unsigned long status; } MotifWmHints; @@ -249079,7 +249083,7 @@ private: unsigned long flags; unsigned long functions; unsigned long decorations; - ::INT32 input_mode; + long input_mode; unsigned long status; } MotifWmHints; @@ -249393,7 +249397,7 @@ private: XA_CARDINAL, &actualType, &actualFormat, &nitems, &bytesLeft, &data) == Success) { - const unsigned long* const sizes = (const CARD32*) data; + const unsigned long* const sizes = (const unsigned long*) data; if (actualFormat == 32) windowBorder = BorderSize ((int) sizes[2], (int) sizes[0], diff --git a/src/juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp b/src/juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp index 20f14d4b40..7d8a55eeba 100644 --- a/src/juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp +++ b/src/juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp @@ -45,32 +45,29 @@ namespace FlacNamespace { - extern "C" - { - #define FLAC__NO_DLL 1 - - #if ! defined (SIZE_MAX) - #define SIZE_MAX 0xffffffff - #endif - - #define __STDC_LIMIT_MACROS 1 - #include "flac/all.h" - #include "flac/libFLAC/bitmath.c" - #include "flac/libFLAC/bitreader.c" - #include "flac/libFLAC/bitwriter.c" - #include "flac/libFLAC/cpu.c" - #include "flac/libFLAC/crc.c" - #include "flac/libFLAC/fixed.c" - #include "flac/libFLAC/float.c" - #include "flac/libFLAC/format.c" - #include "flac/libFLAC/lpc_flac.c" - #include "flac/libFLAC/md5.c" - #include "flac/libFLAC/memory.c" - #include "flac/libFLAC/stream_decoder.c" - #include "flac/libFLAC/stream_encoder.c" - #include "flac/libFLAC/stream_encoder_framing.c" - #include "flac/libFLAC/window_flac.c" - } +#define FLAC__NO_DLL 1 + +#if ! defined (SIZE_MAX) + #define SIZE_MAX 0xffffffff +#endif + +#define __STDC_LIMIT_MACROS 1 +#include "flac/all.h" +#include "flac/libFLAC/bitmath.c" +#include "flac/libFLAC/bitreader.c" +#include "flac/libFLAC/bitwriter.c" +#include "flac/libFLAC/cpu.c" +#include "flac/libFLAC/crc.c" +#include "flac/libFLAC/fixed.c" +#include "flac/libFLAC/float.c" +#include "flac/libFLAC/format.c" +#include "flac/libFLAC/lpc_flac.c" +#include "flac/libFLAC/md5.c" +#include "flac/libFLAC/memory.c" +#include "flac/libFLAC/stream_decoder.c" +#include "flac/libFLAC/stream_encoder.c" +#include "flac/libFLAC/stream_encoder_framing.c" +#include "flac/libFLAC/window_flac.c" } #ifdef _MSC_VER diff --git a/src/juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp b/src/juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp index eaaef9cf84..079dfd9439 100644 --- a/src/juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp +++ b/src/juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp @@ -42,36 +42,33 @@ namespace OggVorbisNamespace { - extern "C" - { - #include "oggvorbis/vorbisenc.h" - #include "oggvorbis/codec.h" - #include "oggvorbis/vorbisfile.h" - - #include "oggvorbis/bitwise.c" - #include "oggvorbis/framing.c" - #include "oggvorbis/libvorbis-1.1.2/lib/analysis.c" - #include "oggvorbis/libvorbis-1.1.2/lib/bitrate.c" - #include "oggvorbis/libvorbis-1.1.2/lib/block.c" - #include "oggvorbis/libvorbis-1.1.2/lib/codebook.c" - #include "oggvorbis/libvorbis-1.1.2/lib/envelope.c" - #include "oggvorbis/libvorbis-1.1.2/lib/floor0.c" - #include "oggvorbis/libvorbis-1.1.2/lib/floor1.c" - #include "oggvorbis/libvorbis-1.1.2/lib/info.c" - #include "oggvorbis/libvorbis-1.1.2/lib/lpc.c" - #include "oggvorbis/libvorbis-1.1.2/lib/lsp.c" - #include "oggvorbis/libvorbis-1.1.2/lib/mapping0.c" - #include "oggvorbis/libvorbis-1.1.2/lib/mdct.c" - #include "oggvorbis/libvorbis-1.1.2/lib/psy.c" - #include "oggvorbis/libvorbis-1.1.2/lib/registry.c" - #include "oggvorbis/libvorbis-1.1.2/lib/res0.c" - #include "oggvorbis/libvorbis-1.1.2/lib/sharedbook.c" - #include "oggvorbis/libvorbis-1.1.2/lib/smallft.c" - #include "oggvorbis/libvorbis-1.1.2/lib/synthesis.c" - #include "oggvorbis/libvorbis-1.1.2/lib/vorbisenc.c" - #include "oggvorbis/libvorbis-1.1.2/lib/vorbisfile.c" - #include "oggvorbis/libvorbis-1.1.2/lib/window.c" - } +#include "oggvorbis/vorbisenc.h" +#include "oggvorbis/codec.h" +#include "oggvorbis/vorbisfile.h" + +#include "oggvorbis/bitwise.c" +#include "oggvorbis/framing.c" +#include "oggvorbis/libvorbis-1.1.2/lib/analysis.c" +#include "oggvorbis/libvorbis-1.1.2/lib/bitrate.c" +#include "oggvorbis/libvorbis-1.1.2/lib/block.c" +#include "oggvorbis/libvorbis-1.1.2/lib/codebook.c" +#include "oggvorbis/libvorbis-1.1.2/lib/envelope.c" +#include "oggvorbis/libvorbis-1.1.2/lib/floor0.c" +#include "oggvorbis/libvorbis-1.1.2/lib/floor1.c" +#include "oggvorbis/libvorbis-1.1.2/lib/info.c" +#include "oggvorbis/libvorbis-1.1.2/lib/lpc.c" +#include "oggvorbis/libvorbis-1.1.2/lib/lsp.c" +#include "oggvorbis/libvorbis-1.1.2/lib/mapping0.c" +#include "oggvorbis/libvorbis-1.1.2/lib/mdct.c" +#include "oggvorbis/libvorbis-1.1.2/lib/psy.c" +#include "oggvorbis/libvorbis-1.1.2/lib/registry.c" +#include "oggvorbis/libvorbis-1.1.2/lib/res0.c" +#include "oggvorbis/libvorbis-1.1.2/lib/sharedbook.c" +#include "oggvorbis/libvorbis-1.1.2/lib/smallft.c" +#include "oggvorbis/libvorbis-1.1.2/lib/synthesis.c" +#include "oggvorbis/libvorbis-1.1.2/lib/vorbisenc.c" +#include "oggvorbis/libvorbis-1.1.2/lib/vorbisfile.c" +#include "oggvorbis/libvorbis-1.1.2/lib/window.c" } BEGIN_JUCE_NAMESPACE diff --git a/src/juce_appframework/audio/audio_file_formats/oggvorbis/libvorbis-1.1.2/lib/mapping0.c b/src/juce_appframework/audio/audio_file_formats/oggvorbis/libvorbis-1.1.2/lib/mapping0.c index e4732aa842..6a27787b0f 100644 --- a/src/juce_appframework/audio/audio_file_formats/oggvorbis/libvorbis-1.1.2/lib/mapping0.c +++ b/src/juce_appframework/audio/audio_file_formats/oggvorbis/libvorbis-1.1.2/lib/mapping0.c @@ -48,6 +48,16 @@ static void mapping0_free_info(vorbis_info_mapping *i){ } } +static int ilog3(unsigned int v){ + int ret=0; + if(v)--v; + while(v){ + ret++; + v>>=1; + } + return(ret); +} + static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm, oggpack_buffer *opb){ int i; @@ -71,8 +81,8 @@ static void mapping0_pack(vorbis_info *vi,vorbis_info_mapping *vm, oggpack_write(opb,info->coupling_steps-1,8); for(i=0;icoupling_steps;i++){ - oggpack_write(opb,info->coupling_mag[i],ilog(vi->channels)); - oggpack_write(opb,info->coupling_ang[i],ilog(vi->channels)); + oggpack_write(opb,info->coupling_mag[i],ilog3(vi->channels)); + oggpack_write(opb,info->coupling_ang[i],ilog3(vi->channels)); } }else oggpack_write(opb,0,1); @@ -107,8 +117,8 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb) info->coupling_steps=oggpack_read(opb,8)+1; for(i=0;icoupling_steps;i++){ - int testM=info->coupling_mag[i]=oggpack_read(opb,ilog(vi->channels)); - int testA=info->coupling_ang[i]=oggpack_read(opb,ilog(vi->channels)); + int testM=info->coupling_mag[i]=oggpack_read(opb,ilog3(vi->channels)); + int testA=info->coupling_ang[i]=oggpack_read(opb,ilog3(vi->channels)); if(testM<0 || testA<0 ||