From 7e3a0fb926e84393a59e185d2f678bb825d384e1 Mon Sep 17 00:00:00 2001 From: wangqr Date: Mon, 20 Jul 2020 21:38:08 -0400 Subject: [PATCH] FFMS actually can be used without cache --- src/audio_provider_factory.cpp | 4 ++-- src/preferences.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/audio_provider_factory.cpp b/src/audio_provider_factory.cpp index 23c9b97f4..773725db2 100644 --- a/src/audio_provider_factory.cpp +++ b/src/audio_provider_factory.cpp @@ -116,10 +116,10 @@ std::unique_ptr GetAudioProvider(fs::path const& filename, if (cache == 1) { if (sizeof(void*) == 4 && (provider->GetNumSamples() * provider->GetChannels() * provider->GetBytesPerSample() >= (1 << 30))) { wxMessageBox(_( - "Unable to create RAM audio cache: 32-bit memory limit exceeded. Fallback to hard disk cache.\n" + "Unable to create RAM audio cache: 32-bit memory limit exceeded. Fallback to hard disk cache.\n\n" "Possible solutions:\n" "- Use 64-bit version\n" - "- Switch to hard disk cache in Preferences -> Advanced -> Audio -> Cache -> Cache type\n" + "- Turn off cache or switch to hard disk cache in Preferences -> Advanced -> Audio -> Cache -> Cache type\n" "- Enable channel downmix in Preferences -> Advanced -> Audio" ), _("Out of Memory"), wxICON_ERROR | wxOK | wxCENTRE); cache = 2; diff --git a/src/preferences.cpp b/src/preferences.cpp index 8f2ebe5d2..6d04e4527 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -374,7 +374,7 @@ void Advanced_Audio(wxTreebook *book, Preferences *parent) { p->OptionChoice(expert, _("Audio player"), apl_choice, "Audio/Player"); auto cache = p->PageSizer(_("Cache")); - const wxString ct_arr[3] = { _("None (NOT RECOMMENDED)"), _("RAM"), _("Hard Disk") }; + const wxString ct_arr[3] = { _("None (Not recommended with Avisynth)"), _("RAM"), _("Hard Disk") }; wxArrayString ct_choice(3, ct_arr); p->OptionChoice(cache, _("Cache type"), ct_choice, "Audio/Cache/Type"); p->OptionBrowse(cache, _("Path"), "Audio/Cache/HD/Location");