mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

FFMS actually can be used without cache

Browse source
This commit is contained in:
wangqr 2020-07-20 21:38:08 -04:00
parent 79c2141082
commit 7e3a0fb926
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/audio_provider_factory.cpp
View file

@ -116,10 +116,10 @@ std::unique_ptr<agi::AudioProvider> GetAudioProvider(fs::path const& filename,
if (cache == 1) { if (cache == 1) {
if (sizeof(void*) == 4 && (provider->GetNumSamples() * provider->GetChannels() * provider->GetBytesPerSample() >= (1 << 30))) { if (sizeof(void*) == 4 && (provider->GetNumSamples() * provider->GetChannels() * provider->GetBytesPerSample() >= (1 << 30))) {
wxMessageBox(_( 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" "Possible solutions:\n"
"- Use 64-bit version\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" "- Enable channel downmix in Preferences -> Advanced -> Audio"
), _("Out of Memory"), wxICON_ERROR | wxOK | wxCENTRE); ), _("Out of Memory"), wxICON_ERROR | wxOK | wxCENTRE);
cache = 2; cache = 2;

2
src/preferences.cpp
View file

@ -374,7 +374,7 @@ void Advanced_Audio(wxTreebook *book, Preferences *parent) {
p->OptionChoice(expert, _("Audio player"), apl_choice, "Audio/Player"); p->OptionChoice(expert, _("Audio player"), apl_choice, "Audio/Player");
auto cache = p->PageSizer(_("Cache")); 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); wxArrayString ct_choice(3, ct_arr);
p->OptionChoice(cache, _("Cache type"), ct_choice, "Audio/Cache/Type"); p->OptionChoice(cache, _("Cache type"), ct_choice, "Audio/Cache/Type");
p->OptionBrowse(cache, _("Path"), "Audio/Cache/HD/Location"); p->OptionBrowse(cache, _("Path"), "Audio/Cache/HD/Location");