iOS-compatible AUv3

plugin/Source/SFZeroAudioProcessor.cpp

@@ -1,13 +1,15 @@
 #include "SFZeroAudioProcessor.h"
 #include "SFZeroEditor.h"
+#include "SFZeroEditorList.h"
 
 sfzero::SFZeroAudioProcessor::SFZeroAudioProcessor() : loadProgress(0.0), loadThread(this)
+//sfzero::SFZeroAudioProcessor::SFZeroAudioProcessor() : AudioProcessor (BusesProperties().withOutput ("Output", AudioChannelSet::stereo(), true)),loadProgress(0.0), loadThread(this)
 {
   formatManager.registerBasicFormats();
 
   for (int i = 0; i < 128; ++i)
   {
-    synth.addVoice(new sfzero::Voice());
+    synth.addVoice(new sfzero::Voice(&formatManager, synth.GetCleaner()));
   }
 }
 
@@ -19,13 +21,13 @@ void sfzero::SFZeroAudioProcessor::setParameter(int /*index*/, float /*newValue*
 const String sfzero::SFZeroAudioProcessor::getParameterName(int /*index*/) { return String::empty; }
 const String sfzero::SFZeroAudioProcessor::getParameterText(int /*index*/) { return String::empty; }
 
-void sfzero::SFZeroAudioProcessor::setSfzFile(File *newSfzFile)
+void sfzero::SFZeroAudioProcessor::setSfzFile(const File *newSfzFile)
 {
   sfzFile = *newSfzFile;
   loadSound();
 }
 
