mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-31 03:00:05 +00:00
Code Activity

Changed the Linux native code files to use the same amalgamation file structure as the mac and windows ones do; made a small adjustment to the amalgamator, and removed some redundancy from the amalgamated files (if you are amalgamating code yourself, please build a new copy of the amalgamator, as the old one won't work correctly on this new code); fixed a few minor build warnings in linux

Browse source
This commit is contained in:
jules 2009-08-13 11:11:26 +00:00
parent 4544b32be7
commit ddc16536a3
49 changed files with 3800 additions and 14878 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/juce_amalgamated_template.cpp
View file

@ -44,13 +44,13 @@
#error
#endif
#include "../juce_Config.h"
#include "../juce_Config.h" // FORCE_AMALGAMATOR_INCLUDE
//==============================================================================
#ifdef _WIN32
#include "../build/win32/platform_specific_code/juce_win32_NativeIncludes.h"
#elif defined (LINUX)
//
#include "../build/linux/platform_specific_code/juce_linux_NativeIncludes.h"
#else
#include "../build/macosx/platform_specific_code/juce_mac_NativeIncludes.h"
#endif
@ -333,46 +333,24 @@
#include "juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp"
#if ! JUCE_ONLY_BUILD_CORE_LIBRARY
#include "juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp"
#include "juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp"
#include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp"
#include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp"
#include "juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp"
#include "juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp"
#include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp"
#include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp"
#endif
//==============================================================================
#if JUCE_WIN32
#include "../build/win32/platform_specific_code/juce_win32_NativeCode.cpp"
#include "../build/win32/platform_specific_code/juce_win32_AutoLinkLibraries.h"
#include "../build/win32/platform_specific_code/juce_win32_NativeCode.cpp"
#include "../build/win32/platform_specific_code/juce_win32_AutoLinkLibraries.h"
#endif
//==============================================================================
#if JUCE_LINUX
#include "../build/linux/platform_specific_code/juce_linux_Files.cpp"
#include "../build/linux/platform_specific_code/juce_linux_NamedPipe.cpp"
#include "../build/linux/platform_specific_code/juce_linux_Network.cpp"
#include "../build/linux/platform_specific_code/juce_linux_SystemStats.cpp"
#include "../build/linux/platform_specific_code/juce_linux_Threads.cpp"
#if ! JUCE_ONLY_BUILD_CORE_LIBRARY
#include "../build/linux/platform_specific_code/juce_linux_Audio.cpp"
#include "../build/linux/platform_specific_code/juce_linux_AudioCDReader.cpp"
#include "../build/linux/platform_specific_code/juce_linux_FileChooser.cpp"
#include "../build/linux/platform_specific_code/juce_linux_Fonts.cpp"
#include "../build/linux/platform_specific_code/juce_linux_Messaging.cpp"
#include "../build/linux/platform_specific_code/juce_linux_Midi.cpp"
#include "../build/linux/platform_specific_code/juce_linux_WebBrowserComponent.cpp"
#include "../build/linux/platform_specific_code/juce_linux_Windowing.cpp"
#endif
#include "../build/linux/platform_specific_code/juce_linux_NativeCode.cpp"
#endif
//==============================================================================
#if JUCE_MAC
#include "../build/macosx/platform_specific_code/juce_mac_NativeCode.mm"
#include "../build/macosx/platform_specific_code/juce_mac_NamedPipe.cpp"
#include "../build/macosx/platform_specific_code/juce_mac_NativeCode.mm"
#endif

2
src/juce_appframework/audio/audio_file_formats/oggvorbis/codec.h
View file

@ -168,7 +168,7 @@ extern int vorbis_info_blocksize(vorbis_info *vi,int zo);
extern void vorbis_comment_init(vorbis_comment *vc);
extern void vorbis_comment_add(vorbis_comment *vc, char *comment);
extern void vorbis_comment_add_tag(vorbis_comment *vc,
char *tag, char *contents);
const char *tag, char *contents);
extern char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count);
extern int vorbis_comment_query_count(vorbis_comment *vc, char *tag);
extern void vorbis_comment_clear(vorbis_comment *vc);

2
src/juce_appframework/audio/audio_file_formats/oggvorbis/libvorbis-1.1.2/lib/analysis.c
View file

