diff options
| author | Darrell Anderson <[email protected]> | 2012-05-06 13:16:13 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-05-06 13:16:13 -0500 |
| commit | 31fb9ddc684a64f472df8dddbbddcf167f7cc433 (patch) | |
| tree | bb8fe8dd569ae8e2f2d3c46a428dff8a7adef893 /src | |
| parent | 5106117b5c1439d3fee08395c1a025f62d30a53e (diff) | |
| download | kmplayer-31fb9ddc684a64f472df8dddbbddcf167f7cc433.tar.gz kmplayer-31fb9ddc684a64f472df8dddbbddcf167f7cc433.zip | |
Add build support for xine-libs >= 1.2.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xineplayer.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/xineplayer.cpp b/src/xineplayer.cpp index b0dd3d8..0c0c6a8 100644 --- a/src/xineplayer.cpp +++ b/src/xineplayer.cpp @@ -549,7 +549,11 @@ void KXinePlayer::play (int repeat) { return; } +#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 ) + xine_port_send_gui_data(vo_port, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1); +#else xine_gui_send_vo_data(stream, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1); +#endif running = 1; TQString mrlsetup = mrl; @@ -939,7 +943,11 @@ protected: if(xevent.xexpose.count != 0 || !stream || xevent.xexpose.window != wid) break; mutex.lock (); +#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 ) + xine_port_send_gui_data(vo_port, XINE_GUI_SEND_EXPOSE_EVENT, &xevent); +#else xine_gui_send_vo_data(stream, XINE_GUI_SEND_EXPOSE_EVENT, &xevent); +#endif mutex.unlock (); break; @@ -967,7 +975,11 @@ protected: if (stream) { XMotionEvent *mev = (XMotionEvent *) &xevent; x11_rectangle_t rect = { mev->x, mev->y, 0, 0 }; +#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 ) + if (xine_port_send_gui_data(vo_port, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1) +#else if (xine_gui_send_vo_data (stream, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1) +#endif break; xine_input_data_t data; data.x = rect.x; @@ -1001,7 +1013,11 @@ protected: fprintf(stderr, "ButtonPress\n"); XButtonEvent *bev = (XButtonEvent *) &xevent; x11_rectangle_t rect = { bev->x, bev->y, 0, 0 }; +#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 ) + if (xine_port_send_gui_data(vo_port, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1) +#else if (xine_gui_send_vo_data (stream, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1) +#endif break; xine_input_data_t data; data.x = rect.x; @@ -1036,7 +1052,11 @@ protected: } if(xevent.type == completion_event && stream) +#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 ) + xine_port_send_gui_data(vo_port, XINE_GUI_SEND_COMPLETION_EVENT, &xevent); +#else xine_gui_send_vo_data(stream, XINE_GUI_SEND_COMPLETION_EVENT, &xevent); +#endif } } }; |