Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-03-21 10:32:22 +00:00
Code Issues Releases Activity

Small build fix & zero playtime and progress bars when XMMS2 playback is stopped.

Browse Source 
patch contributed by sleipner
This commit is contained in:
Pavel Labath 2010-06-13 19:10:59 +02:00
parent cccbf3b4c0
commit b82250d551
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xmms2.cc
View File

@ -239,6 +239,7 @@ int handle_playback_state_change(xmmsv_t *value, void *p)
break; break;
case XMMS_PLAYBACK_STATUS_STOP: case XMMS_PLAYBACK_STATUS_STOP:
strncpy(ptr->xmms2.status, "Stopped", text_buffer_size - 1); strncpy(ptr->xmms2.status, "Stopped", text_buffer_size - 1);
ptr->xmms2.elapsed = ptr->xmms2.progress = ptr->xmms2.percent = 0;
break; break;
default: default:
strncpy(ptr->xmms2.status, "Unknown", text_buffer_size - 1); strncpy(ptr->xmms2.status, "Unknown", text_buffer_size - 1);
@ -268,7 +269,7 @@ int handle_playlist_loaded(xmmsv_t *value, void *p)
return TRUE; return TRUE;
} }
void update_xmms2(void) int update_xmms2(void)
{ {
struct information *current_info = &info; struct information *current_info = &info;
@ -282,7 +283,7 @@ void update_xmms2(void)
/* did init fail? */ /* did init fail? */
if (xmms2_conn == NULL) { if (xmms2_conn == NULL) {
fprintf(stderr,"XMMS2 init failed. %s\n", xmmsc_get_last_error(xmms2_conn)); fprintf(stderr,"XMMS2 init failed. %s\n", xmmsc_get_last_error(xmms2_conn));
return; return 0;
} }
/* init ok but not connected yet.. */ /* init ok but not connected yet.. */
@ -300,7 +301,7 @@ void update_xmms2(void)
if (!xmmsc_connect(xmms2_conn, path)) { if (!xmmsc_connect(xmms2_conn, path)) {
fprintf(stderr,"XMMS2 connection failed. %s\n", xmmsc_get_last_error(xmms2_conn)); fprintf(stderr,"XMMS2 connection failed. %s\n", xmmsc_get_last_error(xmms2_conn));
current_info->xmms2.conn_state = CONN_NO; current_info->xmms2.conn_state = CONN_NO;
return; return 0;
} }
/* set callbacks */ /* set callbacks */
@ -334,6 +335,7 @@ void update_xmms2(void)
xmmsc_io_out_handle(xmms2_conn); xmmsc_io_out_handle(xmms2_conn);
} }
return 0;
} }
void print_xmms2_tracknr(struct text_object *obj, char *p, int p_max_size) void print_xmms2_tracknr(struct text_object *obj, char *p, int p_max_size)

2
src/xmms2.h
View File

@ -54,7 +54,7 @@ struct xmms2_s {
int conn_state; int conn_state;
}; };
void update_xmms2(void); int update_xmms2(void);
void print_xmms2_tracknr(struct text_object *, char *, int); void print_xmms2_tracknr(struct text_object *, char *, int);
void print_xmms2_elapsed(struct text_object *, char *, int); void print_xmms2_elapsed(struct text_object *, char *, int);