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

Format code using 'make clang-format'

Browse Source
This commit is contained in:
Julian Schuler 2021-12-09 22:52:07 +01:00 committed by Brenden Matthews
parent 183b45c7ea
commit f11eb219ad
3 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core.cc
View File

@ -660,12 +660,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
EQUAL) { EQUAL) {
obj->data.i = PB_BATT_STATUS; obj->data.i = PB_BATT_STATUS;
} }
else if (strcmp(arg, "percent") == EQUAL) { else if (strcmp(arg, "percent") == EQUAL) { obj->data.i = PB_BATT_PERCENT; }
obj->data.i = PB_BATT_PERCENT; else if (strcmp(arg, "time") == EQUAL) { obj->data.i = PB_BATT_TIME; }
}
else if (strcmp(arg, "time") == EQUAL) {
obj->data.i = PB_BATT_TIME;
}
else { else {
NORM_ERR("pb_battery: illegal argument '%s', defaulting to status", arg); NORM_ERR("pb_battery: illegal argument '%s', defaulting to status", arg);
obj->data.i = PB_BATT_STATUS; obj->data.i = PB_BATT_STATUS;
@ -2013,7 +2009,8 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
END OBJ(pa_card_name, 0) obj->callbacks.print = &print_puau_card_name; END OBJ(pa_card_name, 0) obj->callbacks.print = &print_puau_card_name;
obj->callbacks.free = &free_pulseaudio; obj->callbacks.free = &free_pulseaudio;
init_pulseaudio(obj); init_pulseaudio(obj);
END OBJ_IF(if_pa_source_running, 0) obj->callbacks.iftest = &puau_source_running; END OBJ_IF(if_pa_source_running, 0) obj->callbacks.iftest =
&puau_source_running;
obj->callbacks.free = &free_pulseaudio; obj->callbacks.free = &free_pulseaudio;
init_pulseaudio(obj); init_pulseaudio(obj);
END OBJ_IF(if_pa_source_muted, 0) obj->callbacks.iftest = &puau_source_muted; END OBJ_IF(if_pa_source_muted, 0) obj->callbacks.iftest = &puau_source_muted;

39
src/pulseaudio.cc
View File

@ -40,20 +40,21 @@
struct pulseaudio_default_results get_result_copy(); struct pulseaudio_default_results get_result_copy();
const struct pulseaudio_default_results pulseaudio_result0 = {std::string(), const struct pulseaudio_default_results pulseaudio_result0 = {
std::string(), std::string(),
std::string(), std::string(),
std::string(), std::string(),
0, std::string(),
0, 0,
0, 0,
0, 0,
std::string(), 0,
PA_SOURCE_SUSPENDED, std::string(),
0, PA_SOURCE_SUSPENDED,
std::string(), 0,
std::string(), std::string(),
0}; std::string(),
0};
pulseaudio_c *pulseaudio = nullptr; pulseaudio_c *pulseaudio = nullptr;
void pa_sink_info_callback(pa_context *c, const pa_sink_info *i, int eol, void pa_sink_info_callback(pa_context *c, const pa_sink_info *i, int eol,
@ -80,9 +81,8 @@ void pa_sink_info_callback(pa_context *c, const pa_sink_info *i, int eol,
++eol; ++eol;
} }
void pa_source_info_callback(pa_context *c, const pa_source_info *i, int eol, void pa_source_info_callback(pa_context *c, const pa_source_info *i, int eol,
void *data) { void *data) {
if (i != nullptr && data) { if (i != nullptr && data) {
struct pulseaudio_default_results *pdr = struct pulseaudio_default_results *pdr =
(struct pulseaudio_default_results *)data; (struct pulseaudio_default_results *)data;
@ -186,9 +186,10 @@ void subscribe_cb(pa_context *c, pa_subscription_event_type_t t, uint32_t index,
case PA_SUBSCRIPTION_EVENT_SOURCE: { case PA_SUBSCRIPTION_EVENT_SOURCE: {
if (res->source_name.empty()) return; if (res->source_name.empty()) return;
pa_operation *op; pa_operation *op;
PULSEAUDIO_OP(pa_context_get_source_info_by_name( PULSEAUDIO_OP(
c, res->source_name.c_str(), pa_source_info_callback, res), pa_context_get_source_info_by_name(c, res->source_name.c_str(),
"pa_context_get_source_info_by_name failed"); pa_source_info_callback, res),
"pa_context_get_source_info_by_name failed");
} break; } break;
case PA_SUBSCRIPTION_EVENT_CARD: case PA_SUBSCRIPTION_EVENT_CARD:

4
src/top.cc
View File

@ -99,9 +99,7 @@ static void unhash_all_processes() {
} }
} }
struct process *get_first_process() { struct process *get_first_process() { return first_process; }
return first_process;
}
void free_all_processes() { void free_all_processes() {
struct process *next = nullptr, *pr = first_process; struct process *next = nullptr, *pr = first_process;