diff options
Diffstat (limited to 'xine_artsplugin')
| -rw-r--r-- | xine_artsplugin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | xine_artsplugin/audio_fifo_out.c | 23 | ||||
| -rw-r--r-- | xine_artsplugin/tools/thumbnail/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | xine_artsplugin/tools/thumbnail/videocreator.cpp | 2 |
4 files changed, 19 insertions, 10 deletions
diff --git a/xine_artsplugin/CMakeLists.txt b/xine_artsplugin/CMakeLists.txt index 0b647c96..4b69798f 100644 --- a/xine_artsplugin/CMakeLists.txt +++ b/xine_artsplugin/CMakeLists.txt @@ -39,7 +39,7 @@ tde_add_library( arts_xine SHARED AUTOMOC 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} ) 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 |