build fixes for ios

This commit is contained in:
essej 2022-06-16 17:27:11 -04:00
parent 3fe8379663
commit 8ec191fdd7
2 changed files with 39 additions and 9 deletions

View File

@ -58,10 +58,12 @@ RenderSettingsComponent::RenderSettingsComponent (PaulstretchpluginAudioProcesso
label4.setJustificationType(Justification::centredRight); label4.setJustificationType(Justification::centredRight);
#if JUCE_IOS #if JUCE_IOS
addAndMakeVisible(&m_shareAfterRenderToggle); if (JUCEApplication::isStandaloneApp()) {
m_shareAfterRenderToggle.setButtonText("Share after render"); addAndMakeVisible(&m_shareAfterRenderToggle);
bool lastshare = m_proc->m_propsfile->m_props_file->getBoolValue(ID_lastrendershare, false); m_shareAfterRenderToggle.setButtonText("Share after render");
m_shareAfterRenderToggle.setToggleState(lastshare, dontSendNotification); bool lastshare = m_proc->m_propsfile->m_props_file->getBoolValue(ID_lastrendershare, false);
m_shareAfterRenderToggle.setToggleState(lastshare, dontSendNotification);
}
#endif #endif
addAndMakeVisible(&outfileNameEditor); addAndMakeVisible(&outfileNameEditor);
@ -162,8 +164,10 @@ void RenderSettingsComponent::resized()
buttonbox.flexDirection = FlexBox::Direction::row; buttonbox.flexDirection = FlexBox::Direction::row;
buttonbox.items.add(FlexItem(2, itemh).withFlex(1)); buttonbox.items.add(FlexItem(2, itemh).withFlex(1));
#if JUCE_IOS #if JUCE_IOS
buttonbox.items.add(FlexItem(labelw, itemh, m_shareAfterRenderToggle).withMargin(margin).withFlex(1)); if (JUCEApplication::isStandaloneApp()) {
buttonbox.items.add(FlexItem(4, itemh).withFlex(0.1).withMaxWidth(20)); buttonbox.items.add(FlexItem(labelw, itemh, m_shareAfterRenderToggle).withMargin(margin).withFlex(1));
buttonbox.items.add(FlexItem(4, itemh).withFlex(0.1).withMaxWidth(20));
}
#endif #endif
buttonbox.items.add(FlexItem(minitemw, itemh, buttonRender).withMargin(margin)); buttonbox.items.add(FlexItem(minitemw, itemh, buttonRender).withMargin(margin));
@ -244,7 +248,7 @@ void RenderSettingsComponent::buttonClicked (Button* buttonThatWasClicked)
std::function<void(bool,File file)> completion; std::function<void(bool,File file)> completion;
#if JUCE_IOS #if JUCE_IOS
if (m_shareAfterRenderToggle.getToggleState()) { if (JUCEApplication::isStandaloneApp() && m_shareAfterRenderToggle.getToggleState()) {
completion = [](bool status,File file) { completion = [](bool status,File file) {
// this completion handler will be called from another thread // this completion handler will be called from another thread
MessageManager::callAsync([status,file]() { MessageManager::callAsync([status,file]() {
@ -286,7 +290,7 @@ void RenderSettingsComponent::buttonClicked (Button* buttonThatWasClicked)
File lastexportfolder; // File(g_propsfile->getValue("last_export_file")).getParentDirectory(); File lastexportfolder; // File(g_propsfile->getValue("last_export_file")).getParentDirectory();
Component * parent = nullptr; Component * parent = nullptr;
#if JUCE_IOS #if JUCE_IOS
parent = JUCEApplication::isStandaloneApp() ? nullptr : getActiveEditor(); parent = JUCEApplication::isStandaloneApp() ? nullptr : m_proc->getActiveEditor();
#endif #endif
m_filechooser = std::make_unique<FileChooser>("Please select audio file to render...", m_filechooser = std::make_unique<FileChooser>("Please select audio file to render...",

View File

@ -28,14 +28,26 @@
<FILE id="uGTN39" name="play_icon.svg" compile="0" resource="1" file="../images/play_icon.svg"/> <FILE id="uGTN39" name="play_icon.svg" compile="0" resource="1" file="../images/play_icon.svg"/>
<FILE id="OyhaIc" name="power.svg" compile="0" resource="1" file="../images/power.svg"/> <FILE id="OyhaIc" name="power.svg" compile="0" resource="1" file="../images/power.svg"/>
<FILE id="uMLkyi" name="power_sel.svg" compile="0" resource="1" file="../images/power_sel.svg"/> <FILE id="uMLkyi" name="power_sel.svg" compile="0" resource="1" file="../images/power_sel.svg"/>
<FILE id="kOKR8S" name="record.svg" compile="0" resource="1" file="../images/record.svg"/>
<FILE id="aogj2H" name="record_active.svg" compile="0" resource="1" <FILE id="aogj2H" name="record_active.svg" compile="0" resource="1"
file="../images/record_active.svg"/> file="../images/record_active.svg"/>
<FILE id="sdhUZp" name="record_input.svg" compile="0" resource="1"
file="../images/record_input.svg"/>
<FILE id="ljzBUV" name="record_input_active.svg" compile="0" resource="1"
file="../images/record_input_active.svg"/>
<FILE id="CWzK0D" name="record_output.svg" compile="0" resource="1"
file="../images/record_output.svg"/>
<FILE id="rjOnS4" name="record_output_active.svg" compile="0" resource="1"
file="../images/record_output_active.svg"/>
<FILE id="MKkrTg" name="skipback_icon.svg" compile="0" resource="1" <FILE id="MKkrTg" name="skipback_icon.svg" compile="0" resource="1"
file="../images/skipback_icon.svg"/> file="../images/skipback_icon.svg"/>
</GROUP> </GROUP>
<GROUP id="{03DA6B32-F666-FF60-F168-4385D0847058}" name="Source"> <GROUP id="{03DA6B32-F666-FF60-F168-4385D0847058}" name="Source">
<GROUP id="{3B6D1AF9-E53E-2F78-24A5-D12A34009E6A}" name="PS_Source"> <GROUP id="{3B6D1AF9-E53E-2F78-24A5-D12A34009E6A}" name="PS_Source">
<FILE id="F5ZPuM" name="FreeEdit.cpp" compile="1" resource="0" file="../Source/PS_Source/FreeEdit.cpp"/>
<FILE id="uHUVmT" name="FreeEdit.h" compile="0" resource="0" file="../Source/PS_Source/FreeEdit.h"/>
<FILE id="BRDYVf" name="BinauralBeats.cpp" compile="1" resource="0"
file="../Source/PS_Source/BinauralBeats.cpp"/>
<FILE id="REl3dN" name="BinauralBeats.h" compile="0" resource="0" file="../Source/PS_Source/BinauralBeats.h"/>
<FILE id="gDsFRp" name="globals.h" compile="0" resource="0" file="../Source/PS_Source/globals.h"/> <FILE id="gDsFRp" name="globals.h" compile="0" resource="0" file="../Source/PS_Source/globals.h"/>
<FILE id="MOQjrp" name="ProcessedStretch.h" compile="0" resource="0" <FILE id="MOQjrp" name="ProcessedStretch.h" compile="0" resource="0"
file="../Source/PS_Source/ProcessedStretch.h"/> file="../Source/PS_Source/ProcessedStretch.h"/>
@ -67,7 +79,13 @@
file="../Source/envelope_component.cpp"/> file="../Source/envelope_component.cpp"/>
<FILE id="apM6W6" name="envelope_component.h" compile="0" resource="0" <FILE id="apM6W6" name="envelope_component.h" compile="0" resource="0"
file="../Source/envelope_component.h"/> file="../Source/envelope_component.h"/>
<FILE id="JbDTUJ" name="GenericItemChooser.cpp" compile="1" resource="0"
file="../Source/GenericItemChooser.cpp"/>
<FILE id="TYMQPN" name="GenericItemChooser.h" compile="0" resource="0"
file="../Source/GenericItemChooser.h"/>
<FILE id="qfCc8R" name="jcdp_envelope.h" compile="0" resource="0" file="../Source/jcdp_envelope.h"/> <FILE id="qfCc8R" name="jcdp_envelope.h" compile="0" resource="0" file="../Source/jcdp_envelope.h"/>
<FILE id="YNkYxK" name="OptionsView.cpp" compile="1" resource="0" file="../Source/OptionsView.cpp"/>
<FILE id="JKfJ71" name="OptionsView.h" compile="0" resource="0" file="../Source/OptionsView.h"/>
<FILE id="lyNyYp" name="PluginEditor.cpp" compile="1" resource="0" <FILE id="lyNyYp" name="PluginEditor.cpp" compile="1" resource="0"
file="../Source/PluginEditor.cpp"/> file="../Source/PluginEditor.cpp"/>
<FILE id="IO7X2q" name="PluginEditor.h" compile="0" resource="0" file="../Source/PluginEditor.h"/> <FILE id="IO7X2q" name="PluginEditor.h" compile="0" resource="0" file="../Source/PluginEditor.h"/>
@ -84,6 +102,14 @@
<FILE id="L4CoFz" name="RenderSettingsComponent.h" compile="0" resource="0" <FILE id="L4CoFz" name="RenderSettingsComponent.h" compile="0" resource="0"
file="../Source/RenderSettingsComponent.h"/> file="../Source/RenderSettingsComponent.h"/>
<FILE id="TDOHpE" name="resample.cpp" compile="1" resource="0" file="../Source/WDL/resample.cpp"/> <FILE id="TDOHpE" name="resample.cpp" compile="1" resource="0" file="../Source/WDL/resample.cpp"/>
<FILE id="VxIH1M" name="SonoChoiceButton.cpp" compile="1" resource="0"
file="../Source/SonoChoiceButton.cpp"/>
<FILE id="GnI2tf" name="SonoChoiceButton.h" compile="0" resource="0"
file="../Source/SonoChoiceButton.h"/>
<FILE id="XnOwP2" name="SonoTextButton.cpp" compile="1" resource="0"
file="../Source/SonoTextButton.cpp"/>
<FILE id="Dr6hzX" name="SonoTextButton.h" compile="0" resource="0"
file="../Source/SonoTextButton.h"/>
</GROUP> </GROUP>
</MAINGROUP> </MAINGROUP>
<EXPORTFORMATS> <EXPORTFORMATS>