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

Got rid of the remaining uses of juce_useDebuggingNewOperator in the old Jucer template.

Browse source
This commit is contained in:
jules 2012-09-20 13:49:12 +01:00
parent 63085a7185
commit 08dd8f62c7
19 changed files with 128 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

2
extras/JuceDemo/Source/demos/AudioDemoLatencyPage.cpp
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 1:54:50pm
Creation date: 20 Sep 2012 1:43:09pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded

15
extras/JuceDemo/Source/demos/AudioDemoLatencyPage.h
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 1:54:50pm
Creation date: 20 Sep 2012 1:43:09pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_7C897E97__
#define __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_7C897E97__
#ifndef __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_623CCFC4__
#define __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_623CCFC4__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -56,9 +56,6 @@ public:
//==============================================================================
juce_UseDebuggingNewOperator
private:
//[UserVariables] -- You can add your own custom variables in this section.
AudioDeviceManager& deviceManager;
@ -72,10 +69,8 @@ private:
//==============================================================================
// (prevent copy constructor and operator= being generated..)
AudioDemoLatencyPage (const AudioDemoLatencyPage&);
const AudioDemoLatencyPage& operator= (const AudioDemoLatencyPage&);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioDemoLatencyPage);
};
#endif // __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_7C897E97__
#endif // __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_623CCFC4__

