mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-04 03:40:07 +00:00
Code Activity

Moved a couple of midi files around. DrawableImage::hitTest tweak.

Browse source
This commit is contained in:
Julian Storer 2011-03-04 21:53:04 +00:00
parent 0e4a0df2c2
commit 85aeeea1e9
25 changed files with 239 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/audio/devices/juce_AudioDeviceManager.h
View file

@ -27,8 +27,8 @@
#define __JUCE_AUDIODEVICEMANAGER_JUCEHEADER__
#include "juce_AudioIODeviceType.h"
#include "juce_MidiInput.h"
#include "juce_MidiOutput.h"
#include "../midi/juce_MidiInput.h"
#include "../midi/juce_MidiOutput.h"
#include "../../text/juce_XmlElement.h"
#include "../../gui/components/controls/juce_ComboBox.h"
#include "../dsp/juce_AudioSampleBuffer.h"

2
src/audio/devices/juce_MidiInput.h → src/audio/midi/juce_MidiInput.h
View file

@ -33,7 +33,7 @@ class MidiInput;
//==============================================================================
/**
Receives midi messages from a midi input device.
Receives incoming messages from a physical MIDI input device.
This class is overridden to handle incoming midi messages. See the MidiInput
class for more details.

2
src/audio/midi/juce_MidiMessageCollector.h
View file

@ -26,7 +26,7 @@
#ifndef __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
#define __JUCE_MIDIMESSAGECOLLECTOR_JUCEHEADER__
#include "../devices/juce_MidiInput.h"
#include "juce_MidiInput.h"
#include "juce_MidiKeyboardState.h"
//==============================================================================

5
src/audio/devices/juce_MidiOutput.cpp → src/audio/midi/juce_MidiOutput.cpp
View file

@ -40,9 +40,8 @@ MidiOutput::MidiOutput()
{
}
MidiOutput::PendingMessage::PendingMessage (const uint8* const data, const int len,
const double sampleNumber)
: message (data, len, sampleNumber)
MidiOutput::PendingMessage::PendingMessage (const void* const data, const int len, const double timeStamp)
: message (data, len, timeStamp)
{
}

12
src/audio/devices/juce_MidiOutput.h → src/audio/midi/juce_MidiOutput.h
View file

@ -34,10 +34,10 @@
//==============================================================================
/**
Represents a midi output device.
Controls a physical MIDI output device.
To create one of these, use the static getDevices() method to find out what
outputs are available, then use the openDevice() method to try to open one.
To create one of these, use the static getDevices() method to get a list of the
available output devices, then use the openDevice() method to try to open one.
@see MidiInput
*/
@ -73,7 +73,7 @@ public:
static MidiOutput* openDevice (int deviceIndex);
#if JUCE_LINUX || JUCE_MAC || DOXYGEN
#if JUCE_LINUX || JUCE_MAC || DOXYGEN
/** This will try to create a new midi output device (Not available on Windows).
This will attempt to create a new midi output device that other apps can connect
@ -84,7 +84,7 @@ public:
@param deviceName the name to use for the new device
*/
static MidiOutput* createNewDevice (const String& deviceName);
#endif
#endif
//==============================================================================
/** Destructor. */
@ -154,7 +154,7 @@ protected:
struct PendingMessage
{
PendingMessage (const uint8* data, int len, double sampleNumber);
PendingMessage (const void* data, int len, double timeStamp);
MidiMessage message;
PendingMessage* next;

2
src/audio/processors/juce_AudioProcessorPlayer.h
View file

@ -28,7 +28,7 @@
#include "juce_AudioProcessor.h"
#include "../devices/juce_AudioIODevice.h"
#include "../devices/juce_MidiInput.h"
#include "../midi/juce_MidiInput.h"
#include "../midi/juce_MidiMessageCollector.h"

2
src/gui/graphics/drawables/juce_DrawableImage.cpp
View file

@ -153,7 +153,7 @@ const Rectangle<float> DrawableImage::getDrawableBounds() const
bool DrawableImage::hitTest (int x, int y)
{
return image.isValid() && image.getPixelAt (x, y).getAlpha() >= 127;
return Drawable::hitTest (x, y) && image.isValid() && image.getPixelAt (x, y).getAlpha() >= 127;
}
Drawable* DrawableImage::createCopy() const

12
src/juce_app_includes.h
View file

@ -128,12 +128,6 @@
#ifndef __JUCE_AUDIOIODEVICETYPE_JUCEHEADER__
#include "audio/devices/juce_AudioIODeviceType.h"
#endif
#ifndef __JUCE_MIDIINPUT_JUCEHEADER__
#include "audio/devices/juce_MidiInput.h"
#endif
#ifndef __JUCE_MIDIOUTPUT_JUCEHEADER__
#include "audio/devices/juce_MidiOutput.h"
#endif
#ifndef __JUCE_AUDIODATACONVERTERS_JUCEHEADER__
#include "audio/dsp/juce_AudioDataConverters.h"
#endif
@ -152,6 +146,9 @@
#ifndef __JUCE_MIDIFILE_JUCEHEADER__
#include "audio/midi/juce_MidiFile.h"
#endif
#ifndef __JUCE_MIDIINPUT_JUCEHEADER__
#include "audio/midi/juce_MidiInput.h"
#endif
#ifndef __JUCE_MIDIKEYBOARDSTATE_JUCEHEADER__
#include "audio/midi/juce_MidiKeyboardState.h"
#endif
@ -164,6 +161,9 @@
#ifndef __JUCE_MIDIMESSAGESEQUENCE_JUCEHEADER__
#include "audio/midi/juce_MidiMessageSequence.h"
#endif
#ifndef __JUCE_MIDIOUTPUT_JUCEHEADER__
#include "audio/midi/juce_MidiOutput.h"
#endif
#ifndef __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__
#include "audio/plugins/formats/juce_AudioUnitPluginFormat.h"
#endif

4
src/native/android/juce_android_NativeCode.cpp
View file

@ -85,8 +85,8 @@ BEGIN_JUCE_NAMESPACE
#include "../../audio/audio_sources/juce_AudioSource.h"
#include "../../audio/dsp/juce_AudioDataConverters.h"
#include "../../audio/devices/juce_AudioIODeviceType.h"
#include "../../audio/devices/juce_MidiOutput.h"
#include "../../audio/devices/juce_MidiInput.h"
#include "../../audio/midi/juce_MidiOutput.h"
#include "../../audio/midi/juce_MidiInput.h"
#include "../../containers/juce_ScopedValueSetter.h"
#include "../common/juce_MidiDataConcatenator.h"

4
src/native/linux/juce_linux_NativeCode.cpp
View file

@ -76,8 +76,8 @@ BEGIN_JUCE_NAMESPACE
#include "../../audio/dsp/juce_AudioDataConverters.h"
#include "../../audio/audio_file_formats/juce_AudioCDReader.h"
#include "../../audio/devices/juce_AudioIODeviceType.h"
#include "../../audio/devices/juce_MidiOutput.h"
#include "../../audio/devices/juce_MidiInput.h"
#include "../../audio/midi/juce_MidiOutput.h"
#include "../../audio/midi/juce_MidiInput.h"
#include "../../gui/graphics/fonts/juce_Font.h"
#include "../../gui/graphics/geometry/juce_RectangleList.h"
#include "../../gui/graphics/imaging/juce_ImageFileFormat.h"

4
src/native/mac/juce_mac_NativeCode.mm
View file

@ -90,8 +90,8 @@ BEGIN_JUCE_NAMESPACE
#include "../../audio/audio_sources/juce_AudioSource.h"
#include "../../audio/dsp/juce_AudioDataConverters.h"
#include "../../audio/devices/juce_AudioIODeviceType.h"
#include "../../audio/devices/juce_MidiOutput.h"
#include "../../audio/devices/juce_MidiInput.h"
#include "../../audio/midi/juce_MidiOutput.h"
#include "../../audio/midi/juce_MidiInput.h"
#include "../../containers/juce_ScopedValueSetter.h"
#include "../common/juce_MidiDataConcatenator.h"
#undef Point

4
src/native/windows/juce_win32_NativeCode.cpp
View file

@ -85,8 +85,8 @@ BEGIN_JUCE_NAMESPACE
#include "../../audio/audio_sources/juce_AudioSource.h"
#include "../../audio/dsp/juce_AudioDataConverters.h"
#include "../../audio/devices/juce_AudioIODeviceType.h"
#include "../../audio/devices/juce_MidiOutput.h"
#include "../../audio/devices/juce_MidiInput.h"
#include "../../audio/midi/juce_MidiOutput.h"
#include "../../audio/midi/juce_MidiInput.h"
#include "../../containers/juce_ScopedValueSetter.h"
#include "../common/juce_MidiDataConcatenator.h"