forked from mia/Aegisub
Revert pending changes when audio is opened to fix problems with stale data
Originally committed to SVN as r5566.
This commit is contained in:
parent
a45b971b3a
commit
2006995645
1 changed files with 4 additions and 1 deletions
|
@ -150,6 +150,7 @@ class AudioTimingControllerDialogue : public AudioTimingController, private Sele
|
||||||
SelectionController<AssDialogue> *selection_controller;
|
SelectionController<AssDialogue> *selection_controller;
|
||||||
|
|
||||||
agi::signal::Connection commit_slot;
|
agi::signal::Connection commit_slot;
|
||||||
|
agi::signal::Connection audio_open_slot;
|
||||||
|
|
||||||
/// @todo Dealing with the AssFile directly is probably not the best way to
|
/// @todo Dealing with the AssFile directly is probably not the best way to
|
||||||
/// handle committing, but anything better probably needs to wait for
|
/// handle committing, but anything better probably needs to wait for
|
||||||
|
@ -261,6 +262,7 @@ AudioTimingControllerDialogue::AudioTimingControllerDialogue(AudioController *au
|
||||||
|
|
||||||
selection_controller->AddSelectionListener(this);
|
selection_controller->AddSelectionListener(this);
|
||||||
commit_slot = ass->AddCommitListener(&AudioTimingControllerDialogue::OnFileChanged, this);
|
commit_slot = ass->AddCommitListener(&AudioTimingControllerDialogue::OnFileChanged, this);
|
||||||
|
audio_open_slot = audio_controller->AddAudioOpenListener(&AudioTimingControllerDialogue::Revert, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -303,6 +305,7 @@ void AudioTimingControllerDialogue::GetMarkers(const SampleRange &range, AudioMa
|
||||||
|
|
||||||
void AudioTimingControllerDialogue::OnActiveLineChanged(AssDialogue *new_line)
|
void AudioTimingControllerDialogue::OnActiveLineChanged(AssDialogue *new_line)
|
||||||
{
|
{
|
||||||
|
if (audio_controller->IsAudioOpen())
|
||||||
Revert();
|
Revert();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue