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

Added ResizableBorderComponent::getCurrentZone(). Misc tidying-up.

Browse source
This commit is contained in:
jules 2013-03-13 10:46:57 +00:00
parent fbe3d179fb
commit cc26ae1fc1
10 changed files with 62 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/juce_audio_devices/sources/juce_AudioTransportSource.cpp
View file

@ -224,12 +224,11 @@ void AudioTransportSource::setGain (const float newGain) noexcept
gain = newGain;
}
void AudioTransportSource::prepareToPlay (int samplesPerBlockExpected,
double sampleRate_)
void AudioTransportSource::prepareToPlay (int samplesPerBlockExpected, double newSampleRate)
{
const ScopedLock sl (callbackLock);
sampleRate = sampleRate_;
sampleRate = newSampleRate;
blockSize = samplesPerBlockExpected;
if (masterSource != nullptr)

16
modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp
View file

@ -76,15 +76,15 @@ private:
class AudioThumbnail::LevelDataSource : public TimeSliceClient
{
public:
LevelDataSource (AudioThumbnail& owner_, AudioFormatReader* newReader, int64 hash)
LevelDataSource (AudioThumbnail& thumb, AudioFormatReader* newReader, int64 hash)
: lengthInSamples (0), numSamplesFinished (0), sampleRate (0), numChannels (0),
hashCode (hash), owner (owner_), reader (newReader)
hashCode (hash), owner (thumb), reader (newReader)
{
}
LevelDataSource (AudioThumbnail& owner_, InputSource* source_)
LevelDataSource (AudioThumbnail& thumb, InputSource* src)
: lengthInSamples (0), numSamplesFinished (0), sampleRate (0), numChannels (0),
hashCode (source_->hashCode()), owner (owner_), source (source_)
hashCode (src->hashCode()), owner (thumb), source (src)
{
}
@ -95,11 +95,11 @@ public:
enum { timeBeforeDeletingReader = 3000 };
void initialise (int64 numSamplesFinished_)
void initialise (int64 samplesFinished)
{
const ScopedLock sl (readerLock);
numSamplesFinished = numSamplesFinished_;
numSamplesFinished = samplesFinished;
createReader();
@ -519,9 +519,9 @@ private:
//==============================================================================
AudioThumbnail::AudioThumbnail (const int originalSamplesPerThumbnailSample,
AudioFormatManager& formatManagerToUse_,
AudioFormatManager& formatManager,
AudioThumbnailCache& cacheToUse)
: formatManagerToUse (formatManagerToUse_),
: formatManagerToUse (formatManager),
cache (cacheToUse),
window (new CachedWindow()),
samplesPerThumbSample (originalSamplesPerThumbnailSample),

4
modules/juce_audio_utils/gui/juce_AudioThumbnailCache.cpp
View file

@ -56,9 +56,9 @@ private:
};
//==============================================================================
AudioThumbnailCache::AudioThumbnailCache (const int maxNumThumbsToStore_)
AudioThumbnailCache::AudioThumbnailCache (const int maxNumThumbs)
: thread ("thumb cache"),
maxNumThumbsToStore (maxNumThumbsToStore_)
maxNumThumbsToStore (maxNumThumbs)
{
jassert (maxNumThumbsToStore > 0);
thread.startThread (2);

4
modules/juce_core/files/juce_TemporaryFile.cpp
View file

@ -31,8 +31,8 @@ TemporaryFile::TemporaryFile (const String& suffix, const int optionFlags)
optionFlags);
}
TemporaryFile::TemporaryFile (const File& targetFile_, const int optionFlags)
: targetFile (targetFile_)
TemporaryFile::TemporaryFile (const File& target, const int optionFlags)
: targetFile (target)
{
// If you use this constructor, you need to give it a valid target file!
jassert (targetFile != File::nonexistent);

3
modules/juce_core/streams/juce_BufferedInputStream.cpp
View file

@ -87,8 +87,7 @@ bool BufferedInputStream::setPosition (int64 newPosition)
bool BufferedInputStream::isExhausted()
{
return (position >= lastReadPos)
&& source->isExhausted();
return position >= lastReadPos && source->isExhausted();
}
void BufferedInputStream::ensureBuffered()

4
modules/juce_core/streams/juce_FileInputSource.cpp
View file

@ -23,8 +23,8 @@
==============================================================================
*/
FileInputSource::FileInputSource (const File& file_, bool useFileTimeInHashGeneration_)
: file (file_), useFileTimeInHashGeneration (useFileTimeInHashGeneration_)
FileInputSource::FileInputSource (const File& f, bool useFileTimeInHash)
: file (f), useFileTimeInHashGeneration (useFileTimeInHash)
{
}

6
modules/juce_core/streams/juce_MemoryOutputStream.cpp
View file

@ -124,11 +124,9 @@ bool MemoryOutputStream::setPosition (int64 newPosition)
position = jlimit ((size_t) 0, size, (size_t) newPosition);
return true;
}
else
{
// trying to make it bigger isn't a good thing to do..
// can't move beyond the end of the stream..
return false;
}
}
int MemoryOutputStream::writeFromInputStream (InputStream& source, int64 maxNumBytesToWrite)

15
modules/juce_core/streams/juce_SubregionStream.cpp
View file

