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

Support loading keyframes and timecodes files via drag-and-drop 

Closes #1749.
This commit is contained in:
Thomas Goyne 2014-05-22 09:13:34 -07:00
parent de2e1e23de
commit 9ae9da4aab
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/project.cpp
View File

@ -393,8 +393,7 @@ void Project::LoadList(std::vector<agi::fs::path> const& files) {
".srt",
".ssa",
".sub",
".ttxt",
".txt"
".ttxt"
};
// Audio formats
@ -419,7 +418,7 @@ void Project::LoadList(std::vector<agi::fs::path> const& files) {
});
};
agi::fs::path audio, video, subs;
agi::fs::path audio, video, subs, timecodes, keyframes;
for (auto file : files) {
if (file.is_relative()) file = absolute(file);
if (!agi::fs::FileExists(file)) continue;
@ -427,6 +426,29 @@ void Project::LoadList(std::vector<agi::fs::path> const& files) {
auto ext = file.extension().string();
boost::to_lower(ext);
// Could be subtitles, keyframes or timecodes, so try loading as each
if (ext == ".txt" || ext == ".log") {
if (timecodes.empty()) {
try {
DoLoadTimecodes(file);
timecodes = file;
continue;
} catch (...) { }
}
if (keyframes.empty()) {
try {
DoLoadKeyframes(file);
keyframes = file;
continue;
} catch (...) { }
}
if (subs.empty() && ext != ".log")
subs = file;
continue;
}
if (subs.empty() && search(std::begin(subsList), std::end(subsList), ext))
subs = file;
if (video.empty() && search(std::begin(videoList), std::end(videoList), ext))
@ -437,12 +459,24 @@ void Project::LoadList(std::vector<agi::fs::path> const& files) {
if (!subs.empty())
DoLoadSubtitles(subs);
// Loading video will clear the audio file script header, so make sure we
// end up loading the audio if the newly loaded subs has some
if (!video.empty() && audio.empty() && !context->ass->Properties.audio_file.empty())
audio = config::path->MakeAbsolute(context->ass->Properties.audio_file, "?script");
if (!video.empty()) {
auto rel_audio_file = context->ass->Properties.audio_file;
DoLoadVideo(video);
if (!rel_audio_file.empty() && context->ass->Properties.audio_file.empty())
context->ass->Properties.audio_file.swap(rel_audio_file);
// We loaded these earlier, but loading video unloaded them
// Non-Do version of Load in case they've vanished or changed between
// then and now
if (!timecodes.empty())
LoadTimecodes(timecodes);
if (!keyframes.empty())
LoadKeyframes(keyframes);
}
if (!audio.empty())
DoLoadAudio(audio, false);
else if (OPT_GET("Video/Open Audio")->GetBool() && audio_file != video_file)