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

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.

Browse source 
Originally committed to SVN as r5191.
This commit is contained in:
Thomas Goyne 2011-01-16 07:14:53 +00:00
parent cc5952035e
commit daa8c58cd8
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/src/audio_display.cpp
View file

@ -1199,9 +1199,6 @@ void AudioDisplay::OnPlaybackPosition(int64_t sample_position)
void AudioDisplay::OnSelectionChanged() 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 /// @todo Handle rendering style ranges from timing controller instead
SampleRange sel(controller->GetPrimaryPlaybackRange()); SampleRange sel(controller->GetPrimaryPlaybackRange());
scrollbar->SetSelection(AbsoluteXFromSamples(sel.begin()), AbsoluteXFromSamples(sel.length())); scrollbar->SetSelection(AbsoluteXFromSamples(sel.begin()), AbsoluteXFromSamples(sel.length()));

13
aegisub/src/audio_timing.h
View file

@ -33,8 +33,6 @@
/// @brief Construction-functions for timing controller objects /// @brief Construction-functions for timing controller objects
/// @ingroup audio_ui /// @ingroup audio_ui
class AssDialogue; class AssDialogue;
class AssFile; class AssFile;
class AudioController; class AudioController;
@ -44,12 +42,13 @@ class AudioController;
/// @class AudioTimingController /// @class AudioTimingController
/// @brief Base class for objects controlling audio timing /// @brief Base class for objects controlling audio timing
/// ///
/// There is just one active audio timing controller at a time per audio controller. /// There is just one active audio timing controller at a time per audio
/// The timing controller manages the timing mode and supplies markers that can be /// controller. The timing controller manages the timing mode and supplies
/// manipulated to the audio display, as well as the current selection. /// 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 /// The timing controller must then be sent the marker drag events as well as
/// in empty areas of the audio display. /// clicks in empty areas of the audio display.
class AudioTimingController : public AudioMarkerProvider { class AudioTimingController : public AudioMarkerProvider {
protected: protected:
/// The primary playback range has changed, usually as a result of user interaction. /// The primary playback range has changed, usually as a result of user interaction.

1
aegisub/src/audio_timing_dialogue.cpp
View file

@ -506,7 +506,6 @@ void AudioTimingControllerDialogue::UpdateSelection()
void AudioTimingControllerDialogue::SetMarker(AudioMarkerDialogueTiming *marker, int64_t sample) void AudioTimingControllerDialogue::SetMarker(AudioMarkerDialogueTiming *marker, int64_t sample)
{ {
marker->SetPosition(sample); marker->SetPosition(sample);
AnnounceMarkerMoved(marker);
timing_modified = true; timing_modified = true;
if (auto_commit->GetBool()) Commit(); if (auto_commit->GetBool()) Commit();
UpdateSelection(); UpdateSelection();