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

Remove AudioTimingController::HasLabels as the rewritten audio display doesn't need it

Browse source 
Originally committed to SVN as r6253.
This commit is contained in:
Thomas Goyne 2012-01-08 01:37:12 +00:00
parent d04753aaf2
commit f4c8bf429b
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aegisub/src/audio_timing.h
View file

@ -81,17 +81,9 @@ public:
virtual SampleRange GetPrimaryPlaybackRange() const = 0; virtual SampleRange GetPrimaryPlaybackRange() const = 0;
/// @brief Get all rendering style ranges /// @brief Get all rendering style ranges
/// @param[out] swpts Rendering ranges will be added to this /// @param[out] ranges Rendering ranges will be added to this
virtual void GetRenderingStyles(AudioRenderingStyleRanges &ranges) const = 0; virtual void GetRenderingStyles(AudioRenderingStyleRanges &ranges) const = 0;
/// @brief Does this timing mode have labels on the audio display?
/// @return True if this timing mode needs labels on the audio display.
///
/// This is labels for things such as karaoke syllables. When labels are
/// required, some vertical space is set off for them in the drawing of the
/// audio display.
virtual bool HasLabels() const = 0;
/// @brief Go to next timing unit /// @brief Go to next timing unit
/// ///
/// Advances the timing controller cursor to the next timing unit, for /// Advances the timing controller cursor to the next timing unit, for

1
aegisub/src/audio_timing_dialogue.cpp
View file

@ -218,7 +218,6 @@ public:
SampleRange GetIdealVisibleSampleRange() const; SampleRange GetIdealVisibleSampleRange() const;
SampleRange GetPrimaryPlaybackRange() const; SampleRange GetPrimaryPlaybackRange() const;
void GetRenderingStyles(AudioRenderingStyleRanges &ranges) const; void GetRenderingStyles(AudioRenderingStyleRanges &ranges) const;
bool HasLabels() const { return false; }
void GetLabels(SampleRange const& range, std::vector<AudioLabel> &out) const { } void GetLabels(SampleRange const& range, std::vector<AudioLabel> &out) const { }
void Next(); void Next();
void Prev(); void Prev();

1
aegisub/src/audio_timing_karaoke.cpp
View file

@ -123,7 +123,6 @@ public:
SampleRange GetIdealVisibleSampleRange() const; SampleRange GetIdealVisibleSampleRange() const;
void GetRenderingStyles(AudioRenderingStyleRanges &ranges) const; void GetRenderingStyles(AudioRenderingStyleRanges &ranges) const;
SampleRange GetPrimaryPlaybackRange() const; SampleRange GetPrimaryPlaybackRange() const;
bool HasLabels() const { return true; }
void GetLabels(const SampleRange &range, std::vector<AudioLabel> &out_labels) const; void GetLabels(const SampleRange &range, std::vector<AudioLabel> &out_labels) const;
void Next(); void Next();
void Prev(); void Prev();