Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-27 17:18:33 +00:00
Code Issues Releases Activity

if_mixer_mute: convert to callbacks.iftest

Browse Source
This commit is contained in:
Phil Sutter 2009-11-16 23:32:35 +01:00
parent 5249c9da04
commit 482f2d50b4
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conky.c
View File

@ -1013,12 +1013,6 @@ void generate_text_internal(char *p, int p_max_size,
new_graph(obj, p, p_max_size, cur->memmax ? (cur->mem * 100.0) / (cur->memmax) : 0.0); new_graph(obj, p, p_max_size, cur->memmax ? (cur->mem * 100.0) / (cur->memmax) : 0.0);
} }
#endif /* X11 */ #endif /* X11 */
/* mixer stuff */
OBJ(if_mixer_mute) {
if (!check_mixer_muted(obj)) {
DO_JUMP;
}
}
#ifdef X11 #ifdef X11
#define NOT_IN_X "Not running in X" #define NOT_IN_X "Not running in X"
OBJ(monitor) { OBJ(monitor) {

1
src/core.c
View File

@ -795,6 +795,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
obj->callbacks.print = &print_mixerr_bar; obj->callbacks.print = &print_mixerr_bar;
END OBJ_IF(if_mixer_mute, 0) END OBJ_IF(if_mixer_mute, 0)
parse_mixer_arg(obj, arg); parse_mixer_arg(obj, arg);
obj->callbacks.iftest = &check_mixer_muted;
#ifdef X11 #ifdef X11
END OBJ(monitor, &update_x11info) END OBJ(monitor, &update_x11info)
END OBJ(monitor_number, &update_x11info) END OBJ(monitor_number, &update_x11info)