50
extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.cpp
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:08:14pm
Creation date: 20 Sep 2012 1:43:44pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -24,6 +24,7 @@
#include "AudioDemoPlaybackPage.h"
//[MiscUserDefs] You can add your own user definitions and misc code here...
class DemoThumbnailComp : public Component,
public ChangeListener,
@ -176,11 +177,11 @@ AudioDemoPlaybackPage::AudioDemoPlaybackPage (AudioDeviceManager& deviceManager_
thread ("audio file preview"),
directoryList (0, thread),
zoomLabel (0),
explanation (0),
zoomSlider (0),
thumbnail (0),
startStopButton (0),
fileTreeComp (0),
explanation (0),
zoomSlider (0)
fileTreeComp (0)
{
addAndMakeVisible (zoomLabel = new Label (String::empty,
L"zoom:"));
@ -214,6 +215,7 @@ AudioDemoPlaybackPage::AudioDemoPlaybackPage (AudioDeviceManager& deviceManager_
addAndMakeVisible (fileTreeComp = new FileTreeComponent (directoryList));
//[UserPreSize]
//[/UserPreSize]
@ -245,11 +247,11 @@ AudioDemoPlaybackPage::~AudioDemoPlaybackPage()
//[/Destructor_pre]
deleteAndZero (zoomLabel);
deleteAndZero (explanation);
deleteAndZero (zoomSlider);
deleteAndZero (thumbnail);
deleteAndZero (startStopButton);
deleteAndZero (fileTreeComp);
deleteAndZero (explanation);
deleteAndZero (zoomSlider);
//[Destructor]. You can add your own custom destruction code here..
@ -271,15 +273,31 @@ void AudioDemoPlaybackPage::paint (Graphics& g)
void AudioDemoPlaybackPage::resized()
{
zoomLabel->setBounds (16, getHeight() - 90, 55, 24);
explanation->setBounds (256, getHeight() - 82, getWidth() - 275, 64);
zoomSlider->setBounds (72, getHeight() - 90, 200, 24);
thumbnail->setBounds (16, getHeight() - 221, getWidth() - 32, 123);
startStopButton->setBounds (16, getHeight() - 46, 150, 32);
fileTreeComp->setBounds (16, 8, getWidth() - 32, getHeight() - 245);
explanation->setBounds (256, getHeight() - 82, getWidth() - 275, 64);
zoomSlider->setBounds (72, getHeight() - 90, 200, 24);
//[UserResized] Add your own custom resize handling here..
//[/UserResized]
}
void AudioDemoPlaybackPage::sliderValueChanged (Slider* sliderThatWasMoved)
{
//[UsersliderValueChanged_Pre]
//[/UsersliderValueChanged_Pre]
if (sliderThatWasMoved == zoomSlider)
{
//[UserSliderCode_zoomSlider] -- add your slider handling code here..
thumbnail->setZoomFactor (zoomSlider->getValue());
//[/UserSliderCode_zoomSlider]
}
//[UsersliderValueChanged_Post]
//[/UsersliderValueChanged_Post]
}
void AudioDemoPlaybackPage::buttonClicked (Button* buttonThatWasClicked)
{
//[UserbuttonClicked_Pre]
@ -304,22 +322,6 @@ void AudioDemoPlaybackPage::buttonClicked (Button* buttonThatWasClicked)
//[/UserbuttonClicked_Post]
}
void AudioDemoPlaybackPage::sliderValueChanged (Slider* sliderThatWasMoved)
{
//[UsersliderValueChanged_Pre]
//[/UsersliderValueChanged_Pre]
if (sliderThatWasMoved == zoomSlider)
{
//[UserSliderCode_zoomSlider] -- add your slider handling code here..
thumbnail->setZoomFactor (zoomSlider->getValue());
//[/UserSliderCode_zoomSlider]
}
//[UsersliderValueChanged_Post]
//[/UsersliderValueChanged_Post]
}
//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...

25
extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.h
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:08:14pm
Creation date: 20 Sep 2012 1:43:44pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_81B4F279__
#define __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_81B4F279__
#ifndef __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_10A391BC__
#define __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_10A391BC__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -39,8 +39,8 @@ class DemoThumbnailComp;
*/
class AudioDemoPlaybackPage : public Component,
public FileBrowserListener,
public ButtonListener,
public SliderListener
public SliderListener,
public ButtonListener
{
public:
//==============================================================================
@ -60,14 +60,11 @@ public:
void paint (Graphics& g);
void resized();
void buttonClicked (Button* buttonThatWasClicked);
void sliderValueChanged (Slider* sliderThatWasMoved);
void buttonClicked (Button* buttonThatWasClicked);
//==============================================================================
juce_UseDebuggingNewOperator
private:
//[UserVariables] -- You can add your own custom variables in this section.
AudioDeviceManager& deviceManager;
@ -84,18 +81,16 @@ private:
//==============================================================================
Label* zoomLabel;
Label* explanation;
Slider* zoomSlider;
DemoThumbnailComp* thumbnail;
TextButton* startStopButton;
FileTreeComponent* fileTreeComp;
Label* explanation;
Slider* zoomSlider;
//==============================================================================
// (prevent copy constructor and operator= being generated..)
AudioDemoPlaybackPage (const AudioDemoPlaybackPage&);
const AudioDemoPlaybackPage& operator= (const AudioDemoPlaybackPage&);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioDemoPlaybackPage);
};
#endif // __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_81B4F279__
#endif // __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_10A391BC__

2
extras/JuceDemo/Source/demos/AudioDemoRecordPage.cpp
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:08:25pm
Creation date: 20 Sep 2012 1:43:57pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded

15
extras/JuceDemo/Source/demos/AudioDemoRecordPage.h
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:08:25pm
Creation date: 20 Sep 2012 1:43:57pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_E12E1947__
#define __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_E12E1947__
#ifndef __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_9CE2EC8__
#define __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_9CE2EC8__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -57,9 +57,6 @@ public:
//==============================================================================
juce_UseDebuggingNewOperator
private:
//[UserVariables] -- You can add your own custom variables in this section.
AudioDeviceManager& deviceManager;
@ -73,10 +70,8 @@ private:
//==============================================================================
// (prevent copy constructor and operator= being generated..)
AudioDemoRecordPage (const AudioDemoRecordPage&);
const AudioDemoRecordPage& operator= (const AudioDemoRecordPage&);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioDemoRecordPage);
};
#endif // __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_E12E1947__
#endif // __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_9CE2EC8__

2
extras/JuceDemo/Source/demos/AudioDemoSetupPage.cpp
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 1:54:18pm
Creation date: 20 Sep 2012 1:44:04pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded

15
extras/JuceDemo/Source/demos/AudioDemoSetupPage.h
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 1:54:18pm
Creation date: 20 Sep 2012 1:44:04pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_A3545895__
#define __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_A3545895__
#ifndef __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_31046283__
#define __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_31046283__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -52,9 +52,6 @@ public:
//==============================================================================
juce_UseDebuggingNewOperator
private:
//[UserVariables] -- You can add your own custom variables in this section.
AudioDeviceManager& deviceManager;
@ -65,10 +62,8 @@ private:
//==============================================================================
// (prevent copy constructor and operator= being generated..)
AudioDemoSetupPage (const AudioDemoSetupPage&);
const AudioDemoSetupPage& operator= (const AudioDemoSetupPage&);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioDemoSetupPage);
};
#endif // __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_A3545895__
#endif // __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_31046283__

2
extras/JuceDemo/Source/demos/AudioDemoSynthPage.cpp
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:06:00pm
Creation date: 20 Sep 2012 1:44:13pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded

15
extras/JuceDemo/Source/demos/AudioDemoSynthPage.h
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:06:00pm
Creation date: 20 Sep 2012 1:44:13pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_1E55DCCB__
#define __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_1E55DCCB__
#ifndef __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_B0883FF1__
#define __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_B0883FF1__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -56,9 +56,6 @@ public:
//==============================================================================
juce_UseDebuggingNewOperator
private:
//[UserVariables] -- You can add your own custom variables in this section.
AudioDeviceManager& deviceManager;
@ -75,10 +72,8 @@ private:
//==============================================================================
// (prevent copy constructor and operator= being generated..)
AudioDemoSynthPage (const AudioDemoSynthPage&);
const AudioDemoSynthPage& operator= (const AudioDemoSynthPage&);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioDemoSynthPage);
};
#endif // __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_1E55DCCB__
#endif // __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_B0883FF1__

2
extras/JuceDemo/Source/demos/AudioDemoTabComponent.cpp
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:07:35pm
Creation date: 20 Sep 2012 1:44:23pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded

15
extras/JuceDemo/Source/demos/AudioDemoTabComponent.h
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:07:35pm
Creation date: 20 Sep 2012 1:44:23pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_ADE99E0E__
#define __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_ADE99E0E__
#ifndef __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_E13E3004__
#define __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_E13E3004__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -82,9 +82,6 @@ public:
//==============================================================================
juce_UseDebuggingNewOperator
private:
//[UserVariables] -- You can add your own custom variables in this section.
AudioDeviceManager deviceManager;
@ -95,10 +92,8 @@ private:
//==============================================================================
// (prevent copy constructor and operator= being generated..)
AudioDemoTabComponent (const AudioDemoTabComponent&);
const AudioDemoTabComponent& operator= (const AudioDemoTabComponent&);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioDemoTabComponent);
};
#endif // __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_ADE99E0E__
#endif // __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_E13E3004__