@ -24,12 +24,11 @@
*/
SubregionStream::SubregionStream (InputStream* const sourceStream,
const int64 startPositionInSourceStream_,
const int64 lengthOfSourceStream_,
const int64 start, const int64 length,
const bool deleteSourceWhenDestroyed)
: source (sourceStream, deleteSourceWhenDestroyed),
startPositionInSourceStream (startPositionInSourceStream_),
lengthOfSourceStream (lengthOfSourceStream_)
startPositionInSourceStream (start),
lengthOfSourceStream (length)
{
SubregionStream::setPosition (0);
}
@ -42,7 +41,7 @@ int64 SubregionStream::getTotalLength()
{
const int64 srcLen = source->getTotalLength() - startPositionInSourceStream;
return (lengthOfSourceStream >= 0) ? jmin (lengthOfSourceStream, srcLen)
return lengthOfSourceStream >= 0 ? jmin (lengthOfSourceStream, srcLen)
: srcLen;
}
@ -61,18 +60,14 @@ int SubregionStream::read (void* destBuffer, int maxBytesToRead)
jassert (destBuffer != nullptr && maxBytesToRead >= 0);
if (lengthOfSourceStream < 0)
{
return source->read (destBuffer, maxBytesToRead);
}
else
{
maxBytesToRead = (int) jmin ((int64) maxBytesToRead, lengthOfSourceStream - getPosition());
if (maxBytesToRead <= 0)
return 0;
return source->read (destBuffer, maxBytesToRead);
}
}
bool SubregionStream::isExhausted()

6
modules/juce_gui_basics/layout/juce_ResizableBorderComponent.cpp
View file

@ -23,6 +23,10 @@
==============================================================================
*/
ResizableBorderComponent::Zone::Zone() noexcept
: zone (0)
{}
ResizableBorderComponent::Zone::Zone (const int zoneFlags) noexcept
: zone (zoneFlags)
{}
@ -40,7 +44,7 @@ ResizableBorderComponent::Zone& ResizableBorderComponent::Zone::operator= (const
bool ResizableBorderComponent::Zone::operator== (const ResizableBorderComponent::Zone& other) const noexcept { return zone == other.zone; }
bool ResizableBorderComponent::Zone::operator!= (const ResizableBorderComponent::Zone& other) const noexcept { return zone != other.zone; }
const ResizableBorderComponent::Zone ResizableBorderComponent::Zone::fromPositionOnBorder (const Rectangle<int>& totalSize,
ResizableBorderComponent::Zone ResizableBorderComponent::Zone::fromPositionOnBorder (const Rectangle<int>& totalSize,
const BorderSize<int>& border,
const Point<int>& position)
{

48
modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h
View file

@ -106,18 +106,20 @@ public:
//==============================================================================
/** Creates a Zone from a combination of the flags in \enum Zones. */
explicit Zone (int zoneFlags = 0) noexcept;
Zone (const Zone& other) noexcept;
Zone& operator= (const Zone& other) noexcept;
explicit Zone (int zoneFlags) noexcept;
bool operator== (const Zone& other) const noexcept;
bool operator!= (const Zone& other) const noexcept;
Zone() noexcept;
Zone (const Zone&) noexcept;
Zone& operator= (const Zone&) noexcept;
bool operator== (const Zone&) const noexcept;
bool operator!= (const Zone&) const noexcept;
//==============================================================================
/** Given a point within a rectangle with a resizable border, this returns the
zone that the point lies within.
*/
static const Zone fromPositionOnBorder (const Rectangle<int>& totalSize,
static Zone fromPositionOnBorder (const Rectangle<int>& totalSize,
const BorderSize<int>& border,
const Point<int>& position);
@ -139,23 +141,16 @@ public:
applies to.
*/
template <typename ValueType>
const Rectangle<ValueType> resizeRectangleBy (Rectangle<ValueType> original,
Rectangle<ValueType> resizeRectangleBy (Rectangle<ValueType> original,
const Point<ValueType>& distance) const noexcept
{
if (isDraggingWholeObject())
return original + distance;
if (isDraggingLeftEdge())
original.setLeft (jmin (original.getRight(), original.getX() + distance.x));
if (isDraggingRightEdge())
original.setWidth (jmax (ValueType(), original.getWidth() + distance.x));
if (isDraggingTopEdge())
original.setTop (jmin (original.getBottom(), original.getY() + distance.y));
if (isDraggingBottomEdge())
original.setHeight (jmax (ValueType(), original.getHeight() + distance.y));
if (isDraggingLeftEdge()) original.setLeft (jmin (original.getRight(), original.getX() + distance.x));
if (isDraggingRightEdge()) original.setWidth (jmax (ValueType(), original.getWidth() + distance.x));
if (isDraggingTopEdge()) original.setTop (jmin (original.getBottom(), original.getY() + distance.y));
if (isDraggingBottomEdge()) original.setHeight (jmax (ValueType(), original.getHeight() + distance.y));
return original;
}
@ -168,21 +163,22 @@ public:
int zone;
};
/** Returns the zone in which the mouse was last seen. */
Zone getCurrentZone() const noexcept { return mouseZone; }
protected:
//==============================================================================
/** @internal */
void paint (Graphics& g);
void paint (Graphics&);
/** @internal */
void mouseEnter (const MouseEvent& e);
void mouseEnter (const MouseEvent&);
/** @internal */
void mouseMove (const MouseEvent& e);
void mouseMove (const MouseEvent&);
/** @internal */
void mouseDown (const MouseEvent& e);
void mouseDown (const MouseEvent&);
/** @internal */
void mouseDrag (const MouseEvent& e);
void mouseDrag (const MouseEvent&);
/** @internal */
void mouseUp (const MouseEvent& e);
void mouseUp (const MouseEvent&);
/** @internal */
bool hitTest (int x, int y);
@ -193,7 +189,7 @@ private:
Rectangle<int> originalBounds;
Zone mouseZone;
void updateMouseZone (const MouseEvent& e);
void updateMouseZone (const MouseEvent&);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ResizableBorderComponent)
};