Fix deprecation build warnings by removing xine version

preprocessor checks. The "old" functions have been deprecated
since at least xine 1.0 from 2004.
pull/1/head
Darrell Anderson 12 years ago
parent 556e28a2a0
commit e9c83ca160

@ -549,11 +549,7 @@ void KXinePlayer::play (int repeat) {
return; 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); 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; running = 1;
TQString mrlsetup = mrl; TQString mrlsetup = mrl;
@ -943,11 +939,7 @@ protected:
if(xevent.xexpose.count != 0 || !stream || xevent.xexpose.window != wid) if(xevent.xexpose.count != 0 || !stream || xevent.xexpose.window != wid)
break; break;
mutex.lock (); 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); 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 (); mutex.unlock ();
break; break;
@ -975,11 +967,7 @@ protected:
if (stream) { if (stream) {
XMotionEvent *mev = (XMotionEvent *) &xevent; XMotionEvent *mev = (XMotionEvent *) &xevent;
x11_rectangle_t rect = { mev->x, mev->y, 0, 0 }; 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) 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; break;
xine_input_data_t data; xine_input_data_t data;
data.x = rect.x; data.x = rect.x;
@ -1013,11 +1001,7 @@ protected:
fprintf(stderr, "ButtonPress\n"); fprintf(stderr, "ButtonPress\n");
XButtonEvent *bev = (XButtonEvent *) &xevent; XButtonEvent *bev = (XButtonEvent *) &xevent;
x11_rectangle_t rect = { bev->x, bev->y, 0, 0 }; 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) 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; break;
xine_input_data_t data; xine_input_data_t data;
data.x = rect.x; data.x = rect.x;
@ -1052,11 +1036,7 @@ protected:
} }
if(xevent.type == completion_event && stream) 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); 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
} }
} }
}; };

Loading…
Cancel
Save