Browse Source

Fixed a GCC OSX compile bug. Tidied up some comments. Added more checking when opening a wav or aiff file.

tags/2021-05-28
jules 13 years ago
parent
commit
51002a72db
4 changed files with 5 additions and 4 deletions
  1. +2
    -1
      modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
  2. +1
    -1
      modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm
  3. +1
    -1
      modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp
  4. +1
    -1
      modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp

+ 2
- 1
modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h View File

@@ -121,7 +121,8 @@ public:
/** The current sample rate. /** The current sample rate.
This rate is used for both the input and output devices. This rate is used for both the input and output devices.
A value of 0 indicates the default rate.
A value of 0 indicates that you don't care what rate is used, and the
device will choose a sensible rate for you.
*/ */
double sampleRate; double sampleRate;


+ 1
- 1
modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm View File

@@ -27,7 +27,7 @@ const int kilobytesPerSecond1x = 176;
struct AudioTrackProducerClass : public ObjCClass <NSObject> struct AudioTrackProducerClass : public ObjCClass <NSObject>
{ {
AudioTrackProducerClass() : ObjCClass ("JUCEAudioTrackProducer_")
AudioTrackProducerClass() : ObjCClass <NSObject> ("JUCEAudioTrackProducer_")
{ {
addIvar<AudioSourceHolder*> ("source"); addIvar<AudioSourceHolder*> ("source");


+ 1
- 1
modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp View File

@@ -696,7 +696,7 @@ AudioFormatReader* AiffAudioFormat::createReaderFor (InputStream* sourceStream,
{ {
ScopedPointer <AiffAudioFormatReader> w (new AiffAudioFormatReader (sourceStream)); ScopedPointer <AiffAudioFormatReader> w (new AiffAudioFormatReader (sourceStream));
if (w->sampleRate > 0)
if (w->sampleRate > 0 && w->numChannels > 0)
return w.release(); return w.release();
if (! deleteStreamIfOpeningFails) if (! deleteStreamIfOpeningFails)


+ 1
- 1
modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp View File

@@ -1016,7 +1016,7 @@ AudioFormatReader* WavAudioFormat::createReaderFor (InputStream* sourceStream,
{ {
ScopedPointer <WavAudioFormatReader> r (new WavAudioFormatReader (sourceStream)); ScopedPointer <WavAudioFormatReader> r (new WavAudioFormatReader (sourceStream));
if (r->sampleRate > 0)
if (r->sampleRate > 0 && r->numChannels > 0)
return r.release(); return r.release();
if (! deleteStreamIfOpeningFails) if (! deleteStreamIfOpeningFails)


Loading…
Cancel
Save