Skip to content

Add support to move line edges in karaoke mode #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+44 −6
Open

Add support to move line edges in karaoke mode #402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 44 additions & 6 deletions src/audio_timing_karaoke.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ class AudioTimingControllerKaraoke final : public AudioTimingController {

void DoCommit();
void ApplyLead(bool announce_primary);
void UpdateLineTimes();
int MoveMarker(KaraokeMarker *marker, int new_position);
void AnnounceChanges(int syl);

Expand Down Expand Up @@ -236,8 +237,10 @@ void AudioTimingControllerKaraoke::GetMarkers(TimeRange const& range, AudioMarke

void AudioTimingControllerKaraoke::DoCommit() {
active_line->Text = kara->GetText();
active_line->Start = (int)start_marker;
active_line->End = (int)end_marker;
file_changed_slot.Block();
commit_id = c->ass->Commit(_("karaoke timing"), AssFile::COMMIT_DIAG_TEXT, commit_id, active_line);
commit_id = c->ass->Commit(_("karaoke timing"), AssFile::COMMIT_DIAG_TEXT | AssFile::COMMIT_DIAG_TIME, commit_id, active_line);
file_changed_slot.Unblock();
pending_changes = false;
}
Expand Down Expand Up @@ -287,16 +290,24 @@ void AudioTimingControllerKaraoke::AddLeadOut() {
}

void AudioTimingControllerKaraoke::ApplyLead(bool announce_primary) {
active_line->Start = (int)start_marker;
active_line->End = (int)end_marker;
kara->SetLineTimes(start_marker, end_marker);
if (!announce_primary)
AnnounceUpdatedStyleRanges();
AnnounceChanges(announce_primary ? cur_syl : cur_syl + 2);
}

void AudioTimingControllerKaraoke::UpdateLineTimes() {
kara->SetLineTimes(start_marker, end_marker);
AnnounceChanges(cur_syl);
}

void AudioTimingControllerKaraoke::ModifyLength(int delta, bool shift_following) {
if (cur_syl == markers.size()) return;
if (cur_syl == markers.size()) {
end_marker.Move(end_marker + delta);
labels.back().range = TimeRange(labels.back().range.begin(), end_marker);
UpdateLineTimes();
return;
}

int cur, end, step;
if (delta < 0) {
Expand All @@ -317,7 +328,13 @@ void AudioTimingControllerKaraoke::ModifyLength(int delta, bool shift_following)
}

void AudioTimingControllerKaraoke::ModifyStart(int delta) {
if (cur_syl == 0) return;
if (cur_syl == 0) {
start_marker.Move(start_marker + delta);
labels.front().range = TimeRange(start_marker, labels.front().range.end());
UpdateLineTimes();
return;
}

MoveMarker(&markers[cur_syl - 1], markers[cur_syl - 1] + delta * 10);
AnnounceChanges(cur_syl);
}
Expand All @@ -326,7 +343,7 @@ bool AudioTimingControllerKaraoke::IsNearbyMarker(int ms, int sensitivity, bool)
TimeRange range(ms - sensitivity, ms + sensitivity);
return any_of(markers.begin(), markers.end(), [&](KaraokeMarker const& km) {
return range.contains(km);
});
}) || range.contains(start_marker) || range.contains(end_marker);
}

template<typename Out, typename In>
Expand All @@ -347,6 +364,11 @@ std::vector<AudioMarker*> AudioTimingControllerKaraoke::OnLeftClick(int ms, bool
if (syl > 0 && range.contains(markers[syl - 1]))
return copy_ptrs<AudioMarker>(markers, syl - 1, ctrl_down ? markers.size() : syl);

if (syl == 0 && range.contains(start_marker))
return std::vector<AudioMarker*> {&start_marker};
if (syl == markers.size() && range.contains(end_marker))
return std::vector<AudioMarker*> {&end_marker};

cur_syl = syl;

AnnounceUpdatedPrimaryRange();
Expand All @@ -366,6 +388,22 @@ std::vector<AudioMarker*> AudioTimingControllerKaraoke::OnRightClick(int ms, boo
}

int AudioTimingControllerKaraoke::MoveMarker(KaraokeMarker *marker, int new_position) {
if (marker == &start_marker) {
new_position = std::min(new_position, labels.front().range.end());
start_marker.Move(new_position);
labels.front().range = TimeRange(start_marker, labels.front().range.end());
UpdateLineTimes();
return -1;
}

if (marker == &end_marker) {
new_position = std::max(new_position, labels.back().range.begin());
end_marker.Move(new_position);
labels.back().range = TimeRange(labels.back().range.begin(), end_marker);
UpdateLineTimes();
return -1;
}

// No rearranging of syllables allowed
new_position = mid(
marker == &markers.front() ? start_marker.GetPosition() : (marker - 1)->GetPosition(),
Expand Down