Browse Source

Couple of minor clean-ups.

tags/2021-05-28
jules 11 years ago
parent
commit
b5af44a485
2 changed files with 10 additions and 10 deletions
  1. +7
    -7
      modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h
  2. +3
    -3
      modules/juce_core/files/juce_File.cpp

+ 7
- 7
modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h View File

@@ -497,14 +497,14 @@ public:
//==============================================================================
#ifndef DOXYGEN
// Note that these methods have now been replaced by getReadPointer() and getWritePointer()
JUCE_DEPRECATED (const float* getSampleData (int channel) const) { return getReadPointer (channel); }
JUCE_DEPRECATED (const float* getSampleData (int channel, int index) const) { return getReadPointer (channel, index); }
JUCE_DEPRECATED (float* getSampleData (int channel)) { return getWritePointer (channel); }
JUCE_DEPRECATED (float* getSampleData (int channel, int index)) { return getWritePointer (channel, index); }
JUCE_DEPRECATED_WITH_BODY (const float* getSampleData (int channel) const, { return getReadPointer (channel); })
JUCE_DEPRECATED_WITH_BODY (const float* getSampleData (int channel, int index) const, { return getReadPointer (channel, index); })
JUCE_DEPRECATED_WITH_BODY (float* getSampleData (int channel), { return getWritePointer (channel); })
JUCE_DEPRECATED_WITH_BODY (float* getSampleData (int channel, int index), { return getWritePointer (channel, index); })
// These have been replaced by getArrayOfReadPointers() and getArrayOfWritePointers()
JUCE_DEPRECATED (const float** getArrayOfChannels() const) { return getArrayOfReadPointers(); }
JUCE_DEPRECATED (float** getArrayOfChannels()) { return getArrayOfWritePointers(); }
JUCE_DEPRECATED_WITH_BODY (const float** getArrayOfChannels() const, { return getArrayOfReadPointers(); })
JUCE_DEPRECATED_WITH_BODY (float** getArrayOfChannels(), { return getArrayOfWritePointers(); })
#endif
private:
@@ -517,7 +517,7 @@ private:
bool isClear;
void allocateData();
void allocateChannels (float* const* dataToReferTo, int offset);
void allocateChannels (float* const*, int offset);
JUCE_LEAK_DETECTOR (AudioSampleBuffer)
};


+ 3
- 3
modules/juce_core/files/juce_File.cpp View File

@@ -355,7 +355,7 @@ File File::getChildFile (StringRef relativePath) const
if (isAbsolutePath (relativePath))
return File (String (relativePath.text));
if (relativePath.text[0] != '.')
if (relativePath[0] != '.')
return File (addTrailingSeparator (fullPath) + relativePath);
String path (fullPath);
@@ -368,11 +368,11 @@ File File::getChildFile (StringRef relativePath) const
while (relativePath[0] == '.')
{
const juce_wchar secondChar = relativePath.text[1];
const juce_wchar secondChar = relativePath[1];
if (secondChar == '.')
{
const juce_wchar thirdChar = relativePath.text[2];
const juce_wchar thirdChar = relativePath[2];
if (thirdChar == 0 || thirdChar == separator)
{


Loading…
Cancel
Save