allanger/paulxstretch
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 2 Activity

Nicer way to deal with the shared audiothumbnailcache

Browse Source
This commit is contained in:
xenakios 2017-11-23 19:36:46 +02:00
parent a109d71f09
commit e9e1c45550
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/PluginEditor.cpp
View File

@ -154,15 +154,8 @@ void PaulstretchpluginAudioProcessorEditor::chooseFile()
} }
} }
std::shared_ptr<AudioThumbnailCache> g_thumbcache;
WaveformComponent::WaveformComponent(AudioFormatManager* afm) WaveformComponent::WaveformComponent(AudioFormatManager* afm)
{ {
if (g_thumbcache == nullptr)
{
g_thumbcache = std::make_shared<AudioThumbnailCache>(100);
}
m_thumbcache = g_thumbcache;
TimeSelectionChangedCallback = [](Range<double>, int) {}; TimeSelectionChangedCallback = [](Range<double>, int) {};
if (m_use_opengl == true) if (m_use_opengl == true)
m_ogl.attachTo(*this); m_ogl.attachTo(*this);
@ -438,10 +431,3 @@ int WaveformComponent::getTimeSelectionEdge(int x, int y)
return 0; return 0;
} }
void cleanUpGUI()
{
if (g_thumbcache.unique())
{
g_thumbcache = nullptr;
}
}

10
Source/PluginEditor.h
View File

@ -133,6 +133,13 @@ private:
bool m_dragging = false; bool m_dragging = false;
}; };
class MyThumbCache : public AudioThumbnailCache
{
public:
MyThumbCache() : AudioThumbnailCache(100) { Logger::writeToLog("Constructed AudioThumbNailCache"); }
~MyThumbCache() { Logger::writeToLog("Destructed AudioThumbNailCache"); }
};
class WaveformComponent : public Component, public ChangeListener, public Timer class WaveformComponent : public Component, public ChangeListener, public Timer
{ {
public: public:
@ -175,7 +182,7 @@ public:
Value ShowFileCacheRange; Value ShowFileCacheRange;
void setRecordingPosition(double pos) { m_rec_pos = pos; } void setRecordingPosition(double pos) { m_rec_pos = pos; }
private: private:
std::shared_ptr<AudioThumbnailCache> m_thumbcache; SharedResourcePointer<MyThumbCache> m_thumbcache;
std::unique_ptr<AudioThumbnail> m_thumb; std::unique_ptr<AudioThumbnail> m_thumb;
Range<double> m_view_range{ 0.0,1.0 }; Range<double> m_view_range{ 0.0,1.0 };
@ -222,4 +229,3 @@ private:
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PaulstretchpluginAudioProcessorEditor) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PaulstretchpluginAudioProcessorEditor)
}; };
void cleanUpGUI();

1
Source/PluginProcessor.cpp
View File

@ -96,7 +96,6 @@ PaulstretchpluginAudioProcessor::~PaulstretchpluginAudioProcessor()
{ {
g_activeprocessors.erase(this); g_activeprocessors.erase(this);
m_bufferingthread.stopThread(1000); m_bufferingthread.stopThread(1000);
cleanUpGUI();
} }
void PaulstretchpluginAudioProcessor::setPreBufferAmount(int x) void PaulstretchpluginAudioProcessor::setPreBufferAmount(int x)

6
Source/PluginProcessor.h
View File

@ -13,9 +13,8 @@
#include "../JuceLibraryCode/JuceHeader.h" #include "../JuceLibraryCode/JuceHeader.h"
#include "PS_Source/PaulStretchControl.h" #include "PS_Source/PaulStretchControl.h"
//============================================================================== class MyThumbCache;
/**
*/
class PaulstretchpluginAudioProcessor : public AudioProcessor class PaulstretchpluginAudioProcessor : public AudioProcessor
{ {
public: public:
@ -97,6 +96,7 @@ private:
void setPreBufferAmount(int x); void setPreBufferAmount(int x);
void setFFTSize(double size); void setFFTSize(double size);
void startplay(Range<double> playrange, int numoutchans, String& err); void startplay(Range<double> playrange, int numoutchans, String& err);
SharedResourcePointer<MyThumbCache> m_thumbcache;
//============================================================================== //==============================================================================
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PaulstretchpluginAudioProcessor) JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PaulstretchpluginAudioProcessor)
}; };