# include "config.h"
#endif
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-
#define _XOPEN_SOURCE_EXTENDED 1
+
+#include <assert.h>
#include <wchar.h>
+#include <sys/stat.h>
+#include <math.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <ncurses.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>
#include <vlc_fs.h>
#include <vlc_url.h>
-#include <assert.h>
-
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
add_directory("browse-dir", NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false)
vlc_module_end ()
+#include "eject.c"
+
/*****************************************************************************
* intf_sys_t: description and status of ncurses interface
*****************************************************************************/
struct intf_sys_t
{
+ vlc_thread_t thread;
input_thread_t *p_input;
bool color;
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;
/* Search Box context */
char search_chain[20];
- char *old_search;
- int before_search;
/* Open Box Context */
char open_chain[50];
intf_sys_t *sys = intf->p_sys;
playlist_t *p_playlist = pl_Get(intf);
- PL_LOCK;
PlaylistDestroy(sys);
PlaylistAddNode(sys, p_playlist->p_root_onelevel, "");
- PL_UNLOCK;
}
static int ItemChanged(vlc_object_t *p_this, const char *variable,
return -1;
}
-static void SearchPlaylist(intf_sys_t *sys, char *str)
+static void SearchPlaylist(intf_sys_t *sys)
{
- int i_first = sys->before_search;
+ char *str = sys->search_chain;
+ int i_first = sys->box_idx;
if (i_first < 0)
i_first = 0;
- if (!str || !*str) {
- sys->box_idx = sys->before_search;
+ if (!str || !*str)
return;
- }
int i_item = SubSearchPlaylist(sys, str, i_first + 1, sys->plist_entries);
if (i_item < 0)
/* Input */
if (sys->color) color_set(C_CATEGORY, NULL);
- MainBoxWrite(sys, l++, _(" [Incoming]"));
+ MainBoxWrite(sys, l++, _("+-[Incoming]"));
if (sys->color) color_set(C_DEFAULT, NULL);
- MainBoxWrite(sys, l++, _(" input bytes read : %8.0f KiB"),
+ MainBoxWrite(sys, l++, _("| input bytes read : %8.0f KiB"),
(float)(p_stats->i_read_bytes)/1024);
- MainBoxWrite(sys, l++, _(" input bitrate : %6.0f kb/s"),
+ MainBoxWrite(sys, l++, _("| input bitrate : %6.0f kb/s"),
p_stats->f_input_bitrate*8000);
- MainBoxWrite(sys, l++, _(" demux bytes read : %8.0f KiB"),
+ MainBoxWrite(sys, l++, _("| demux bytes read : %8.0f KiB"),
(float)(p_stats->i_demux_read_bytes)/1024);
- MainBoxWrite(sys, l++, _(" demux bitrate : %6.0f kb/s"),
+ MainBoxWrite(sys, l++, _("| demux bitrate : %6.0f kb/s"),
p_stats->f_demux_bitrate*8000);
/* Video */
if (i_video) {
if (sys->color) color_set(C_CATEGORY, NULL);
- MainBoxWrite(sys, l++, _(" [Video Decoding]"));
+ MainBoxWrite(sys, l++, _("+-[Video Decoding]"));
if (sys->color) color_set(C_DEFAULT, NULL);
- MainBoxWrite(sys, l++, _(" video decoded : %"PRId64),
+ MainBoxWrite(sys, l++, _("| video decoded : %5"PRIi64),
p_stats->i_decoded_video);
- MainBoxWrite(sys, l++, _(" frames displayed : %"PRId64),
+ MainBoxWrite(sys, l++, _("| frames displayed : %5"PRIi64),
p_stats->i_displayed_pictures);
- MainBoxWrite(sys, l++, _(" frames lost : %"PRId64),
+ MainBoxWrite(sys, l++, _("| frames lost : %5"PRIi64),
p_stats->i_lost_pictures);
}
/* Audio*/
if (i_audio) {
if (sys->color) color_set(C_CATEGORY, NULL);
- MainBoxWrite(sys, l++, _(" [Audio Decoding]"));
+ MainBoxWrite(sys, l++, _("+-[Audio Decoding]"));
if (sys->color) color_set(C_DEFAULT, NULL);
- MainBoxWrite(sys, l++, _(" audio decoded : %"PRId64),
+ MainBoxWrite(sys, l++, _("| audio decoded : %5"PRIi64),
p_stats->i_decoded_audio);
- MainBoxWrite(sys, l++, _(" buffers played : %"PRId64),
+ MainBoxWrite(sys, l++, _("| buffers played : %5"PRIi64),
p_stats->i_played_abuffers);
- MainBoxWrite(sys, l++, _(" buffers lost : %"PRId64),
+ MainBoxWrite(sys, l++, _("| buffers lost : %5"PRIi64),
p_stats->i_lost_abuffers);
}
/* Sout */
if (sys->color) color_set(C_CATEGORY, NULL);
- MainBoxWrite(sys, l++, _(" [Streaming]"));
+ MainBoxWrite(sys, l++, _("+-[Streaming]"));
if (sys->color) color_set(C_DEFAULT, NULL);
- MainBoxWrite(sys, l++, _(" packets sent : %5i"), p_stats->i_sent_packets);
- MainBoxWrite(sys, l++, _(" bytes sent : %8.0f KiB"),
+ MainBoxWrite(sys, l++, _("| packets sent : %5"PRIi64), p_stats->i_sent_packets);
+ MainBoxWrite(sys, l++, _("| bytes sent : %8.0f KiB"),
(float)(p_stats->i_sent_bytes)/1025);
- MainBoxWrite(sys, l++, _(" sending bitrate : %6.0f kb/s"),
+ MainBoxWrite(sys, l++, _("| sending bitrate : %6.0f kb/s"),
p_stats->f_send_bitrate*8000);
if (sys->color) color_set(C_DEFAULT, NULL);
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"));
/* 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 */
H(_(" O Reverse order Playlist by title"));
H(_(" g Go to the current playing item"));
H(_(" / Look for an item"));
+ H(_(" ; Look for the next item"));
H(_(" A Add an entry"));
/* xgettext: You can use ⌫ character to translate <backspace> */
H(_(" D, <backspace>, <del> Delete an entry"));
intf_sys_t *sys = intf->p_sys;
playlist_t *p_playlist = pl_Get(intf);
+ PL_LOCK;
vlc_mutex_lock(&sys->pl_lock);
if (sys->need_update) {
PlaylistRebuild(intf);
sys->need_update = false;
}
vlc_mutex_unlock(&sys->pl_lock);
+ PL_UNLOCK;
if (sys->plidx_follow)
FindIndex(sys, p_playlist);
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);
};
char buf1[MSTRTIME_MAX_SIZE];
char buf2[MSTRTIME_MAX_SIZE];
- unsigned i_volume;
+ float volume;
case INIT_S:
case END_S:
mvnprintw(y++, 0, COLS, _(" Position : %s/%s"), buf1, buf2);
- i_volume = aout_VolumeGet(p_playlist);
- mvnprintw(y++, 0, COLS, _(" Volume : %u%%"),
- i_volume*100/AOUT_VOLUME_DEFAULT);
+ 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");
static void FillTextBox(intf_sys_t *sys)
{
int width = COLS - 2;
- const char *title = sys->box_type == BOX_OPEN ? "Open: %s" : "Find: %s";
- char *chain = sys->box_type == BOX_OPEN ? sys->open_chain :
- sys->old_search ? sys->old_search :
- sys->search_chain;
DrawEmptyLine(7, 1, width);
- mvnprintw(7, 1, width, _(title), chain);
+ if (sys->box_type == BOX_OPEN)
+ mvnprintw(7, 1, width, _("Open: %s"), sys->open_chain);
+ else
+ mvnprintw(7, 1, width, _("Find: %s"), sys->search_chain);
}
static void FillBox(intf_thread_t *intf)
vlc_mutex_unlock(&sys->pl_lock);
return true;
+ case ';':
+ SearchPlaylist(sys);
+ return true;
+
case 'g':
FindIndex(sys, p_playlist);
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;
return false;
}
+static void OpenSelection(intf_thread_t *intf)
+{
+ intf_sys_t *sys = intf->p_sys;
+ char *uri = vlc_path2uri(sys->open_chain, NULL);
+ if (uri == NULL)
+ return;
+
+ playlist_t *p_playlist = pl_Get(intf);
+ vlc_mutex_lock(&sys->pl_lock);
+ playlist_item_t *p_parent = sys->node;
+ vlc_mutex_unlock(&sys->pl_lock);
+
+ PL_LOCK;
+ if (!p_parent) {
+ playlist_item_t *current;
+ current= playlist_CurrentPlayingItem(p_playlist);
+ p_parent = current ? current->p_parent : NULL;
+ if (!p_parent)
+ p_parent = p_playlist->p_local_onelevel;
+ }
+
+ while (p_parent->p_parent && p_parent->p_parent->p_parent)
+ p_parent = p_parent->p_parent;
+ PL_UNLOCK;
+
+ playlist_Add(p_playlist, uri, NULL,
+ PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END,
+ p_parent->p_input == p_playlist->p_local_onelevel->p_input,
+ false);
+
+ sys->plidx_follow = true;
+ free(uri);
+}
+
static void HandleEditBoxKey(intf_thread_t *intf, int key, int box)
{
intf_sys_t *sys = intf->p_sys;
case KEY_ENTER:
case '\r':
case '\n':
- if (search) {
- if (len)
- sys->old_search = strdup(sys->search_chain);
- else if (sys->old_search)
- SearchPlaylist(sys, sys->old_search);
- } else if (len) {
- char *uri = make_URI(sys->open_chain, NULL);
- if (uri == NULL) {
- sys->box_type = BOX_PLAYLIST;
- return;
- }
-
- playlist_t *p_playlist = pl_Get(intf);
- vlc_mutex_lock(&sys->pl_lock);
- playlist_item_t *p_parent = sys->node;
- vlc_mutex_unlock(&sys->pl_lock);
-
- PL_LOCK;
- if (!p_parent) {
- playlist_item_t *current;
- current= playlist_CurrentPlayingItem(p_playlist);
- p_parent = current ? current->p_parent : NULL;
- if (!p_parent)
- p_parent = p_playlist->p_local_onelevel;
- }
-
- while (p_parent->p_parent && p_parent->p_parent->p_parent)
- p_parent = p_parent->p_parent;
- PL_UNLOCK;
-
- playlist_Add(p_playlist, uri, NULL,
- PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END,
- p_parent->p_input == p_playlist->p_local_onelevel->p_input,
- false);
+ if (search)
+ SearchPlaylist(sys);
+ else
+ OpenSelection(intf);
- free(uri);
- sys->plidx_follow = true;
- }
sys->box_type = BOX_PLAYLIST;
return;
* following function-key sequence.
*
*/
- if (getch() != ERR)
- return;
-
- if (search) sys->box_idx = sys->before_search;
- sys->box_type = BOX_PLAYLIST;
+ if (getch() == ERR)
+ sys->box_type = BOX_PLAYLIST;
return;
case KEY_BACKSPACE:
}
}
- if (search) {
- free(sys->old_search);
- sys->old_search = NULL;
- SearchPlaylist(sys, str);
- }
+ if (search)
+ SearchPlaylist(sys);
}
static void InputNavigate(input_thread_t* p_input, const char *var)
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 'S': BoxSwitch(sys, BOX_STATS); return;
case '/': /* Search */
- sys->search_chain[0] = '\0';
sys->plidx_follow = false;
- if (sys->box_type == BOX_PLAYLIST) {
- sys->before_search = sys->box_idx;
- sys->box_type = BOX_SEARCH;
- } else {
- sys->before_search = 0;
- BoxSwitch(sys, BOX_SEARCH);
- }
+ BoxSwitch(sys, BOX_SEARCH);
return;
case 'A': /* Open */
sys->open_chain[0] = '\0';
- if (sys->box_type == BOX_PLAYLIST)
- sys->box_type = BOX_OPEN;
- else
- BoxSwitch(sys, BOX_OPEN);
+ BoxSwitch(sys, BOX_OPEN);
return;
/* Navigation */
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 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;
/*****************************************************************************
* 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) {
+ while (!sys->exit) {
UpdateInput(sys, p_playlist);
Redraw(intf);
HandleKey(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);
- 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);
if (!sys)
return VLC_ENOMEM;
vlc_mutex_init(&sys->pl_lock);
sys->verbosity = var_InheritInteger(intf, "verbose");
- sys->sub = vlc_Subscribe(MsgCallback, sys);
+ vlc_LogSet(intf->p_libvlc, MsgCallback, sys);
sys->box_type = BOX_PLAYLIST;
sys->plidx_follow = true;
msg_Err(intf, "Couldn't close stderr (%m)");
ReadDir(intf);
+ PL_LOCK;
PlaylistRebuild(intf),
+ PL_UNLOCK;
+
+ if (vlc_clone(&sys->thread, Run, intf, VLC_THREAD_PRIORITY_LOW))
+ abort(); /* TODO */
- intf->pf_run = Run;
return VLC_SUCCESS;
}
{
intf_sys_t *sys = ((intf_thread_t*)p_this)->p_sys;
+ vlc_join(sys->thread, NULL);
+
PlaylistDestroy(sys);
DirsDestroy(sys);
free(sys->current_dir);
- free(sys->old_search);
if (sys->p_input)
vlc_object_release(sys->p_input);
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