From daa8c58cd87bfc7a187eca294e737c55cf3e95e2 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 16 Jan 2011 07:14:53 +0000 Subject: [PATCH] Don't announce marker movements that update the styled ranges as well; it's redundant and the marker move signal is more useful as only non-interactive markers. Originally committed to SVN as r5191. --- aegisub/src/audio_display.cpp | 3 --- aegisub/src/audio_timing.h | 13 ++++++------- aegisub/src/audio_timing_dialogue.cpp | 1 - 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp index ac7aee99f..f44e21e91 100644 --- a/aegisub/src/audio_display.cpp +++ b/aegisub/src/audio_display.cpp @@ -1199,9 +1199,6 @@ void AudioDisplay::OnPlaybackPosition(int64_t sample_position) void AudioDisplay::OnSelectionChanged() { - /// @todo This is all currently completely pointless as the whole thing is - /// refreshed whenever a marker moves anyway - /// @todo Handle rendering style ranges from timing controller instead SampleRange sel(controller->GetPrimaryPlaybackRange()); scrollbar->SetSelection(AbsoluteXFromSamples(sel.begin()), AbsoluteXFromSamples(sel.length())); diff --git a/aegisub/src/audio_timing.h b/aegisub/src/audio_timing.h index 1bb193e22..edfd0709b 100644 --- a/aegisub/src/audio_timing.h +++ b/aegisub/src/audio_timing.h @@ -33,8 +33,6 @@ /// @brief Construction-functions for timing controller objects /// @ingroup audio_ui - - class AssDialogue; class AssFile; class AudioController; @@ -44,12 +42,13 @@ class AudioController; /// @class AudioTimingController /// @brief Base class for objects controlling audio timing /// -/// There is just one active audio timing controller at a time per audio controller. -/// The timing controller manages the timing mode and supplies markers that can be -/// manipulated to the audio display, as well as the current selection. +/// There is just one active audio timing controller at a time per audio +/// controller. The timing controller manages the timing mode and supplies +/// markers that can be manipulated to the audio display, as well as the +/// current selection. /// -/// The timing controller must then be sent the marker drag events as well as clicks -/// in empty areas of the audio display. +/// The timing controller must then be sent the marker drag events as well as +/// clicks in empty areas of the audio display. class AudioTimingController : public AudioMarkerProvider { protected: /// The primary playback range has changed, usually as a result of user interaction. diff --git a/aegisub/src/audio_timing_dialogue.cpp b/aegisub/src/audio_timing_dialogue.cpp index 19ea71b70..3eb76fca5 100644 --- a/aegisub/src/audio_timing_dialogue.cpp +++ b/aegisub/src/audio_timing_dialogue.cpp @@ -506,7 +506,6 @@ void AudioTimingControllerDialogue::UpdateSelection() void AudioTimingControllerDialogue::SetMarker(AudioMarkerDialogueTiming *marker, int64_t sample) { marker->SetPosition(sample); - AnnounceMarkerMoved(marker); timing_modified = true; if (auto_commit->GetBool()) Commit(); UpdateSelection();