/* status changes */
vlc_mutex_t status_lock;
- playlist_status_t i_last_state;
+ int i_last_state;
playlist_t *p_playlist;
bool b_input_buffering;
#if defined (HAVE_ISATTY)
add_bool( "rc-fake-tty", false, NULL, TTY_TEXT, TTY_LONGTEXT, true )
#endif
- add_string( "rc-unix", NULL, NULL, UNIX_TEXT, UNIX_LONGTEXT, true )
+ add_string( "rc-unix", NULL, UNIX_TEXT, UNIX_LONGTEXT, true )
#endif
- add_string( "rc-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true )
+ add_string( "rc-host", NULL, HOST_TEXT, HOST_LONGTEXT, true )
set_capability( "interface", 20 )
if( p_playlist )
{
- p_intf->p_sys->i_last_state = (int) PLAYLIST_STOPPED;
+ p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
msg_rc( STATUS_CHANGE "( stop state: 0 )" );
}
}
}
else if ( !strcmp( psz_cmd, "faster" ) )
{
- var_TriggerCallback( p_input, "rate-faster" );
+ var_TriggerCallback( p_intf->p_sys->p_playlist, "rate-faster" );
i_error = VLC_SUCCESS;
}
else if ( !strcmp( psz_cmd, "slower" ) )
{
- var_TriggerCallback( p_input, "rate-slower" );
+ var_TriggerCallback( p_intf->p_sys->p_playlist, "rate-slower" );
i_error = VLC_SUCCESS;
}
else if ( !strcmp( psz_cmd, "normal" ) )
{
- var_SetInteger( p_input, "rate", INPUT_RATE_DEFAULT );
+ var_SetFloat( p_intf->p_sys->p_playlist, "rate", 1. );
i_error = VLC_SUCCESS;
}
else if ( !strcmp( psz_cmd, "frame" ) )
{
PL_LOCK;
int i_pos = atoi( newval.psz_string );
- /* The playlist stores 2 times the same item: onelevel & category */
- int i_size = p_playlist->items.i_size / 2;
+ int i_size = p_playlist->items.i_size;
if( i_pos <= 0 )
msg_rc( "%s", _("Error: `goto' needs an argument greater than zero.") );
else if( i_pos <= i_size )
{
playlist_item_t *p_item, *p_parent;
- p_item = p_parent = p_playlist->items.p_elems[i_pos*2-1];
+ p_item = p_parent = p_playlist->items.p_elems[i_pos-1];
while( p_parent->p_parent )
p_parent = p_parent->p_parent;
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
if ( !strcmp(psz_cmd, "volup") )
{
- if ( aout_VolumeUp( p_this, i_nb_steps, &i_volume ) < 0 )
+ if ( aout_VolumeUp( p_intf->p_sys->p_playlist, i_nb_steps, &i_volume ) < 0 )
i_error = VLC_EGENERIC;
}
else
{
- if ( aout_VolumeDown( p_this, i_nb_steps, &i_volume ) < 0 )
+ if ( aout_VolumeDown( p_intf->p_sys->p_playlist, i_nb_steps, &i_volume ) < 0 )
i_error = VLC_EGENERIC;
}
osd_Volume( p_this );
(float)(p_item->p_stats->i_demux_read_bytes)/1024 );
msg_rc(_("| demux bitrate : %6.0f kb/s"),
(float)(p_item->p_stats->f_demux_bitrate)*8000 );
- msg_rc(_("| demux corrupted : %5i"),
+ msg_rc(_("| demux corrupted : %5"PRIi64),
p_item->p_stats->i_demux_corrupted );
- msg_rc(_("| discontinuities : %5i"),
+ msg_rc(_("| discontinuities : %5"PRIi64),
p_item->p_stats->i_demux_discontinuity );
msg_rc("|");
/* Video */
msg_rc("%s", _("+-[Video Decoding]"));
- msg_rc(_("| video decoded : %5i"),
+ msg_rc(_("| video decoded : %5"PRIi64),
p_item->p_stats->i_decoded_video );
- msg_rc(_("| frames displayed : %5i"),
+ msg_rc(_("| frames displayed : %5"PRIi64),
p_item->p_stats->i_displayed_pictures );
- msg_rc(_("| frames lost : %5i"),
+ msg_rc(_("| frames lost : %5"PRIi64),
p_item->p_stats->i_lost_pictures );
msg_rc("|");
/* Audio*/
msg_rc("%s", _("+-[Audio Decoding]"));
- msg_rc(_("| audio decoded : %5i"),
+ msg_rc(_("| audio decoded : %5"PRIi64),
p_item->p_stats->i_decoded_audio );
- msg_rc(_("| buffers played : %5i"),
+ msg_rc(_("| buffers played : %5"PRIi64),
p_item->p_stats->i_played_abuffers );
- msg_rc(_("| buffers lost : %5i"),
+ msg_rc(_("| buffers lost : %5"PRIi64),
p_item->p_stats->i_lost_abuffers );
msg_rc("|");
/* Sout */
msg_rc("%s", _("+-[Streaming]"));
- msg_rc(_("| packets sent : %5i"), p_item->p_stats->i_sent_packets );
+ msg_rc(_("| packets sent : %5"PRIi64),
+ p_item->p_stats->i_sent_packets );
msg_rc(_("| bytes sent : %8.0f KiB"),
(float)(p_item->p_stats->i_sent_bytes)/1024 );
msg_rc(_("| sending bitrate : %6.0f kb/s"),