diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-09-27 10:56:06 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-09-27 10:56:25 +0200 |
| commit | 32c704dca05b08a60aa616b2386e4b0da07e9922 (patch) | |
| tree | eb5ab346f6edf0d07cb3f569b8ee8826fa95b67c | |
| parent | 81496c74ed182ff3ae798ebe71ec168c180e9fd4 (diff) | |
| download | amarok-32c704dca05b08a60aa616b2386e4b0da07e9922.tar.gz amarok-32c704dca05b08a60aa616b2386e4b0da07e9922.zip | |
Fix FTBFS with clangr14.0.2
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ae29f50ac6c1edd872b824bbd1fe1e202ef57fa9)
| -rw-r--r-- | amarok/src/engine/xine/xine-engine.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/metadata/rmff/rmff.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp index 5aadf3ce..a6c1069d 100644 --- a/amarok/src/engine/xine/xine-engine.cpp +++ b/amarok/src/engine/xine/xine-engine.cpp @@ -1286,7 +1286,7 @@ Fader::run() elapsedUs += stepSizeUs; // get volume (amarok main * equalizer preamp) - float vol = Engine::Base::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp; + float vol = XineEngine::makeVolumeLogarithmic( m_engine->m_volume ) * m_engine->m_preamp; // compute the mix factor as the percentage of time spent since fade begun float mix = (elapsedUs / 1000.0) / (float)m_fadeLength; diff --git a/amarok/src/metadata/rmff/rmff.h b/amarok/src/metadata/rmff/rmff.h index aab22abe..abc8ea23 100644 --- a/amarok/src/metadata/rmff/rmff.h +++ b/amarok/src/metadata/rmff/rmff.h @@ -35,6 +35,8 @@ namespace TagLib { + class AudioProperties; + namespace RealMedia { #if SIZEOF_LONG == 4 @@ -277,9 +279,7 @@ namespace TagLib private: TagLib::ID3v1::Tag *m_id3tag; }; - - class TagLib::AudioProperties; - + class RealMediaFF { public: |