Skip to content
Extraits de code Groupes Projets
Valider 8870eac2 rédigé par Niels Martin Hansen's avatar Niels Martin Hansen
Parcourir les fichiers

Scrap the "OH NO VSFILTER CANNOT OPEN FROM MEMORY" sillyness from CSRI sub...

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.
parent 225832c4
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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,22 +94,12 @@ 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);
}
}
//////////////////
// Draw subtitles
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter