extern const char *status_item_list[NUM_STAT_ITEMS];
extern struct misc_meta_data *mmd;
extern struct gengetopt_args_info conf;
-extern struct audio_file_selector dblist[];
+extern struct audio_file_selector selectors[];
extern struct audio_format afl[];
extern struct sender senders[];
extern char *user_list;
status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
status_item_list[SI_STATUS], status,
status_item_list[SI_STATUS_FLAGS], flags,
- status_item_list[SI_DBTOOL], dblist[nmmd->dbt_num].name,
+ status_item_list[SI_SELECTOR], selectors[nmmd->selector_num].name,
status_item_list[SI_OFFSET], offset,
status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
- nmmd->dbinfo,
+ nmmd->selector_info,
nmmd->audio_file_info,
status_item_list[SI_UPTIME], ut,
{
int i, ret;
char *ut;
- char *dbtools = NULL, *sender_info = NULL, *sender_list = NULL;
+ char *selector_string = NULL, *sender_info = NULL, *sender_list = NULL;
struct mallinfo mi = mallinfo();
if (argc)
return -E_COMMAND_SYNTAX;
mmd_lock();
- for (i = 0; dblist[i].name; i++) {
- dbtools = para_strcat(dbtools, dblist[i].name);
- dbtools = para_strcat(dbtools, " ");
+ for (i = 0; selectors[i].name; i++) {
+ selector_string = para_strcat(selector_string, selectors[i].name);
+ selector_string = para_strcat(selector_string, " ");
}
for (i = 0; senders[i].name; i++) {
char *info = senders[i].info();
"mallinfo: %d\n"
"connections (active/accepted/total): %u/%u/%u\n"
"current loglevel: %i\n"
- "supported database tools: %s\n"
+ "supported audio file selectors: %s\n"
"supported audio formats: %s\n"
"supported senders: %s\n"
"%s",
mmd->num_commands,
mmd->num_connects,
conf.loglevel_arg,
- dbtools,
+ selector_string,
SUPPORTED_AUDIO_FORMATS,
sender_list,
sender_info
);
mmd_unlock();
free(ut);
- free(dbtools);
+ free(selector_string);
free(sender_list);
free(sender_info);
return ret;
/* stat */
static int com_stat(int socket_fd, int argc, char **argv)
{
-// char *old_stat = NULL, *old_dbinfo = NULL;
int ret, num = 0;/* status will be printed that many
* times. num <= 0 means: print forever
*/
/* not found, look for commands supported by the current selector */
mmd_lock();
if (handler)
- *handler = make_message("the %s database tool", dblist[mmd->dbt_num].name);
- cmd = dblist[mmd->dbt_num].cmd_list;
+ *handler = make_message("the %s selector",
+ selectors[mmd->selector_num].name);
+ cmd = selectors[mmd->selector_num].cmd_list;
mmd_unlock();
for (; cmd->name; cmd++)
if (!strcmp(cmd->name, name))
if ((ret = send_description(fd, cmd_struct, "server", 0)) < 0)
return ret;
mmd_lock();
- handler = para_strdup(dblist[mmd->dbt_num].name);
- cmd = dblist[mmd->dbt_num].cmd_list;
+ handler = para_strdup(selectors[mmd->selector_num].name);
+ cmd = selectors[mmd->selector_num].cmd_list;
mmd_unlock();
ret = send_description(fd, cmd, handler, 0);
free(handler);
int i, ret;
if (!argc) {
- char *dbtool;
+ char *selector;
mmd_lock();
- dbtool = para_strdup(dblist[mmd->dbt_num].name);
+ selector = para_strdup(selectors[mmd->selector_num].name);
mmd_unlock();
- ret = send_va_buffer(fd, "%s\n", dbtool);
- free(dbtool);
+ ret = send_va_buffer(fd, "%s\n", selector);
+ free(selector);
return ret;
}
- for (i = 0; dblist[i].name; i++) {
- if (strcmp(dblist[i].name, argv[1]))
+ for (i = 0; selectors[i].name; i++) {
+ if (strcmp(selectors[i].name, argv[1]))
continue;
mmd_lock();
- mmd->dbt_change = i;
+ mmd->selector_change = i;
mmd->events++;
mmd_unlock();
return 1;
}
- return -E_BAD_DBTOOL;
+ return -E_BAD_SELECTOR;
}
/* next */
if (argc)
return -E_COMMAND_SYNTAX;
mmd_lock();
+ mmd->events++;
mmd->new_afs_status_flags |= AFS_NEXT;
mmd_unlock();
return 1;
/* valid command and sufficient perms */
alarm(0);
argc = split_args(command, &argv, '\n');
- argv[0] = cmd->name;
mmd_lock();
mmd->num_commands++;
mmd_unlock();