@ -69,7 +69,7 @@ int vorbis_analysis(vorbis_block *vb, ogg_packet *op){
}
/* there was no great place to put this.... */
void _analysis_output_always(char *base,int i,float *v,int n,int bark,int dB,ogg_int64_t off){
void _analysis_output_always(const char *base,int i,float *v,int n,int bark,int dB,ogg_int64_t off){
int j;
FILE *of;
char buffer[80];

4
src/juce_appframework/audio/audio_file_formats/oggvorbis/libvorbis-1.1.2/lib/info.c
View file

@ -35,7 +35,7 @@
#include "os.h"
static void _v_writestring(oggpack_buffer *o,char *s, int bytes){
static void _v_writestring(oggpack_buffer *o, const char *s, int bytes){
while(bytes--){
oggpack_write(o,*s++,8);
@ -64,7 +64,7 @@ void vorbis_comment_add(vorbis_comment *vc,char *comment){
vc->user_comments[vc->comments]=NULL;
}
void vorbis_comment_add_tag(vorbis_comment *vc, char *tag, char *contents){
void vorbis_comment_add_tag(vorbis_comment *vc, const char *tag, char *contents){
char *comment=(char*)alloca(strlen(tag)+strlen(contents)+2); /* +2 for = and \0 */
strcpy(comment, tag);
strcat(comment, "=");

2
src/juce_appframework/audio/audio_file_formats/oggvorbis/libvorbis-1.1.2/lib/vorbisfile.c
View file

@ -1704,7 +1704,7 @@ long ov_read_float(OggVorbis_File *vf,float ***pcm_channels,int length,
}
extern float *vorbis_window(vorbis_dsp_state *v,int W);
extern void _analysis_output_always(char *base,int i,float *v,int n,int bark,int dB,
extern void _analysis_output_always(const char *base,int i,float *v,int n,int bark,int dB,
ogg_int64_t off);
static void _ov_splice(float **pcm,float **lappcm,

4
src/juce_core/basics/juce_StandardHeader.h
View file

@ -83,10 +83,6 @@
#include <cstring>
#include <cstdio>
#if JUCE_MAC || JUCE_LINUX
#include <pthread.h>
#endif
#if JUCE_USE_INTRINSICS
#include <intrin.h>
#endif

2
src/juce_core/io/streams/zlib/zutil.c
View file

@ -119,7 +119,7 @@ uLong ZEXPORT zlibCompileFlags()
# endif
int z_verbose = verbose;
void z_error (char *m)
void z_error (const char *m)
{
fprintf(stderr, "%s\n", m);
exit(1);

2
src/juce_core/io/streams/zlib/zutil.h
View file

@ -241,7 +241,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#ifdef DEBUG
# include <stdio.h>
extern int z_verbose;
extern void z_error OF((char *m));
extern void z_error OF((const char *m));
# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
# define Trace(x) {if (z_verbose>=0) fprintf x ;}
# define Tracev(x) {if (z_verbose>0) fprintf x ;}

12
src/juce_core_includes.h
View file

@ -35,9 +35,6 @@
#ifndef __JUCE_ATOMIC_JUCEHEADER__
#include "juce_core/basics/juce_Atomic.h"
#endif
#ifndef __JUCE_STANDARDHEADER_JUCEHEADER__
#include "juce_core/basics/juce_StandardHeader.h"
#endif
#ifndef __JUCE_FILELOGGER_JUCEHEADER__
#include "juce_core/basics/juce_FileLogger.h"
#endif
@ -59,6 +56,9 @@
#ifndef __JUCE_RANDOM_JUCEHEADER__
#include "juce_core/basics/juce_Random.h"
#endif
#ifndef __JUCE_TIME_JUCEHEADER__
#include "juce_core/basics/juce_Time.h"
#endif
#ifndef __JUCE_RELATIVETIME_JUCEHEADER__
#include "juce_core/basics/juce_RelativeTime.h"
#endif
@ -68,12 +68,12 @@
#ifndef __JUCE_SYSTEMSTATS_JUCEHEADER__
#include "juce_core/basics/juce_SystemStats.h"
#endif
#ifndef __JUCE_TIME_JUCEHEADER__
#include "juce_core/basics/juce_Time.h"
#endif
#ifndef __JUCE_DATACONVERSIONS_JUCEHEADER__
#include "juce_core/basics/juce_DataConversions.h"
#endif
#ifndef __JUCE_STANDARDHEADER_JUCEHEADER__
#include "juce_core/basics/juce_StandardHeader.h"
#endif
#ifndef __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
#include "juce_core/containers/juce_ArrayAllocationBase.h"
#endif