|
Lines 528-534
Link Here
|
| 528 |
xine_event_create_listener_thread (event_queue, event_listener, NULL); |
528 |
xine_event_create_listener_thread (event_queue, event_listener, NULL); |
| 529 |
if (mrl == "cdda:/") { |
529 |
if (mrl == "cdda:/") { |
| 530 |
int nr; |
530 |
int nr; |
|
|
531 |
#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 ) |
| 532 |
const char * const* mrls = xine_get_autoplay_mrls (xine, "CD", &nr); |
| 533 |
#else |
| 531 |
char ** mrls = xine_get_autoplay_mrls (xine, "CD", &nr); |
534 |
char ** mrls = xine_get_autoplay_mrls (xine, "CD", &nr); |
|
|
535 |
#endif |
| 532 |
running = 1; |
536 |
running = 1; |
| 533 |
for (int i = 0; i < nr; i++) { |
537 |
for (int i = 0; i < nr; i++) { |
| 534 |
TQString m (mrls[i]); |
538 |
TQString m (mrls[i]); |
|
Lines 863-872
Link Here
|
| 863 |
case XK_p: // previous |
867 |
case XK_p: // previous |
| 864 |
mutex.lock (); |
868 |
mutex.lock (); |
| 865 |
if (stream) { |
869 |
if (stream) { |
| 866 |
xine_event_t xine_event = { |
870 |
xine_event_t xine_event; |
| 867 |
XINE_EVENT_INPUT_PREVIOUS, |
871 |
memset(&xine_event, 0, sizeof(xine_event)); |
| 868 |
stream, 0L, 0, { 0, 0 } |
872 |
xine_event.type = XINE_EVENT_INPUT_PREVIOUS; |
| 869 |
}; |
873 |
xine_event.stream = stream; |
| 870 |
xine_event_send (stream, &xine_event); |
874 |
xine_event_send (stream, &xine_event); |
| 871 |
} |
875 |
} |
| 872 |
mutex.unlock (); |
876 |
mutex.unlock (); |
|
Lines 875-884
Link Here
|
| 875 |
case XK_n: // next |
879 |
case XK_n: // next |
| 876 |
mutex.lock (); |
880 |
mutex.lock (); |
| 877 |
if (stream) { |
881 |
if (stream) { |
| 878 |
xine_event_t xine_event = { |
882 |
xine_event_t xine_event; |
| 879 |
XINE_EVENT_INPUT_NEXT, |
883 |
memset(&xine_event, 0, sizeof(xine_event)); |
| 880 |
stream, 0L, 0, { 0, 0 } |
884 |
xine_event.type = XINE_EVENT_INPUT_NEXT; |
| 881 |
}; |
885 |
xine_event.stream = stream; |
| 882 |
xine_event_send (stream, &xine_event); |
886 |
xine_event_send (stream, &xine_event); |
| 883 |
} |
887 |
} |
| 884 |
mutex.unlock (); |
888 |
mutex.unlock (); |
|
Lines 887-896
Link Here
|
| 887 |
case XK_u: // up menu |
891 |
case XK_u: // up menu |
| 888 |
mutex.lock (); |
892 |
mutex.lock (); |
| 889 |
if (stream) { |
893 |
if (stream) { |
| 890 |
xine_event_t xine_event = { |
894 |
xine_event_t xine_event; |
| 891 |
XINE_EVENT_INPUT_MENU1, |
895 |
memset(&xine_event, 0, sizeof(xine_event)); |
| 892 |
stream, 0L, 0, { 0, 0 } |
896 |
xine_event.type = XINE_EVENT_INPUT_MENU1; |
| 893 |
}; |
897 |
xine_event.stream = stream; |
| 894 |
xine_event_send (stream, &xine_event); |
898 |
xine_event_send (stream, &xine_event); |
| 895 |
} |
899 |
} |
| 896 |
mutex.unlock (); |
900 |
mutex.unlock (); |
|
Lines 899-908
Link Here
|
| 899 |
case XK_r: // root menu |
903 |
case XK_r: // root menu |
| 900 |
mutex.lock (); |
904 |
mutex.lock (); |
| 901 |
if (stream) { |
905 |
if (stream) { |
| 902 |
xine_event_t xine_event = { |
906 |
xine_event_t xine_event; |
| 903 |
XINE_EVENT_INPUT_MENU3, |
907 |
memset(&xine_event, 0, sizeof(xine_event)); |
| 904 |
stream, 0L, 0, { 0, 0 } |
908 |
xine_event.type = XINE_EVENT_INPUT_MENU3; |
| 905 |
}; |
909 |
xine_event.stream = stream; |
| 906 |
xine_event_send (stream, &xine_event); |
910 |
xine_event_send (stream, &xine_event); |
| 907 |
} |
911 |
} |
| 908 |
mutex.unlock (); |
912 |
mutex.unlock (); |
|
Lines 985-995
Link Here
|
| 985 |
data.x = rect.x; |
989 |
data.x = rect.x; |
| 986 |
data.y = rect.y; |
990 |
data.y = rect.y; |
| 987 |
data.button = 0; |
991 |
data.button = 0; |
| 988 |
xine_event_t xine_event = { |
992 |
xine_event_t xine_event; |
| 989 |
XINE_EVENT_INPUT_MOUSE_MOVE, |
993 |
memset(&xine_event, 0, sizeof(xine_event)); |
| 990 |
stream, &data, sizeof (xine_input_data_t), |
994 |
xine_event.type = XINE_EVENT_INPUT_MOUSE_MOVE; |
| 991 |
{ 0 , 0 } |
995 |
xine_event.stream = stream; |
| 992 |
}; |
996 |
xine_event.data = &data; |
|
|
997 |
xine_event.data_length = sizeof (xine_input_data_t); |
| 993 |
mutex.lock (); |
998 |
mutex.lock (); |
| 994 |
xine_event_send (stream, &xine_event); |
999 |
xine_event_send (stream, &xine_event); |
| 995 |
mutex.unlock (); |
1000 |
mutex.unlock (); |
|
Lines 1023-1033
Link Here
|
| 1023 |
data.x = rect.x; |
1028 |
data.x = rect.x; |
| 1024 |
data.y = rect.y; |
1029 |
data.y = rect.y; |
| 1025 |
data.button = 1; |
1030 |
data.button = 1; |
| 1026 |
xine_event_t xine_event = { |
1031 |
xine_event_t xine_event; |
| 1027 |
XINE_EVENT_INPUT_MOUSE_BUTTON, |
1032 |
memset(&xine_event, 0, sizeof(xine_event)); |
| 1028 |
stream, &data, sizeof (xine_input_data_t), |
1033 |
xine_event.type = XINE_EVENT_INPUT_MOUSE_BUTTON; |
| 1029 |
{ 0, 0 } |
1034 |
xine_event.stream = stream; |
| 1030 |
}; |
1035 |
xine_event.data = &data; |
|
|
1036 |
xine_event.data_length = sizeof (xine_input_data_t); |
| 1031 |
mutex.lock (); |
1037 |
mutex.lock (); |
| 1032 |
xine_event_send (stream, &xine_event); |
1038 |
xine_event_send (stream, &xine_event); |
| 1033 |
mutex.unlock (); |
1039 |
mutex.unlock (); |