mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-25 02:44:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed obsolete BUFFERING_S input state.

Browse Source 
The associated libvlc_MediaPlayerBuffering and libvlc_Buffering value could
probably be removed (not done as I do not know the maintainer opinion).
This commit is contained in:
Laurent Aimar 2008-12-04 22:59:32 +01:00
parent 2d98c228d6
commit 31715344b7
7 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/vlc_input.h
View File

@ -477,7 +477,6 @@ typedef enum input_state_e
{
INIT_S = 0,
OPENING_S,
BUFFERING_S,
PLAYING_S,
PAUSE_S,
END_S,

4
modules/control/http/http.c
View File

@ -400,10 +400,6 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer,
{
state = "opening/connecting";
}
else if( val.i_int == BUFFERING_S )
{
state = "buffering";
}
else if( val.i_int == PAUSE_S )
{
state = "paused";

1
modules/gui/beos/MediaControlView.cpp
View File

@ -316,7 +316,6 @@ MediaControlView::SetStatus(int status, int rate)
{
case PLAYING_S:
case OPENNING_S:
case BUFFERING_S:
fPlayPause->SetPlaying();
break;
case PAUSE_S:

3
modules/gui/macosx/intf.m
View File

@ -1506,8 +1506,7 @@ static void * manage_cleanup( void * args )
/* seekable streams */
cachedInputState = input_GetState( p_input );
if ( cachedInputState == INIT_S ||
cachedInputState == OPENING_S ||
cachedInputState == BUFFERING_S )
cachedInputState == OPENING_S )
{
b_buffering = YES;
}

4
modules/gui/ncurses.c
View File

@ -1547,10 +1547,6 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
{
mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state );
}
else if( val.i_int == BUFFERING_S )
{
mvnprintw( y++, 0, COLS, _(" State : Buffering %s"), psz_state );
}
else if( val.i_int == PAUSE_S )
{
mvnprintw( y++, 0, COLS, _(" State : Paused %s"), psz_state );

5
src/control/media_player.c
View File

@ -49,7 +49,6 @@ static const libvlc_state_t vlc_to_libvlc_state_array[] =
{
[INIT_S] = libvlc_NothingSpecial,
[OPENING_S] = libvlc_Opening,
[BUFFERING_S] = libvlc_Buffering,
[PLAYING_S] = libvlc_Playing,
[PAUSE_S] = libvlc_Paused,
[END_S] = libvlc_Ended,
@ -148,10 +147,6 @@ input_state_changed( const vlc_event_t * event, void * p_userdata )
libvlc_media_set_state( p_mi->p_md, libvlc_Opening, NULL);
forwarded_event.type = libvlc_MediaPlayerOpening;
break;
case BUFFERING_S:
libvlc_media_set_state( p_mi->p_md, libvlc_Buffering, NULL);
forwarded_event.type = libvlc_MediaPlayerBuffering;
break;
case PLAYING_S:
libvlc_media_set_state( p_mi->p_md, libvlc_Playing, NULL);
forwarded_event.type = libvlc_MediaPlayerPlaying;

7
src/input/input.c
View File

@ -2395,10 +2395,6 @@ static int InputSourceInit( input_thread_t *p_input,
{
int64_t i_pts_delay;
/* */
if( b_master )
input_ChangeState( p_input, BUFFERING_S );
/* Get infos from access_demux */
demux_Control( in->p_demux,
DEMUX_GET_PTS_DELAY, &i_pts_delay );
@ -2535,9 +2531,6 @@ static int InputSourceInit( input_thread_t *p_input,
}
/* Create the stream_t */
if( b_master )
input_ChangeState( p_input, BUFFERING_S );
in->p_stream = stream_AccessNew( in->p_access, p_input->b_preparsing );
/* Restor old value */