diff options
| author | Max Kellermann <max@musicpd.org> | 2017-05-15 23:01:49 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2017-05-15 23:01:49 +0200 |
| commit | 4faef28cc56c3ed72a22dbd1cb317cf756217400 (patch) | |
| tree | f2a3e8168ce9efada0fd0afe9971f90f0dee12b4 /src/decoder/plugins/MadDecoderPlugin.cxx | |
| parent | 89b900432e0bfb324356f6ae62a09241eb75d251 (diff) | |
| parent | b4c9d9c2a72fbf2c6c9090c73fe37fcc94dce1ca (diff) | |
Merge tag 'v0.20.7'
release v0.20.7
Diffstat (limited to 'src/decoder/plugins/MadDecoderPlugin.cxx')
| -rw-r--r-- | src/decoder/plugins/MadDecoderPlugin.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index 184d5b327..f0b707a02 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -71,7 +71,7 @@ static bool gapless_playback; gcc_const static SongTime -ToSongTime(mad_timer_t t) +ToSongTime(mad_timer_t t) noexcept { return SongTime::FromMS(mad_timer_count(t, MAD_UNITS_MILLISECONDS)); } @@ -155,10 +155,10 @@ struct MadDecoder { enum mp3_action DecodeNextFrame(); gcc_pure - offset_type ThisFrameOffset() const; + offset_type ThisFrameOffset() const noexcept; gcc_pure - offset_type RestIncludingThisFrame() const; + offset_type RestIncludingThisFrame() const noexcept; /** * Attempt to calulcate the length of the song from filesize @@ -177,7 +177,7 @@ struct MadDecoder { } gcc_pure - long TimeToFrame(SongTime t) const; + long TimeToFrame(SongTime t) const noexcept; void UpdateTimerNextFrame(); @@ -291,7 +291,7 @@ parse_id3_replay_gain_info(ReplayGainInfo &rgi, #ifdef ENABLE_ID3TAG gcc_pure static MixRampInfo -parse_id3_mixramp(struct id3_tag *tag) +parse_id3_mixramp(struct id3_tag *tag) noexcept { MixRampInfo result; @@ -710,7 +710,7 @@ mp3_frame_duration(const struct mad_frame *frame) } inline offset_type -MadDecoder::ThisFrameOffset() const +MadDecoder::ThisFrameOffset() const noexcept { auto offset = input_stream.GetOffset(); @@ -723,7 +723,7 @@ MadDecoder::ThisFrameOffset() const } inline offset_type -MadDecoder::RestIncludingThisFrame() const +MadDecoder::RestIncludingThisFrame() const noexcept { return input_stream.GetSize() - ThisFrameOffset(); } @@ -846,7 +846,7 @@ mad_decoder_total_file_time(InputStream &is) } long -MadDecoder::TimeToFrame(SongTime t) const +MadDecoder::TimeToFrame(SongTime t) const noexcept { unsigned long i; |