iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Scrap the "OH NO VSFILTER CANNOT OPEN FROM MEMORY" sillyness from CSRI sub provider. It _can_, it just does it in a rather inefficient way (which incidentally involves a temporary file). It probably won't make a difference but it's less complexity on our side. 

Originally committed to SVN as r5787.
This commit is contained in:
Niels Martin Hansen 2011-10-27 22:23:52 +00:00
parent 225832c490
commit 8870eac2e9
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
aegisub/src/subtitles_provider_csri.cpp
View File

@ -75,13 +75,11 @@ void CSRISubtitlesProvider::LoadSubtitles(AssFile *subs) {
csri_info *info;
// Select renderer
bool canOpenMem = true;
for (cur = csri_renderer_default();cur;cur=csri_renderer_next(cur)) {
info = csri_renderer_info(cur);
wxString name(info->name,wxConvUTF8);
if (name == subType) {
renderer = cur;
if (name.StartsWith(_T("vsfilter"))) canOpenMem = false;
break;
}
}
@ -96,20 +94,10 @@ void CSRISubtitlesProvider::LoadSubtitles(AssFile *subs) {
}
// Open from memory
if (canOpenMem) {
std::vector<char> data;
subs->SaveMemory(data,_T("UTF-8"));
delete subs;
instance = csri_open_mem(renderer,&data[0],data.size(),NULL);
}
// Open from disk
else {
wxString subsFileName = VideoContext::Get()->GetTempWorkFile();
subs->Save(subsFileName,false,false,_T("UTF-8"));
delete subs;
instance = csri_open_file(renderer,subsFileName.mb_str(wxConvUTF8),NULL);
}
std::vector<char> data;
subs->SaveMemory(data,_T("UTF-8"));
delete subs;
instance = csri_open_mem(renderer,&data[0],data.size(),NULL);
}