Changeset f8763a6ca1881728dbc5025acfe3103536036ab7

Show
Ignore:
Timestamp:
06/20/08 21:21:24 (2 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1213989684 +0300
git-parent:

[aeb8ed0fb0a896579de098b6a13ffcae41fc8ec7]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1213989684 +0300
Message:

RC: fix segmentation fault due to input state changes - fixes #1620

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc_input.h

    r43a486b rf8763a6  
    526526 
    527527/* "state" value */ 
     528/* NOTE: you need to update ppsz_input_state in the RC interface 
     529 * if you modify this list. */ 
    528530enum input_state_e 
    529531{ 
    …… 
    537539    BACKWARD_S, 
    538540    END_S, 
    539     ERROR_S 
     541    ERROR_S, 
    540542}; 
    541543 

  • modules/control/rc.c

    r7e413aa rf8763a6  
    6868#define STATUS_CHANGE "status change: " 
    6969 
    70 static const char *ppsz_input_state[] = { N_("Initializing"), N_("Opening"), N_("Buffer"), N_("Play"), N_("Pause"), N_("Stop"), N_("Error") }; 
     70/* input_state_e from <vlc_input.h> */ 
     71static const char *ppsz_input_state[] = { 
     72    N_("Initializing"), 
     73    N_("Opening"), 
     74    N_("Buffer"), 
     75    N_("Play"), 
     76    N_("Pause"), 
     77    N_("Stop"), 
     78    N_("Forward"), 
     79    N_("Backward"), 
     80    N_("End"), 
     81    N_("Error"), 
     82}; 
    7183 
    7284/***************************************************************************** 
    …… 
    10011013        } /* var_GetInteger( p_input, "state" )  */ 
    10021014        msg_rc( STATUS_CHANGE "( %s state: %d ): %s", 
    1003                               &cmd[0], newval.i_int, 
     1015                              cmd, newval.i_int, 
    10041016                              ppsz_input_state[ newval.i_int ] ); 
    10051017        vlc_object_release( p_playlist );