mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Don't cache the selection in the dialogue timing controller, as getting it isn't very expensive and it was used in a stale state when the active line changed

Browse source 
Originally committed to SVN as r6751.
This commit is contained in:
Thomas Goyne 2012-05-05 02:10:57 +00:00
parent a15024e052
commit 70abaf75d7
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
aegisub/src/audio_timing_dialogue.cpp
View file

@ -303,9 +303,6 @@ class AudioTimingControllerDialogue : public AudioTimingController, private Sele
/// Inactive lines which are currently modifiable /// Inactive lines which are currently modifiable
std::list<TimeableLine> inactive_lines; std::list<TimeableLine> inactive_lines;
/// The current set of selected dialogue lines
Selection sel;
/// Selected lines which are currently modifiable /// Selected lines which are currently modifiable
std::list<TimeableLine> selected_lines; std::list<TimeableLine> selected_lines;
@ -352,7 +349,7 @@ class AudioTimingControllerDialogue : public AudioTimingController, private Sele
void RegenerateSelectedLines(); void RegenerateSelectedLines();
/// Add a line to the list of timeable inactive lines /// Add a line to the list of timeable inactive lines
void AddInactiveLine(AssDialogue *diag); void AddInactiveLine(Selection const& sel, AssDialogue *diag);
/// Regenerate the list of active and inactive line markers /// Regenerate the list of active and inactive line markers
void RegenerateMarkers(); void RegenerateMarkers();
@ -440,7 +437,6 @@ AudioTimingControllerDialogue::AudioTimingControllerDialogue(agi::Context *c)
video_position_provider.AddMarkerMovedListener(std::tr1::bind(std::tr1::ref(AnnounceMarkerMoved))); video_position_provider.AddMarkerMovedListener(std::tr1::bind(std::tr1::ref(AnnounceMarkerMoved)));
seconds_provider.AddMarkerMovedListener(std::tr1::bind(std::tr1::ref(AnnounceMarkerMoved))); seconds_provider.AddMarkerMovedListener(std::tr1::bind(std::tr1::ref(AnnounceMarkerMoved)));
sel = context->selectionController->GetSelectedSet();
Revert(); Revert();
} }
@ -474,7 +470,6 @@ void AudioTimingControllerDialogue::OnActiveLineChanged(AssDialogue *new_line)
void AudioTimingControllerDialogue::OnSelectedSetChanged(Selection const&, Selection const&) void AudioTimingControllerDialogue::OnSelectedSetChanged(Selection const&, Selection const&)
{ {
sel = context->selectionController->GetSelectedSet();
RegenerateSelectedLines(); RegenerateSelectedLines();
RegenerateInactiveLines(); RegenerateInactiveLines();
} }
@ -729,6 +724,8 @@ void AudioTimingControllerDialogue::RegenerateInactiveLines()
bool was_empty = inactive_lines.empty(); bool was_empty = inactive_lines.empty();
inactive_lines.clear(); inactive_lines.clear();
Selection sel = context->selectionController->GetSelectedSet();
switch (int mode = inactive_line_mode->GetInt()) switch (int mode = inactive_line_mode->GetInt())
{ {
case 1: // Previous line only case 1: // Previous line only
@ -741,14 +738,14 @@ void AudioTimingControllerDialogue::RegenerateInactiveLines()
std::list<AssEntry*>::iterator prev = current_line; std::list<AssEntry*>::iterator prev = current_line;
while (--prev != context->ass->Line.begin() && !predicate(*prev)) ; while (--prev != context->ass->Line.begin() && !predicate(*prev)) ;
if (prev != context->ass->Line.begin()) if (prev != context->ass->Line.begin())
AddInactiveLine(static_cast<AssDialogue*>(*prev)); AddInactiveLine(sel, static_cast<AssDialogue*>(*prev));
if (mode == 2) if (mode == 2)
{ {
std::list<AssEntry*>::iterator next = std::list<AssEntry*>::iterator next =
find_if(++current_line, context->ass->Line.end(), predicate); find_if(++current_line, context->ass->Line.end(), predicate);
if (next != context->ass->Line.end()) if (next != context->ass->Line.end())
AddInactiveLine(static_cast<AssDialogue*>(*next)); AddInactiveLine(sel, static_cast<AssDialogue*>(*next));
} }
} }
break; break;
@ -758,7 +755,7 @@ void AudioTimingControllerDialogue::RegenerateInactiveLines()
for (std::list<AssEntry*>::const_iterator it = context->ass->Line.begin(); it != context->ass->Line.end(); ++it) for (std::list<AssEntry*>::const_iterator it = context->ass->Line.begin(); it != context->ass->Line.end(); ++it)
{ {
if (*it != active_line && predicate(*it)) if (*it != active_line && predicate(*it))
AddInactiveLine(static_cast<AssDialogue*>(*it)); AddInactiveLine(sel, static_cast<AssDialogue*>(*it));
} }
break; break;
} }
@ -775,7 +772,7 @@ void AudioTimingControllerDialogue::RegenerateInactiveLines()
RegenerateMarkers(); RegenerateMarkers();
} }
void AudioTimingControllerDialogue::AddInactiveLine(AssDialogue *diag) void AudioTimingControllerDialogue::AddInactiveLine(Selection const& sel, AssDialogue *diag)
{ {
if (sel.count(diag)) return; if (sel.count(diag)) return;
@ -789,6 +786,7 @@ void AudioTimingControllerDialogue::RegenerateSelectedLines()
selected_lines.clear(); selected_lines.clear();
AssDialogue *active = context->selectionController->GetActiveLine(); AssDialogue *active = context->selectionController->GetActiveLine();
Selection sel = context->selectionController->GetSelectedSet();
for (Selection::iterator it = sel.begin(); it != sel.end(); ++it) for (Selection::iterator it = sel.begin(); it != sel.end(); ++it)
{ {
if (*it == active) continue; if (*it == active) continue;