/*****************************************************************************
- * ncurses.c : NCurses plugin for vlc
+ * ncurses.c : NCurses interface for vlc
*****************************************************************************
- * Copyright (C) 2001-2006 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
* $Id$
*
* Authors: Sam Hocevar <sam@zoy.org>
* Laurent Aimar <fenrir@via.ecp.fr>
* Yoann Peronneau <yoann@videolan.org>
* Derk-Jan Hartman <hartman at videolan dot org>
+ * Rafaël Carré <funman@videolanorg>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <errno.h> /* ENOMEM */
#include <time.h>
-#ifdef HAVE_NCURSESW_CURSES_H
-#include <ncursesw/curses.h>
-#else
-#include <curses.h>
+#ifdef HAVE_NCURSESW
+# define _XOPEN_SOURCE_EXTENDED 1
#endif
+#include <ncurses.h>
+
#include <vlc_interface.h>
#include <vlc_vout.h>
#include <vlc_aout.h>
#include <vlc_charset.h>
#include <vlc_input.h>
#include <vlc_playlist.h>
+#include <vlc_meta.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#ifdef HAVE_VCDX
#define VCD_MRL "vcdx://"
#else
-#define VCD_MRL "vcdx://"
+#define VCD_MRL "vcd://"
#endif
#define SEARCH_CHAIN_SIZE 20
BOX_PLAYLIST,
BOX_SEARCH,
BOX_OPEN,
- BOX_BROWSE
+ BOX_BROWSE,
+ BOX_META
};
enum
{
};
struct intf_sys_t
{
- playlist_t *p_playlist;
input_thread_t *p_input;
float f_slider;
int i_box_plidx; /* Playlist index */
int b_box_plidx_follow;
- playlist_item_t *p_plnode; /* Playlist node */
int i_box_bidx; /* browser index */
+ playlist_item_t *p_node; /* current node */
+
int b_box_cleared;
msg_subscription_t* p_sub; /* message bank subscription */
/* Allocate instance and initialize some members */
p_sys = p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
- p_sys->p_playlist = NULL;
+ p_sys->p_node = NULL;
p_sys->p_input = NULL;
p_sys->f_slider = 0.0;
p_sys->f_slider_old = 0.0;
p_sys->b_box_plidx_follow = VLC_TRUE;
p_sys->b_box_cleared = VLC_FALSE;
p_sys->i_box_plidx = 0;
- p_sys->p_plnode = NULL;
p_sys->i_box_bidx = 0;
p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
memset( p_sys->psz_partial_keys, 0, sizeof( p_sys->psz_partial_keys ) );
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
intf_sys_t *p_sys = p_intf->p_sys;
+ playlist_t *p_playlist = pl_Get( p_intf );
int i;
- var_DelCallback( p_sys->p_playlist, "intf-change", PlaylistChanged,
- p_intf );
- var_DelCallback( p_sys->p_playlist, "item-append", PlaylistChanged,
- p_intf );
+ var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
+ var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
PlaylistDestroy( p_intf );
{
vlc_object_release( p_sys->p_input );
}
- if( p_sys->p_playlist )
- {
- vlc_object_release( p_sys->p_playlist );
- }
+ pl_Release( p_intf );
/* Close the ncurses interface */
endwin();
static void Run( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
+ playlist_t *p_playlist = pl_Yield( p_intf );
int i_key;
time_t t_last_refresh;
msleep( INTF_IDLE_SLEEP );
/* Update the input */
- if( p_sys->p_playlist == NULL )
- {
- p_sys->p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_sys->p_playlist )
- {
- var_AddCallback( p_sys->p_playlist, "intf-change",
- PlaylistChanged, p_intf );
- var_AddCallback( p_sys->p_playlist, "item-append",
- PlaylistChanged, p_intf );
- }
- }
- if( p_sys->p_playlist )
+ var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
+ var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
+
+ PL_LOCK;
+ if( p_sys->p_input == NULL )
{
- vlc_mutex_lock( &p_sys->p_playlist->object_lock );
- if( p_sys->p_input == NULL )
+ p_sys->p_input = p_playlist->p_input;
+ if( p_sys->p_input )
{
- p_sys->p_input = p_sys->p_playlist->p_input;
- if( p_sys->p_input )
+ if( !p_sys->p_input->b_dead )
{
- if( !p_sys->p_input->b_dead )
- {
- vlc_object_yield( p_sys->p_input );
- }
+ vlc_object_yield( p_sys->p_input );
}
}
- else if( p_sys->p_input->b_dead )
- {
- vlc_object_release( p_sys->p_input );
- p_sys->p_input = NULL;
- p_sys->f_slider = p_sys->f_slider_old = 0.0;
- p_sys->b_box_cleared = VLC_FALSE;
- }
- vlc_mutex_unlock( &p_sys->p_playlist->object_lock );
}
+ else if( p_sys->p_input->b_dead )
+ {
+ vlc_object_release( p_sys->p_input );
+ p_sys->p_input = NULL;
+ p_sys->f_slider = p_sys->f_slider_old = 0.0;
+ p_sys->b_box_cleared = VLC_FALSE;
+ }
+ PL_UNLOCK;
- if( p_sys->b_box_plidx_follow && p_sys->p_playlist->status.p_item )
+ if( p_sys->b_box_plidx_follow && p_playlist->status.p_item )
{
FindIndex( p_intf );
}
}
/* following functions are local */
-
static char *KeyToUTF8( int i_key, char *psz_part )
{
- char *psz_utf8, *psz;
+ char *psz_utf8;
int len = strlen( psz_part );
if( len == 6 )
{
psz_part[len] = (char)i_key;
+#ifdef HAVE_NCURSESW
+ psz_utf8 = strdup( psz_part );
+#else
psz_utf8 = FromLocaleDup( psz_part );
/* Ugly check for incomplete bytes sequences
* (in case of non-UTF8 multibyte local encoding) */
+ char *psz;
for( psz = psz_utf8; *psz; psz++ )
if( ( *psz == '?' ) && ( *psz_utf8 != '?' ) )
{
free( psz_utf8 );
return NULL;
}
+#endif
memset( psz_part, 0, 6 );
return psz_utf8;
{
intf_sys_t *p_sys = p_intf->p_sys;
vlc_value_t val;
+ playlist_t *p_playlist = pl_Get( p_intf );
- if( p_sys->i_box_type == BOX_PLAYLIST && p_sys->p_playlist )
+ if( p_sys->i_box_type == BOX_PLAYLIST )
{
int b_ret = VLC_TRUE;
vlc_bool_t b_box_plidx_follow = VLC_FALSE;
vlc_value_t val;
/* Playlist Settings */
case 'r':
- var_Get( p_sys->p_playlist, "random", &val );
+ var_Get( p_playlist, "random", &val );
val.b_bool = !val.b_bool;
- var_Set( p_sys->p_playlist, "random", val );
+ var_Set( p_playlist, "random", val );
return 1;
case 'l':
- var_Get( p_sys->p_playlist, "loop", &val );
+ var_Get( p_playlist, "loop", &val );
val.b_bool = !val.b_bool;
- var_Set( p_sys->p_playlist, "loop", val );
+ var_Set( p_playlist, "loop", val );
return 1;
case 'R':
- var_Get( p_sys->p_playlist, "repeat", &val );
+ var_Get( p_playlist, "repeat", &val );
val.b_bool = !val.b_bool;
- var_Set( p_sys->p_playlist, "repeat", val );
+ var_Set( p_playlist, "repeat", val );
return 1;
/* Playlist sort */
case 'o':
- playlist_RecursiveNodeSort( p_sys->p_playlist,
+ playlist_RecursiveNodeSort( p_playlist,
PlaylistGetRoot( p_intf ),
SORT_TITLE_NODES_FIRST, ORDER_NORMAL );
p_sys->b_need_update = VLC_TRUE;
return 1;
case 'O':
- playlist_RecursiveNodeSort( p_sys->p_playlist,
+ playlist_RecursiveNodeSort( p_playlist,
PlaylistGetRoot( p_intf ),
SORT_TITLE_NODES_FIRST, ORDER_REVERSE );
p_sys->b_need_update = VLC_TRUE;
return 1;
/* Playlist navigation */
+ case 'g':
+ FindIndex( p_intf );
+ break;
case KEY_HOME:
p_sys->i_box_plidx = 0;
break;
+#ifdef __FreeBSD__
+/* workaround for FreeBSD + xterm:
+ * see http://www.nabble.com/curses-vs.-xterm-key-mismatch-t3574377.html */
+ case KEY_SELECT:
+#endif
case KEY_END:
- p_sys->i_box_plidx = p_sys->p_playlist->items.i_size - 1;
+ p_sys->i_box_plidx = p_playlist->items.i_size - 1;
break;
case KEY_UP:
p_sys->i_box_plidx--;
case KEY_BACKSPACE:
case KEY_DC:
{
- playlist_t *p_playlist = p_sys->p_playlist;
playlist_item_t *p_item;
- vlc_mutex_lock( &p_playlist->object_lock );
+ PL_LOCK;
p_item = p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
if( p_item->i_children == -1 )
{
playlist_NodeDelete( p_playlist, p_item,
VLC_TRUE , VLC_FALSE );
}
- vlc_mutex_unlock( &p_playlist->object_lock );
- p_sys->b_need_update = VLC_TRUE;
-
+ PL_UNLOCK;
+ PlaylistRebuild( p_intf );
break;
}
case KEY_ENTER:
case 0x0d:
+ if( !p_sys->pp_plist || !p_sys->pp_plist[p_sys->i_box_plidx] )
+ {
+ b_ret = VLC_FALSE;
+ break;
+ }
if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children
== -1 )
{
- playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
- VLC_TRUE, NULL,
- p_sys->pp_plist[p_sys->i_box_plidx]->p_item );
+ playlist_item_t *p_item, *p_parent;
+ p_item = p_parent =
+ p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
+
+ if( !p_parent )
+ p_parent = p_playlist->p_root_onelevel;
+ while( p_parent->p_parent )
+ p_parent = p_parent->p_parent;
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
+ VLC_TRUE, p_parent, p_item );
+ }
+ else if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children
+ == 0 )
+ { /* We only want to set the current node */
+ playlist_Stop( p_playlist );
+ p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
}
else
{
- playlist_Control( p_sys->p_playlist, PLAYLIST_VIEWPLAY,
- VLC_TRUE,
- p_sys->pp_plist[p_sys->i_box_plidx]->p_item,
- NULL );
+ p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, VLC_TRUE,
+ p_sys->pp_plist[p_sys->i_box_plidx]->p_item, NULL );
}
b_box_plidx_follow = VLC_TRUE;
break;
case KEY_HOME:
p_sys->i_box_bidx = 0;
break;
+#ifdef __FreeBSD__
+ case KEY_SELECT:
+#endif
case KEY_END:
p_sys->i_box_bidx = p_sys->i_dir_entries - 1;
break;
char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path );
- /* XXX
- playlist_Add( p_sys->p_playlist, psz_uri,
- psz_uri,
- PLAYLIST_APPEND, PLAYLIST_END );
- */
+
+ playlist_item_t *p_parent = p_sys->p_node;
+ if( !p_parent )
+ p_parent = p_playlist->status.p_node;
+ 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;
+
+ playlist_Add( p_playlist, psz_uri, NULL, PLAYLIST_APPEND,
+ PLAYLIST_END,
+ p_parent->p_input ==
+ p_playlist->p_local_onelevel->p_input
+ , VLC_FALSE );
+
p_sys->i_box_type = BOX_PLAYLIST;
free( psz_uri );
}
return 1;
}
}
- else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO )
+ else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO ||
+ p_sys->i_box_type == BOX_META )
{
switch( i_key )
{
case KEY_HOME:
p_sys->i_box_start = 0;
return 1;
+#ifdef __FreeBSD__
+ case KEY_SELECT:
+#endif
case KEY_END:
p_sys->i_box_start = p_sys->i_box_lines_total - 1;
return 1;
p_sys->f_slider = 0;
ManageSlider( p_intf );
return 1;
+#ifdef __FreeBSD__
+ case KEY_SELECT:
+#endif
case KEY_END:
p_sys->f_slider = 99.9;
ManageSlider( p_intf );
else if( p_sys->i_box_type == BOX_OPEN && p_sys->psz_open_chain )
{
int i_chain_len = strlen( p_sys->psz_open_chain );
- playlist_t *p_playlist = p_sys->p_playlist;
switch( i_key )
{
return 1;
case KEY_ENTER:
case 0x0d:
- if( p_playlist && i_chain_len > 0 )
+ if( i_chain_len > 0 )
{
- /*
- playlist_Add( p_playlist, p_sys->psz_open_chain,
- p_sys->psz_open_chain,
- PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END );
- */
+ playlist_item_t *p_parent = p_sys->p_node;
+
+ if( !p_parent )
+ p_parent = p_playlist->status.p_node;
+ 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;
+
+ playlist_Add( p_playlist, p_sys->psz_open_chain, NULL,
+ PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END,
+ p_parent->p_input ==
+ p_playlist->p_local_onelevel->p_input
+ , VLC_FALSE );
+
p_sys->b_box_plidx_follow = VLC_TRUE;
}
p_sys->i_box_type = BOX_PLAYLIST;
p_sys->i_box_type = BOX_INFO;
p_sys->i_box_lines_total = 0;
return 1;
+ case 'm':
+ if( p_sys->i_box_type == BOX_META )
+ p_sys->i_box_type = BOX_NONE;
+ else
+ p_sys->i_box_type = BOX_META;
+ p_sys->i_box_lines_total = 0;
+ return 1;
case 'L':
if( p_sys->i_box_type == BOX_LOG )
p_sys->i_box_type = BOX_NONE;
}
else
{
- playlist_t *p_playlist;
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- var_Get( p_playlist, "fullscreen", &val );
- val.b_bool = !val.b_bool;
- var_Set( p_playlist, "fullscreen", val );
- vlc_object_release( p_playlist );
- }
+ var_Get( p_playlist, "fullscreen", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_playlist, "fullscreen", val );
}
}
return 0;
return 1;
case 's':
- if( p_intf->p_sys->p_playlist )
- {
- playlist_Stop( p_intf->p_sys->p_playlist );
- }
+ playlist_Stop( p_playlist );
return 1;
case 'e':
return 1;
case 'p':
- if( p_intf->p_sys->p_playlist )
- {
- playlist_Prev( p_intf->p_sys->p_playlist );
- }
+ playlist_Prev( p_playlist );
clear();
return 1;
case 'n':
- if( p_intf->p_sys->p_playlist )
- {
- playlist_Next( p_intf->p_sys->p_playlist );
- }
+ playlist_Next( p_playlist );
clear();
return 1;
va_list vl_args;
char *p_buf = NULL;
int i_len;
-#ifdef HAVE_NCURSESW_CURSES_H
- size_t i_char_len; /* UCS character length */
- size_t i_width; /* Display width */
- wchar_t *psz_wide; /* wchar_t representation of p_buf */
-#endif
va_start( vl_args, p_fmt );
- vasprintf( &p_buf, p_fmt, vl_args );
+ if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 )
+ return;
va_end( vl_args );
if( ( p_buf == NULL ) || ( w <= 0 ) )
return;
i_len = strlen( p_buf );
-#ifdef HAVE_NCURSESW_CURSES_H
- psz_wide = (wchar_t *) malloc( sizeof( wchar_t ) * ( i_len + 1 ) );
- i_char_len = mbstowcs( psz_wide, p_buf, i_len );
+#ifdef HAVE_NCURSESW
+ wchar_t psz_wide[i_len + 1];
+
+ EnsureUTF8( p_buf );
+ size_t i_char_len = mbstowcs( psz_wide, p_buf, i_len );
+
+ size_t i_width; /* number of columns */
- if( i_char_len == -1 ) /* an invalid character was encountered */
- i_width = i_len;
+ if( i_char_len == (size_t)-1 )
+ /* an invalid character was encountered */
+ abort();
else
{
i_width = wcswidth( psz_wide, i_char_len );
- if( i_width == -1 ) /* a non printable character was encountered */
- i_width = i_len;
+ if( i_width == (size_t)-1 )
+ {
+ /* a non printable character was encountered */
+ unsigned int i;
+ int i_cwidth;
+ i_width = 0;
+ for( i = 0 ; i < i_char_len ; i++ )
+ {
+ i_cwidth = wcwidth( psz_wide[i] );
+ if( i_cwidth != -1 )
+ i_width += i_cwidth;
+ }
+ }
+ }
+ if( i_width > (size_t)w )
+ {
+ int i_total_width = 0;
+ int i = 0;
+ while( i_total_width < w )
+ {
+ i_total_width += wcwidth( psz_wide[i] );
+ if( w > 7 && i_total_width >= w/2 )
+ {
+ psz_wide[i ] = '.';
+ psz_wide[i+1] = '.';
+ i_total_width -= wcwidth( psz_wide[i] ) - 2;
+ if( i > 0 )
+ {
+ /* we require this check only if at least one character
+ * 4 or more columns wide exists (which i doubt) */
+ psz_wide[i-1] = '.';
+ i_total_width -= wcwidth( psz_wide[i-1] ) - 1;
+ }
+
+ /* find the widest string */
+ int j, i_2nd_width = 0;
+ for( j = i_char_len - 1; i_2nd_width < w - i_total_width; j-- )
+ i_2nd_width += wcwidth( psz_wide[j] );
+
+ /* we already have i_total_width columns filled, and we can't
+ * have more than w columns */
+ if( i_2nd_width > w - i_total_width )
+ j++;
+
+ wmemmove( &psz_wide[i+2], &psz_wide[j+1], i_char_len - j - 1 );
+ psz_wide[i + 2 + i_char_len - j - 1] = '\0';
+ break;
+ }
+ i++;
+ }
+ if( w <= 7 ) /* we don't add the '...' else we lose too much chars */
+ psz_wide[i] = '\0';
+
+ size_t i_wlen = wcslen( psz_wide ) * 6 + 1; /* worst case */
+ char psz_ellipsized[i_wlen];
+ wcstombs( psz_ellipsized, psz_wide, i_wlen );
+ mvprintw( y, x, "%s", psz_ellipsized );
+ }
+ else
+ {
+ mvprintw( y, x, "%s", p_buf );
+ mvhline( y, x + i_width, ' ', w - i_width );
}
- if( i_width > w )
#else
if( i_len > w )
-#endif
- { /* FIXME: ncursesw: ellipsize psz_wide while keeping the width in mind */
- char *psz_local;
+ {
int i_cut = i_len - w;
int x1 = i_len/2 - i_cut/2;
int x2 = x1 + i_cut;
p_buf[w/2 ] = '.';
p_buf[w/2+1] = '.';
}
- psz_local = ToLocale( p_buf );
+ char *psz_local = ToLocale( p_buf );
mvprintw( y, x, "%s", psz_local );
LocaleFree( p_buf );
}
char *psz_local = ToLocale( p_buf );
mvprintw( y, x, "%s", psz_local );
LocaleFree( p_buf );
-#ifdef HAVE_NCURSESW_CURSES_H
- mvhline( y, x + i_width, ' ', w - i_width );
-#else
mvhline( y, x + i_len, ' ', w - i_len );
-#endif
}
+#endif
}
static void MainBoxWrite( intf_thread_t *p_intf, int l, int x, const char *p_fmt, ... )
{
}
va_start( vl_args, p_fmt );
- vasprintf( &p_buf, p_fmt, vl_args );
+ if( vasprintf( &p_buf, p_fmt, vl_args ) == -1 )
+ return;
va_end( vl_args );
if( p_buf == NULL )
{
intf_sys_t *p_sys = p_intf->p_sys;
input_thread_t *p_input = p_sys->p_input;
+ playlist_t *p_playlist = pl_Get( p_intf );
int y = 0;
int h;
int y_end;
/* Title */
attrset( A_REVERSE );
- mvnprintw( y, 0, COLS, "VLC media player" " (ncurses interface) [ h for help ]" );
+ int i_len = strlen( "VLC media player [ h for help ]" );
+ int mid = ( COLS - i_len ) / 2;
+ if( mid < 0 )
+ mid = 0;
+ int i_size = ( COLS > i_len + 1 ) ? COLS : i_len + 1;
+ char psz_title[i_size];
+ memset( psz_title, ' ', mid );
+ snprintf( &psz_title[mid], i_size, "VLC media player [ h for help ]" );
+ mvnprintw( y, 0, COLS, "%s", psz_title );
attroff( A_REVERSE );
y += 2;
/* Infos */
+
+ char psz_state[25];
+ /* strlen( "[Repeat] [Random] [Loop]" ) == 24, + '\0' */
+ psz_state[0] = '\0';
+ if( var_GetBool( p_playlist, "repeat" ) )
+ strcat( psz_state, "[Repeat] " );
+ if( var_GetBool( p_playlist, "random" ) )
+ strcat( psz_state, "[Random] " );
+ if( var_GetBool( p_playlist, "loop" ) )
+ strcat( psz_state, "[Loop]" );
+
if( p_input && !p_input->b_dead )
{
char buf1[MSTRTIME_MAX_SIZE];
var_Get( p_input, "state", &val );
if( val.i_int == PLAYING_S )
{
- mvnprintw( y++, 0, COLS, " State : Playing" );
+ mvnprintw( y++, 0, COLS, " State : Playing %s", psz_state );
}
else if( val.i_int == OPENING_S )
{
- mvnprintw( y++, 0, COLS, " State : Openning/Connecting" );
+ mvnprintw( y++, 0, COLS, " State : Opening/Connecting %s", psz_state );
}
else if( val.i_int == BUFFERING_S )
{
- mvnprintw( y++, 0, COLS, " State : Buffering" );
+ mvnprintw( y++, 0, COLS, " State : Buffering %s", psz_state );
}
else if( val.i_int == PAUSE_S )
{
- mvnprintw( y++, 0, COLS, " State : Paused" );
- }
- else
- {
- y++;
+ mvnprintw( y++, 0, COLS, " State : Paused %s", psz_state );
}
+
if( val.i_int != INIT_S && val.i_int != END_S )
{
audio_volume_t i_volume;
}
else
{
- mvnprintw( y++, 0, COLS, "Source: <no current item>" );
+ mvnprintw( y++, 0, COLS, "Source: <no current item> %s", psz_state );
DrawEmptyLine( p_sys->w, y++, 0, COLS );
DrawEmptyLine( p_sys->w, y++, 0, COLS );
DrawEmptyLine( p_sys->w, y++, 0, COLS );
MainBoxWrite( p_intf, l++, 1, "[Display]" );
MainBoxWrite( p_intf, l++, 1, " h,H Show/Hide help box" );
MainBoxWrite( p_intf, l++, 1, " i Show/Hide info box" );
+ MainBoxWrite( p_intf, l++, 1, " m Show/Hide metadata box" );
MainBoxWrite( p_intf, l++, 1, " L Show/Hide messages box" );
MainBoxWrite( p_intf, l++, 1, " P Show/Hide playlist box" );
MainBoxWrite( p_intf, l++, 1, " B Show/Hide filebrowser" );
MainBoxWrite( p_intf, l++, 1, "" );
MainBoxWrite( p_intf, l++, 1, "[Playlist]" );
- MainBoxWrite( p_intf, l++, 1, " r Random" );
- MainBoxWrite( p_intf, l++, 1, " l Loop Playlist" );
- MainBoxWrite( p_intf, l++, 1, " R Repeat item" );
+ MainBoxWrite( p_intf, l++, 1, " r Toggle Random playing" );
+ MainBoxWrite( p_intf, l++, 1, " l Toggle Loop Playlist" );
+ MainBoxWrite( p_intf, l++, 1, " R Toggle Repeat item" );
MainBoxWrite( p_intf, l++, 1, " o Order Playlist by title" );
MainBoxWrite( p_intf, l++, 1, " O Reverse order Playlist by title" );
+ MainBoxWrite( p_intf, l++, 1, " g Go to the current playing item" );
MainBoxWrite( p_intf, l++, 1, " / Look for an item" );
MainBoxWrite( p_intf, l++, 1, " A Add an entry" );
MainBoxWrite( p_intf, l++, 1, " D, <del> Delete an entry" );
y += p_sys->i_box_lines;
}
}
+ else if( p_sys->i_box_type == BOX_META )
+ {
+ /* Meta data box */
+ int l = 0;
+
+ int i_len = strlen( VLC_META_INFO_CAT );
+ char psz_title[i_len + 3];
+ psz_title[0] = ' ';
+ psz_title[1] = '\0';
+ strcat( &psz_title[1], VLC_META_INFO_CAT );
+ psz_title[i_len + 1] = ' ';
+ psz_title[i_len + 2] = '\0';
+ DrawBox( p_sys->w, y++, 0, h, COLS, psz_title );
+
+ if( p_input )
+ {
+ int i;
+ input_item_t *p_item = input_GetItem( p_input );
+ vlc_mutex_lock( &p_item->lock );
+ for( i=0; i<VLC_META_TYPE_COUNT; i++ )
+ {
+ if( y >= y_end ) break;
+ char *psz_meta = p_item->p_meta->ppsz_meta[i];
+ if( psz_meta && *psz_meta )
+ {
+ const char *psz_meta_title;
+ switch( i )
+ {
+ case 0:
+ psz_meta_title = VLC_META_TITLE; break;
+ case 1:
+ psz_meta_title = VLC_META_ARTIST; break;
+ case 2:
+ psz_meta_title = VLC_META_GENRE ; break;
+ case 3:
+ psz_meta_title = VLC_META_COPYRIGHT; break;
+ case 4:
+ psz_meta_title = VLC_META_COLLECTION; break;
+ case 5:
+ psz_meta_title = VLC_META_SEQ_NUM; break;
+ case 6:
+ psz_meta_title = VLC_META_DESCRIPTION; break;
+ case 7:
+ psz_meta_title = VLC_META_RATING; break;
+ case 8:
+ psz_meta_title = VLC_META_DATE; break;
+ case 9:
+ psz_meta_title = VLC_META_SETTING; break;
+ case 10:
+ psz_meta_title = VLC_META_URL; break;
+ case 11:
+ psz_meta_title = VLC_META_LANGUAGE; break;
+ case 12:
+ psz_meta_title = VLC_META_NOW_PLAYING; break;
+ case 13:
+ psz_meta_title = VLC_META_PUBLISHER; break;
+ case 14:
+ psz_meta_title = VLC_META_ENCODED_BY; break;
+ case 15:
+ psz_meta_title = VLC_META_ART_URL; break;
+ case 16:
+ psz_meta_title = VLC_META_TRACKID; break;
+ default:
+ psz_meta_title = ""; break;
+ }
+ MainBoxWrite( p_intf, l++, 1, " [%s]", psz_meta_title );
+ MainBoxWrite( p_intf, l++, 1, " %s", psz_meta );
+ }
+ }
+ vlc_mutex_unlock( &p_item->lock );
+ }
+ else
+ {
+ MainBoxWrite( p_intf, l++, 1, "No item currently playing" );
+ }
+ p_sys->i_box_lines_total = l;
+ if( p_sys->i_box_start >= p_sys->i_box_lines_total )
+ {
+ p_sys->i_box_start = p_sys->i_box_lines_total - 1;
+ }
+
+ if( l - p_sys->i_box_start < p_sys->i_box_lines )
+ {
+ y += l - p_sys->i_box_start;
+ }
+ else
+ {
+ y += p_sys->i_box_lines;
+ }
+ }
else if( p_sys->i_box_type == BOX_LOG )
{
int i_line = 0;
}
}
- else if( ( p_sys->i_box_type == BOX_PLAYLIST ||
+ else if( p_sys->i_box_type == BOX_PLAYLIST ||
p_sys->i_box_type == BOX_SEARCH ||
- p_sys->i_box_type == BOX_OPEN ) && p_sys->p_playlist )
+ p_sys->i_box_type == BOX_OPEN )
{
/* Playlist box */
int i_start, i_stop, i_max = p_sys->i_plist_entries;
for( i_item = i_start; i_item < i_stop; i_item++ )
{
vlc_bool_t b_selected = ( p_sys->i_box_plidx == i_item );
- int c = ( PlaylistIsPlaying( p_intf,
- p_sys->pp_plist[i_item]->p_item ) ) ? '>' : ' ';
+ playlist_item_t *p_item = p_sys->pp_plist[i_item]->p_item;
+ playlist_item_t *p_node = p_sys->p_node;
+ int c = ' ';
+ if( ( p_node && p_item->p_input == p_node->p_input ) ||
+ ( !p_node && p_item->p_input ==
+ p_playlist->status.p_node->p_input ) )
+ c = '*';
+ else if( p_item == p_node || ( p_item != p_node &&
+ PlaylistIsPlaying( p_intf, p_item ) ) )
+ c = '>';
if( y >= y_end ) break;
if( b_selected )
static playlist_item_t *PlaylistGetRoot( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = p_sys->p_playlist;
-
- if( p_playlist == NULL )
- {
- return NULL;
- }
+ playlist_t *p_playlist = pl_Get( p_intf );
switch( p_sys->i_current_view )
{
static void PlaylistRebuild( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = p_sys->p_playlist;
-
- if( p_playlist == NULL )
- {
- return;
- }
+ playlist_t *p_playlist = pl_Get( p_intf );
- vlc_mutex_lock( &p_playlist->object_lock );
+ PL_LOCK;
/* First clear the old one */
PlaylistDestroy( p_intf );
p_sys->b_need_update = VLC_FALSE;
- vlc_mutex_unlock( &p_playlist->object_lock );
+ PL_UNLOCK;
}
static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node,
{
intf_sys_t *p_sys = p_intf->p_sys;
playlist_item_t *p_child;
- char *psz_tmp;
int k;
- psz_tmp = (char *)malloc( strlen( c ) + 4 );
- if( psz_tmp == NULL ) return;
for( k = 0; k < p_node->i_children; k++ )
{
- struct pl_item_t *p_pl_item;
- char *buff;
- int i_size;
-
+ char *psz_display;
p_child = p_node->pp_children[k];
- i_size = strlen( c ) + strlen( p_child->p_input->psz_name ) + 4;
- buff = (char *)malloc( sizeof( char ) * i_size );
- p_pl_item = (struct pl_item_t *)malloc( sizeof( struct pl_item_t ) );
- if( p_pl_item == NULL || buff == NULL ) return;
+ char *psz_name = input_item_GetTitle( p_child->p_input );
+ if( !psz_name || !*psz_name )
+ {
+ free( psz_name );
+ psz_name = input_item_GetName( p_child->p_input );
+ }
- if( strlen( c ) )
+ if( c && *c )
{
- sprintf( buff, "%s%c-%s", c, k == p_node->i_children - 1 ?
- '`' : '|', p_child->p_input->psz_name );
+ if( asprintf( &psz_display, "%s%c-%s", c,
+ k == p_node->i_children - 1 ? '`' : '|', psz_name ) == -1 )
+ return;
}
else
{
- sprintf( buff, " %s", p_child->p_input->psz_name );
+ if( asprintf( &psz_display, " %s", psz_name ) == -1 )
+ return;
}
- p_pl_item->psz_display = strdup( buff );
+ free( psz_name );
+ struct pl_item_t *p_pl_item = malloc( sizeof( struct pl_item_t ) );
+ if( !p_pl_item )
+ return;
+ p_pl_item->psz_display = psz_display;
p_pl_item->p_item = p_child;
INSERT_ELEM( p_sys->pp_plist, p_sys->i_plist_entries,
p_sys->i_plist_entries, p_pl_item );
- free( buff );
i++;
if( p_child->i_children > 0 )
{
- sprintf( psz_tmp, "%s%c ", c,
- k == p_node->i_children - 1 ? ' ' : '|' );
+ char *psz_tmp;
+ if( asprintf( &psz_tmp, "%s%c ", c,
+ k == p_node->i_children - 1 ? ' ' : '|' ) == -1 )
+ return;
PlaylistAddNode( p_intf, p_child, i,
strlen( c ) ? psz_tmp : " " );
+ free( psz_tmp );
}
}
- free( psz_tmp );
}
static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t oval, vlc_value_t nval, void *param )
{
intf_thread_t *p_intf = (intf_thread_t *)param;
+ playlist_t *p_playlist = pl_Get( p_intf );
p_intf->p_sys->b_need_update = VLC_TRUE;
+ p_intf->p_sys->p_node = p_playlist->status.p_node;
return VLC_SUCCESS;
}
static inline vlc_bool_t PlaylistIsPlaying( intf_thread_t *p_intf,
playlist_item_t *p_item )
{
- playlist_item_t *p_played_item = p_intf->p_sys->p_playlist->status.p_item;
+ playlist_t *p_playlist = pl_Get( p_intf );
+ playlist_item_t *p_played_item = p_playlist->status.p_item;
return( p_item != NULL && p_played_item != NULL &&
p_item->p_input != NULL && p_played_item->p_input != NULL &&
p_item->p_input->i_id == p_played_item->p_input->i_id );
intf_sys_t *p_sys = p_intf->p_sys;
int i;
- if( p_sys->i_box_plidx < p_sys->i_plist_entries &&
- p_sys->i_box_plidx >= 0 &&
- PlaylistIsPlaying( p_intf,
- p_sys->pp_plist[p_sys->i_box_plidx]->p_item ) )
+ if( p_sys->i_box_plidx < p_sys->i_plist_entries && p_sys->i_box_plidx >= 0 )
{
- return;
+ playlist_item_t *p_item = p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
+ if( ( p_item->i_children == 0 && p_item == p_sys->p_node ) ||
+ PlaylistIsPlaying( p_intf, p_item ) )
+ return;
}
for( i = 0; i < p_sys->i_plist_entries; i++ )
{
- if( PlaylistIsPlaying( p_intf, p_sys->pp_plist[i]->p_item ) )
+ playlist_item_t *p_item = p_sys->pp_plist[i]->p_item;
+ if( ( p_item->i_children == 0 && p_item == p_sys->p_node ) ||
+ PlaylistIsPlaying( p_intf, p_sys->pp_plist[i]->p_item ) )
{
p_sys->i_box_plidx = i;
break;
* If it's neither of these, then return
*/
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist == NULL )
- {
- return;
- }
-
- vlc_mutex_lock( &p_playlist->object_lock );
+ playlist_t * p_playlist = pl_Get( p_intf );
+ PL_LOCK;
if( p_playlist->status.p_item == NULL )
{
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+ PL_UNLOCK;
return;
}
}
}
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+ PL_UNLOCK;
if( psz_device == NULL )
{
if( p_current_dir == NULL )
{
/* something went bad, get out of here ! */
-#ifdef HAVE_ERRNO_H
- msg_Warn( p_intf, "cannot open directory `%s' (%s)",
- p_sys->psz_current_dir, strerror(errno));
-#else
- msg_Warn( p_intf, "cannot open directory `%s'", p_sys->psz_current_dir );
-#endif
+ msg_Warn( p_intf, "cannot open directory `%s' (%m)",
+ p_sys->psz_current_dir );
return;
}
static void PlayPause( intf_thread_t *p_intf )
{
input_thread_t *p_input = p_intf->p_sys->p_input;
+ playlist_t *p_playlist = pl_Get( p_intf );
vlc_value_t val;
if( p_input )
}
var_Set( p_input, "state", val );
}
- else if( p_intf->p_sys->p_playlist )
- {
- playlist_Play( p_intf->p_sys->p_playlist );
- }
+ else
+ playlist_Play( p_playlist );
}
/****************************************************************************
projects / vlc / blobdiff