diff options
| author | Darrell Anderson <[email protected]> | 2012-11-03 16:43:08 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-11-04 01:42:18 +0100 |
| commit | a65e2314710206b6a00d201c0e7a6a446b240421 (patch) | |
| tree | 6c87a1780af59aca46bbd94d4240147a1c8d5849 /src | |
| parent | 290a1f4cc3c630bfe9a91254e34ffbf435f02f85 (diff) | |
| download | kmplayer-a65e2314710206b6a00d201c0e7a6a446b240421.tar.gz kmplayer-a65e2314710206b6a00d201c0e7a6a446b240421.zip | |
Fix deprecation build warnings by removing xine version
preprocessor checks. The "old" functions have been deprecated
since at least xine 1.0 from 2004.
(cherry picked from commit e9c83ca1603162e32acbe35d2368ebb14814e7e2)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xineplayer.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/xineplayer.cpp b/src/xineplayer.cpp index 0c0c6a8..dfca10e 100644 --- a/src/xineplayer.cpp +++ b/src/xineplayer.cpp @@ -549,11 +549,7 @@ 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; @@ -943,11 +939,7 @@ 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; @@ -975,11 +967,7 @@ 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; @@ -1013,11 +1001,7 @@ 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; @@ -1052,11 +1036,7 @@ 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 } } }; |