98
extras/JuceDemo/Source/demos/RenderingTestComponent.cpp
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:07:57pm
Creation date: 20 Sep 2012 1:44:35pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -43,8 +43,7 @@ public:
glyphs.addFittedText (Font (20.0f), "The Quick Brown Fox Jumped Over The Lazy Dog",
-120, -50, 240, 100, Justification::centred, 2, 1.0f);
int i;
for (i = 0; i < numElementsInArray (bouncingPointX); ++i)
for (int i = 0; i < numElementsInArray (bouncingPointX); ++i)
{
bouncingPointX[i] = (float) Random::getSystemRandom().nextInt (200);
bouncingPointY[i] = (float) Random::getSystemRandom().nextInt (200);
@ -52,13 +51,13 @@ public:
bouncingPointDY[i] = (Random::getSystemRandom().nextFloat() - 0.5f) * 6.0f;
}
for (i = 0; i < numElementsInArray (bouncingNumber); ++i)
for (int i = 0; i < numElementsInArray (bouncingNumber); ++i)
{
bouncingNumber[i] = Random::getSystemRandom().nextFloat();
bouncingNumberDelta[i] = (Random::getSystemRandom().nextFloat() - 0.5f) * 0.03f;
}
for (i = 0; i < numElementsInArray (speeds); ++i)
for (int i = 0; i < numElementsInArray (speeds); ++i)
speeds[i] = 0.02f;
int redrawFramesPerSecond = 60;
@ -109,14 +108,13 @@ public:
{
repaint();
int i;
for (i = 0; i < numElementsInArray (bouncingPointX); ++i)
for (int i = 0; i < numElementsInArray (bouncingPointX); ++i)
{
bounce (bouncingPointX[i], bouncingPointDX[i], (float) getWidth());
bounce (bouncingPointY[i], bouncingPointDY[i], (float) getHeight());
}
for (i = 0; i < numElementsInArray (bouncingNumber); ++i)
for (int i = 0; i < numElementsInArray (bouncingNumber); ++i)
bounce (bouncingNumber[i], bouncingNumberDelta[i], 1.0f);
owner.speedLabel->setText (String (getWidth()) + "x" + String (getHeight())
@ -591,28 +589,28 @@ void RenderingTestComponent::paint (Graphics& g)
void RenderingTestComponent::resized()
{
testTypeComboBox->setBounds (proportionOfWidth (0.1647f), 16, proportionOfWidth (0.3426f), 24);
testTypeLabel->setBounds (proportionOfWidth (0.0277f), 16, proportionOfWidth (0.1291f), 24);
speedLabel->setBounds (proportionOfWidth (0.5375f), 16, proportionOfWidth (0.4308f), 24);
testTypeComboBox->setBounds (proportionOfWidth (0.1652f), 16, proportionOfWidth (0.3429f), 24);
testTypeLabel->setBounds (proportionOfWidth (0.0269f), 16, proportionOfWidth (0.1293f), 24);
speedLabel->setBounds (proportionOfWidth (0.5368f), 16, proportionOfWidth (0.4309f), 24);
testCanvas->setBounds (20, 56, getWidth() - 40, getHeight() - 215);
opacitySlider->setBounds (proportionOfWidth (0.5995f), getHeight() - 141, proportionOfWidth (0.3781f), 24);
highQualityToggle->setBounds (proportionOfWidth (0.0224f), getHeight() - 141, proportionOfWidth (0.4453f), 24);
animateSizeToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 85, proportionOfWidth (0.2240f), 24);
animateRotationToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 61, proportionOfWidth (0.2240f), 24);
animatePositionToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 109, proportionOfWidth (0.2240f), 24);
animateFillToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 37, proportionOfWidth (0.2345f), 24);
opacityLabel->setBounds ((proportionOfWidth (0.5995f)) + -66, getHeight() - 141, 64, 24);
xSlider->setBounds (proportionOfWidth (0.3610f), getHeight() - 109, proportionOfWidth (0.3781f), 24);
ySlider->setBounds (proportionOfWidth (0.3610f), getHeight() - 85, proportionOfWidth (0.3781f), 24);
sizeSlider->setBounds (proportionOfWidth (0.3610f), getHeight() - 61, proportionOfWidth (0.3781f), 24);
angleSlider->setBounds (proportionOfWidth (0.3610f), getHeight() - 37, proportionOfWidth (0.3781f), 24);
xSliderLabel->setBounds (proportionOfWidth (0.2490f), getHeight() - 109, proportionOfWidth (0.1067f), 24);
ySliderLabel->setBounds (proportionOfWidth (0.2490f), getHeight() - 85, proportionOfWidth (0.1067f), 24);
sizeSliderLabel->setBounds (proportionOfWidth (0.2490f), getHeight() - 61, proportionOfWidth (0.1067f), 24);
angleSliderLabel->setBounds (proportionOfWidth (0.2490f), getHeight() - 37, proportionOfWidth (0.1067f), 24);
clipToRectangleToggle->setBounds (proportionOfWidth (0.0224f), getHeight() - 109, 144, 24);
clipToPathToggle->setBounds (proportionOfWidth (0.0224f), getHeight() - 85, 144, 24);
clipToImageToggle->setBounds (proportionOfWidth (0.0224f), getHeight() - 61, 144, 24);
opacitySlider->setBounds (proportionOfWidth (0.5996f), getHeight() - 141, proportionOfWidth (0.3788f), 24);
highQualityToggle->setBounds (proportionOfWidth (0.0215f), getHeight() - 141, proportionOfWidth (0.4452f), 24);
animateSizeToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 85, proportionOfWidth (0.2244f), 24);
animateRotationToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 61, proportionOfWidth (0.2244f), 24);
animatePositionToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 109, proportionOfWidth (0.2244f), 24);
animateFillToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 37, proportionOfWidth (0.2352f), 24);
opacityLabel->setBounds ((proportionOfWidth (0.5996f)) + -66, getHeight() - 141, 64, 24);
xSlider->setBounds (proportionOfWidth (0.3609f), getHeight() - 109, proportionOfWidth (0.3788f), 24);
ySlider->setBounds (proportionOfWidth (0.3609f), getHeight() - 85, proportionOfWidth (0.3788f), 24);
sizeSlider->setBounds (proportionOfWidth (0.3609f), getHeight() - 61, proportionOfWidth (0.3788f), 24);
angleSlider->setBounds (proportionOfWidth (0.3609f), getHeight() - 37, proportionOfWidth (0.3788f), 24);
xSliderLabel->setBounds (proportionOfWidth (0.2495f), getHeight() - 109, proportionOfWidth (0.1059f), 24);
ySliderLabel->setBounds (proportionOfWidth (0.2495f), getHeight() - 85, proportionOfWidth (0.1059f), 24);
sizeSliderLabel->setBounds (proportionOfWidth (0.2495f), getHeight() - 61, proportionOfWidth (0.1059f), 24);
angleSliderLabel->setBounds (proportionOfWidth (0.2495f), getHeight() - 37, proportionOfWidth (0.1059f), 24);
clipToRectangleToggle->setBounds (proportionOfWidth (0.0215f), getHeight() - 109, 144, 24);
clipToPathToggle->setBounds (proportionOfWidth (0.0215f), getHeight() - 85, 144, 24);
clipToImageToggle->setBounds (proportionOfWidth (0.0215f), getHeight() - 61, 144, 24);
//[UserResized] Add your own custom resize handling here..
//[/UserResized]
}
@ -687,16 +685,16 @@ BEGIN_JUCER_METADATA
fixedSize="0" initialWidth="600" initialHeight="400">
<BACKGROUND backgroundColour="ffffffff"/>
<COMBOBOX name="" id="216a392b47348589" memberName="testTypeComboBox" virtualName=""
explicitFocusOrder="0" pos="16.517% 16 34.291% 24" editable="0"
explicitFocusOrder="0" pos="16.581% 16 34.359% 24" editable="0"
layout="33" items="Paths - Solid&#10;Paths - Linear gradient&#10;Paths - Radial gradient&#10;Paths - Stroked&#10;Images - RGB&#10;Images - ARGB&#10;Tiled Images - RGB&#10;Tiled Images - ARGB&#10;Glyphs&#10;SVG&#10;Lines"
textWhenNonSelected="" textWhenNoItems="(no choices)"/>
<LABEL name="" id="193cb8e961baa02a" memberName="testTypeLabel" virtualName=""
explicitFocusOrder="0" pos="2.693% 16 12.926% 24" edTextCol="ff000000"
explicitFocusOrder="0" pos="2.735% 16 12.991% 24" edTextCol="ff000000"
edBkgCol="0" labelText="Test type:" editableSingleClick="0" editableDoubleClick="0"
focusDiscardsChanges="0" fontname="Default font" fontsize="15"
bold="0" italic="0" justification="34"/>
<LABEL name="" id="c4977cdfea8776fb" memberName="speedLabel" virtualName=""
explicitFocusOrder="0" pos="53.68% 16 43.088% 24" edTextCol="ff000000"
explicitFocusOrder="0" pos="53.675% 16 43.077% 24" edTextCol="ff000000"
edBkgCol="0" labelText="speed" editableSingleClick="0" editableDoubleClick="0"
focusDiscardsChanges="0" fontname="Default font" fontsize="15"
bold="0" italic="0" justification="33"/>
@ -704,27 +702,27 @@ BEGIN_JUCER_METADATA
explicitFocusOrder="0" pos="20 56 40M 215M" class="RenderingTestCanvas"
params="*this"/>
<SLIDER name="" id="e970a33ca991909e" memberName="opacitySlider" virtualName=""
explicitFocusOrder="0" pos="59.964% 141R 37.882% 24" min="0"
max="1" int="0.001" style="LinearHorizontal" textBoxPos="TextBoxLeft"
explicitFocusOrder="0" pos="60% 141R 37.949% 24" min="0" max="1"
int="0.001" style="LinearHorizontal" textBoxPos="TextBoxLeft"
textBoxEditable="1" textBoxWidth="70" textBoxHeight="20" skewFactor="1"/>
<TOGGLEBUTTON name="" id="2d368b2ffc99beef" memberName="highQualityToggle"
virtualName="" explicitFocusOrder="0" pos="2.154% 141R 44.524% 24"
virtualName="" explicitFocusOrder="0" pos="2.222% 141R 44.444% 24"
buttonText="Higher quality image interpolation" connectedEdges="0"
needsCallback="0" radioGroupId="0" state="0"/>
<TOGGLEBUTTON name="" id="3b7c06ef24935a72" memberName="animateSizeToggle"
virtualName="" explicitFocusOrder="0" pos="75.763% 85R 22.442% 24"
virtualName="" explicitFocusOrder="0" pos="75.726% 85R 22.393% 24"
buttonText="Animate size" connectedEdges="0" needsCallback="0"
radioGroupId="0" state="0"/>
<TOGGLEBUTTON name="" id="acf40ac0130d68eb" memberName="animateRotationToggle"
virtualName="" explicitFocusOrder="0" pos="75.763% 61R 22.442% 24"
virtualName="" explicitFocusOrder="0" pos="75.726% 61R 22.393% 24"
buttonText="Animate rotation" connectedEdges="0" needsCallback="0"
radioGroupId="0" state="0"/>
<TOGGLEBUTTON name="" id="afe7d31210a544cb" memberName="animatePositionToggle"
virtualName="" explicitFocusOrder="0" pos="75.763% 109R 22.442% 24"
virtualName="" explicitFocusOrder="0" pos="75.726% 109R 22.393% 24"
buttonText="Animate position" connectedEdges="0" needsCallback="0"
radioGroupId="0" state="0"/>
<TOGGLEBUTTON name="" id="20466306ead4c6c2" memberName="animateFillToggle"
virtualName="" explicitFocusOrder="0" pos="75.763% 37R 23.519% 24"
virtualName="" explicitFocusOrder="0" pos="75.726% 37R 23.59% 24"
buttonText="Animate gradient" connectedEdges="0" needsCallback="0"
radioGroupId="0" state="0"/>
<LABEL name="" id="ff3fb4acd2101aa5" memberName="opacityLabel" virtualName=""
@ -733,50 +731,50 @@ BEGIN_JUCER_METADATA
editableDoubleClick="0" focusDiscardsChanges="0" fontname="Default font"
fontsize="15" bold="0" italic="0" justification="34"/>
<SLIDER name="" id="549cfd1459f09c12" memberName="xSlider" virtualName=""
explicitFocusOrder="0" pos="36.086% 109R 37.882% 24" min="-100"
explicitFocusOrder="0" pos="36.068% 109R 37.949% 24" min="-100"
max="100" int="0.1" style="LinearHorizontal" textBoxPos="TextBoxLeft"
textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1"/>
<SLIDER name="" id="49b53bab0eca9967" memberName="ySlider" virtualName=""
explicitFocusOrder="0" pos="36.086% 85R 37.882% 24" min="-100"
explicitFocusOrder="0" pos="36.068% 85R 37.949% 24" min="-100"
max="100" int="0.1" style="LinearHorizontal" textBoxPos="TextBoxLeft"
textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1"/>
<SLIDER name="" id="d89d3e0269c1aef4" memberName="sizeSlider" virtualName=""
explicitFocusOrder="0" pos="36.086% 61R 37.882% 24" min="0.01"
explicitFocusOrder="0" pos="36.068% 61R 37.949% 24" min="0.01"
max="10" int="0.01" style="LinearHorizontal" textBoxPos="TextBoxLeft"
textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="0.4"/>
<SLIDER name="" id="a68c75ae0f41c437" memberName="angleSlider" virtualName=""
explicitFocusOrder="0" pos="36.086% 37R 37.882% 24" min="-180"
explicitFocusOrder="0" pos="36.068% 37R 37.949% 24" min="-180"
max="180" int="0.1" style="LinearHorizontal" textBoxPos="TextBoxLeft"
textBoxEditable="1" textBoxWidth="80" textBoxHeight="20" skewFactor="1"/>
<LABEL name="" id="61972b44db6093d7" memberName="xSliderLabel" virtualName=""
explicitFocusOrder="0" pos="24.955% 109R 10.592% 24" edTextCol="ff000000"
explicitFocusOrder="0" pos="24.957% 109R 10.598% 24" edTextCol="ff000000"
edBkgCol="0" labelText="X offset:" editableSingleClick="0" editableDoubleClick="0"
focusDiscardsChanges="0" fontname="Default font" fontsize="15"
bold="0" italic="0" justification="34"/>
<LABEL name="" id="fd87229f56908c79" memberName="ySliderLabel" virtualName=""
explicitFocusOrder="0" pos="24.955% 85R 10.592% 24" edTextCol="ff000000"
explicitFocusOrder="0" pos="24.957% 85R 10.598% 24" edTextCol="ff000000"
edBkgCol="0" labelText="Y offset:" editableSingleClick="0" editableDoubleClick="0"
focusDiscardsChanges="0" fontname="Default font" fontsize="15"
bold="0" italic="0" justification="34"/>
<LABEL name="" id="889901f3d351ac41" memberName="sizeSliderLabel" virtualName=""
explicitFocusOrder="0" pos="24.955% 61R 10.592% 24" edTextCol="ff000000"
explicitFocusOrder="0" pos="24.957% 61R 10.598% 24" edTextCol="ff000000"
edBkgCol="0" labelText="Size:" editableSingleClick="0" editableDoubleClick="0"
focusDiscardsChanges="0" fontname="Default font" fontsize="15"
bold="0" italic="0" justification="34"/>
<LABEL name="" id="98c096221f161097" memberName="angleSliderLabel" virtualName=""
explicitFocusOrder="0" pos="24.955% 37R 10.592% 24" edTextCol="ff000000"
explicitFocusOrder="0" pos="24.957% 37R 10.598% 24" edTextCol="ff000000"
edBkgCol="0" labelText="Angle:" editableSingleClick="0" editableDoubleClick="0"
focusDiscardsChanges="0" fontname="Default font" fontsize="15"
bold="0" italic="0" justification="34"/>
<TOGGLEBUTTON name="" id="dc21f241b7188003" memberName="clipToRectangleToggle"
virtualName="" explicitFocusOrder="0" pos="2.154% 109R 144 24"
virtualName="" explicitFocusOrder="0" pos="2.222% 109R 144 24"
buttonText="Clip to rectangle" connectedEdges="0" needsCallback="0"
radioGroupId="0" state="0"/>
<TOGGLEBUTTON name="" id="e242a0decedf4fbd" memberName="clipToPathToggle" virtualName=""
explicitFocusOrder="0" pos="2.154% 85R 144 24" buttonText="Clip to path"
explicitFocusOrder="0" pos="2.222% 85R 144 24" buttonText="Clip to path"
connectedEdges="0" needsCallback="0" radioGroupId="0" state="0"/>
<TOGGLEBUTTON name="" id="2c40de62d77841ae" memberName="clipToImageToggle"
virtualName="" explicitFocusOrder="0" pos="2.154% 61R 144 24"
virtualName="" explicitFocusOrder="0" pos="2.222% 61R 144 24"
buttonText="Clip to image" connectedEdges="0" needsCallback="0"
radioGroupId="0" state="0"/>
</JUCER_COMPONENT>

