Browse Source

A few minor tweaks to avoid warnings etc.

tags/2021-05-28
jules 12 years ago
parent
commit
aec3d12753
5 changed files with 5 additions and 9 deletions
  1. +0
    -3
      modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp
  2. +3
    -2
      modules/juce_core/containers/juce_OwnedArray.h
  3. +0
    -2
      modules/juce_core/files/juce_File.h
  4. +1
    -1
      modules/juce_core/juce_core.h
  5. +1
    -1
      modules/juce_core/threads/juce_WaitableEvent.h

+ 0
- 3
modules/juce_audio_formats/codecs/juce_MP3AudioFormat.cpp View File

@@ -436,10 +436,7 @@ struct VBRTagData
vbrScale = -1; vbrScale = -1;
if (flags & 8) if (flags & 8)
{
vbrScale = ByteOrder::bigEndianInt (data); vbrScale = ByteOrder::bigEndianInt (data);
data += 4;
}
headersize = ((type + 1) * 72000 * bitrate) / sampleRate; headersize = ((type + 1) * 72000 * bitrate) / sampleRate;
return true; return true;


+ 3
- 2
modules/juce_core/containers/juce_OwnedArray.h View File

@@ -249,12 +249,13 @@ public:
@param newObject the new object to add to the array @param newObject the new object to add to the array
@see set, insert, addIfNotAlreadyThere, addSorted @see set, insert, addIfNotAlreadyThere, addSorted
*/ */
void add (const ObjectClass* const newObject) noexcept
ObjectClass* add (ObjectClass* const newObject) noexcept
{ {
const ScopedLockType lock (getLock()); const ScopedLockType lock (getLock());
data.ensureAllocatedSize (numUsed + 1); data.ensureAllocatedSize (numUsed + 1);
jassert (data.elements != nullptr); jassert (data.elements != nullptr);
data.elements [numUsed++] = const_cast <ObjectClass*> (newObject); data.elements [numUsed++] = const_cast <ObjectClass*> (newObject);
return const_cast <ObjectClass*> (newObject);
} }
/** Inserts a new object into the array at the given index. /** Inserts a new object into the array at the given index.
@@ -275,7 +276,7 @@ public:
@see add, addSorted, addIfNotAlreadyThere, set @see add, addSorted, addIfNotAlreadyThere, set
*/ */
void insert (int indexToInsertAt, void insert (int indexToInsertAt,
const ObjectClass* const newObject) noexcept
ObjectClass* const newObject) noexcept
{ {
if (indexToInsertAt >= 0) if (indexToInsertAt >= 0)
{ {


+ 0
- 2
modules/juce_core/files/juce_File.h View File

@@ -952,8 +952,6 @@ private:
bool setFileTimesInternal (int64 m, int64 a, int64 c) const; bool setFileTimesInternal (int64 m, int64 a, int64 c) const;
void getFileTimesInternal (int64& m, int64& a, int64& c) const; void getFileTimesInternal (int64& m, int64& a, int64& c) const;
bool setFileReadOnlyInternal (bool) const; bool setFileReadOnlyInternal (bool) const;
JUCE_LEAK_DETECTOR (File)
}; };
#endif // __JUCE_FILE_JUCEHEADER__ #endif // __JUCE_FILE_JUCEHEADER__

+ 1
- 1
modules/juce_core/juce_core.h View File

@@ -101,7 +101,7 @@
#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0 #define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0
#endif #endif
/* Config: JUCE_INCLUDE_ZLIB_CODE
/** Config: JUCE_INCLUDE_ZLIB_CODE
This can be used to disable Juce's embedded 3rd-party zlib code. This can be used to disable Juce's embedded 3rd-party zlib code.
You might need to tweak this if you're linking to an external zlib library in your app, You might need to tweak this if you're linking to an external zlib library in your app,
but for normal apps, this option should be left alone. but for normal apps, this option should be left alone.


+ 1
- 1
modules/juce_core/threads/juce_WaitableEvent.h View File

@@ -50,7 +50,7 @@ public:
method is called. If manualReset is true, then once the event is signalled, method is called. If manualReset is true, then once the event is signalled,
the only way to reset it will be by calling the reset() method. the only way to reset it will be by calling the reset() method.
*/ */
WaitableEvent (bool manualReset = false) noexcept;
explicit WaitableEvent (bool manualReset = false) noexcept;
/** Destructor. /** Destructor.


Loading…
Cancel
Save