#include <lopsub.h>
#include "recv_cmd.lsg.h"
+#include "filter_cmd.lsg.h"
#include "play_cmd.lsg.h"
#include "write_cmd.lsg.h"
#include "play.lsg.h"
#include "recv.h"
#include "write.h"
#include "fd.h"
-
-/**
- * Besides playback tasks which correspond to the receiver/filter/writer nodes,
- * para_play creates two further tasks: The play task and the i9e task. It is
- * important whether a function can be called in the context of para_play or
- * i9e or both. As a rule, all command handlers are called only in i9e context via
- * the line handler (input mode) or the key handler (command mode) below.
- *
- * Playlist handling is done exclusively in play context.
- */
+#include "interactive.h"
/** Array of error strings. */
DEFINE_PARA_ERRLIST;
int err;
if (!pt->wn.task)
- return 0;
+ return 1;
err = task_status(pt->wn.task);
if (err >= 0)
return 0;
return 0;
if (task_status(pt->rn.task) >= 0)
return 0;
- if (err == -E_BTR_EOF || err == -E_RECV_EOF || err == -E_EOF
- || err == -E_WRITE_COMMON_EOF)
+ if (err == -E_EOF)
return 1;
return err;
}
decoder = filter_get(pt->fn.filter_num);
task_reap(&pt->fn.task);
- if (decoder->close)
+ if (decoder && decoder->close)
decoder->close(&pt->fn);
btr_remove_node(&pt->fn.btrn);
+ lls_free_parse_result(pt->fn.lpr, FILTER_CMD(pt->fn.filter_num));
free(pt->fn.conf);
memset(&pt->fn, 0, sizeof(struct filter_node));
task_notify(pt->wn.task, E_EOF);
}
-#ifdef HAVE_READLINE
-
/* only called from com_prev(), nec. only if we have readline */
static int previous_valid_file(void)
{
return -E_NO_VALID_FILES;
}
-#include "interactive.h"
-
/*
* Define the default (internal) key mappings and helper functions to get the
* key sequence or the command from a key id, which is what we obtain from
return para_strdup(default_keyseqs[get_internal_key_map_idx(key)]);
}
-static char *get_user_key_map_seq(int key)
+static char *get_key_map_seq(int key)
{
- const char *kma = get_user_key_map_arg(key);
- const char *p = strchr(kma + 1, ':');
+ const char *kma, *p;
char *result;
int len;
- if (!p)
- return NULL;
+ if (is_internal_key(key))
+ return get_internal_key_map_seq(key);
+ kma = get_user_key_map_arg(key);
+ p = strchr(kma + 1, ':');
+ assert(p); /* We checked earlier that kma contains a colon */
len = p - kma;
result = alloc(len + 1);
memcpy(result, kma, len);
return result;
}
-static char *get_key_map_seq(int key)
-{
- return is_internal_key(key)?
- get_internal_key_map_seq(key) : get_user_key_map_seq(key);
-}
-
static char *get_key_map_seq_safe(int key)
{
const char hex[] = "0123456789abcdef";
return com_next(NULL);
if (pt->playing && !pt->fn.btrn)
return 0;
- pt->start_chunk = percent * pt->num_chunks / 100;
+ pt->start_chunk = (uint64_t)percent * pt->num_chunks / 100;
if (!pt->playing)
return 0;
pt->rq = CRT_REPOS;
seconds += (get_play_time() + 500) / 1000;
seconds = PARA_MIN(seconds, (typeof(seconds))pt->seconds - 4);
seconds = PARA_MAX(seconds, 0);
- pt->start_chunk = pt->num_chunks * seconds / pt->seconds;
+ pt->start_chunk = (uint64_t)pt->num_chunks * seconds / pt->seconds;
pt->start_chunk = PARA_MIN(pt->start_chunk, pt->num_chunks - 1);
pt->start_chunk = PARA_MAX(pt->start_chunk, 0UL);
if (!pt->playing)
char *dot_para = make_message("%s/.paraslash", home);
free(home);
- ret = para_mkdir(dot_para, 0777);
+ ret = para_mkdir(dot_para);
/* warn, but otherwise ignore mkdir error */
- if (ret < 0 && ret != -ERRNO_TO_PARA_ERROR(EEXIST))
+ if (ret < 0)
PARA_WARNING_LOG("Can not create %s: %s\n", dot_para,
para_strerror(-ret));
history_file = make_message("%s/play.history", dot_para);
i9e_print_status_bar(str, len);
}
-/*
- * If we are about to die we must call i9e_close() to reset the terminal.
- * However, i9e_close() must be called in *this* context, i.e. from
- * play_task.post_monitor() rather than from i9e_post_monitor(), because
- * otherwise i9e would access freed memory upon return. So the play task must
- * stay alive until the i9e task terminates.
- *
- * We achieve this by sending a fake SIGTERM signal via i9e_signal_dispatch()
- * and reschedule. In the next iteration, i9e->post_monitor returns an error and
- * terminates. Subsequent calls to i9e_get_error() then return negative and we
- * are allowed to call i9e_close() and terminate as well.
- */
-static int session_post_monitor(__a_unused struct sched *s)
-{
- int ret;
-
- if (pt->background)
- detach_stdout();
- else
- attach_stdout(__FUNCTION__);
- ret = i9e_get_error();
- if (ret < 0) {
- kill_stream();
- i9e_close();
- para_log = stderr_log;
- free(ici.history_file);
- return ret;
- }
- if (get_playback_state() == 'X')
- i9e_signal_dispatch(SIGTERM);
- return 0;
-}
-
-#else /* HAVE_READLINE */
-
-static int session_post_monitor(struct sched *s)
-{
- char c;
-
- if (!sched_read_ok(STDIN_FILENO, s))
- return 0;
- if (read(STDIN_FILENO, &c, 1))
- do_nothing;
- kill_stream();
- return 1;
-}
-
-static void session_open(void)
-{
-}
-
-static void session_update_time_string(char *str, __a_unused unsigned len)
-{
- printf("\r%s ", str);
- fflush(stdout);
-}
-#endif /* HAVE_READLINE */
-
static void play_pre_monitor(struct sched *s, __a_unused void *context)
{
char state;
);
}
-static int play_post_monitor(struct sched *s, __a_unused void *context)
+static int play_post_monitor(__a_unused struct sched *s, __a_unused void *context)
{
- int ret;
+ int ret, i9e_error;
+ if (pt->background)
+ detach_stdout();
+ else
+ attach_stdout(__FUNCTION__);
+ i9e_error = i9e_get_error();
ret = eof_cleanup();
- if (ret < 0) {
- pt->rq = CRT_TERM_RQ;
- return 0;
- }
- ret = session_post_monitor(s);
- if (ret < 0)
- goto out;
+ if (pt->rq == CRT_TERM_RQ || i9e_error < 0) /* com_quit() or CTRL+D */
+ kill_stream(); /* terminate receiver/filter/writer */
+ if ((ret < 0 || pt->rq == CRT_TERM_RQ) && i9e_error >= 0)
+ i9e_signal_dispatch(SIGTERM); /* terminate the i9e task */
+ if (ret < 0) /* unexpected error from the writer node */
+ return ret;
+ if (ret != 0 && i9e_error < 0) /* eof, and i9e has died */
+ return i9e_error;
if (!pt->wn.btrn && !pt->fn.btrn) {
char state = get_playback_state();
if (state == 'P' || state == 'R' || state == 'F') {
if (ret < 0) {
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
pt->rq = CRT_TERM_RQ;
- ret = 1;
- goto out;
+ return 1;
}
pt->next_update = *now;
}
free(str);
tv_add(now, &delay, &pt->next_update);
}
- ret = 1;
-out:
- return ret;
+ return 1;
}
/**
* The main function of para_play.
*
- * \param argc Standard.
- * \param argv Standard.
+ * \param argc See man page.
+ * \param argv See man page.
*
- * \return \p EXIT_FAILURE or \p EXIT_SUCCESS.
+ * para_play distributes its work by submitting various tasks to the paraslash
+ * scheduler. The receiver, filter and writer tasks, which are used to play an
+ * audio file, require one task each to maintain their underlying buffer tree
+ * node. These tasks only exist when an audio file is playing.
+ *
+ * The i9 task, which is submitted and maintained by the i9e subsystem, reads
+ * an input line and calls the corresponding command handler such as com_stop()
+ * which is implemented in this file. The command handlers typically write a
+ * request to the global play_task structure, whose contents are read and acted
+ * upon by another task, the play task.
+ *
+ * As a rule, playlist handling is performed exclusively in play context, i.e.
+ * in the post-monitor step of the play task, while command handlers are only
+ * called in i9e context.
+ *
+ * \return EXIT_FAILURE or EXIT_SUCCESS.
*/
int main(int argc, char *argv[])
{
}, &sched);
ret = schedule(&sched);
sched_shutdown(&sched);
+ i9e_close();
+ wipe_receiver_node();
+ para_log = stderr_log;
+ free(ici.history_file);
if (ret < 0)
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;