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

Fix joining as karaoke

Browse source
This commit is contained in:
rr- 2017-06-02 23:41:44 +02:00 committed by Thomas Goyne
parent 876d59ec22
commit 21f704f138
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/command/edit.cpp
View file

@ -755,6 +755,7 @@ static void combine_lines(agi::Context *c, void (*combiner)(AssDialogue *, AssDi
auto sel = c->selectionController->GetSortedSelection(); auto sel = c->selectionController->GetSortedSelection();
AssDialogue *first = sel[0]; AssDialogue *first = sel[0];
combiner(first, nullptr);
for (size_t i = 1; i < sel.size(); ++i) { for (size_t i = 1; i < sel.size(); ++i) {
combiner(first, sel[i]); combiner(first, sel[i]);
first->End = std::max(first->End, sel[i]->End); first->End = std::max(first->End, sel[i]->End);
@ -767,11 +768,15 @@ static void combine_lines(agi::Context *c, void (*combiner)(AssDialogue *, AssDi
} }
static void combine_karaoke(AssDialogue *first, AssDialogue *second) { static void combine_karaoke(AssDialogue *first, AssDialogue *second) {
first->Text = first->Text.get() + "{\\k" + std::to_string((second->Start - first->End) / 10) + "}" + second->Text.get(); if (second)
first->Text = first->Text.get() + "{\\k" + std::to_string((second->End - second->Start) / 10) + "}" + second->Text.get();
else
first->Text = "{\\k" + std::to_string((first->End - first->Start) / 10) + "}" + first->Text.get();
} }
static void combine_concat(AssDialogue *first, AssDialogue *second) { static void combine_concat(AssDialogue *first, AssDialogue *second) {
first->Text = first->Text.get() + " " + second->Text.get(); if (second)
first->Text = first->Text.get() + " " + second->Text.get();
} }
static void combine_drop(AssDialogue *, AssDialogue *) { } static void combine_drop(AssDialogue *, AssDialogue *) { }