24 lines
980 B
Text
24 lines
980 B
Text
$NetBSD: patch-amarok_src_engine_xine_xine-engine_cpp,v 1.2 2012/07/03 18:21:48 joerg Exp $
|
|
|
|
Fix build with newer xine-lib.
|
|
|
|
--- amarok/src/engine/xine/xine-engine.cpp.orig 2008-08-13 21:21:51.000000000 +0000
|
|
+++ amarok/src/engine/xine/xine-engine.cpp
|
|
@@ -1131,7 +1131,7 @@ bool XineEngine::metaDataForUrl(const KU
|
|
|
|
bool XineEngine::getAudioCDContents(const QString &device, KURL::List &urls)
|
|
{
|
|
- char **xine_urls = NULL;
|
|
+ const char *const *xine_urls = NULL;
|
|
int num;
|
|
int i = 0;
|
|
|
|
@@ -1244,7 +1244,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;
|