mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Android: Fix file loading in DSP demos

Browse source
This commit is contained in:
reuk 2022-11-08 16:08:39 +00:00
parent e3e8b8a91d
commit 06a71ccce0
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
3 changed files with 34 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

58
examples/Assets/DSPDemos_Common.h
View file

@ -25,7 +25,7 @@ using namespace dsp;
struct DSPDemoParameterBase : public ChangeBroadcaster
{
DSPDemoParameterBase (const String& labelName) : name (labelName) {}
virtual ~DSPDemoParameterBase() {}
virtual ~DSPDemoParameterBase() = default;
virtual Component* getComponent() = 0;
@ -142,7 +142,7 @@ public:
loadURL (u);
}
URL getCurrentURL() { return currentURL; }
URL getCurrentURL() const { return currentURL; }
void setTransportSource (AudioTransportSource* newSource)
{
@ -189,21 +189,7 @@ private:
currentURL = u;
InputSource* inputSource = nullptr;
#if ! JUCE_IOS
if (u.isLocalFile())
{
inputSource = new FileInputSource (u.getLocalFile());
}
else
#endif
{
if (inputSource == nullptr)
inputSource = new URLInputSource (u);
}
thumbnail.setSource (inputSource);
thumbnail.setSource (makeInputSource (u).release());
if (notify)
sendChangeMessage();
@ -407,33 +393,27 @@ public:
transportSource.reset();
readerSource.reset();
AudioFormatReader* newReader = nullptr;
auto source = makeInputSource (fileToPlay);
#if ! JUCE_IOS
if (fileToPlay.isLocalFile())
{
newReader = formatManager.createReaderFor (fileToPlay.getLocalFile());
}
else
#endif
{
if (newReader == nullptr)
newReader = formatManager.createReaderFor (fileToPlay.createInputStream (URL::InputStreamOptions (URL::ParameterHandling::inAddress)));
}
if (source == nullptr)
return false;
reader.reset (newReader);
auto stream = rawToUniquePtr (source->createInputStream());
if (reader.get() != nullptr)
{
readerSource.reset (new AudioFormatReaderSource (reader.get(), false));
readerSource->setLooping (loopState.getValue());
if (stream == nullptr)
return false;
init();
reader = rawToUniquePtr (formatManager.createReaderFor (std::move (stream)));
return true;
}
if (reader == nullptr)
return false;
return false;
readerSource.reset (new AudioFormatReaderSource (reader.get(), false));
readerSource->setLooping (loopState.getValue());
init();
return true;
}
void togglePlay()
@ -613,7 +593,7 @@ private:
{
if (fc.getURLResults().size() > 0)
{
auto u = fc.getURLResult();
const auto u = fc.getURLResult();
if (! audioFileReader.loadURL (u))
NativeMessageBox::showAsync (MessageBoxOptions()

15
examples/Assets/DemoUtilities.h
View file

@ -242,4 +242,19 @@ struct SlowerBouncingNumber : public BouncingNumber
}
};
inline std::unique_ptr<InputSource> makeInputSource (const URL& url)
{
#if JUCE_ANDROID
if (auto doc = AndroidDocument::fromDocument (url))
return std::make_unique<AndroidDocumentInputSource> (doc);
#endif
#if ! JUCE_IOS
if (url.isLocalFile())
return std::make_unique<FileInputSource> (url.getLocalFile());
#endif
return std::make_unique<URLInputSource> (url);
}
#endif // PIP_DEMO_UTILITIES_INCLUDED

16
examples/Audio/AudioPlaybackDemo.h
View file

@ -48,22 +48,6 @@
#include "../Assets/DemoUtilities.h"
inline std::unique_ptr<InputSource> makeInputSource (const URL& url)
{
#if JUCE_ANDROID
if (auto doc = AndroidDocument::fromDocument (url))
return std::make_unique<AndroidDocumentInputSource> (doc);
#endif
#if ! JUCE_IOS
if (url.isLocalFile())
return std::make_unique<FileInputSource> (url.getLocalFile());
#endif
return std::make_unique<URLInputSource> (url);
}
//==============================================================================
class DemoThumbnailComp : public Component,
public ChangeListener,
public FileDragAndDropTarget,