-void sfzero::SFZeroAudioProcessor::setSfzFileThreaded(File *newSfzFile)
+void sfzero::SFZeroAudioProcessor::setSfzFileThreaded(const File *newSfzFile)
 {
   loadThread.stopThread(2000);
   sfzFile = *newSfzFile;
@@ -36,7 +38,6 @@ bool sfzero::SFZeroAudioProcessor::acceptsMidi() const
 {
 #if JucePlugin_WantsMidiInput
   return true;
-
 #else
   return false;
 #endif
@@ -46,7 +47,6 @@ bool sfzero::SFZeroAudioProcessor::producesMidi() const
 {
 #if JucePlugin_ProducesMidiOutput
   return true;
-
 #else
   return false;
 #endif
@@ -84,7 +84,12 @@ bool sfzero::SFZeroAudioProcessor::hasEditor() const
   return true; // (change this to false if you choose to not supply an editor)
 }
 
-AudioProcessorEditor *sfzero::SFZeroAudioProcessor::createEditor() { return new SFZeroEditor(this); }
+AudioProcessorEditor *sfzero::SFZeroAudioProcessor::createEditor() {
+  if(SystemStats::isRunningInAppExtensionSandbox())
+    return new SFZeroEditorList(this);
+  else
+    return new SFZeroEditor(this);
+}
 
 void sfzero::SFZeroAudioProcessor::getStateInformation(MemoryBlock &destData)
 {

plugin/Source/SFZeroAudioProcessor.h

@@ -32,8 +32,8 @@ class SFZeroAudioProcessor : public AudioProcessor
   const String getParameterName(int index) override;
   const String getParameterText(int index) override;
 
-  void setSfzFile(File *newSfzFile);
-  void setSfzFileThreaded(File *newSfzFile);
+  void setSfzFile(const File *newSfzFile);
+  void setSfzFileThreaded(const File *newSfzFile);
 
   File getSfzFile() { return (sfzFile); }
   bool acceptsMidi() const override;
@@ -54,6 +54,10 @@ class SFZeroAudioProcessor : public AudioProcessor
   Sound *getSound();
   int numVoicesUsed();
   String voiceInfoString();
+  /*bool isBusesLayoutSupported (const BusesLayout& layouts) const override
+  {
+    return (layouts.getMainOutputChannels() == 2);
+  }*/
 
 protected:
 

plugin/Source/SFZeroEditor.cpp

@@ -1,75 +1,25 @@
 #include "SFZeroEditor.h"
 #include "SFZeroAudioProcessor.h"
+#include "SFZeroFolders.h"
 
-enum
-{
-  hMargin = 12,
-  vMargin = 12,
-  labelHeight = 25,
-  progressBarHeight = 30,
-  keyboardHeight = 54,
-};
-
-sfzero::SFZeroEditor::SFZeroEditor(SFZeroAudioProcessor *ownerFilter)
-    : AudioProcessorEditor(ownerFilter), fileLabel(String::empty, "File... (click here to choose)"), pathLabel(String::empty),
-      showingInfo(showingSoundInfo), midiKeyboard(ownerFilter->keyboardState, MidiKeyboardComponent::horizontalKeyboard),
-      progressBar(nullptr)
-{
-  setSize(500, 300);
-
-#ifdef JUCE_MAC
-  Font fileFont("Helvetica", 22.0, Font::bold);
-  Font labelFont("Helvetica", 15.0, Font::plain);
-#else
-  Font fileFont("Ariel", 22.0, Font::bold);
-  Font labelFont("Ariel", 15.0, Font::plain);
-#endif
-
-  addAndMakeVisible(&fileLabel);
-  fileLabel.setFont(fileFont);
-  fileLabel.setColour(Label::textColourId, Colours::grey);
-  fileLabel.addClickListener(this);
-
-  addAndMakeVisible(&pathLabel);
-  pathLabel.setFont(labelFont);
-  pathLabel.setColour(Label::textColourId, Colours::grey);
-  pathLabel.addClickListener(this);
-
+sfzero::SFZeroEditor::SFZeroEditor(SFZeroAudioProcessor *ownerFilter) : SFZeroEditorBase(ownerFilter){
   addAndMakeVisible(&viewport);
   viewport.setScrollBarsShown(true, true);
   viewport.setViewedComponent(&infoLabel, false);
   infoLabel.setFont(labelFont);
   infoLabel.setJustificationType(Justification::topLeft);
   infoLabel.addClickListener(this);
-
-  addAndMakeVisible(&midiKeyboard);
-  midiKeyboard.setOctaveForMiddleC(4);
-
-  startTimer(200);
-
-  File sfzFile = ownerFilter->getSfzFile();
-  if (sfzFile != File::nonexistent)
-  {
-    updateFile(&sfzFile);
-    showSoundInfo();
-    auto sound = ownerFilter->getSound();
-    if (sound && (sound->numSubsounds() > 1))
-    {
-      showSubsound();
-    }
-  }
-  else
-  {
-    showVersion();
-  }
+  setSize(500, 300);
 }
 
-sfzero::SFZeroEditor::~SFZeroEditor() { delete progressBar; }
+sfzero::SFZeroEditor::~SFZeroEditor(){
+}
 
-void sfzero::SFZeroEditor::paint(Graphics &g) { g.fillAll(Colours::white); }
+void sfzero::SFZeroEditor::paint(Graphics &g){
+  g.fillAll(Colours::white);
+}
 
-void sfzero::SFZeroEditor::resized()
-{
+void sfzero::SFZeroEditor::resized(){
   int marginedWidth = getWidth() - 2 * hMargin;
 
   fileLabel.setBounds(hMargin, vMargin, marginedWidth, labelHeight);
@@ -81,215 +31,3 @@ void sfzero::SFZeroEditor::resized()
   infoLabel.setBounds(0, 0, marginedWidth, infoLabelHeight * 10);
   midiKeyboard.setBounds(hMargin, keyboardTop, marginedWidth, keyboardHeight);
 }
-
-void sfzero::SFZeroEditor::labelClicked(Label *clickedLabel)
-{
-  if (clickedLabel == &fileLabel)
-  {
-    chooseFile();
-  }
-  else if (clickedLabel == &pathLabel)
-  {
-    if (showing == showingSubsound)
-    {
-      auto processor = getProcessor();
-      auto sound = processor->getSound();
-      if (sound)
-      {
-        PopupMenu menu;
-        int selectedSubsound = sound->selectedSubsound();
-        int numSubsounds = sound->numSubsounds();
-        for (int i = 0; i < numSubsounds; ++i)
-        {
-          menu.addItem(i + 1, sound->subsoundName(i), true, (i == selectedSubsound));
-        }
-        int result = menu.show();
-        if (result != 0)
-        {
-          sound->useSubsound(result - 1);
-          showSubsound();
-        }
-      }
-    }
-    else if (showing == showingVersion)
-    {
-      showPath();
-    }
-    else
-    {
-      showVersion();
-    }
-  }
-  else if (clickedLabel == &infoLabel)
-  {
-    if (showingInfo == showingSoundInfo)
-    {
-      showVoiceInfo();
-    }
-    else
-    {
-      showSoundInfo();
-    }
-  }
-}
-
-void sfzero::SFZeroEditor::timerCallback()
-{
-  if (showing == showingProgress)
-  {
-    auto processor = getProcessor();
-    if (processor->loadProgress >= 1.0)
-    {
-      auto sound = processor->getSound();
-      if (sound && (sound->numSubsounds() > 1))
-      {
-        showSubsound();
-      }
-      else
-      {
-        showPath();
-      }
-      showSoundInfo();
-    }
-  }
-
-  if (showingInfo == showingVoiceInfo)
-  {
-    showVoiceInfo();
-  }
-}
-
-void sfzero::SFZeroEditor::chooseFile()
-{
-  FileChooser chooser("Select an SFZ file...", File::nonexistent, "*.sfz;*.SFZ;*.sf2;*.SF2");
-
-  if (chooser.browseForFileToOpen())
-  {
-    File sfzFile(chooser.getResult());
-    setFile(&sfzFile);
-  }
-}
-
-void sfzero::SFZeroEditor::setFile(File *newFile)
-{
-  auto processor = getProcessor();
-
-  processor->setSfzFileThreaded(newFile);
-
-  updateFile(newFile);
-  showProgress();
-}
-
-void sfzero::SFZeroEditor::updateFile(File *file)
-{
-  fileLabel.setText(file->getFileName(), dontSendNotification);
-  fileLabel.setColour(Label::textColourId, Colours::black);
-  showPath();
-}
-
-void sfzero::SFZeroEditor::showSoundInfo()
-{
-  auto processor = getProcessor();
-  auto sound = processor->getSound();
-
-  if (sound)
-  {
-      String info;
-      auto& errors = sound->getErrors();
-      if (errors.size() > 0)
-      {
-          info << errors.size() << " errors: \n";
-          info << errors.joinIntoString("\n");
-          info << "\n";
-      }
-      else
-      {
-          info << "no errors.\n\n";
-      }
-      auto& warnings = sound->getWarnings();
-      if (warnings.size() > 0)
-      {
-          info << warnings.size() << " warnings: \n";
-          info << warnings.joinIntoString("\n");
-      }
-      else
-      {
-          info << "no warnings.\n";
-      }
-      infoLabel.setText(info, dontSendNotification);
-  }
-  showingInfo = showingSoundInfo;
-}
-
-void sfzero::SFZeroEditor::showVoiceInfo()
-{
-  auto processor = getProcessor();
-
-  infoLabel.setText(processor->voiceInfoString(), dontSendNotification);
-  showingInfo = showingVoiceInfo;
-}
-
-void sfzero::SFZeroEditor::showVersion()
-{
-  auto date = Time::getCompilationDate();
-  auto str = String::formatted("SFZero beta %d.%d.%d", date.getYear(), date.getMonth(), date.getDayOfMonth());
-  pathLabel.setText(str, dontSendNotification);
-  pathLabel.setColour(Label::textColourId, Colours::grey);
-  hideProgress();
-  showing = showingVersion;
-}
-
-void sfzero::SFZeroEditor::showPath()
-{
-  auto processor = getProcessor();
-  File file = processor->getSfzFile();
-
-  pathLabel.setText(file.getParentDirectory().getFullPathName(), dontSendNotification);
-  pathLabel.setColour(Label::textColourId, Colours::grey);
-  hideProgress();
-  showing = showingPath;
-}
-
-void sfzero::SFZeroEditor::showSubsound()
-{
-  auto processor = getProcessor();
-  auto sound = processor->getSound();
-
-  if (sound == nullptr)
-  {
-    return;
-  }
-
-  pathLabel.setText(sound->subsoundName(sound->selectedSubsound()), dontSendNotification);
-  pathLabel.setColour(Label::textColourId, Colours::black);
-  hideProgress();
-  showing = showingSubsound;
-}
-
-void sfzero::SFZeroEditor::showProgress()
-{
-  auto processor = getProcessor();
-
-  pathLabel.setVisible(false);
-  infoLabel.setVisible(false);
-  progressBar = new ProgressBar(processor->loadProgress);
-  addAndMakeVisible(progressBar);
-  int marginedWidth = getWidth() - 2 * hMargin;
-  progressBar->setBounds(hMargin, vMargin + labelHeight, marginedWidth, progressBarHeight);
-  showing = showingProgress;
-}
-
-void sfzero::SFZeroEditor::hideProgress()
-{
-  if (progressBar == nullptr)
-  {
-    return;
-  }
-
-  removeChildComponent(progressBar);
-  delete progressBar;
-  progressBar = nullptr;
-
-  pathLabel.setVisible(true);
-  infoLabel.setVisible(true);
-}