1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00

treat mpd opjects as non-threaded

In fact, they are. But we don't want to treat them as those, because
the rewrite made the only situation when threaded objects matter
uncritical, i.e. when an object calls calling parse_conky_vars().
This commit is contained in:
Phil Sutter 2008-12-20 02:32:45 +01:00
parent b31af01d91
commit 05624868e3

View File

@ -2886,39 +2886,39 @@ static struct text_object *construct_text_object(const char *s,
else \ else \
ERR(#name ": invalid length argument"); \ ERR(#name ": invalid length argument"); \
} }
END OBJ_THREAD(mpd_artist, INFO_MPD) END OBJ(mpd_artist, INFO_MPD)
mpd_set_maxlen(mpd_artist); mpd_set_maxlen(mpd_artist);
init_mpd(); init_mpd();
END OBJ_THREAD(mpd_title, INFO_MPD) END OBJ(mpd_title, INFO_MPD)
mpd_set_maxlen(mpd_title); mpd_set_maxlen(mpd_title);
init_mpd(); init_mpd();
END OBJ_THREAD(mpd_random, INFO_MPD) init_mpd(); END OBJ(mpd_random, INFO_MPD) init_mpd();
END OBJ_THREAD(mpd_repeat, INFO_MPD) init_mpd(); END OBJ(mpd_repeat, INFO_MPD) init_mpd();
END OBJ_THREAD(mpd_elapsed, INFO_MPD) init_mpd(); END OBJ(mpd_elapsed, INFO_MPD) init_mpd();
END OBJ_THREAD(mpd_length, INFO_MPD) init_mpd(); END OBJ(mpd_length, INFO_MPD) init_mpd();
END OBJ_THREAD(mpd_track, INFO_MPD) END OBJ(mpd_track, INFO_MPD)
mpd_set_maxlen(mpd_track); mpd_set_maxlen(mpd_track);
init_mpd(); init_mpd();
END OBJ_THREAD(mpd_name, INFO_MPD) END OBJ(mpd_name, INFO_MPD)
mpd_set_maxlen(mpd_name); mpd_set_maxlen(mpd_name);
init_mpd(); init_mpd();
END OBJ_THREAD(mpd_file, INFO_MPD) END OBJ(mpd_file, INFO_MPD)
mpd_set_maxlen(mpd_file); mpd_set_maxlen(mpd_file);
init_mpd(); init_mpd();
END OBJ_THREAD(mpd_percent, INFO_MPD) init_mpd(); END OBJ(mpd_percent, INFO_MPD) init_mpd();
END OBJ_THREAD(mpd_album, INFO_MPD) END OBJ(mpd_album, INFO_MPD)
mpd_set_maxlen(mpd_album); mpd_set_maxlen(mpd_album);
init_mpd(); init_mpd();
END OBJ_THREAD(mpd_vol, INFO_MPD) init_mpd(); END OBJ(mpd_vol, INFO_MPD) init_mpd();
END OBJ_THREAD(mpd_bitrate, INFO_MPD) init_mpd(); END OBJ(mpd_bitrate, INFO_MPD) init_mpd();
END OBJ_THREAD(mpd_status, INFO_MPD) init_mpd(); END OBJ(mpd_status, INFO_MPD) init_mpd();
END OBJ_THREAD(mpd_bar, INFO_MPD) END OBJ(mpd_bar, INFO_MPD)
scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b); scan_bar(arg, &obj->data.pair.a, &obj->data.pair.b);
init_mpd(); init_mpd();
END OBJ_THREAD(mpd_smart, INFO_MPD) END OBJ(mpd_smart, INFO_MPD)
mpd_set_maxlen(mpd_smart); mpd_set_maxlen(mpd_smart);
init_mpd(); init_mpd();
END OBJ_THREAD(if_mpd_playing, INFO_MPD) END OBJ(if_mpd_playing, INFO_MPD)
obj_be_ifblock_if(obj); obj_be_ifblock_if(obj);
init_mpd(); init_mpd();
#undef mpd_set_maxlen #undef mpd_set_maxlen