15
extras/JuceDemo/Source/demos/RenderingTestComponent.h
View file

@ -3,7 +3,7 @@
This is an automatically generated file created by the Jucer!
Creation date: 1 May 2011 12:07:57pm
Creation date: 20 Sep 2012 1:44:35pm
Be careful when adding custom code to these files, as only the code within
the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
@ -19,8 +19,8 @@
==============================================================================
*/
#ifndef __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_ABDF1DF__
#define __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_ABDF1DF__
#ifndef __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_51E39D0E__
#define __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_51E39D0E__
//[Headers] -- You can add your own extra header files here --
#include "../jucedemo_headers.h"
@ -62,9 +62,6 @@ public:
static const int demoPng_pngSize;
//==============================================================================
juce_UseDebuggingNewOperator
private:
//[UserVariables] -- You can add your own custom variables in this section.
friend class RenderingTestCanvas;
@ -96,10 +93,8 @@ private:
//==============================================================================
// (prevent copy constructor and operator= being generated..)
RenderingTestComponent (const RenderingTestComponent&);
const RenderingTestComponent& operator= (const RenderingTestComponent&);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (RenderingTestComponent);
};
#endif // __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_ABDF1DF__
#endif // __JUCER_HEADER_RENDERINGTESTCOMPONENT_RENDERINGTESTCOMPONENT_51E39D0E__

