Browse Source

Fix FTBFS with clang

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ae29f50ac6)
r14.0.x r14.0.2
Slávek Banko 6 years ago
parent
commit
32c704dca0
  1. 2
      amarok/src/engine/xine/xine-engine.cpp
  2. 6
      amarok/src/metadata/rmff/rmff.h

2
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;

6
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:

Loading…
Cancel
Save