Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-12 19:06:36 +00:00
Code Issues Releases Activity

XMMS2 fix and refactoring patch sf.net id #2579357 (thanks Tamim).

Browse Source
This commit is contained in:
Tamim Khan 2009-02-17 22:29:42 -07:00 committed by Brenden Matthews
parent cf77d3f1f9
commit d1180b4729
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -19,6 +19,7 @@
is not full charged patch sf.net id #2556056 (thanks Martin) is not full charged patch sf.net id #2556056 (thanks Martin)
* Extended support for local Maildir patch sf.net id #2561323 (thanks * Extended support for local Maildir patch sf.net id #2561323 (thanks
Nicolas) Nicolas)
* XMMS2 fix and refactoring patch sf.net id #2579357 (thanks Tamim)
2009-02-15 2009-02-15
* Added out_to_x * Added out_to_x

2
src/conky.h
View File

@ -235,8 +235,6 @@ struct information {
#ifdef XMMS2 #ifdef XMMS2
struct xmms2_s xmms2; struct xmms2_s xmms2;
int xmms2_conn_state; int xmms2_conn_state;
xmms_socket_t xmms2_fd;
fd_set xmms2_fdset;
xmmsc_connection_t *xmms2_conn; xmmsc_connection_t *xmms2_conn;
#endif #endif
#ifdef AUDACIOUS #ifdef AUDACIOUS

10
src/xmms2.c
View File

@ -317,6 +317,9 @@ void update_xmms2()
XMMS_CALLBACK_SET(current_info->xmms2_conn, XMMS_CALLBACK_SET(current_info->xmms2_conn,
xmmsc_broadcast_playlist_loaded, handle_playlist_loaded, xmmsc_broadcast_playlist_loaded, handle_playlist_loaded,
current_info); current_info);
XMMS_CALLBACK_SET(current_info->xmms2_conn,
xmmsc_broadcast_medialib_entry_changed, handle_curent_id,
current_info);
/* get playback status, current id and active playlist */ /* get playback status, current id and active playlist */
XMMS_CALLBACK_SET(current_info->xmms2_conn, XMMS_CALLBACK_SET(current_info->xmms2_conn,
@ -335,13 +338,6 @@ void update_xmms2()
/* handle callbacks */ /* handle callbacks */
if (current_info->xmms2_conn_state == CONN_OK) { if (current_info->xmms2_conn_state == CONN_OK) {
struct timeval tmout;
tmout.tv_sec = 0;
tmout.tv_usec = 100;
select(current_info->xmms2_fd + 1, &current_info->xmms2_fdset, NULL,
NULL, &tmout);
xmmsc_io_in_handle(current_info->xmms2_conn); xmmsc_io_in_handle(current_info->xmms2_conn);
if (xmmsc_io_want_out(current_info->xmms2_conn)) { if (xmmsc_io_want_out(current_info->xmms2_conn)) {