mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-23 01:44:22 +00:00
Code Activity

Browse source
This commit is contained in:
jules 2008-05-18 21:12:04 +00:00
parent e08ebbf2e6
commit f4d2d645a4
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/juce demo/src/demos/OpenGLDemo.cpp
View file

@ -43,10 +43,6 @@
#ifdef _WIN32
#include <gl/gl.h>
#include <gl/glu.h>
#ifdef _MSC_VER
#pragma comment(lib, "OpenGL32.Lib")
#pragma comment(lib, "GlU32.Lib")
#endif
#elif defined (LINUX)
#include <GL/gl.h>
#include <GL/glut.h>

11
src/juce_appframework/audio/audio_file_formats/juce_AiffAudioFormat.cpp
View file

@ -39,11 +39,12 @@ BEGIN_JUCE_NAMESPACE
#include "../../../juce_core/text/juce_LocalisedStrings.h"
#undef chunkName
#define chunkName(a) (int)littleEndianInt(a)
//==============================================================================
#define formatName TRANS("AIFF file")
static const tchar* const extensions[] = { T(".aiff"), T(".aif"), 0 };
#define aiffFormatName TRANS("AIFF file")
static const tchar* const aiffExtensions[] = { T(".aiff"), T(".aif"), 0 };
//==============================================================================
@ -56,7 +57,7 @@ public:
//==============================================================================
AiffAudioFormatReader (InputStream* in)
: AudioFormatReader (in, formatName)
: AudioFormatReader (in, aiffFormatName)
{
if (input->readInt() == chunkName ("FORM"))
{
@ -624,7 +625,7 @@ public:
const unsigned int chans,
const int bits)
: AudioFormatWriter (out,
formatName,
aiffFormatName,
sampleRate,
chans,
bits),
@ -767,7 +768,7 @@ public:
//==============================================================================
AiffAudioFormat::AiffAudioFormat()
: AudioFormat (formatName, (const tchar**) extensions)
: AudioFormat (aiffFormatName, (const tchar**) aiffExtensions)
{
}

11
src/juce_appframework/audio/audio_file_formats/juce_WavAudioFormat.cpp
View file

@ -39,8 +39,8 @@ BEGIN_JUCE_NAMESPACE
//==============================================================================
#define formatName TRANS("WAV file")
static const tchar* const extensions[] = { T(".wav"), T(".bwf"), 0 };
#define wavFormatName TRANS("WAV file")
static const tchar* const wavExtensions[] = { T(".wav"), T(".bwf"), 0 };
//==============================================================================
@ -156,6 +156,7 @@ struct BWAVChunk
#undef PACKED
#undef chunkName
#define chunkName(a) ((int) littleEndianInt(a))
//==============================================================================
@ -170,7 +171,7 @@ class WavAudioFormatReader : public AudioFormatReader
public:
//==============================================================================
WavAudioFormatReader (InputStream* const in)
: AudioFormatReader (in, formatName),
: AudioFormatReader (in, wavFormatName),
dataLength (0)
{
if (input->readInt() == chunkName ("RIFF"))
@ -543,7 +544,7 @@ public:
const int bits,
const StringPairArray& metadataValues)
: AudioFormatWriter (out,
formatName,
wavFormatName,
sampleRate,
numChannels_,
bits),
@ -686,7 +687,7 @@ public:
//==============================================================================
WavAudioFormat::WavAudioFormat()
: AudioFormat (formatName, (const tchar**) extensions)
: AudioFormat (wavFormatName, (const tchar**) wavExtensions)
{
}