diff --git a/source/backend/CarlaStandalone.cpp b/source/backend/CarlaStandalone.cpp index 0e2146da6..b1fe57f04 100644 --- a/source/backend/CarlaStandalone.cpp +++ b/source/backend/CarlaStandalone.cpp @@ -455,60 +455,57 @@ const char* carla_get_complete_license_text() if (retText.isEmpty()) { - CarlaString text1, text2, text3, text4, text5; - - text1 += "
This current Carla build is using the following features and 3rd-party code:
"; - text1 += "This current Carla build is using the following features and 3rd-party code:
" + "(*) Using LinuxSampler code in commercial hardware or software products is not allowed without prior written authorization by the authors.
"; + "(*) Using LinuxSampler code in commercial hardware or software products is not allowed without prior written authorization by the authors.
" #endif - - retText = text1 + text2 + text3 + text4 + text5; + ; } return retText; @@ -539,16 +536,24 @@ const char* carla_get_supported_file_extensions() if (retText.isEmpty()) { + retText = // Base types - retText += "*.carxp;*.carxs"; - - // Sample kits + "*.carxp;*.carxs" + // MIDI files + ";*.mid;*.midi" #ifdef HAVE_FLUIDSYNTH - retText += ";*.sf2"; + // fluidsynth (sf2) + ";*.sf2" #endif #ifdef HAVE_LINUXSAMPLER - retText += ";*.gig;*.sfz"; + // linuxsampler (gig and sfz) + ";*.gig;*.sfz" #endif +#ifdef WANT_ZYNADDSUBFX + // zynaddsubfx presets + ";*.xmz;*.xiz" +#endif + ; #ifndef BUILD_BRIDGE // Audio files @@ -558,22 +563,18 @@ const char* carla_get_supported_file_extensions() AudioFormatManager afm; afm.registerBasicFormats(); + String juceFormats; + for (AudioFormat **it=afm.begin(), **end=afm.end(); it != end; ++it) { const StringArray& exts((*it)->getFileExtensions()); for (String *eit=exts.begin(), *eend=exts.end(); eit != eend; ++eit) - retText += String(";*" + (*eit)).toRawUTF8(); + juceFormats += String(";*" + (*eit)).toRawUTF8(); } - } -#endif - - // MIDI files - retText += ";*.mid;*.midi"; - // Plugin presets -#ifdef WANT_ZYNADDSUBFX - retText += ";*.xmz;*.xiz"; + retText += juceFormats.toRawUTF8(); + } #endif } diff --git a/source/carla_widgets.py b/source/carla_widgets.py index b8bad6923..8b7af00c7 100755 --- a/source/carla_widgets.py +++ b/source/carla_widgets.py @@ -115,7 +115,7 @@ class CarlaAboutW(QDialog): self.ui.l_ladspa.setText(self.tr("Everything! (Including LRDF)")) self.ui.l_dssi.setText(self.tr("Everything! (Including CustomData/Chunks)")) - self.ui.l_lv2.setText(self.tr("About 90% complete (using custom extensions)