mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
A bit more minor cleaning-up.
This commit is contained in:
parent
7f6394478a
commit
636ffe68d3
33 changed files with 31 additions and 87 deletions
|
|
@ -25,6 +25,7 @@
|
|||
#ifndef JUCE_DECIBELS_H_INCLUDED
|
||||
#define JUCE_DECIBELS_H_INCLUDED
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
This class contains some helpful static methods for dealing with decibel values.
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#ifndef JUCE_LAGRANGEINTERPOLATOR_H_INCLUDED
|
||||
#define JUCE_LAGRANGEINTERPOLATOR_H_INCLUDED
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
Interpolator for resampling a stream of floats using 4-point lagrange interpolation.
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
namespace juce
|
||||
{
|
||||
|
||||
// START_AUTOINCLUDE buffers, effects, midi, sources, synthesisers
|
||||
#include "buffers/juce_AudioDataConverters.h"
|
||||
#include "buffers/juce_AudioSampleBuffer.h"
|
||||
#include "buffers/juce_FloatVectorOperations.h"
|
||||
|
|
@ -39,22 +38,21 @@ namespace juce
|
|||
#include "effects/juce_IIRFilter.h"
|
||||
#include "effects/juce_LagrangeInterpolator.h"
|
||||
#include "effects/juce_Reverb.h"
|
||||
#include "midi/juce_MidiMessage.h"
|
||||
#include "midi/juce_MidiBuffer.h"
|
||||
#include "midi/juce_MidiMessageSequence.h"
|
||||
#include "midi/juce_MidiFile.h"
|
||||
#include "midi/juce_MidiKeyboardState.h"
|
||||
#include "midi/juce_MidiMessage.h"
|
||||
#include "midi/juce_MidiMessageSequence.h"
|
||||
#include "sources/juce_AudioSource.h"
|
||||
#include "sources/juce_PositionableAudioSource.h"
|
||||
#include "sources/juce_BufferingAudioSource.h"
|
||||
#include "sources/juce_ChannelRemappingAudioSource.h"
|
||||
#include "sources/juce_IIRFilterAudioSource.h"
|
||||
#include "sources/juce_MixerAudioSource.h"
|
||||
#include "sources/juce_PositionableAudioSource.h"
|
||||
#include "sources/juce_ResamplingAudioSource.h"
|
||||
#include "sources/juce_ReverbAudioSource.h"
|
||||
#include "sources/juce_ToneGeneratorAudioSource.h"
|
||||
#include "synthesisers/juce_Synthesiser.h"
|
||||
// END_AUTOINCLUDE
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_MIDIBUFFER_H_INCLUDED
|
||||
#define JUCE_MIDIBUFFER_H_INCLUDED
|
||||
|
||||
#include "juce_MidiMessage.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_MIDIFILE_H_INCLUDED
|
||||
#define JUCE_MIDIFILE_H_INCLUDED
|
||||
|
||||
#include "juce_MidiMessageSequence.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
#ifndef JUCE_MIDIKEYBOARDSTATE_H_INCLUDED
|
||||
#define JUCE_MIDIKEYBOARDSTATE_H_INCLUDED
|
||||
|
||||
#include "juce_MidiBuffer.h"
|
||||
class MidiKeyboardState;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
|
||||
#define JUCE_MIDIMESSAGESEQUENCE_H_INCLUDED
|
||||
|
||||
#include "juce_MidiMessage.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_AUDIOSOURCE_H_INCLUDED
|
||||
#define JUCE_AUDIOSOURCE_H_INCLUDED
|
||||
|
||||
#include "../buffers/juce_AudioSampleBuffer.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_BUFFERINGAUDIOSOURCE_H_INCLUDED
|
||||
#define JUCE_BUFFERINGAUDIOSOURCE_H_INCLUDED
|
||||
|
||||
#include "juce_PositionableAudioSource.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_CHANNELREMAPPINGAUDIOSOURCE_H_INCLUDED
|
||||
#define JUCE_CHANNELREMAPPINGAUDIOSOURCE_H_INCLUDED
|
||||
|
||||
#include "juce_AudioSource.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@
|
|||
#ifndef JUCE_IIRFILTERAUDIOSOURCE_H_INCLUDED
|
||||
#define JUCE_IIRFILTERAUDIOSOURCE_H_INCLUDED
|
||||
|
||||
#include "juce_AudioSource.h"
|
||||
#include "../effects/juce_IIRFilter.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_MIXERAUDIOSOURCE_H_INCLUDED
|
||||
#define JUCE_MIXERAUDIOSOURCE_H_INCLUDED
|
||||
|
||||
#include "juce_AudioSource.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_POSITIONABLEAUDIOSOURCE_H_INCLUDED
|
||||
#define JUCE_POSITIONABLEAUDIOSOURCE_H_INCLUDED
|
||||
|
||||
#include "juce_AudioSource.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_RESAMPLINGAUDIOSOURCE_H_INCLUDED
|
||||
#define JUCE_RESAMPLINGAUDIOSOURCE_H_INCLUDED
|
||||
|
||||
#include "juce_AudioSource.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@
|
|||
#ifndef JUCE_REVERBAUDIOSOURCE_H_INCLUDED
|
||||
#define JUCE_REVERBAUDIOSOURCE_H_INCLUDED
|
||||
|
||||
#include "juce_AudioSource.h"
|
||||
#include "../effects/juce_Reverb.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_TONEGENERATORAUDIOSOURCE_H_INCLUDED
|
||||
#define JUCE_TONEGENERATORAUDIOSOURCE_H_INCLUDED
|
||||
|
||||
#include "juce_AudioSource.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@
|
|||
#ifndef JUCE_SYNTHESISER_H_INCLUDED
|
||||
#define JUCE_SYNTHESISER_H_INCLUDED
|
||||
|
||||
#include "../buffers/juce_AudioSampleBuffer.h"
|
||||
#include "../midi/juce_MidiBuffer.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -112,9 +112,7 @@ public:
|
|||
virtual AudioFormatReader* createReaderFor (InputStream* sourceStream,
|
||||
bool deleteStreamIfOpeningFails) = 0;
|
||||
|
||||
/** Attempts to create a MemoryMappedAudioFormatReader, if possible for this
|
||||
format.
|
||||
|
||||
/** Attempts to create a MemoryMappedAudioFormatReader, if possible for this format.
|
||||
If the format does not support this, the method will return nullptr;
|
||||
*/
|
||||
virtual MemoryMappedAudioFormatReader* createMemoryMappedReader (const File& file);
|
||||
|
|
|
|||
|
|
@ -415,15 +415,12 @@ bool MemoryMappedAudioFormatReader::mapSectionOfFile (Range<int64> samplesToMap)
|
|||
return map != nullptr;
|
||||
}
|
||||
|
||||
static int memoryReadDummyVariable; // used to force the compiler not to optimise-away the read operation
|
||||
|
||||
void MemoryMappedAudioFormatReader::touchSample (int64 sample) const noexcept
|
||||
{
|
||||
if (map != nullptr && mappedSection.contains (sample))
|
||||
{
|
||||
static int dummy = 0; // to force the compiler not to optimise this stuff away
|
||||
dummy += *(int*) sampleToPointer (sample);
|
||||
}
|
||||
memoryReadDummyVariable += *(int*) sampleToPointer (sample);
|
||||
else
|
||||
{
|
||||
jassertfalse; // you must make sure that the window contains all the samples you're going to attempt to read.
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_AUDIOFORMATWRITER_H_INCLUDED
|
||||
#define JUCE_AUDIOFORMATWRITER_H_INCLUDED
|
||||
|
||||
#include "juce_AudioFormatReader.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_AUDIOSUBSECTIONREADER_H_INCLUDED
|
||||
#define JUCE_AUDIOSUBSECTIONREADER_H_INCLUDED
|
||||
|
||||
#include "juce_AudioFormatReader.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#ifndef JUCE_MEMORYMAPPEDAUDIOFORMATREADER_H_INCLUDED
|
||||
#define JUCE_MEMORYMAPPEDAUDIOFORMATREADER_H_INCLUDED
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
A specialised type of AudioFormatReader that uses a MemoryMappedFile to read
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_CPLUSPLUSCODETOKENISER_H_INCLUDED
|
||||
#define JUCE_CPLUSPLUSCODETOKENISER_H_INCLUDED
|
||||
|
||||
#include "juce_CodeTokeniser.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@
|
|||
#ifndef JUCE_CODEEDITORCOMPONENT_H_INCLUDED
|
||||
#define JUCE_CODEEDITORCOMPONENT_H_INCLUDED
|
||||
|
||||
#include "juce_CodeDocument.h"
|
||||
class CodeTokeniser;
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
A text editor component designed specifically for source code.
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@
|
|||
#ifndef JUCE_CODETOKENISER_H_INCLUDED
|
||||
#define JUCE_CODETOKENISER_H_INCLUDED
|
||||
|
||||
#include "juce_CodeDocument.h"
|
||||
#include "juce_CodeEditorComponent.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
namespace juce
|
||||
{
|
||||
|
||||
// START_AUTOINCLUDE documents, code_editor, embedding, lookandfeel, misc
|
||||
#include "documents/juce_FileBasedDocument.h"
|
||||
#include "code_editor/juce_CodeDocument.h"
|
||||
#include "code_editor/juce_CodeEditorComponent.h"
|
||||
|
|
@ -61,7 +60,6 @@ namespace juce
|
|||
#include "misc/juce_SplashScreen.h"
|
||||
#include "misc/juce_SystemTrayIconComponent.h"
|
||||
#include "misc/juce_WebBrowserComponent.h"
|
||||
// END_AUTOINCLUDE
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -68,20 +68,16 @@ public:
|
|||
const StringArray* headers = nullptr,
|
||||
const MemoryBlock* postData = nullptr);
|
||||
|
||||
/** Stops the current page loading.
|
||||
*/
|
||||
/** Stops the current page loading. */
|
||||
void stop();
|
||||
|
||||
/** Sends the browser back one page.
|
||||
*/
|
||||
/** Sends the browser back one page. */
|
||||
void goBack();
|
||||
|
||||
/** Sends the browser forward one page.
|
||||
*/
|
||||
/** Sends the browser forward one page. */
|
||||
void goForward();
|
||||
|
||||
/** Refreshes the browser.
|
||||
*/
|
||||
/** Refreshes the browser. */
|
||||
void refresh();
|
||||
|
||||
//==============================================================================
|
||||
|
|
|
|||
|
|
@ -77,23 +77,25 @@
|
|||
namespace juce
|
||||
{
|
||||
|
||||
#include "opengl/juce_OpenGLHelpers.h"
|
||||
class OpenGLTexture;
|
||||
class OpenGLFrameBuffer;
|
||||
|
||||
// START_AUTOINCLUDE opengl
|
||||
#include "opengl/juce_Draggable3DOrientation.h"
|
||||
#include "opengl/juce_OpenGLHelpers.h"
|
||||
#include "opengl/juce_Quaternion.h"
|
||||
#include "opengl/juce_Matrix3D.h"
|
||||
#include "opengl/juce_Draggable3DOrientation.h"
|
||||
#include "opengl/juce_OpenGLPixelFormat.h"
|
||||
#include "native/juce_OpenGLExtensions.h"
|
||||
#include "opengl/juce_OpenGLRenderer.h"
|
||||
#include "opengl/juce_OpenGLContext.h"
|
||||
#include "opengl/juce_OpenGLFrameBuffer.h"
|
||||
#include "opengl/juce_OpenGLGraphicsContext.h"
|
||||
#include "opengl/juce_OpenGLHelpers.h"
|
||||
#include "opengl/juce_OpenGLImage.h"
|
||||
#include "opengl/juce_OpenGLPixelFormat.h"
|
||||
#include "opengl/juce_OpenGLRenderer.h"
|
||||
#include "opengl/juce_OpenGLShaderProgram.h"
|
||||
#include "opengl/juce_OpenGLTexture.h"
|
||||
#include "opengl/juce_Quaternion.h"
|
||||
#include "opengl/juce_Vector3D.h"
|
||||
// END_AUTOINCLUDE
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@
|
|||
#ifndef JUCE_DRAGGABLE3DORIENTATION_H_INCLUDED
|
||||
#define JUCE_DRAGGABLE3DORIENTATION_H_INCLUDED
|
||||
|
||||
#include "juce_Quaternion.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,10 +25,6 @@
|
|||
#ifndef JUCE_OPENGLCONTEXT_H_INCLUDED
|
||||
#define JUCE_OPENGLCONTEXT_H_INCLUDED
|
||||
|
||||
#include "juce_OpenGLPixelFormat.h"
|
||||
#include "../native/juce_OpenGLExtensions.h"
|
||||
#include "juce_OpenGLRenderer.h"
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,9 +25,6 @@
|
|||
#ifndef JUCE_OPENGLHELPERS_H_INCLUDED
|
||||
#define JUCE_OPENGLHELPERS_H_INCLUDED
|
||||
|
||||
class OpenGLTexture;
|
||||
class OpenGLFrameBuffer;
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#ifndef JUCE_OPENGLRENDERER_H_INCLUDED
|
||||
#define JUCE_OPENGLRENDERER_H_INCLUDED
|
||||
|
||||
|
||||
//==============================================================================
|
||||
/**
|
||||
A base class that should be implemented by classes which want to render openGL
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ public:
|
|||
|
||||
//==============================================================================
|
||||
/** Returns the name of this device */
|
||||
String getName() const { return name; }
|
||||
const String& getName() const noexcept { return name; }
|
||||
|
||||
/** Creates a component that can be used to display a preview of the
|
||||
video from this camera.
|
||||
|
|
@ -89,8 +89,7 @@ public:
|
|||
*/
|
||||
void startRecordingToFile (const File& file, int quality = 2);
|
||||
|
||||
/** Stops recording, after a call to startRecordingToFile().
|
||||
*/
|
||||
/** Stops recording, after a call to startRecordingToFile(). */
|
||||
void stopRecording();
|
||||
|
||||
/** Returns the file extension that should be used for the files
|
||||
|
|
@ -133,8 +132,7 @@ public:
|
|||
*/
|
||||
void addListener (Listener* listenerToAdd);
|
||||
|
||||
/** Removes a listener that was previously added with addListener().
|
||||
*/
|
||||
/** Removes a listener that was previously added with addListener(). */
|
||||
void removeListener (Listener* listenerToRemove);
|
||||
|
||||
|
||||
|
|
@ -151,9 +149,10 @@ private:
|
|||
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CameraDevice)
|
||||
};
|
||||
|
||||
/** This typedef is just for compatibility with old code - newer code should use the CameraDevice::Listener class directly. */
|
||||
typedef CameraDevice::Listener CameraImageListener;
|
||||
|
||||
#ifndef DOXYGEN
|
||||
/** This typedef is just for compatibility with VC6 - newer code should use the CameraDevice::Listener class directly. */
|
||||
typedef CameraDevice::Listener CameraImageListener;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif // JUCE_CAMERADEVICE_H_INCLUDED
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue