diff --git a/build/win32/platform_specific_code/juce_win32_AudioCDReader.cpp b/build/win32/platform_specific_code/juce_win32_AudioCDReader.cpp index 1bd61850c2..ceb9d76e4b 100644 --- a/build/win32/platform_specific_code/juce_win32_AudioCDReader.cpp +++ b/build/win32/platform_specific_code/juce_win32_AudioCDReader.cpp @@ -36,8 +36,16 @@ #include "win32_headers.h" #include -#include -#include + +#include "../../../juce_Config.h" + +#if JUCE_USE_CDBURNER + // you'll need the Platform SDK for these headers - if you don't have it and don't + // need to use CD-burning, then you might just want to disable the JUCE_USE_CDBURNER + // flag in juce_Config.h to avoid these includes. + #include + #include +#endif #include "../../../src/juce_core/basics/juce_StandardHeader.h" @@ -2114,6 +2122,8 @@ void AudioCDReader::ejectDisk() } +#if JUCE_USE_CDBURNER + //============================================================================== static IDiscRecorder* enumCDBurners (StringArray* list, int indexToOpen, IDiscMaster** master) { @@ -2489,5 +2499,6 @@ bool AudioCDBurner::addAudioTrack (AudioSource& source, int numSamples) return ok && hr == S_OK; } +#endif END_JUCE_NAMESPACE diff --git a/build/win32/vc6/JUCE.dsp b/build/win32/vc6/JUCE.dsp index 815fd05808..6d9cdcfd96 100644 --- a/build/win32/vc6/JUCE.dsp +++ b/build/win32/vc6/JUCE.dsp @@ -384,6 +384,22 @@ SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioSubsect # End Source File # Begin Source File +SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioThumbnail.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioThumbnail.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioThumbnailCache.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioThumbnailCache.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_FlacAudioFormat.cpp # End Source File # Begin Source File @@ -400,6 +416,14 @@ SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_OggVorbisAud # End Source File # Begin Source File +SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_QuickTimeAudioFormat.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_QuickTimeAudioFormat.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_WavAudioFormat.cpp # End Source File # Begin Source File @@ -648,10 +672,26 @@ SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorEditor # End Source File # Begin Source File +SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorGraph.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorGraph.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorListener.h # End Source File # Begin Source File +SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorPlayer.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorPlayer.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\juce_appframework\audio\processors\juce_GenericAudioProcessorEditor.cpp # End Source File # Begin Source File @@ -2760,6 +2800,18 @@ SOURCE=..\..\..\src\juce_core\io\streams\juce_SubregionStream.h # End Group # Begin Source File +SOURCE=..\..\..\src\juce_core\io\streams\juce_FileInputSource.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\juce_core\io\streams\juce_FileInputSource.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\juce_core\io\streams\juce_InputSource.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\juce_core\io\juce_InputStream.cpp # End Source File # Begin Source File @@ -2904,6 +2956,18 @@ SOURCE=..\..\..\src\juce_core\threads\juce_ScopedLock.h # End Source File # Begin Source File +SOURCE=..\..\..\src\juce_core\threads\juce_ScopedReadLock.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\juce_core\threads\juce_ScopedTryLock.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\juce_core\threads\juce_ScopedWriteLock.h +# End Source File +# Begin Source File + SOURCE=..\..\..\src\juce_core\threads\juce_Thread.cpp # End Source File # Begin Source File diff --git a/build/win32/vc8/JUCE.vcproj b/build/win32/vc8/JUCE.vcproj index 252b43364f..3675a6ba8e 100644 --- a/build/win32/vc8/JUCE.vcproj +++ b/build/win32/vc8/JUCE.vcproj @@ -970,90 +970,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1093,6 +1009,90 @@ RelativePath="..\..\..\src\juce_appframework\audio\devices\juce_MidiOutput.h" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sampleRate); for (int i = numSamples; --i >= 0;) @@ -426,7 +426,7 @@ void AudioThumbnail::refillCache (const int numSamples, for (int channelNum = 0; channelNum < 2; ++channelNum) { char* const data = getChannelData (channelNum); - char* cacheData = ((char*) cachedLevels) + channelNum * 2; + char* cacheData = ((char*) cachedLevels.getData()) + channelNum * 2; const double timeToThumbSampleFactor = d->sampleRate / (double) d->samplesPerThumbSample; @@ -509,7 +509,7 @@ void AudioThumbnail::drawChannel (Graphics& g, w -= skipLeft; x += skipLeft; - const char* cacheData = ((const char*) cachedLevels) + const char* cacheData = ((const char*) cachedLevels.getData()) + (channelNum << 1) + skipLeft * (numChannelsCached << 1); diff --git a/src/juce_appframework/audio/audio_file_formats/juce_AudioThumbnailCache.cpp b/src/juce_appframework/audio/audio_file_formats/juce_AudioThumbnailCache.cpp index 2d148ec45e..c0339d8151 100644 --- a/src/juce_appframework/audio/audio_file_formats/juce_AudioThumbnailCache.cpp +++ b/src/juce_appframework/audio/audio_file_formats/juce_AudioThumbnailCache.cpp @@ -66,7 +66,7 @@ bool AudioThumbnailCache::loadThumb (AudioThumbnail& thumb, const int64 hashCode { if (thumbs[i]->hash == hashCode) { - MemoryInputStream in ((const char*) thumbs[i]->data, + MemoryInputStream in ((const char*) thumbs[i]->data.getData(), thumbs[i]->data.getSize(), false); diff --git a/src/juce_appframework/audio/audio_file_formats/juce_QuickTimeAudioFormat.h b/src/juce_appframework/audio/audio_file_formats/juce_QuickTimeAudioFormat.h index e99dc428ad..e079dba3e1 100644 --- a/src/juce_appframework/audio/audio_file_formats/juce_QuickTimeAudioFormat.h +++ b/src/juce_appframework/audio/audio_file_formats/juce_QuickTimeAudioFormat.h @@ -33,6 +33,7 @@ #define __JUCE_QUICKTIMEAUDIOFORMAT_JUCEHEADER__ #include "juce_AudioFormat.h" +#if JUCE_QUICKTIME_AUDIOFORMAT //============================================================================== @@ -77,5 +78,5 @@ public: }; - +#endif #endif // __JUCE_QUICKTIMEAUDIOFORMAT_JUCEHEADER__ diff --git a/src/juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.cpp b/src/juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.cpp index 1fa171649e..3b82d04d71 100644 --- a/src/juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.cpp +++ b/src/juce_appframework/audio/plugins/formats/juce_VSTPluginFormat.cpp @@ -2661,7 +2661,7 @@ void VSTPluginInstance::createTempParameterStore (MemoryBlock& dest) void VSTPluginInstance::restoreFromTempParameterStore (const MemoryBlock& m) { - changeProgramName (getCurrentProgram(), (const char*) m); + changeProgramName (getCurrentProgram(), (const char*) m.getData()); float* p = (float*) (((char*) m.getData()) + 64); for (int i = 0; i < getNumParameters(); ++i) diff --git a/src/juce_appframework/audio/processors/juce_AudioProcessorGraph.cpp b/src/juce_appframework/audio/processors/juce_AudioProcessorGraph.cpp index dc907266d3..393c571974 100644 --- a/src/juce_appframework/audio/processors/juce_AudioProcessorGraph.cpp +++ b/src/juce_appframework/audio/processors/juce_AudioProcessorGraph.cpp @@ -1213,6 +1213,7 @@ void AudioProcessorGraph::AudioGraphIOProcessor::processBlock (AudioSampleBuffer } case audioInputNode: + { for (int i = jmin (graph->currentAudioIOBuffer->getNumChannels(), buffer.getNumChannels()); --i >= 0;) { @@ -1220,6 +1221,7 @@ void AudioProcessorGraph::AudioGraphIOProcessor::processBlock (AudioSampleBuffer } break; + } case midiOutputNode: graph->currentMidiIOBuffer->addEvents (midiMessages, 0, buffer.getNumSamples(), 0);