Browse Source

tags/2021-05-28
jules 18 years ago
parent
commit
175e9cf3a0
2 changed files with 94 additions and 93 deletions
  1. +84
    -84
      build/win32/vc8/JUCE.vcproj
  2. +10
    -9
      src/juce_appframework/audio/audio_file_formats/juce_AudioThumbnail.cpp

+ 84
- 84
build/win32/vc8/JUCE.vcproj View File

@@ -1009,90 +1009,6 @@
RelativePath="..\..\..\src\juce_appframework\audio\devices\juce_MidiOutput.h"
>
</File>
<Filter
Name="audio_sources"
>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioFormatReaderSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioFormatReaderSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioSourcePlayer.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioSourcePlayer.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioTransportSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioTransportSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_BufferingAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_BufferingAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ChannelRemappingAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ChannelRemappingAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_IIRFilterAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_IIRFilterAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_MixerAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_MixerAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_PositionableAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ResamplingAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ResamplingAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ToneGeneratorAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ToneGeneratorAudioSource.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="midi"
@@ -1334,6 +1250,90 @@
</File>
</Filter>
</Filter>
<Filter
Name="audio_sources"
>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioFormatReaderSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioFormatReaderSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioSourcePlayer.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioSourcePlayer.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioTransportSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioTransportSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_BufferingAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_BufferingAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ChannelRemappingAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ChannelRemappingAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_IIRFilterAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_IIRFilterAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_MixerAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_MixerAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_PositionableAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ResamplingAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ResamplingAudioSource.h"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ToneGeneratorAudioSource.cpp"
>
</File>
<File
RelativePath="..\..\..\src\juce_appframework\audio\audio_sources\juce_ToneGeneratorAudioSource.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="events"


+ 10
- 9
src/juce_appframework/audio/audio_file_formats/juce_AudioThumbnail.cpp View File

@@ -98,12 +98,7 @@ AudioThumbnail::~AudioThumbnail()
void AudioThumbnail::setSource (InputSource* const newSource)
{
cache.removeThumbnail (this);
stopTimer();
{
const ScopedLock sl (readerLock);
deleteAndZero (reader);
}
timerCallback(); // stops the timer and deletes the reader
delete source;
source = newSource;
@@ -202,6 +197,7 @@ void AudioThumbnail::clear()
d->sampleRate = 0;
numSamplesCached = 0;
cacheNeedsRefilling = true;
}
void AudioThumbnail::loadFrom (InputStream& input)
@@ -221,6 +217,7 @@ void AudioThumbnail::loadFrom (InputStream& input)
}
numSamplesCached = 0;
cacheNeedsRefilling = true;
}
void AudioThumbnail::saveTo (OutputStream& output) const
@@ -264,7 +261,7 @@ bool AudioThumbnail::readNextBlockFromAudioFile (AudioFormatReader& reader)
d->numFinishedSamples += numToDo;
}
numSamplesCached = 0; // zap the cache
cacheNeedsRefilling = true;
return (d->numFinishedSamples < d->totalSamples);
}
@@ -362,13 +359,15 @@ void AudioThumbnail::refillCache (const int numSamples,
|| d->sampleRate <= 0)
{
numSamplesCached = 0;
cacheNeedsRefilling = true;
return;
}
if (numSamples == numSamplesCached
&& numChannelsCached == d->numChannels
&& startTime == cachedStart
&& timePerPixel == cachedTimePerPixel)
&& timePerPixel == cachedTimePerPixel
&& ! cacheNeedsRefilling)
{
return;
}
@@ -384,6 +383,8 @@ void AudioThumbnail::refillCache (const int numSamples,
const ScopedLock sl (readerLock);
cacheNeedsRefilling = false;
if (needExtraDetail && reader == 0)
reader = createReader();
@@ -427,7 +428,7 @@ void AudioThumbnail::refillCache (const int numSamples,
}
else
{
for (int channelNum = 0; channelNum < 2; ++channelNum)
for (int channelNum = 0; channelNum < numChannelsCached; ++channelNum)
{
char* const data = getChannelData (channelNum);
char* cacheData = ((char*) cachedLevels.getData()) + channelNum * 2;


Loading…
Cancel
Save