6 files changed, 24 insertions, 15 deletions
diff --git a/xine_artsplugin/CMakeLists.txt b/xine_artsplugin/CMakeLists.txt
index 1013d3a9..4b69798f 100644
--- a/xine_artsplugin/CMakeLists.txt
+++ b/xine_artsplugin/CMakeLists.txt
@@ -33,19 +33,19 @@ link_directories(
 
 tde_add_library( arts_xine SHARED AUTOMOC
   SOURCES
-    xinePlayObject.cc
+    xinePlayObject.cpp
     xinePlayObject_impl.cpp
     audio_fifo_out.c
   VERSION 0.0.0
   LINK
     mcop kmedia2_idl soundserver_idl artsflow artsflow_idl
-    ${ARTS_LIBRARIES} ${XINE_LIBRARIES} ${XEXT_LIBRARIES} X11 pthread
+    ${ARTS_LIBRARIES} ${XINE_LIBRARIES} ${XEXT_LIBRARIES} X11 ${CMAKE_THREAD_LIBS_INIT}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 add_custom_command(
   OUTPUT
-    xinePlayObject.cc xinePlayObject.h
+    xinePlayObject.cpp xinePlayObject.h
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE}
     -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/xinePlayObject.idl
   DEPENDS xinePlayObject.idl
diff --git a/xine_artsplugin/Makefile.am b/xine_artsplugin/Makefile.am
index c7b8a223..b1d1ac73 100644
--- a/xine_artsplugin/Makefile.am
+++ b/xine_artsplugin/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = -U__STRICT_ANSI__
 
 lib_LTLIBRARIES = libarts_xine.la
 
-libarts_xine_la_SOURCES = xinePlayObject.cc \
+libarts_xine_la_SOURCES = xinePlayObject.cpp \
 			  xinePlayObject_impl.cpp \
 			  audio_fifo_out.c
 libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread
@@ -14,7 +14,7 @@ libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIBPTHREAD) $(LIB_X11) $(LIB_XEXT) $(LIB
 libarts_xine_la_METASOURCES = AUTO
 
 $(srcdir)/xinePlayObject_impl.cpp: xinePlayObject.h
-xinePlayObject.cc xinePlayObject.h: $(srcdir)/xinePlayObject.idl
+xinePlayObject.cpp xinePlayObject.h: $(srcdir)/xinePlayObject.idl
 	$(MCOPIDL) -I$(kde_includes)/arts $(srcdir)/xinePlayObject.idl
 
 noinst_HEADERS = xinePlayObject_impl.h audio_fifo_out.h
diff --git a/xine_artsplugin/audio_fifo_out.c b/xine_artsplugin/audio_fifo_out.c
index 9255ba2c..bc64277f 100644
--- a/xine_artsplugin/audio_fifo_out.c
+++ b/xine_artsplugin/audio_fifo_out.c
@@ -22,7 +22,7 @@
 #include <sys/time.h>
 #include <xine/audio_out.h>
 
-#if (XINE_MAJOR_VERSION >= 1) && (XINE_MINOR_VERSION >= 2)
+#if (XINE_MAJOR_VERSION > 1) || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2)
 #include <xine/xine_internal.h>
 #include <xine/xine_plugin.h>
 #endif
@@ -52,7 +52,7 @@ typedef struct fifo_driver_s {
 	int			fifo_flush;
 	int			fifo_delay;
 
-#if (XINE_MAJOR_VERSION >= 1) && (XINE_MINOR_VERSION >= 2)
+#if (XINE_MAJOR_VERSION > 1) || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2)
 	config_values_t		*config;
 	xine_t			*xine;
 #endif
@@ -292,7 +292,7 @@ static int ao_fifo_control( ao_driver_t *this_gen, int cmd, ... )
     return 0;
 }
 
-#if (XINE_MAJOR_VERSION >= 1) && (XINE_MINOR_VERSION >= 2)
+#if (XINE_MAJOR_VERSION > 1) || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2)
 static fifo_driver_t * _ao_driver = NULL;
 
 typedef struct fifo_class_s {
@@ -354,9 +354,18 @@ static ao_driver_t * _arts_open(audio_driver_class_t *driver_class, const void *
 	return &_ao_driver->ao_driver;
 }
 
+#if (XINE_MAJOR_VERSION > 1) || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION > 2) || \
+	(XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION == 2 && XINE_SUB_VERSION >= 10)
+
+static void *_arts_plugin_class_init(xine_t *xine, const void *data) {
+
+#else
+
 static void *_arts_plugin_class_init(xine_t *xine, void *data) {
+
+#endif
 	fifo_class_t *cl;
-	
+
 	cl = (fifo_class_t *) malloc(sizeof(fifo_class_t));
 	if (!cl) return NULL;
 	cl->driver_class.open_plugin     = _arts_open;
@@ -365,7 +374,7 @@ static void *_arts_plugin_class_init(xine_t *xine, void *data) {
 	cl->driver_class.dispose         = _arts_class_dispose;
 	cl->config                       = xine->config;
 	cl->xine                         = xine;
-	
+
 	return cl;
 }
 
@@ -376,7 +385,7 @@ static ao_info_t _arts_info =
 
 plugin_info_t arts_xine_plugin_info[] =
 {
-     { PLUGIN_AUDIO_OUT, AUDIO_OUT_IFACE_VERSION, "arts", XINE_VERSION_CODE, &_arts_info, _arts_plugin_class_init },
+     { PLUGIN_AUDIO_OUT, AUDIO_OUT_IFACE_VERSION, "arts", XINE_VERSION_CODE, &_arts_info, &_arts_plugin_class_init },
      { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 #endif
@@ -388,7 +397,7 @@ xine_audio_port_t *init_audio_out_plugin( xine_t *xine, xine_arts_audio *audio,
     xine->verbosity = 1;
 #endif
 
-#if (XINE_MAJOR_VERSION >= 1) && (XINE_MINOR_VERSION >= 2)
+#if (XINE_MAJOR_VERSION > 1) || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2)
     xine_audio_port_t *ret;
     xine_register_plugins(xine, arts_xine_plugin_info);
     ret = xine_open_audio_driver( xine, "arts", audio );
diff --git a/xine_artsplugin/tools/thumbnail/CMakeLists.txt b/xine_artsplugin/tools/thumbnail/CMakeLists.txt
index 4dbc9502..ac77313e 100644
--- a/xine_artsplugin/tools/thumbnail/CMakeLists.txt
+++ b/xine_artsplugin/tools/thumbnail/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_add_kpart( videothumbnail AUTOMOC
   SOURCES
     videocreator.cpp videoscaler.cpp
   LINK
-    tdecore-shared ${XINE_LIBRARIES} pthread
+    tdecore-shared ${XINE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/xine_artsplugin/tools/thumbnail/videocreator.cpp b/xine_artsplugin/tools/thumbnail/videocreator.cpp
index a96d574a..9a545ede 100644
--- a/xine_artsplugin/tools/thumbnail/videocreator.cpp
+++ b/xine_artsplugin/tools/thumbnail/videocreator.cpp
@@ -35,7 +35,7 @@
 
 #include <iostream>
 
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeapplication.h>
 
 #define XINE_ENABLE_EXPERIMENTAL_FEATURES	1
diff --git a/xine_artsplugin/tools/thumbnail/videocreator.h b/xine_artsplugin/tools/thumbnail/videocreator.h
index 439b9cf4..dc8a519d 100644
--- a/xine_artsplugin/tools/thumbnail/videocreator.h
+++ b/xine_artsplugin/tools/thumbnail/videocreator.h
@@ -24,7 +24,7 @@
 
 class VideoCreator : public TQObject, public ThumbCreator
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     VideoCreator();