# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#ifdef HAVE_NCURSESW
# define _XOPEN_SOURCE_EXTENDED 1
+# include <wchar.h>
#endif
#include <ncurses.h>
#include <vlc_playlist.h>
#include <vlc_meta.h>
+#include <assert.h>
+
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
vlc_module_begin();
set_shortname( "Ncurses" );
- set_description( _("Ncurses interface") );
+ set_description( N_("Ncurses interface") );
set_capability( "interface", 10 );
set_category( CAT_INTERFACE );
set_subcategory( SUBCAT_INTERFACE_MAIN );
struct intf_sys_t
{
input_thread_t *p_input;
+ playlist_t *p_playlist;
bool b_color;
bool b_color_started;
/* Allocate instance and initialize some members */
p_sys = p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
p_sys->p_node = NULL;
p_sys->p_input = NULL;
p_sys->f_slider = 0.0;
p_sys->b_box_cleared = false;
p_sys->i_box_plidx = 0;
p_sys->i_box_bidx = 0;
- p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
- p_sys->b_color = p_this->p_libvlc->b_color;
+ p_sys->p_sub = msg_Subscribe( p_intf );
+ p_sys->b_color = var_CreateGetBool( p_intf, "color" );
p_sys->b_color_started = false;
#ifndef HAVE_NCURSESW
if( val.psz_string && *val.psz_string )
{
p_sys->psz_current_dir = strdup( val.psz_string );
- free( val.psz_string );
}
else
{
- p_sys->psz_current_dir = strdup( p_intf->p_libvlc->psz_homedir );
+ p_sys->psz_current_dir = strdup( config_GetHomeDir() );
}
+ free( val.psz_string );
+
p_sys->i_dir_entries = 0;
p_sys->pp_dir_entries = NULL;
p_sys->b_show_hidden_files = false;
{
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_playlist, "intf-change", PlaylistChanged, p_intf );
- var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
PlaylistDestroy( p_intf );
- for( i = 0; i < p_sys->i_dir_entries; i++ )
+ while( p_sys->i_dir_entries )
{
- struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[i];
+ struct dir_entry_t *p_dir_entry = p_sys->pp_dir_entries[0];
free( p_dir_entry->psz_path );
- REMOVE_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, i );
+ REMOVE_ELEM( p_sys->pp_dir_entries, p_sys->i_dir_entries, 0 );
free( p_dir_entry );
}
p_sys->pp_dir_entries = NULL;
{
intf_sys_t *p_sys = p_intf->p_sys;
playlist_t *p_playlist = pl_Yield( p_intf );
+ p_sys->p_playlist = p_playlist;
int i_key;
time_t t_last_refresh;
* force building of the playlist array
*/
PlaylistRebuild( p_intf );
+ var_AddCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
+ var_AddCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
+ var_AddCallback( p_playlist, "item-change", PlaylistChanged, p_intf );
while( !intf_ShouldDie( p_intf ) )
{
msleep( INTF_IDLE_SLEEP );
/* Update the input */
- 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 )
{
{
FindIndex( p_intf );
}
-
+
while( ( i_key = wgetch( p_sys->w ) ) != -1 )
{
/*
Redraw( p_intf, &t_last_refresh );
}
}
+ var_DelCallback( p_playlist, "intf-change", PlaylistChanged, p_intf );
+ var_DelCallback( p_playlist, "item-append", PlaylistChanged, p_intf );
+ var_DelCallback( p_playlist, "item-change", PlaylistChanged, p_intf );
}
/* following functions are local */
{
intf_sys_t *p_sys = p_intf->p_sys;
vlc_value_t val;
- playlist_t *p_playlist = pl_Get( p_intf );
+
+ #define ReturnTrue \
+ do { \
+ vlc_object_release( p_playlist ); \
+ return 1; \
+ } while(0)
+
+ #define ReturnFalse \
+ do { \
+ vlc_object_release( p_playlist ); \
+ return 0; \
+ } while(0)
+
+ playlist_t *p_playlist = pl_Yield( p_intf );
if( p_sys->i_box_type == BOX_PLAYLIST )
{
var_Get( p_playlist, "random", &val );
val.b_bool = !val.b_bool;
var_Set( p_playlist, "random", val );
- return 1;
+ ReturnTrue;
case 'l':
var_Get( p_playlist, "loop", &val );
val.b_bool = !val.b_bool;
var_Set( p_playlist, "loop", val );
- return 1;
+ ReturnTrue;
case 'R':
var_Get( p_playlist, "repeat", &val );
val.b_bool = !val.b_bool;
var_Set( p_playlist, "repeat", val );
- return 1;
+ ReturnTrue;
/* Playlist sort */
case 'o':
PlaylistGetRoot( p_intf ),
SORT_TITLE_NODES_FIRST, ORDER_NORMAL );
p_sys->b_need_update = true;
- return 1;
+ ReturnTrue;
case 'O':
playlist_RecursiveNodeSort( p_playlist,
PlaylistGetRoot( p_intf ),
SORT_TITLE_NODES_FIRST, ORDER_REVERSE );
p_sys->b_need_update = true;
- return 1;
+ ReturnTrue;
/* Playlist view */
case 'v':
}
//p_sys->b_need_update = true;
PlaylistRebuild( p_intf );
- return 1;
+ ReturnTrue;
/* Playlist navigation */
case 'g':
while( p_parent->p_parent )
p_parent = p_parent->p_parent;
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
- true, p_parent, p_item );
+ false, p_parent, p_item );
}
else if( p_sys->pp_plist[p_sys->i_box_plidx]->p_item->i_children
== 0 )
else
{
p_sys->p_node = p_sys->pp_plist[p_sys->i_box_plidx]->p_item;
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, false,
p_sys->pp_plist[p_sys->i_box_plidx]->p_item, NULL );
}
b_box_plidx_follow = true;
p_sys->pp_plist[p_sys->i_box_plidx]->p_item ) )
b_box_plidx_follow = true;
p_sys->b_box_plidx_follow = b_box_plidx_follow;
- return 1;
+ ReturnTrue;
}
}
if( p_sys->i_box_type == BOX_BROWSE )
playlist_Add( p_playlist, psz_uri, NULL, PLAYLIST_APPEND,
PLAYLIST_END,
- p_parent->p_input ==
+ p_parent->p_input ==
p_playlist->p_local_onelevel->p_input
, false );
{
if( p_sys->i_box_bidx >= p_sys->i_dir_entries ) p_sys->i_box_bidx = p_sys->i_dir_entries - 1;
if( p_sys->i_box_bidx < 0 ) p_sys->i_box_bidx = 0;
- return 1;
+ ReturnTrue;
}
}
else if( p_sys->i_box_type == BOX_HELP || p_sys->i_box_type == BOX_INFO ||
{
case KEY_HOME:
p_sys->i_box_start = 0;
- return 1;
+ ReturnTrue;
#ifdef __FreeBSD__
case KEY_SELECT:
#endif
case KEY_END:
p_sys->i_box_start = p_sys->i_box_lines_total - 1;
- return 1;
+ ReturnTrue;
case KEY_UP:
if( p_sys->i_box_start > 0 ) p_sys->i_box_start--;
- return 1;
+ ReturnTrue;
case KEY_DOWN:
if( p_sys->i_box_start < p_sys->i_box_lines_total - 1 )
{
p_sys->i_box_start++;
}
- return 1;
+ ReturnTrue;
case KEY_PPAGE:
p_sys->i_box_start -= p_sys->i_box_lines;
if( p_sys->i_box_start < 0 ) p_sys->i_box_start = 0;
- return 1;
+ ReturnTrue;
case KEY_NPAGE:
p_sys->i_box_start += p_sys->i_box_lines;
if( p_sys->i_box_start >= p_sys->i_box_lines_total )
{
p_sys->i_box_start = p_sys->i_box_lines_total - 1;
}
- return 1;
+ ReturnTrue;
default:
break;
}
case KEY_HOME:
p_sys->f_slider = 0;
ManageSlider( p_intf );
- return 1;
+ ReturnTrue;
#ifdef __FreeBSD__
case KEY_SELECT:
#endif
case KEY_END:
p_sys->f_slider = 99.9;
ManageSlider( p_intf );
- return 1;
+ ReturnTrue;
case KEY_UP:
p_sys->f_slider += 5.0;
if( p_sys->f_slider >= 99.0 ) p_sys->f_slider = 99.0;
ManageSlider( p_intf );
- return 1;
+ ReturnTrue;
case KEY_DOWN:
p_sys->f_slider -= 5.0;
if( p_sys->f_slider < 0.0 ) p_sys->f_slider = 0.0;
ManageSlider( p_intf );
- return 1;
+ ReturnTrue;
default:
break;
case KEY_CLEAR:
case 0x0c: /* ^l */
clear();
- return 1;
+ ReturnTrue;
case KEY_ENTER:
case '\r':
case '\n':
SearchPlaylist( p_intf, p_sys->psz_old_search );
}
p_sys->i_box_type = BOX_PLAYLIST;
- return 1;
+ ReturnTrue;
case 0x1b: /* ESC */
/* Alt+key combinations return 2 keys in the terminal keyboard:
* ESC, and the 2nd key.
* man 3X curs_getch says:
*
* Use of the escape key by a programmer for a single
- * character function is discouraged, as it will cause a delay
+ * character function is discouraged, as it will cause a delay
* of up to one second while the keypad code looks for a
* following function-key sequence.
*
*/
if( wgetch( p_sys->w ) != ERR )
- return 0;
+ ReturnFalse;
p_sys->i_box_plidx = p_sys->i_before_search;
p_sys->i_box_type = BOX_PLAYLIST;
- return 1;
+ ReturnTrue;
case KEY_BACKSPACE:
case 0x7f:
RemoveLastUTF8Entity( p_sys->psz_search_chain, i_chain_len );
free( p_sys->psz_old_search );
p_sys->psz_old_search = NULL;
SearchPlaylist( p_intf, p_sys->psz_search_chain );
- return 1;
+ ReturnTrue;
}
else if( p_sys->i_box_type == BOX_OPEN && p_sys->psz_open_chain )
{
case KEY_CLEAR:
case 0x0c: /* ^l */
clear();
- return 1;
+ ReturnTrue;
case KEY_ENTER:
- case '\r':
+ case '\r':
case '\n':
if( i_chain_len > 0 )
{
playlist_item_t *p_parent = p_sys->p_node;
-
+
if( !p_parent )
p_parent = p_playlist->status.p_node;
if( !p_parent )
playlist_Add( p_playlist, p_sys->psz_open_chain, NULL,
PLAYLIST_APPEND|PLAYLIST_GO, PLAYLIST_END,
- p_parent->p_input ==
+ p_parent->p_input ==
p_playlist->p_local_onelevel->p_input
, false );
p_sys->b_box_plidx_follow = true;
}
p_sys->i_box_type = BOX_PLAYLIST;
- return 1;
+ ReturnTrue;
case 0x1b: /* ESC */
if( wgetch( p_sys->w ) != ERR )
- return 0;
+ ReturnFalse;
p_sys->i_box_type = BOX_PLAYLIST;
- return 1;
+ ReturnTrue;
case KEY_BACKSPACE:
case 0x7f:
RemoveLastUTF8Entity( p_sys->psz_open_chain, i_chain_len );
break;
}
}
- return 1;
+ ReturnTrue;
}
{
case 0x1b: /* ESC */
if( wgetch( p_sys->w ) != ERR )
- return 0;
+ ReturnFalse;
case 'q':
case 'Q':
case KEY_EXIT:
vlc_object_kill( p_intf->p_libvlc );
- return 0;
+ ReturnFalse;
/* Box switching */
case 'i':
else
p_sys->i_box_type = BOX_INFO;
p_sys->i_box_lines_total = 0;
- return 1;
+ ReturnTrue;
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;
+ ReturnTrue;
case 'L':
if( p_sys->i_box_type == BOX_LOG )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_LOG;
- return 1;
+ ReturnTrue;
case 'P':
if( p_sys->i_box_type == BOX_PLAYLIST )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_PLAYLIST;
- return 1;
+ ReturnTrue;
case 'B':
if( p_sys->i_box_type == BOX_BROWSE )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_BROWSE;
- return 1;
+ ReturnTrue;
case 'x':
if( p_sys->i_box_type == BOX_OBJECTS )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_OBJECTS;
- return 1;
+ ReturnTrue;
case 'S':
if( p_sys->i_box_type == BOX_STATS )
p_sys->i_box_type = BOX_NONE;
else
p_sys->i_box_type = BOX_STATS;
- return 1;
+ ReturnTrue;
case 'c':
p_sys->b_color = !p_sys->b_color;
if( p_sys->b_color && !p_sys->b_color_started )
start_color_and_pairs( p_intf );
- return 1;
+ ReturnTrue;
case 'h':
case 'H':
if( p_sys->i_box_type == BOX_HELP )
else
p_sys->i_box_type = BOX_HELP;
p_sys->i_box_lines_total = 0;
- return 1;
+ ReturnTrue;
case '/':
if( p_sys->i_box_type != BOX_SEARCH )
{
if( p_sys->psz_search_chain == NULL )
- {
- return 1;
- }
+ ReturnTrue;
p_sys->psz_search_chain[0] = '\0';
p_sys->b_box_plidx_follow = false;
p_sys->i_before_search = p_sys->i_box_plidx;
p_sys->i_box_type = BOX_SEARCH;
}
- return 1;
+ ReturnTrue;
case 'A': /* Open */
if( p_sys->i_box_type != BOX_OPEN )
{
if( p_sys->psz_open_chain == NULL )
- {
- return 1;
- }
+ ReturnTrue;
p_sys->psz_open_chain[0] = '\0';
p_sys->i_box_type = BOX_OPEN;
}
- return 1;
+ ReturnTrue;
/* Navigation */
case KEY_RIGHT:
p_sys->f_slider += 1.0;
if( p_sys->f_slider > 99.9 ) p_sys->f_slider = 99.9;
ManageSlider( p_intf );
- return 1;
+ ReturnTrue;
case KEY_LEFT:
p_sys->f_slider -= 1.0;
if( p_sys->f_slider < 0.0 ) p_sys->f_slider = 0.0;
ManageSlider( p_intf );
- return 1;
+ ReturnTrue;
/* Common control */
case 'f':
var_Set( p_playlist, "fullscreen", val );
}
}
- return 0;
+ ReturnFalse;
}
case ' ':
PlayPause( p_intf );
- return 1;
+ ReturnTrue;
case 's':
playlist_Stop( p_playlist );
- return 1;
+ ReturnTrue;
case 'e':
Eject( p_intf );
- return 1;
+ ReturnTrue;
case '[':
if( p_sys->p_input )
val.b_bool = true;
var_Set( p_sys->p_input, "prev-title", val );
}
- return 1;
+ ReturnTrue;
case ']':
if( p_sys->p_input )
val.b_bool = true;
var_Set( p_sys->p_input, "next-title", val );
}
- return 1;
+ ReturnTrue;
case '<':
if( p_sys->p_input )
val.b_bool = true;
var_Set( p_sys->p_input, "prev-chapter", val );
}
- return 1;
+ ReturnTrue;
case '>':
if( p_sys->p_input )
val.b_bool = true;
var_Set( p_sys->p_input, "next-chapter", val );
}
- return 1;
+ ReturnTrue;
case 'p':
playlist_Prev( p_playlist );
clear();
- return 1;
+ ReturnTrue;
case 'n':
playlist_Next( p_playlist );
clear();
- return 1;
+ ReturnTrue;
case 'a':
aout_VolumeUp( p_intf, 1, NULL );
clear();
- return 1;
+ ReturnTrue;
case 'z':
aout_VolumeDown( p_intf, 1, NULL );
clear();
- return 1;
+ ReturnTrue;
/*
* ^l should clear and redraw the screen
case KEY_CLEAR:
case 0x0c: /* ^l */
clear();
- return 1;
+ ReturnTrue;
default:
- return 0;
+ ReturnFalse;
}
}
char *p_buf = NULL;
int i_len;
+ if( w <= 0 )
+ return;
+
va_start( vl_args, p_fmt );
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
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 == (size_t)-1 )
- /* an invalid character was encountered */
+ /* an invalid character was encountered */
+ {
+ free( p_buf );
return;
+ }
else
{
i_width = wcswidth( psz_wide, i_char_len );
mvprintw( y, x, "%s", p_buf );
mvhline( y, x + i_width, ' ', w - i_width );
}
+
+ free( p_buf );
#else
if( i_len > w )
{
return;
va_end( vl_args );
- if( p_buf == NULL )
- {
- return;
- }
-
mvnprintw( p_sys->i_box_y + l - p_sys->i_box_start, x, COLS - x - 1, "%s", p_buf );
+ free( p_buf );
}
static void DumpObject( intf_thread_t *p_intf, int *l, vlc_object_t *p_obj, int i_level )
{
- vlc_object_yield( p_obj );
-
if( p_obj->psz_object_name )
MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s \"%s\" (%d)",
p_obj->psz_object_type, p_obj->psz_object_name,
else
MainBoxWrite( p_intf, (*l)++, 1 + 2 * i_level, "%s (%d)",
p_obj->psz_object_type, p_obj->i_object_id );
- int i;
- for( i = 0; i < p_obj->i_children ; i++ )
+
+ vlc_list_t *list = vlc_list_children( p_obj );
+ for( int i = 0; i < list->i_count ; i++ )
{
- MainBoxWrite( p_intf, *l, 1 + 2 * i_level,
- i == p_obj->i_children - 1 ? "`-" : "|-" );
- DumpObject( p_intf, l, p_obj->pp_children[i], i_level + 1 );
+ MainBoxWrite( p_intf, *l, 1 + 2 * i_level,
+ i == list->i_count - 1 ? "`-" : "|-" );
+ DumpObject( p_intf, l, list->p_values[i].p_object, i_level + 1 );
}
-
- vlc_object_release( p_obj );
+ vlc_list_release( list );
}
static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
{
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 );
+ playlist_t *p_playlist = pl_Yield( p_intf );
int y = 0;
int h;
int y_end;
- clear();
-
/* Title */
attrset( A_REVERSE );
int i_len = strlen( "VLC media player "PACKAGE_VERSION );
{
mvnprintw( y++, 0, COLS, _(" State : Playing %s"), psz_state );
}
+ else if( val.i_int == STOP_S )
+ {
+ mvnprintw( y++, 0, COLS, _(" State : Stopped %s"), psz_state );
+ }
else if( val.i_int == OPENING_S )
{
mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state );
/* 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, p_sys->b_color );
+ DrawBox( p_sys->w, y++, 0, h, COLS, _("Meta-information"),
+ p_sys->b_color );
if( p_input )
{
case 3:
psz_meta_title = VLC_META_COPYRIGHT; break;
case 4:
- psz_meta_title = VLC_META_COLLECTION; break;
+ psz_meta_title = VLC_META_ALBUM; break;
case 5:
- psz_meta_title = VLC_META_SEQ_NUM; break;
+ psz_meta_title = VLC_META_TRACK_NUMBER; break;
case 6:
psz_meta_title = VLC_META_DESCRIPTION; break;
case 7:
break;
}
if( p_sys->b_color )
- wcolor_set( p_sys->w,
+ wcolor_set( p_sys->w,
p_sys->p_sub->p_msg[i_stop].i_type + C_INFO,
NULL );
mvnprintw( y + h-2-i_line, 1, COLS - 2, " [%s] %s",
}
DrawBox( p_sys->w, y++, 0, h, COLS, psz_title, p_sys->b_color );
+ free( psz_title );
if( p_sys->b_need_update || p_sys->pp_plist == NULL )
{
refresh();
*t_last_refresh = time( 0 );
+ vlc_object_release( p_playlist );
}
static playlist_item_t *PlaylistGetRoot( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = pl_Get( p_intf );
+ playlist_t *p_playlist = pl_Yield( p_intf );
+ playlist_item_t *p_item;
switch( p_sys->i_current_view )
{
case VIEW_CATEGORY:
- return p_playlist->p_root_category;
+ p_item = p_playlist->p_root_category;
+ break;
default:
- return p_playlist->p_root_onelevel;
+ p_item = p_playlist->p_root_onelevel;
}
+ vlc_object_release( p_playlist );
+ return p_item;
}
static void PlaylistRebuild( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- playlist_t *p_playlist = pl_Get( p_intf );
+ playlist_t *p_playlist = pl_Yield( p_intf );
PL_LOCK;
p_sys->b_need_update = false;
PL_UNLOCK;
+
+ vlc_object_release( p_playlist );
}
static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node,
char *psz_tmp;
if( asprintf( &psz_tmp, "%s%c ", c,
k == p_node->i_children - 1 ? ' ' : '|' ) == -1 )
- return;
+ return;
PlaylistAddNode( p_intf, p_child, i,
strlen( c ) ? psz_tmp : " " );
free( psz_tmp );
VLC_UNUSED(p_this); VLC_UNUSED(psz_variable);
VLC_UNUSED(oval); VLC_UNUSED(nval);
intf_thread_t *p_intf = (intf_thread_t *)param;
- playlist_t *p_playlist = pl_Get( p_intf );
+ playlist_t *p_playlist = pl_Yield( p_intf );
p_intf->p_sys->b_need_update = true;
p_intf->p_sys->p_node = p_playlist->status.p_node;
+ vlc_object_release( p_playlist );
return VLC_SUCCESS;
}
static inline bool PlaylistIsPlaying( intf_thread_t *p_intf,
playlist_item_t *p_item )
{
- playlist_t *p_playlist = pl_Get( p_intf );
+ playlist_t *p_playlist = pl_Yield( p_intf );
playlist_item_t *p_played_item = p_playlist->status.p_item;
+ vlc_object_release( p_playlist );
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 );
static void PlaylistDestroy( intf_thread_t *p_intf )
{
intf_sys_t *p_sys = p_intf->p_sys;
- int i;
- for( i = 0; i < p_sys->i_plist_entries; i++ )
+ while( p_sys->i_plist_entries )
{
- struct pl_item_t *p_pl_item = p_sys->pp_plist[i];
+ struct pl_item_t *p_pl_item = p_sys->pp_plist[0];
free( p_pl_item->psz_display );
- REMOVE_ELEM( p_sys->pp_plist, p_sys->i_plist_entries, i );
+ REMOVE_ELEM( p_sys->pp_plist, p_sys->i_plist_entries, 0 );
free( p_pl_item );
}
p_sys->pp_plist = NULL;
- p_sys->i_plist_entries = 0;
}
static void Eject( intf_thread_t *p_intf )
* If it's neither of these, then return
*/
- playlist_t * p_playlist = pl_Get( p_intf );
+ playlist_t * p_playlist = pl_Yield( p_intf );
PL_LOCK;
if( p_playlist->status.p_item == NULL )
{
PL_UNLOCK;
+ vlc_object_release( p_playlist );
return;
}
}
free( psz_device );
+ vlc_object_release( p_playlist );
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 );
+ playlist_t *p_playlist = pl_Yield( p_intf );
vlc_value_t val;
if( p_input )
}
else
playlist_Play( p_playlist );
+
+ vlc_object_release( p_playlist );
}
/****************************************************************************
projects / vlc / blobdiff