Removed obsolete BUFFERING_S input state.

 The associated libvlc_MediaPlayerBuffering and libvlc_Buffering value could
probably be removed (not done as I do not know the maintainer opinion).

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 85e0de14ab59f364106cb555f9cfaa929b6f932d..8e230e17a9c775c1b76810a10733ba5962080b2f 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -477,7 +477,6 @@ typedef enum input_state_e
 {
     INIT_S = 0,
     OPENING_S,
-    BUFFERING_S,
     PLAYING_S,
     PAUSE_S,
     END_S,

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 0c1cd34bb0ff00be2acb087582d88ffccf0d5b2e..518c1cb06e765d2c76ab38a443e3ffa7c24805ea 100644 (file)
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -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";

diff --git a/modules/gui/beos/MediaControlView.cpp b/modules/gui/beos/MediaControlView.cpp
index 30c23e9d27230348c3a381c5e317b54260923337..b3cdf450ee04045c1d5f4364769c2513596f3fee 100644 (file)
--- a/modules/gui/beos/MediaControlView.cpp
+++ b/modules/gui/beos/MediaControlView.cpp
@@ -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:

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 4c2cc11ab620b45e7a8c01254ac8fed19675588a..24582a47a78e54b7869866dd1fa7c6403edbcd48 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -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;
             }

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 74193f89d63c93f679dc6ae14487364d5a4ef7c4..9f16757a3ff4efba63a0bba96917002ee283c456 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -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 );

diff --git a/src/control/media_player.c b/src/control/media_player.c
index c060dbc7681f3c9681433d560fe631b8fb481425..b210ea3c38f1cbcf4bc184caac93f445727bdb2d 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -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;

diff --git a/src/input/input.c b/src/input/input.c
index 3848cd57de860463776bc5d4a0a47b154921178b..24c60821b243146a52b191c6c2f0e0711f2e920c 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -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 */