-/*
- * Copyright (C) 2012 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2012 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
/** \file play.c Paraslash's standalone player. */
#include <regex.h>
#include <signal.h>
-#include <inttypes.h>
#include <lopsub.h>
#include "recv_cmd.lsg.h"
+#include "play_cmd.lsg.h"
+#include "write_cmd.lsg.h"
+#include "play.lsg.h"
#include "para.h"
#include "list.h"
-#include "play.cmdline.h"
-#include "play_cmd.lsg.h"
#include "error.h"
-#include "ggo.h"
#include "buffer_tree.h"
#include "version.h"
#include "string.h"
#include "afh.h"
#include "recv.h"
#include "write.h"
-#include "write_common.h"
#include "fd.h"
/**
/** Array of error strings. */
DEFINE_PARA_ERRLIST;
+static struct lls_parse_result *play_lpr;
+
+#define CMD_PTR (lls_cmd(0, play_suite))
+#define OPT_RESULT(_name) \
+ (lls_opt_result(LSG_PLAY_PARA_PLAY_OPT_ ## _name, play_lpr))
+#define OPT_GIVEN(_name) (lls_opt_given(OPT_RESULT(_name)))
+#define OPT_UINT32_VAL(_name) (lls_uint32_val(0, OPT_RESULT(_name)))
+#define OPT_STRING_VAL(_name) (lls_string_val(0, OPT_RESULT(_name)))
+
/**
* Describes a request to change the state of para_play.
*
struct filter_node fn;
struct writer_node wn;
- /* See comment to enum state_change_request_type above */
+ /* See comment to enum \ref state_change_request_type above. */
enum state_change_request_type rq;
/* only relevant if rq == CRT_FILE_CHANGE */
unsigned next_file;
char *afhi_txt;
};
-typedef int (*play_cmd_handler_t)(struct play_task *pt,
- struct lls_parse_result *lpr);
+typedef int (*play_cmd_handler_t)(struct lls_parse_result *lpr);
struct play_command_info {
play_cmd_handler_t handler;
};
char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
-/** Iterate over all files in the playlist. */
-#define FOR_EACH_PLAYLIST_FILE(i) for (i = 0; i < conf.inputs_num; i++)
-static struct play_args_info conf;
-
static struct sched sched = {.max_fileno = 0};
-static struct play_task play_task;
+static struct play_task play_task, *pt = &play_task;
#define AFH_RECV_CMD (lls_cmd(LSG_RECV_CMD_CMD_AFH, recv_cmd_suite))
#define AFH_RECV ((struct receiver *)lls_user_data(AFH_RECV_CMD))
-__noreturn static void print_help_and_die(void)
+static unsigned *shuffle_map;
+
+static const char *get_playlist_file(unsigned idx)
{
- struct ggo_help help = DEFINE_GGO_HELP(play);
- unsigned flags = conf.detailed_help_given?
- GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS;
+ return lls_input(shuffle_map[idx], play_lpr);
+}
+
+static void handle_help_flags(void)
+{
+ char *help;
- ggo_print_help(&help, flags);
- printf("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS);
- exit(0);
+ if (OPT_GIVEN(DETAILED_HELP))
+ help = lls_long_help(CMD_PTR);
+ else if (OPT_GIVEN(HELP) || lls_num_inputs(play_lpr) == 0)
+ help = lls_short_help(CMD_PTR);
+ else
+ return;
+ printf("%s\n", help);
+ free(help);
+ exit(EXIT_SUCCESS);
}
static void parse_config_or_die(int argc, char *argv[])
{
- int i, ret;
- char *config_file;
- struct play_cmdline_parser_params params = {
- .override = 0,
- .initialize = 1,
- .check_required = 0,
- .check_ambiguity = 0,
- .print_errors = 1
- };
+ const struct lls_command *cmd = CMD_PTR;
+ int i, ret, cf_argc;
+ char *cf, *errctx, **cf_argv;
+ struct lls_parse_result *cf_lpr, *merged_lpr;
+ unsigned num_kmas;
+ void *map;
+ size_t sz;
- play_cmdline_parser_ext(argc, argv, &conf, ¶ms);
- loglevel = get_loglevel_by_name(conf.loglevel_arg);
- version_handle_flag("play", conf.version_given);
- if (conf.help_given || conf.detailed_help_given)
- print_help_and_die();
- if (conf.config_file_given)
- config_file = para_strdup(conf.config_file_arg);
+ ret = lls(lls_parse(argc, argv, cmd, &play_lpr, &errctx));
+ if (ret < 0)
+ goto fail;
+ loglevel = OPT_UINT32_VAL(LOGLEVEL);
+ version_handle_flag("play", OPT_GIVEN(VERSION));
+ handle_help_flags(); /* also handles the zero-arg case */
+ if (OPT_GIVEN(CONFIG_FILE))
+ cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE));
else {
char *home = para_homedir();
- config_file = make_message("%s/.paraslash/play.conf", home);
+ cf = make_message("%s/.paraslash/play.conf", home);
free(home);
}
- ret = file_exists(config_file);
- if (conf.config_file_given && !ret) {
- PARA_EMERG_LOG("can not read config file %s\n", config_file);
- goto err;
- }
- if (ret) {
- params.initialize = 0;
- params.check_required = 1;
- play_cmdline_parser_config_file(config_file, &conf, ¶ms);
- loglevel = get_loglevel_by_name(conf.loglevel_arg);
+ ret = mmap_full_file(cf, O_RDONLY, &map, &sz, NULL);
+ if (ret < 0) {
+ if (ret != -E_EMPTY && ret != -ERRNO_TO_PARA_ERROR(ENOENT))
+ goto free_cf;
+ if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && OPT_GIVEN(CONFIG_FILE))
+ goto free_cf;
+ ret = 0;
+ goto setup_keymap;
}
- for (i = 0; i < conf.key_map_given; i++) {
- char *kma = conf.key_map_arg[i];
+ ret = lls(lls_convert_config(map, sz, NULL, &cf_argv, &errctx));
+ para_munmap(map, sz);
+ if (ret < 0)
+ goto free_cf;
+ cf_argc = ret;
+ ret = lls(lls_parse(cf_argc, cf_argv, cmd, &cf_lpr, &errctx));
+ lls_free_argv(cf_argv);
+ if (ret < 0)
+ goto free_cf;
+ ret = lls(lls_merge(play_lpr, cf_lpr, cmd, &merged_lpr, &errctx));
+ lls_free_parse_result(cf_lpr, cmd);
+ if (ret < 0)
+ goto free_cf;
+ lls_free_parse_result(play_lpr, cmd);
+ play_lpr = merged_lpr;
+ loglevel = OPT_UINT32_VAL(LOGLEVEL);
+setup_keymap:
+ num_kmas = OPT_GIVEN(KEY_MAP);
+ for (i = 0; i < num_kmas; i++) {
+ const char *kma = lls_string_val(i, OPT_RESULT(KEY_MAP));
if (*kma && strchr(kma + 1, ':'))
continue;
PARA_EMERG_LOG("invalid key map arg: %s\n", kma);
- goto err;
+ goto free_cf;
}
- free(config_file);
- return;
-err:
- free(config_file);
+ ret = 1;
+free_cf:
+ free(cf);
+ if (ret >= 0)
+ return;
+ lls_free_parse_result(play_lpr, cmd);
+fail:
+ if (errctx)
+ PARA_EMERG_LOG("%s\n", errctx);
+ free(errctx);
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
exit(EXIT_FAILURE);
}
-static char get_playback_state(struct play_task *pt)
+static char get_playback_state(void)
{
switch (pt->rq) {
case CRT_NONE: return pt->playing? 'P' : 'U';
assert(false);
};
-static long unsigned get_play_time(struct play_task *pt)
+static long unsigned get_play_time(void)
{
- char state = get_playback_state(pt);
+ char state = get_playback_state();
long unsigned result;
if (state != 'P' && state != 'U')
}
-static void wipe_receiver_node(struct play_task *pt)
+static void wipe_receiver_node(void)
{
PARA_NOTICE_LOG("cleaning up receiver node\n");
btr_remove_node(&pt->rn.btrn);
}
/* returns: 0 not eof, 1: eof, < 0: fatal error. */
-static int get_playback_error(struct play_task *pt)
+static int get_playback_error(void)
{
int err;
return err;
}
-static int eof_cleanup(struct play_task *pt)
+static int eof_cleanup(void)
{
- struct writer *w = writers + DEFAULT_WRITER;
- const struct filter *decoder = filter_get(pt->fn.filter_num);
+ const struct filter *decoder;
+ const struct writer *w = writer_get(-1); /* default writer */
int ret;
- ret = get_playback_error(pt);
+ ret = get_playback_error();
if (ret == 0)
return ret;
PARA_NOTICE_LOG("cleaning up wn/fn nodes\n");
task_reap(&pt->wn.task);
w->close(&pt->wn);
btr_remove_node(&pt->wn.btrn);
- w->free_config(pt->wn.conf);
+ lls_free_parse_result(pt->wn.lpr, WRITE_CMD(pt->wn.wid));
memset(&pt->wn, 0, sizeof(struct writer_node));
+ decoder = filter_get(pt->fn.filter_num);
task_reap(&pt->fn.task);
if (decoder->close)
decoder->close(&pt->fn);
* paused.
*/
if (ret < 0)
- wipe_receiver_node(pt);
+ wipe_receiver_node();
return ret;
}
return para_random(100) - 50;
}
-static void shuffle(char **base, size_t num)
+static void init_shuffle_map(void)
{
+ unsigned n, num_inputs = lls_num_inputs(play_lpr);
+ shuffle_map = para_malloc(num_inputs * sizeof(unsigned));
+ for (n = 0; n < num_inputs; n++)
+ shuffle_map[n] = n;
+ if (!OPT_GIVEN(RANDOMIZE))
+ return;
srandom(time(NULL));
- qsort(base, num, sizeof(char *), shuffle_compare);
+ qsort(shuffle_map, num_inputs, sizeof(unsigned), shuffle_compare);
}
static struct btr_node *new_recv_btrn(struct receiver_node *rn)
.handler = AFH_RECV->execute));
}
-static int open_new_file(struct play_task *pt)
+static int open_new_file(void)
{
int ret;
- char *tmp, *path = conf.inputs[pt->next_file], *errctx = NULL,
- *argv[] = {"play", "-f", path, "-b", "0", NULL};
+ const char *path = get_playlist_file(pt->next_file);
+ char *tmp = para_strdup(path), *errctx;
+ char *argv[] = {"play", "-f", tmp, "-b", "0", NULL};
PARA_NOTICE_LOG("next file: %s\n", path);
- wipe_receiver_node(pt);
+ wipe_receiver_node();
pt->start_chunk = 0;
pt->rn.btrn = new_recv_btrn(&pt->rn);
ret = lls(lls_parse(ARRAY_SIZE(argv) - 1, argv, AFH_RECV_CMD,
}
return 1;
fail:
- wipe_receiver_node(pt);
+ wipe_receiver_node();
return ret;
}
-static int load_file(struct play_task *pt)
+static int load_file(void)
{
const char *af;
char *tmp, buf[20];
int ret;
const struct filter *decoder;
+ static struct lls_parse_result *filter_lpr, *writer_lpr;
btr_remove_node(&pt->rn.btrn);
if (!pt->rn.receiver || pt->next_file != pt->current_file) {
- ret = open_new_file(pt);
+ ret = open_new_file();
if (ret < 0)
return ret;
} else {
/* set up decoding filter */
af = audio_format_name(pt->audio_format_num);
tmp = make_message("%sdec", af);
- PARA_INFO_LOG("decoder: %s\n", tmp);
- ret = check_filter_arg(tmp, &pt->fn.conf);
+ ret = filter_setup(tmp, &pt->fn.conf, &filter_lpr);
freep(&tmp);
if (ret < 0)
goto fail;
pt->fn.filter_num = ret;
+ pt->fn.lpr = filter_lpr;
decoder = filter_get(ret);
pt->fn.btrn = btr_new_node(&(struct btr_node_description)
- EMBRACE(.name = decoder->name, .parent = pt->rn.btrn,
- .handler = decoder->execute, .context = &pt->fn));
+ EMBRACE(.name = filter_name(pt->fn.filter_num),
+ .parent = pt->rn.btrn, .handler = decoder->execute,
+ .context = &pt->fn));
if (decoder->open)
decoder->open(&pt->fn);
PARA_INFO_LOG("buffer tree:\n");
btr_log_tree(pt->rn.btrn, LL_INFO);
/* setup default writer */
- pt->wn.conf = check_writer_arg_or_die(NULL, &pt->wn.writer_num);
-
+ pt->wn.wid = check_writer_arg_or_die(NULL, &writer_lpr);
+ pt->wn.lpr = writer_lpr;
/* success, register tasks */
pt->rn.task = task_register(
&(struct task_info) {
register_writer_node(&pt->wn, pt->fn.btrn, &sched);
return 1;
fail:
- wipe_receiver_node(pt);
+ wipe_receiver_node();
return ret;
}
-static int next_valid_file(struct play_task *pt)
+static int next_valid_file(void)
{
int i, j = pt->current_file;
+ unsigned num_inputs = lls_num_inputs(play_lpr);
- FOR_EACH_PLAYLIST_FILE(i) {
- j = (j + 1) % conf.inputs_num;
+ for (i = 0; i < num_inputs; i++) {
+ j = (j + 1) % num_inputs;
if (!pt->invalid[j])
return j;
}
return -E_NO_VALID_FILES;
}
-static int load_next_file(struct play_task *pt)
+static int load_next_file(void)
{
int ret;
again:
if (pt->rq == CRT_NONE) {
pt->start_chunk = 0;
- ret = next_valid_file(pt);
+ ret = next_valid_file();
if (ret < 0)
return ret;
pt->next_file = ret;
} else if (pt->rq == CRT_REPOS)
pt->next_file = pt->current_file;
- ret = load_file(pt);
+ ret = load_file();
if (ret < 0) {
PARA_ERROR_LOG("%s: marking file as invalid\n",
para_strerror(-ret));
return ret;
}
-static void kill_stream(struct play_task *pt)
+static void kill_stream(void)
{
if (pt->wn.task)
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(struct play_task *pt)
+static int previous_valid_file(void)
{
int i, j = pt->current_file;
+ unsigned num_inputs = lls_num_inputs(play_lpr);
- FOR_EACH_PLAYLIST_FILE(i) {
+ for (i = 0; i < num_inputs; i++) {
j--;
if (j < 0)
- j = conf.inputs_num - 1;
+ j = num_inputs - 1;
if (!pt->invalid[j])
return j;
}
static const char *default_commands[] = {INTERNAL_KEYMAP_ENTRIES};
#undef KEYMAP_ENTRY
#define NUM_INTERNALLY_MAPPED_KEYS ARRAY_SIZE(default_commands)
-#define NUM_MAPPED_KEYS (NUM_INTERNALLY_MAPPED_KEYS + conf.key_map_given)
+#define NUM_MAPPED_KEYS (NUM_INTERNALLY_MAPPED_KEYS + OPT_GIVEN(KEY_MAP))
#define FOR_EACH_MAPPED_KEY(i) for (i = 0; i < NUM_MAPPED_KEYS; i++)
static inline bool is_internal_key(int key)
get_internal_key_map_idx(key) : get_user_key_map_idx(key);
}
-static inline char *get_user_key_map_arg(int key)
+static inline const char *get_user_key_map_arg(int key)
{
- return conf.key_map_arg[get_user_key_map_idx(key)];
+ return lls_string_val(get_user_key_map_idx(key), OPT_RESULT(KEY_MAP));
}
static inline char *get_internal_key_map_seq(int key)
I9E_DUMMY_COMPLETER(info);
I9E_DUMMY_COMPLETER(play);
I9E_DUMMY_COMPLETER(pause);
-I9E_DUMMY_COMPLETER(stop);
I9E_DUMMY_COMPLETER(tasks);
I9E_DUMMY_COMPLETER(quit);
I9E_DUMMY_COMPLETER(ff);
result->matches = i9e_complete_commands(ci->word, pp_completers);
}
-I9E_DUMMY_COMPLETER(SUPERCOMMAND_UNAVAILABLE);
static struct i9e_completer pp_completers[] = {
#define LSG_PLAY_CMD_CMD(_name) {.name = #_name, \
.completer = _name ## _completer}
{.name = NULL}
};
-static void attach_stdout(struct play_task *pt, const char *name)
+static void attach_stdout(const char *name)
{
if (pt->btrn)
return;
i9e_attach_to_stdout(pt->btrn);
}
-static void detach_stdout(struct play_task *pt)
+static void detach_stdout(void)
{
btr_remove_node(&pt->btrn);
}
-static int com_quit(struct play_task *pt,
- __a_unused struct lls_parse_result *lpr)
+static int com_quit(__a_unused struct lls_parse_result *lpr)
{
pt->rq = CRT_TERM_RQ;
return 0;
}
EXPORT_PLAY_CMD_HANDLER(quit);
-static int com_help(struct play_task *pt, struct lls_parse_result *lpr)
+static int com_help(struct lls_parse_result *lpr)
{
int i, ret;
char *buf, *errctx;
}
EXPORT_PLAY_CMD_HANDLER(help);
-static int com_info(struct play_task *pt,
- __a_unused struct lls_parse_result *lpr)
+static int com_info(__a_unused struct lls_parse_result *lpr)
{
char *buf;
size_t sz;
static char dflt[] = "[no information available]";
sz = xasprintf(&buf, "playlist_pos: %u\npath: %s\n",
- pt->current_file, conf.inputs[pt->current_file]);
+ pt->current_file, get_playlist_file(pt->current_file));
btr_add_output(buf, sz, pt->btrn);
buf = pt->afhi_txt? pt->afhi_txt : dflt;
btr_add_output_dont_free(buf, strlen(buf), pt->btrn);
}
EXPORT_PLAY_CMD_HANDLER(info);
-static void list_file(struct play_task *pt, int num)
+static void list_file(int num)
{
char *buf;
size_t sz;
sz = xasprintf(&buf, "%s %4d %s\n", num == pt->current_file?
- "*" : " ", num, conf.inputs[num]);
+ "*" : " ", num, get_playlist_file(num));
btr_add_output(buf, sz, pt->btrn);
}
-static int com_tasks(struct play_task *pt,
- __a_unused struct lls_parse_result *lpr)
+static int com_tasks(__a_unused struct lls_parse_result *lpr)
{
static char state;
char *buf;
buf = get_task_list(&sched);
btr_add_output(buf, strlen(buf), pt->btrn);
- state = get_playback_state(pt);
+ state = get_playback_state();
sz = xasprintf(&buf, "state: %c\n", state);
btr_add_output(buf, sz, pt->btrn);
return 0;
}
EXPORT_PLAY_CMD_HANDLER(tasks);
-static int com_ls(struct play_task *pt,
- __a_unused struct lls_parse_result *lpr)
+static int com_ls(__a_unused struct lls_parse_result *lpr)
{
int i;
+ unsigned num_inputs = lls_num_inputs(play_lpr);
- FOR_EACH_PLAYLIST_FILE(i)
- list_file(pt, i);
+ for (i = 0; i < num_inputs; i++)
+ list_file(i);
return 0;
}
EXPORT_PLAY_CMD_HANDLER(ls);
-static int com_play(struct play_task *pt, struct lls_parse_result *lpr)
+static int com_play(struct lls_parse_result *lpr)
{
int32_t x;
int ret;
free(errctx);
return ret;
}
- state = get_playback_state(pt);
+ state = get_playback_state();
if (lls_num_inputs(lpr) == 0) {
if (state == 'P')
return 0;
ret = para_atoi32(lls_input(0, lpr), &x);
if (ret < 0)
return ret;
- if (x < 0 || x >= conf.inputs_num)
+ if (x < 0 || x >= lls_num_inputs(play_lpr))
return -ERRNO_TO_PARA_ERROR(EINVAL);
- kill_stream(pt);
+ kill_stream();
pt->next_file = x;
pt->rq = CRT_FILE_CHANGE;
return 0;
}
EXPORT_PLAY_CMD_HANDLER(play);
-static int com_pause(struct play_task *pt,
- __a_unused struct lls_parse_result *lpr)
+static int com_pause(__a_unused struct lls_parse_result *lpr)
{
char state;
long unsigned seconds, ss;
- state = get_playback_state(pt);
+ state = get_playback_state();
pt->playing = false;
if (state != 'P')
return 0;
- seconds = get_play_time(pt);
+ seconds = get_play_time();
pt->playing = false;
ss = 0;
if (pt->seconds > 0)
ss = PARA_MAX(ss, 0UL);
ss = PARA_MIN(ss, pt->num_chunks);
pt->start_chunk = ss;
- kill_stream(pt);
+ kill_stream();
return 0;
}
EXPORT_PLAY_CMD_HANDLER(pause);
-static int com_prev(struct play_task *pt,
- __a_unused struct lls_parse_result *lpr)
+static int com_prev(__a_unused struct lls_parse_result *lpr)
{
int ret;
- ret = previous_valid_file(pt);
+ ret = previous_valid_file();
if (ret < 0)
return ret;
- kill_stream(pt);
+ kill_stream();
pt->next_file = ret;
pt->rq = CRT_FILE_CHANGE;
pt->start_chunk = 0;
}
EXPORT_PLAY_CMD_HANDLER(prev);
-static int com_next(struct play_task *pt,
- __a_unused struct lls_parse_result *lpr)
+static int com_next(__a_unused struct lls_parse_result *lpr)
{
int ret;
- ret = next_valid_file(pt);
+ ret = next_valid_file();
if (ret < 0)
return ret;
- kill_stream(pt);
+ kill_stream();
pt->next_file = ret;
pt->rq = CRT_FILE_CHANGE;
pt->start_chunk = 0;
}
EXPORT_PLAY_CMD_HANDLER(next);
-static int com_fg(struct play_task *pt,
- __a_unused struct lls_parse_result *lpr)
+static int com_fg(__a_unused struct lls_parse_result *lpr)
{
pt->background = false;
return 0;
}
EXPORT_PLAY_CMD_HANDLER(fg);
-static int com_bg(struct play_task *pt,
- __a_unused struct lls_parse_result *lpr)
+static int com_bg(__a_unused struct lls_parse_result *lpr)
{
pt->background = true;
return 0;
}
EXPORT_PLAY_CMD_HANDLER(bg);
-static int com_jmp(struct play_task *pt, struct lls_parse_result *lpr)
+static int com_jmp(struct lls_parse_result *lpr)
{
int32_t percent;
int ret;
if (percent < 0 || percent > 100)
return -ERRNO_TO_PARA_ERROR(EINVAL);
if (percent == 100)
- return com_next(pt, NULL);
+ return com_next(NULL);
if (pt->playing && !pt->fn.btrn)
return 0;
pt->start_chunk = percent * pt->num_chunks / 100;
if (!pt->playing)
return 0;
pt->rq = CRT_REPOS;
- kill_stream(pt);
+ kill_stream();
return 0;
}
EXPORT_PLAY_CMD_HANDLER(jmp);
-static int com_ff(struct play_task *pt, struct lls_parse_result *lpr)
+static int com_ff(struct lls_parse_result *lpr)
{
int32_t seconds;
char *errctx;
return ret;
if (pt->playing && !pt->fn.btrn)
return 0;
- seconds += get_play_time(pt);
+ seconds += get_play_time();
seconds = PARA_MIN(seconds, (typeof(seconds))pt->seconds - 4);
seconds = PARA_MAX(seconds, 0);
pt->start_chunk = pt->num_chunks * seconds / pt->seconds;
if (!pt->playing)
return 0;
pt->rq = CRT_REPOS;
- kill_stream(pt);
+ kill_stream();
return 0;
}
EXPORT_PLAY_CMD_HANDLER(ff);
-static int run_command(char *line, struct play_task *pt)
+static int run_command(char *line)
{
int ret, argc;
char **argv = NULL;
struct lls_parse_result *lpr;
const struct lls_command *cmd;
- attach_stdout(pt, __FUNCTION__);
+ attach_stdout(__FUNCTION__);
ret = create_argv(line, " ", &argv);
if (ret < 0)
goto out;
if (ret < 0)
goto out;
pci = lls_user_data(cmd);
- ret = pci->handler(pt, lpr);
+ ret = pci->handler(lpr);
lls_free_parse_result(lpr, cmd);
out:
if (errctx)
static int play_i9e_line_handler(char *line)
{
- return run_command(line, &play_task);
+ return run_command(line);
}
static int play_i9e_key_handler(int key)
{
- struct play_task *pt = &play_task;
int idx = get_key_map_idx(key);
char *seq = get_key_map_seq(key);
char *cmd = get_key_map_cmd(key);
PARA_NOTICE_LOG("pressed %d: %s key #%d (%s -> %s)\n",
key, internal? "internal" : "user-defined",
idx, seq, cmd);
- run_command(cmd, pt);
+ run_command(cmd);
free(seq);
free(cmd);
pt->next_update = *now;
static void sigint_handler(int sig)
{
- play_task.background = true;
+ pt->background = true;
i9e_signal_dispatch(sig);
}
* stderr. Once the i9e subsystem has been initialized, we switch to the i9e
* log facility.
*/
-static void session_open(struct play_task *pt)
+static void session_open(void)
{
int ret;
char *history_file;
struct sigaction act;
PARA_NOTICE_LOG("\n%s\n", version_text("play"));
- if (conf.history_file_given)
- history_file = para_strdup(conf.history_file_arg);
+ if (OPT_GIVEN(HISTORY_FILE))
+ history_file = para_strdup(OPT_STRING_VAL(HISTORY_FILE));
else {
char *home = para_homedir();
history_file = make_message("%s/.paraslash/play.history",
exit(EXIT_FAILURE);
}
-static void session_update_time_string(struct play_task *pt, char *str, unsigned len)
+static void session_update_time_string(char *str, unsigned len)
{
if (pt->background)
return;
* 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_select(__a_unused struct sched *s, struct play_task *pt)
+static int session_post_select(__a_unused struct sched *s)
{
int ret;
if (pt->background)
- detach_stdout(pt);
+ detach_stdout();
else
- attach_stdout(pt, __FUNCTION__);
+ attach_stdout(__FUNCTION__);
ret = i9e_get_error();
if (ret < 0) {
- kill_stream(pt);
+ kill_stream();
i9e_close();
para_log = stderr_log;
free(ici.history_file);
return ret;
}
- if (get_playback_state(pt) == 'X')
+ if (get_playback_state() == 'X')
i9e_signal_dispatch(SIGTERM);
return 0;
}
#else /* HAVE_READLINE */
-static int session_post_select(struct sched *s, struct play_task *pt)
+static int session_post_select(struct sched *s)
{
char c;
return 0;
if (read(STDIN_FILENO, &c, 1))
do_nothing;
- kill_stream(pt);
+ kill_stream();
return 1;
}
-static void session_open(__a_unused struct play_task *pt)
+static void session_open(void)
{
}
-static void session_update_time_string(__a_unused struct play_task *pt,
- char *str, __a_unused unsigned len)
+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_select(struct sched *s, void *context)
+static void play_pre_select(struct sched *s, __a_unused void *context)
{
- struct play_task *pt = context;
char state;
para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
- state = get_playback_state(pt);
+ state = get_playback_state();
if (state == 'R' || state == 'F' || state == 'X')
return sched_min_delay(s);
sched_request_barrier_or_min_delay(&pt->next_update, s);
}
-static unsigned get_time_string(struct play_task *pt, char **result)
+static unsigned get_time_string(char **result)
{
int seconds, length;
- char state = get_playback_state(pt);
+ char state = get_playback_state();
/* do not return anything if things are about to change */
if (state != 'P' && state != 'U') {
length = pt->seconds;
if (length == 0)
return xasprintf(result, "0:00 [0:00] (0%%/0:00)");
- seconds = get_play_time(pt);
+ seconds = get_play_time();
return xasprintf(result, "#%u: %d:%02d [%d:%02d] (%d%%/%d:%02d) %s",
pt->current_file,
seconds / 60,
length? (seconds * 100 + length / 2) / length : 0,
length / 60,
length % 60,
- conf.inputs[pt->current_file]
+ get_playlist_file(pt->current_file)
);
}
-static int play_post_select(struct sched *s, void *context)
+static int play_post_select(struct sched *s, __a_unused void *context)
{
- struct play_task *pt = context;
int ret;
- ret = eof_cleanup(pt);
+ ret = eof_cleanup();
if (ret < 0) {
pt->rq = CRT_TERM_RQ;
return 0;
}
- ret = session_post_select(s, pt);
+ ret = session_post_select(s);
if (ret < 0)
goto out;
if (!pt->wn.btrn && !pt->fn.btrn) {
- char state = get_playback_state(pt);
+ char state = get_playback_state();
if (state == 'P' || state == 'R' || state == 'F') {
PARA_NOTICE_LOG("state: %c\n", state);
- ret = load_next_file(pt);
+ ret = load_next_file();
if (ret < 0) {
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
pt->rq = CRT_TERM_RQ;
}
if (tv_diff(now, &pt->next_update, NULL) >= 0) {
char *str;
- unsigned len = get_time_string(pt, &str);
+ unsigned len = get_time_string(&str);
struct timeval delay = {.tv_sec = 0, .tv_usec = 100 * 1000};
if (str && len > 0)
- session_update_time_string(pt, str, len);
+ session_update_time_string(str, len);
free(str);
tv_add(now, &delay, &pt->next_update);
}
int main(int argc, char *argv[])
{
int ret;
- struct play_task *pt = &play_task;
+ unsigned num_inputs;
/* needed this early to make help work */
recv_init();
- filter_init();
- writer_init();
sched.default_timeout.tv_sec = 5;
-
parse_config_or_die(argc, argv);
- if (conf.inputs_num == 0)
- print_help_and_die();
AFH_RECV->init();
- session_open(pt);
- if (conf.randomize_given)
- shuffle(conf.inputs, conf.inputs_num);
- pt->invalid = para_calloc(sizeof(*pt->invalid) * conf.inputs_num);
+ session_open();
+ num_inputs = lls_num_inputs(play_lpr);
+ init_shuffle_map();
+ pt->invalid = para_calloc(sizeof(*pt->invalid) * num_inputs);
pt->rq = CRT_FILE_CHANGE;
- pt->current_file = conf.inputs_num - 1;
+ pt->current_file = num_inputs - 1;
pt->playing = true;
pt->task = task_register(&(struct task_info){
.name = "play",
projects / paraslash.git / blobdiff