Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 06421a70 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

MISC: Don't use reserved macro names

parent a1888ba3
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!179Queue download if update asked per ID
Pipeline #2564 réussi
...@@ -929,12 +929,12 @@ handle_queue_events(struct lkt_state *srv) ...@@ -929,12 +929,12 @@ handle_queue_events(struct lkt_state *srv)
#define LOG_EVENT(type) #define LOG_EVENT(type)
#endif #endif
#define __CASE(type, func) \ #define CASE(type, func) \
case LKT_EVENT_##type: \ case LKT_EVENT_##type: \
LOG_EVENT(type) \ LOG_EVENT(type) \
func; \ func; \
break; break;
#define __ATTR_IS_STATE(state, func) \ #define ATTR_IS_STATE(state, func) \
{ \ { \
if ((__LKT_PLAY_##state) == (size_t)evt.attr) { \ if ((__LKT_PLAY_##state) == (size_t)evt.attr) { \
func; \ func; \
...@@ -949,7 +949,7 @@ redo: ...@@ -949,7 +949,7 @@ redo:
evt = lkt_queue_handle(&srv->queue); evt = lkt_queue_handle(&srv->queue);
// clang-format off // clang-format off
switch (evt.type) { switch (evt.type) {
__CASE(PLAY_POS, { CASE(PLAY_POS, {
string = LKT_ALLOC_ARRAY(char, BUFFER_MAX); string = LKT_ALLOC_ARRAY(char, BUFFER_MAX);
safe_snprintf(string, BUFFER_MAX, "%ld", (size_t)evt.attr); safe_snprintf(string, BUFFER_MAX, "%ld", (size_t)evt.attr);
arguments_to_pass[0] = string; arguments_to_pass[0] = string;
...@@ -958,40 +958,44 @@ redo: ...@@ -958,40 +958,44 @@ redo:
free(string); free(string);
}) })
__CASE(PLAY_NEXT, command_next(srv, 0, NULL)) CASE(PLAY_NEXT, command_next(srv, 0, NULL))
__CASE(PLAY_PREV, command_previous(srv, 0, NULL)) CASE(PLAY_PREV, command_previous(srv, 0, NULL))
__CASE(PLAY_TOGGLE, { __ATTR_IS_STATE(PAUSE, database_queue_set_paused(srv->db, 1)) CASE(PLAY_TOGGLE, {
__ATTR_IS_STATE(PLAY, database_queue_set_paused(srv->db, 0)) ATTR_IS_STATE(PAUSE, database_queue_set_paused(srv->db, 1))
__ATTR_IS_STATE(TOGGLE, database_queue_toggle_pause(srv->db)) ATTR_IS_STATE(PLAY, database_queue_set_paused(srv->db, 0))
__ATTR_IS_STATE(STOP, database_queue_stop(srv->db)) }) ATTR_IS_STATE(TOGGLE, database_queue_toggle_pause(srv->db))
ATTR_IS_STATE(STOP, database_queue_stop(srv->db))
})
// Note: Convertion order does matter! // Note: Convertion order does matter!
__CASE(PROP_VOL, database_config_queue(srv->db, "volume", (int)(size_t)evt.attr)) CASE(PROP_VOL, database_config_queue(srv->db, "volume", (int)(size_t)evt.attr))
__CASE(PROP_DUR, database_config_queue(srv->db, "duration", (int)(size_t)evt.attr)) CASE(PROP_DUR, database_config_queue(srv->db, "duration", (int)(size_t)evt.attr))
__CASE(PROP_TIME, database_config_queue(srv->db, "elapsed", (int)(size_t)evt.attr)) CASE(PROP_TIME, database_config_queue(srv->db, "elapsed", (int)(size_t)evt.attr))
__CASE(SKIP_CURRENT, { CASE(SKIP_CURRENT, {
string = LKT_ALLOC_ARRAY(char, PATH_MAX); string = LKT_ALLOC_ARRAY(char, PATH_MAX);
database_queue_skip_current(srv->db, string); database_queue_skip_current(srv->db, string);
MOD_CALL(srv->window_mod, "load", string); MOD_CALL(srv->window_mod, "load", string);
free(string); free(string);
}) })
__CASE(TOUCH_KARA, { database_update_touch(srv->db, (int)(size_t)evt.attr); }) CASE(TOUCH_KARA, { database_update_touch(srv->db, (int)(size_t)evt.attr); })
__CASE(DB_UPDATE_TOTAL, { srv->update_total += (size_t)evt.attr; }) CASE(DB_UPDATE_TOTAL, { srv->update_total += (size_t)evt.attr; })
__CASE(DB_UPDATING, { srv->is_updating = (((uint8_t)(size_t)evt.attr) > 0); }) CASE(DB_UPDATING, { srv->is_updating = (((uint8_t)(size_t)evt.attr) > 0); })
__CASE(DB_UPDATE_TICK, { CASE(DB_UPDATE_TICK, {
if (srv->update_current != ((size_t)-1)) if (srv->update_current != ((size_t)-1))
srv->update_current++; srv->update_current++;
if (srv->update_current >= srv->update_total) if (srv->update_current >= srv->update_total)
(LOG_WARN("EVENT", "Force updating state because tikcs exceded the update count"), srv->is_updating = 0, (LOG_WARN("EVENT", "Force updating state because tikcs exceded the update count"),
srv->update_total = 0, srv->update_current = 0); srv->is_updating = 0,
srv->update_total = 0,
srv->update_current = 0);
srv->mpd_idle_events |= MPD_IDLE_DATABASE; srv->mpd_idle_events |= MPD_IDLE_DATABASE;
}) })
/* The null event / ignored events, just return / continue */ /* The null event / ignored events, just return / continue */
__CASE(PLAY_FILE, {}) CASE(PLAY_FILE, {})
case LKT_EVENT_NULL: case LKT_EVENT_NULL:
return; return;
...@@ -1002,8 +1006,8 @@ redo: ...@@ -1002,8 +1006,8 @@ redo:
// clang-format on // clang-format on
goto redo; goto redo;
#undef __ATTR_IS_STATE #undef ATTR_IS_STATE
#undef __CASE #undef CASE
} }
/******************* /*******************
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter