summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-10-12 23:59:02 -0500
committerDarrell Anderson <[email protected]>2012-10-12 23:59:02 -0500
commit8d45a64dda4f4dedbd93144db9c8fcb6076eb712 (patch)
tree0b54577d4aeb27322d41881581d9035b63550a01
parent095f615ab0c1a5494b6fbbf0d71acbf6ef041304 (diff)
downloadamarok-8d45a64dda4f4dedbd93144db9c8fcb6076eb712.tar.gz
amarok-8d45a64dda4f4dedbd93144db9c8fcb6076eb712.zip
Add build support for xine 1.2.
Thanks to Francois Andriot.
-rw-r--r--amarok/src/engine/xine/xine-engine.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp
index 19f979c9..1d284c98 100644
--- a/amarok/src/engine/xine/xine-engine.cpp
+++ b/amarok/src/engine/xine/xine-engine.cpp
@@ -1131,7 +1131,11 @@ bool XineEngine::metaDataForUrl(const KURL &url, Engine::SimpleMetaBundle &b)
bool XineEngine::getAudioCDContents(const TQString &device, KURL::List &urls)
{
+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
+ const char * const* xine_urls = NULL;
+#else
char **xine_urls = NULL;
+#endif
int num;
int i = 0;