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

Revert pending changes when audio is opened to fix problems with stale data

Browse source 
Originally committed to SVN as r5566.
This commit is contained in:
Thomas Goyne 2011-08-27 06:30:56 +00:00
parent a45b971b3a
commit 2006995645
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aegisub/src/audio_timing_dialogue.cpp
View file

@ -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,7 +305,8 @@ void AudioTimingControllerDialogue::GetMarkers(const SampleRange &range, AudioMa
void AudioTimingControllerDialogue::OnActiveLineChanged(AssDialogue *new_line) void AudioTimingControllerDialogue::OnActiveLineChanged(AssDialogue *new_line)
{ {
Revert(); if (audio_controller->IsAudioOpen())
Revert();
} }
void AudioTimingControllerDialogue::OnSelectedSetChanged(const Selection &lines_added, const Selection &lines_removed) void AudioTimingControllerDialogue::OnSelectedSetChanged(const Selection &lines_added, const Selection &lines_removed)