Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 11:05:18 +00:00
Code Issues Releases Activity

convert xmms2_bar to callbacks.barval

Browse Source
This commit is contained in:
Phil Sutter 2009-11-23 23:50:15 +01:00
parent 997805c46b
commit 4988947829
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core.c
View File

@ -1223,7 +1223,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
obj->callbacks.print = &print_xmms2_percent; obj->callbacks.print = &print_xmms2_percent;
END OBJ(xmms2_bar, &update_xmms2) END OBJ(xmms2_bar, &update_xmms2)
scan_bar(obj, arg); scan_bar(obj, arg);
obj->callbacks.print = &print_xmms2_bar; obj->callbacks.barval = &xmms2_barval;
END OBJ(xmms2_smart, &update_xmms2) END OBJ(xmms2_smart, &update_xmms2)
obj->callbacks.print = &print_xmms2_smart; obj->callbacks.print = &print_xmms2_smart;
END OBJ(xmms2_playlist, &update_xmms2) END OBJ(xmms2_playlist, &update_xmms2)

6
src/xmms2.c
View File

@ -343,13 +343,11 @@ void print_xmms2_duration(struct text_object *obj, char *p, int p_max_size)
(info.xmms2.duration / 1000) % 60); (info.xmms2.duration / 1000) % 60);
} }
void print_xmms2_bar(struct text_object *obj, char *p, int p_max_size) uint8_t xmms2_barval(struct text_object *obj)
{ {
(void)obj; (void)obj;
if (!p_max_size)
return;
new_bar(obj, p, p_max_size, (int) (info.xmms2.progress * 255.0f)); return round_to_int(info.xmms2.progress * 255.0f);
} }
void print_xmms2_smart(struct text_object *obj, char *p, int p_max_size) void print_xmms2_smart(struct text_object *obj, char *p, int p_max_size)

4
src/xmms2.h
View File

@ -58,9 +58,7 @@ void 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);
void print_xmms2_duration(struct text_object *, char *, int); void print_xmms2_duration(struct text_object *, char *, int);
#ifdef X11 uint8_t xmms2_barval(struct text_object *);
void print_xmms2_bar(struct text_object *, char *, int);
#endif /* X11 */
void print_xmms2_smart(struct text_object *, char *, int); void print_xmms2_smart(struct text_object *, char *, int);
void print_xmms2_artist(struct text_object *, char *, int); void print_xmms2_artist(struct text_object *, char *, int);
void print_xmms2_album(struct text_object *, char *, int); void print_xmms2_album(struct text_object *, char *, int);