summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2012-10-29 20:25:23 +0100
committerSlávek Banko <[email protected]>2012-10-29 20:30:41 +0100
commit3189bae15b9ffdaa08d651110b04088e68256b9e (patch)
treed64f84175f7d480b976bd79674fb3cca889ee314
parent0076aea7d5ca5f3c81cc59888e8d7eeacdd67f12 (diff)
downloadkaffeine-3189bae15b9ffdaa08d651110b04088e68256b9e.tar.gz
kaffeine-3189bae15b9ffdaa08d651110b04088e68256b9e.zip
Add support for xine 1.2 libraries
Thanks to Francois Andriot (cherry picked from commit 222c53bf1110082431655015991fbdfdcc705bde)
-rw-r--r--kaffeine/src/player-parts/xine-part/kxinewidget.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
index f0cddb0..ea8e72d 100644
--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
@@ -2642,7 +2642,11 @@ void KXineWidget::getAutoplayPlugins(TQStringList& autoPlayList) const
bool KXineWidget::getAutoplayPluginURLS(const TQString& plugin, TQStringList& list)
{
+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
+ const char* const* urls = NULL;
+#else
char** urls = NULL;
+#endif
int num;
int i = 0;