#include <wchar.h>
#include <sys/stat.h>
#include <math.h>
+#include <errno.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_vout.h>
-#include <vlc_aout_intf.h>
#include <vlc_charset.h>
#include <vlc_input.h>
#include <vlc_es.h>
struct intf_sys_t
{
+ vlc_thread_t thread;
input_thread_t *p_input;
bool color;
bool exit;
+ /* rgb values for the color yellow */
+ short yellow_r;
+ short yellow_g;
+ short yellow_b;
+
int box_type;
int box_y; // start of box content
int box_height;
int box_start; // first line of box displayed
int box_idx; // selected line
- msg_subscription_t sub; // message bank subscription
struct
{
int type;
- msg_item_t *item;
+ vlc_log_t *item;
char *msg;
} msgs[50]; // ring buffer
int i_msgs;
DIR *current_dir = vlc_opendir(sys->current_dir);
if (!current_dir) {
- msg_Warn(intf, "cannot open directory `%s' (%m)", sys->current_dir);
+ msg_Warn(intf, "cannot open directory `%s' (%s)", sys->current_dir,
+ vlc_strerror_c(errno));
return;
}
DirsDestroy(sys);
- char *entry;
+ const char *entry;
while ((entry = vlc_readdir(current_dir))) {
if (!sys->show_hidden_files && *entry == '.' && strcmp(entry, ".."))
- goto next;
+ continue;
struct dir_entry_t *dir_entry = malloc(sizeof *dir_entry);
- if (!dir_entry)
- goto next;
+ if (unlikely(dir_entry == NULL))
+ continue;
dir_entry->file = IsFile(sys->current_dir, entry);
- dir_entry->path = entry;
+ dir_entry->path = xstrdup(entry);
INSERT_ELEM(sys->dir_entries, sys->n_dir_entries,
sys->n_dir_entries, dir_entry);
continue;
-
-next:
- free(entry);
}
qsort(sys->dir_entries, sys->n_dir_entries,
static void start_color_and_pairs(intf_thread_t *intf)
{
+ intf_sys_t *sys = intf->p_sys;
+
if (!has_colors()) {
- intf->p_sys->color = false;
+ sys->color = false;
msg_Warn(intf, "Terminal doesn't support colors");
return;
}
init_pair(i, color_pairs[i].f, color_pairs[i].b);
/* untested, in all my terminals, !can_change_color() --funman */
- if (can_change_color())
+ if (can_change_color()) {
+ color_content(COLOR_YELLOW, &sys->yellow_r, &sys->yellow_g, &sys->yellow_b);
init_color(COLOR_YELLOW, 960, 500, 0); /* YELLOW -> ORANGE */
+ }
}
static void DrawBox(int y, int h, bool color, const char *title)
return;
va_start(vl_args, p_fmt);
- if (vasprintf(&p_buf, p_fmt, vl_args) == -1)
- return;
+ int i_ret = vasprintf(&p_buf, p_fmt, vl_args);
va_end(vl_args);
+ if (i_ret == -1)
+ return;
+
len = strlen(p_buf);
wchar_t wide[len + 1];
return;
va_start(vl_args, p_fmt);
- if (vasprintf(&p_buf, p_fmt, vl_args) == -1)
- return;
+ int i_ret = vasprintf(&p_buf, p_fmt, vl_args);
va_end(vl_args);
+ if (i_ret == -1)
+ return;
if (b_selected) attron(A_REVERSE);
mvnprintw(sys->box_y + l - sys->box_start, 1, COLS - 2, "%s", p_buf);
vlc_list_t *list = vlc_list_children(p_obj);
for (int i = 0; i < list->i_count ; i++) {
- l = SubDrawObject(sys, l, list->p_values[i].p_object, i_level,
+ l = SubDrawObject(sys, l, list->p_values[i].p_address, i_level,
(i == list->i_count - 1) ? "`-" : "|-" );
}
vlc_list_release(list);
if (sys->color) color_set(C_DEFAULT, NULL);
H(_(" h,H Show/Hide help box"));
H(_(" i Show/Hide info box"));
- H(_(" m Show/Hide metadata box"));
+ H(_(" M Show/Hide metadata box"));
H(_(" L Show/Hide messages box"));
H(_(" P Show/Hide playlist box"));
H(_(" B Show/Hide filebrowser"));
H(_(" s Stop"));
H(_(" <space> Pause/Play"));
H(_(" f Toggle Fullscreen"));
+ H(_(" c Cycle through audio tracks"));
+ H(_(" v Cycle through subtitles tracks"));
+ H(_(" b Cycle through video tracks"));
H(_(" n, p Next/Previous playlist item"));
H(_(" [, ] Next/Previous title"));
H(_(" <, > Next/Previous chapter"));
/* xgettext: You can use ← and → characters */
H(_(" <left>,<right> Seek -/+ 1%%"));
H(_(" a, z Volume Up/Down"));
+ H(_(" m Mute"));
/* xgettext: You can use ↑ and ↓ characters */
H(_(" <up>,<down> Navigate through the box line by line"));
/* xgettext: You can use ⇞ and ⇟ characters */
vlc_mutex_lock(&sys->msg_lock);
int i = sys->i_msgs;
for(;;) {
- msg_item_t *msg = sys->msgs[i].item;
+ vlc_log_t *msg = sys->msgs[i].item;
if (msg) {
if (sys->color)
color_set(sys->msgs[i].type + C_INFO, NULL);
intf_sys_t *sys = intf->p_sys;
input_thread_t *p_input = sys->p_input;
playlist_t *p_playlist = pl_Get(intf);
- static const char name[] = "VLC media player "PACKAGE_VERSION;
- const size_t name_len = sizeof name - 1; /* without \0 termination */
+ char *name = _("VLC media player");
+ const size_t name_len = strlen(name) + sizeof(PACKAGE_VERSION);
int y = 0;
const char *repeat, *loop, *random;
attrset(A_REVERSE);
if (sys->color) color_set(C_TITLE, NULL);
DrawEmptyLine(y, 0, COLS);
- mvnprintw(y++, padding / 2, COLS, "%s", name);
+ mvnprintw(y++, padding / 2, COLS, "%s %s", name, PACKAGE_VERSION);
if (sys->color) color_set(C_STATUS, NULL);
attroff(A_REVERSE);
mvnprintw(y++, 0, COLS, _(" Position : %s/%s"), buf1, buf2);
- volume = aout_VolumeGet(p_playlist);
- if (volume >= 0.f)
- mvnprintw(y++, 0, COLS, _(" Volume : %3ld%%"),
- lroundf(volume * 100.f));
- else
- mvnprintw(y++, 0, COLS, _(" Volume : ----"),
- lroundf(volume * 100.f));
+ volume = playlist_VolumeGet(p_playlist);
+ int mute = playlist_MuteGet(p_playlist);
+ mvnprintw(y++, 0, COLS,
+ mute ? _(" Volume : Mute") :
+ volume >= 0.f ? _(" Volume : %3ld%%") : _(" Volume : ----"),
+ lroundf(volume * 100.f));
if (!var_Get(p_input, "title", &val)) {
int i_title_count = var_CountChoices(p_input, "title");
playlist_NodeDelete(p_playlist, item, true , false);
PL_UNLOCK;
vlc_mutex_lock(&sys->pl_lock);
+ if (sys->box_idx >= sys->box_lines_total - 1)
+ sys->box_idx = sys->box_lines_total - 2;
sys->need_update = true;
vlc_mutex_unlock(&sys->pl_lock);
return true;
return true;
}
- char *uri = make_URI(path, dir_entry->file ? "file"
- : "directory");
+ char *uri = vlc_path2uri(path, "file");
free(path);
if (uri == NULL)
return true;
static void OpenSelection(intf_thread_t *intf)
{
intf_sys_t *sys = intf->p_sys;
- char *uri = make_URI(sys->open_chain, NULL);
+ char *uri = vlc_path2uri(sys->open_chain, NULL);
if (uri == NULL)
return;
var_TriggerCallback(p_input, var);
}
+static void CycleESTrack(intf_sys_t *sys, const char *var)
+{
+ input_thread_t *input = sys->p_input;
+
+ if (!input)
+ return;
+
+ vlc_value_t val;
+ if (var_Change(input, var, VLC_VAR_GETCHOICES, &val, NULL) < 0)
+ return;
+
+ vlc_list_t *list = val.p_list;
+ int64_t current = var_GetInteger(input, var);
+
+ int i;
+ for (i = 0; i < list->i_count; i++)
+ if (list->p_values[i].i_int == current)
+ break;
+
+ if (++i >= list->i_count)
+ i = 0;
+ var_SetInteger(input, var, list->p_values[i].i_int);
+}
+
static void HandleCommonKey(intf_thread_t *intf, int key)
{
intf_sys_t *sys = intf->p_sys;
case 'h':
case 'H': BoxSwitch(sys, BOX_HELP); return;
case 'i': BoxSwitch(sys, BOX_INFO); return;
- case 'm': BoxSwitch(sys, BOX_META); return;
+ case 'M': BoxSwitch(sys, BOX_META); return;
case 'L': BoxSwitch(sys, BOX_LOG); return;
case 'P': BoxSwitch(sys, BOX_PLAYLIST); return;
case 'B': BoxSwitch(sys, BOX_BROWSE); return;
case 'p': playlist_Prev(p_playlist); break;
case 'n': playlist_Next(p_playlist); break;
- case 'a': aout_VolumeUp(p_playlist, 1, NULL); break;
- case 'z': aout_VolumeDown(p_playlist, 1, NULL); break;
+ case 'a': playlist_VolumeUp(p_playlist, 1, NULL); break;
+ case 'z': playlist_VolumeDown(p_playlist, 1, NULL); break;
+ case 'm': playlist_MuteToggle(p_playlist); break;
+
+ case 'c': CycleESTrack(sys, "audio-es"); break;
+ case 'v': CycleESTrack(sys, "spu-es"); break;
+ case 'b': CycleESTrack(sys, "video-es"); break;
case 0x0c: /* ^l */
case KEY_CLEAR:
/*
*
*/
-static msg_item_t *msg_Copy (const msg_item_t *msg)
+static vlc_log_t *msg_Copy (const vlc_log_t *msg)
{
- msg_item_t *copy = (msg_item_t *)xmalloc (sizeof (*copy));
+ vlc_log_t *copy = (vlc_log_t *)xmalloc (sizeof (*copy));
copy->i_object_id = msg->i_object_id;
copy->psz_object_type = msg->psz_object_type;
copy->psz_module = strdup (msg->psz_module);
return copy;
}
-static void msg_Free (msg_item_t *msg)
+static void msg_Free (vlc_log_t *msg)
{
free ((char *)msg->psz_module);
free ((char *)msg->psz_header);
free (msg);
}
-static void MsgCallback(void *data, int type, const msg_item_t *msg,
+static void MsgCallback(void *data, int type, const vlc_log_t *msg,
const char *format, va_list ap)
{
intf_sys_t *sys = data;
}
}
+static void cleanup_run(void *data)
+{
+ intf_thread_t *intf = data;
+ playlist_t *p_playlist = pl_Get(intf);
+ var_DelCallback(p_playlist, "intf-change", PlaylistChanged, intf);
+ var_DelCallback(p_playlist, "item-change", ItemChanged, intf);
+ var_DelCallback(p_playlist, "playlist-item-append", PlaylistChanged, intf);
+}
+
/*****************************************************************************
* Run: ncurses thread
*****************************************************************************/
-static void Run(intf_thread_t *intf)
+static void *Run(void *data)
{
+ intf_thread_t *intf = data;
intf_sys_t *sys = intf->p_sys;
playlist_t *p_playlist = pl_Get(intf);
- int canc = vlc_savecancel();
-
var_AddCallback(p_playlist, "intf-change", PlaylistChanged, intf);
var_AddCallback(p_playlist, "item-change", ItemChanged, intf);
var_AddCallback(p_playlist, "playlist-item-append", PlaylistChanged, intf);
- while (vlc_object_alive(intf) && !sys->exit) {
+ vlc_cleanup_push(cleanup_run, data);
+ while (!sys->exit) {
UpdateInput(sys, p_playlist);
Redraw(intf);
HandleKey(intf);
}
+ vlc_cleanup_pop();
- var_DelCallback(p_playlist, "intf-change", PlaylistChanged, intf);
- var_DelCallback(p_playlist, "item-change", ItemChanged, intf);
- var_DelCallback(p_playlist, "playlist-item-append", PlaylistChanged, intf);
- vlc_restorecancel(canc);
+ return NULL;
}
/*****************************************************************************
{
intf_thread_t *intf = (intf_thread_t *)p_this;
intf_sys_t *sys = intf->p_sys = calloc(1, sizeof(intf_sys_t));
- playlist_t *p_playlist = pl_Get(p_this);
+ playlist_t *p_playlist = pl_Get(intf);
if (!sys)
return VLC_ENOMEM;
vlc_mutex_init(&sys->pl_lock);
sys->verbosity = var_InheritInteger(intf, "verbose");
- vlc_Subscribe(&sys->sub, MsgCallback, sys);
+ vlc_LogSet(intf->p_libvlc, MsgCallback, sys);
sys->box_type = BOX_PLAYLIST;
sys->plidx_follow = true;
/* Stop printing errors to the console */
if (!freopen("/dev/null", "wb", stderr))
- msg_Err(intf, "Couldn't close stderr (%m)");
+ msg_Err(intf, "Couldn't close stderr (%s)", vlc_strerror_c(errno));
ReadDir(intf);
PL_LOCK;
PlaylistRebuild(intf),
PL_UNLOCK;
- intf->pf_run = Run;
+ if (vlc_clone(&sys->thread, Run, intf, VLC_THREAD_PRIORITY_LOW))
+ abort(); /* TODO */
+
return VLC_SUCCESS;
}
{
intf_sys_t *sys = ((intf_thread_t*)p_this)->p_sys;
+ vlc_cancel(sys->thread);
+ vlc_join(sys->thread, NULL);
+
PlaylistDestroy(sys);
DirsDestroy(sys);
if (sys->p_input)
vlc_object_release(sys->p_input);
+ if (can_change_color())
+ /* Restore yellow to its original color */
+ init_color(COLOR_YELLOW, sys->yellow_r, sys->yellow_g, sys->yellow_b);
+
endwin(); /* Close the ncurses interface */
- vlc_Unsubscribe(&sys->sub);
+ vlc_LogSet(p_this->p_libvlc, NULL, NULL);
vlc_mutex_destroy(&sys->msg_lock);
vlc_mutex_destroy(&sys->pl_lock);
for(unsigned i = 0; i < sizeof sys->msgs / sizeof *sys->msgs; i++) {
projects / vlc / blobdiff