From: Jaroslav Kysela Date: Tue, 15 Sep 2015 18:40:01 +0000 (+0200) Subject: move tvheadend_capabilities_list to main.c X-Git-Tag: v4.2.1~2118 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=73fc4875dc46cc8a1a263d0b538331771dab53c5;p=thirdparty%2Ftvheadend.git move tvheadend_capabilities_list to main.c --- diff --git a/src/main.c b/src/main.c index c2ce95701..5ef84bf2d 100644 --- a/src/main.c +++ b/src/main.c @@ -1215,3 +1215,19 @@ scopedunlock(pthread_mutex_t **mtxp) { pthread_mutex_unlock(*mtxp); } + + +/** + * + */ +htsmsg_t *tvheadend_capabilities_list(int check) +{ + const tvh_caps_t *tc = tvheadend_capabilities; + htsmsg_t *r = htsmsg_create_list(); + while (tc->name) { + if (!check || !tc->enabled || *tc->enabled) + htsmsg_add_str(r, NULL, tc->name); + tc++; + } + return r; +} diff --git a/src/tvheadend.h b/src/tvheadend.h index 8e6c97d70..4fb6c0ff9 100644 --- a/src/tvheadend.h +++ b/src/tvheadend.h @@ -80,19 +80,7 @@ extern const char *tvheadend_cwd; extern const char *tvheadend_webroot; extern const tvh_caps_t tvheadend_capabilities[]; -static inline htsmsg_t *tvheadend_capabilities_list(int check) -{ - int i = 0; - htsmsg_t *r = htsmsg_create_list(); - while (tvheadend_capabilities[i].name) { - if (!check || - !tvheadend_capabilities[i].enabled || - *tvheadend_capabilities[i].enabled) - htsmsg_add_str(r, NULL, tvheadend_capabilities[i].name); - i++; - } - return r; -} +htsmsg_t *tvheadend_capabilities_list(int check); typedef struct str_list {