/* Sum of the length of all control messages in the buffer */
msg.msg_controllen = cmsg->cmsg_len;
- PARA_NOTICE_LOG("passing %zu bytes and fd %d\n", size, fd);
+ PARA_DEBUG_LOG("passing %zu bytes and fd %d\n", size, fd);
ret = sendmsg(server_socket, &msg, 0);
if (ret < 0) {
ret = -ERRNO_TO_PARA_ERROR(errno);
int ret, shmid;
char buf[8];
- PARA_NOTICE_LOG("getting next af\n");
+ PARA_NOTICE_LOG("getting next audio file\n");
ret = score_get_best(&aft_row, &afd.score);
if (ret < 0)
return ret;
if (ret < 0)
return ret;
shmid = ret;
- PARA_NOTICE_LOG("shmid: %u\n", shmid);
if (!write_ok(server_socket)) {
PARA_EMERG_LOG("afs_socket not writable\n");
goto destroy;
return ret;
}
-static void init_admissible_files(void)
+static void init_admissible_files(char *arg)
{
- int ret = 0;
- char *arg = conf.afs_initial_mode_arg;
- ret = activate_mood_or_playlist(arg, NULL);
- if (ret >= 0)
- return;
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
- PARA_NOTICE_LOG("defaulting to dummy mood\n");
- activate_mood_or_playlist(NULL, NULL); /* always successful */
+ if (activate_mood_or_playlist(arg, NULL) < 0)
+ activate_mood_or_playlist(NULL, NULL); /* always successful */
}
static int setup_command_socket_or_die(void)
int i, ret;
get_database_dir();
+ PARA_NOTICE_LOG("opening %u osl tables in %s\n", NUM_AFS_TABLES,
+ database_dir);
for (i = 0; i < NUM_AFS_TABLES; i++) {
ret = afs_tables[i].open(database_dir);
if (ret >= 0)
if (st->signum == SIGHUP) {
close_afs_tables();
t->ret = open_afs_tables();
- /* FIXME: Restore current mood or playlist */
if (t->ret < 0)
goto err;
+ init_admissible_files(current_mop);
return;
}
t->ret = -E_AFS_SIGNAL;
return;
}
buf[ret] = '\0';
- PARA_NOTICE_LOG("received: %s\n", buf);
+ PARA_DEBUG_LOG("received: %s\n", buf);
if (!strcmp(buf, "new")) {
ret = open_next_audio_file();
- PARA_NOTICE_LOG("ret: %d\n", ret);
+ if (ret < 0)
+ PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
return;
}
PARA_ERROR_LOG("unknown command\n");
exit(EXIT_FAILURE);
PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
server_socket, (unsigned) cookie);
- init_admissible_files();
+ init_admissible_files(conf.afs_initial_mode_arg);
register_tasks(cookie);
s.default_timeout.tv_sec = 0;
s.default_timeout.tv_usec = 999 * 1000;