7
extras/the jucer/src/templates/jucer_ComponentTemplate.h
View file

@ -49,9 +49,6 @@ public:
%%publicMemberDeclarations%%
//==============================================================================
juce_UseDebuggingNewOperator
private:
//[UserVariables] -- You can add your own custom variables in this section.
//[/UserVariables]
@ -60,9 +57,7 @@ private:
%%privateMemberDeclarations%%
//==============================================================================
// (prevent copy constructor and operator= being generated..)
%%className%% (const %%className%%&);
const %%className%%& operator= (const %%className%%&);
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%className%%);
};

7
modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp
View file

@ -152,9 +152,7 @@ String AudioDeviceManager::initialise (const int numInputChannelsNeeded,
if (findType (currentDeviceType) == nullptr)
{
AudioIODeviceType* const type = findType (setup.inputDeviceName, setup.outputDeviceName);
if (type != nullptr)
if (AudioIODeviceType* const type = findType (setup.inputDeviceName, setup.outputDeviceName))
currentDeviceType = type->getTypeName();
else if (availableDeviceTypes.size() > 0)
currentDeviceType = availableDeviceTypes.getUnchecked(0)->getTypeName();
@ -233,8 +231,7 @@ String AudioDeviceManager::initialise (const int numInputChannelsNeeded,
void AudioDeviceManager::insertDefaultDeviceNames (AudioDeviceSetup& setup) const
{
AudioIODeviceType* type = getCurrentDeviceTypeObject();
if (type != nullptr)
if (AudioIODeviceType* type = getCurrentDeviceTypeObject())
{
if (setup.outputDeviceName.isEmpty())
setup.outputDeviceName = type->getDeviceNames (false) [type->getDefaultDeviceIndex (false)];

16
modules/juce_audio_formats/format/juce_AudioFormatManager.cpp
View file

@ -142,17 +142,9 @@ AudioFormatReader* AudioFormatManager::createReaderFor (const File& file)
AudioFormat* const af = getKnownFormat(i);
if (af->canHandleFile (file))
{
InputStream* const in = file.createInputStream();
if (in != nullptr)
{
AudioFormatReader* const r = af->createReaderFor (in, true);
if (r != nullptr)
if (InputStream* const in = file.createInputStream())
if (AudioFormatReader* const r = af->createReaderFor (in, true))
return r;
}
}
}
return nullptr;
@ -172,9 +164,7 @@ AudioFormatReader* AudioFormatManager::createReaderFor (InputStream* audioFileSt
for (int i = 0; i < getNumKnownFormats(); ++i)
{
AudioFormatReader* const r = getKnownFormat(i)->createReaderFor (in, false);
if (r != nullptr)
if (AudioFormatReader* const r = getKnownFormat(i)->createReaderFor (in, false))
{
in.release();
return r;

4
modules/juce_audio_formats/format/juce_AudioFormatReaderSource.cpp
View file

@ -23,9 +23,9 @@
==============================================================================
*/
AudioFormatReaderSource::AudioFormatReaderSource (AudioFormatReader* const reader_,
AudioFormatReaderSource::AudioFormatReaderSource (AudioFormatReader* const r,
const bool deleteReaderWhenThisIsDeleted)
: reader (reader_, deleteReaderWhenThisIsDeleted),
: reader (r, deleteReaderWhenThisIsDeleted),
nextPlayPos (0),
looping (false)
{

4
modules/juce_gui_basics/application/juce_Application.cpp
View file

@ -56,9 +56,7 @@ public:
void actionListenerCallback (const String& message)
{
JUCEApplication* const app = JUCEApplication::getInstance();
if (app != nullptr)
if (JUCEApplication* const app = JUCEApplication::getInstance())
{
const String appName (app->getApplicationName());