diff options
| author | Darrell Anderson <[email protected]> | 2012-11-03 16:43:08 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-11-03 16:43:08 -0500 |
| commit | e9c83ca1603162e32acbe35d2368ebb14814e7e2 (patch) | |
| tree | 4ec2ab5c970e71f3306f6a9f13e3438b4b11cfc7 /src | |
| parent | 556e28a2a07bdab643df766ba1371322fdfd924f (diff) | |
| download | kmplayer-e9c83ca1603162e32acbe35d2368ebb14814e7e2.tar.gz kmplayer-e9c83ca1603162e32acbe35d2368ebb14814e7e2.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.
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 } } }; |