main.c 18.9 KB
Newer Older
Michel Kaempf's avatar
Michel Kaempf committed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
/*******************************************************************************
 * main.c: main vlc source
 * (c)1998 VideoLAN
 *******************************************************************************
 * Includes the main() function for vlc. Parses command line, start interface
 * and spawn threads.
 *******************************************************************************/

/*******************************************************************************
 * Preamble
 *******************************************************************************/
#include <errno.h>
#include <getopt.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Vincent Seguin's avatar
Vincent Seguin committed
18 19

#include <sys/soundcard.h>                                   /* audio_output.h */
Michel Kaempf's avatar
Michel Kaempf committed
20 21 22 23

#include "config.h"
#include "common.h"
#include "mtime.h"
24
#include "vlc_thread.h"
Michel Kaempf's avatar
Michel Kaempf committed
25
#include "input_vlan.h"
Vincent Seguin's avatar
Vincent Seguin committed
26
#include "intf_msg.h"
Michel Kaempf's avatar
Michel Kaempf committed
27
#include "interface.h"
Vincent Seguin's avatar
Vincent Seguin committed
28 29
#include "audio_output.h"
#include "main.h"
Michel Kaempf's avatar
Michel Kaempf committed
30

Vincent Seguin's avatar
Vincent Seguin committed
31
/*******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
32 33
 * Command line options constants. If something is changed here, be sure that
 * GetConfiguration and Usage are also changed.
Vincent Seguin's avatar
Vincent Seguin committed
34
 *******************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
35 36 37 38 39 40 41 42

/* Long options return values - note that values corresponding to short options
 * chars, and in general any regular char, should be avoided */
#define OPT_NOAUDIO             150
#define OPT_STEREO              151
#define OPT_MONO                152

#define OPT_NOVIDEO             160
43 44 45 46
#define OPT_DISPLAY             161
#define OPT_WIDTH               162
#define OPT_HEIGHT              163
#define OPT_COLOR               164
Michel Kaempf's avatar
Michel Kaempf committed
47 48

#define OPT_NOVLANS             170
49 50
#define OPT_SERVER              171
#define OPT_PORT                172
Michel Kaempf's avatar
Michel Kaempf committed
51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
 
/* Long options */
static const struct option longopts[] =
{   
    /*  name,               has_arg,    flag,   val */     

    /* General/common options */
    {   "help",             0,          0,      'h' },          

    /* Audio options */
    {   "noaudio",          0,          0,      OPT_NOAUDIO },       
    {   "stereo",           0,          0,      OPT_STEREO },
    {   "mono",             0,          0,      OPT_MONO },      

    /* Video options */
    {   "novideo",          0,          0,      OPT_NOVIDEO },           
67 68 69
    {   "display",          1,          0,      OPT_DISPLAY },  
    {   "width",            1,          0,      OPT_WIDTH },
    {   "height",           1,          0,      OPT_HEIGHT },                
70 71
    {   "grayscale",        0,          0,      'g' },    
    {   "color",            0,          0,      OPT_COLOR },                
Michel Kaempf's avatar
Michel Kaempf committed
72

73
    /* Input options */
Michel Kaempf's avatar
Michel Kaempf committed
74
    {   "novlans",          0,          0,      OPT_NOVLANS },
75 76
    {   "server",           1,          0,      OPT_SERVER },
    {   "port",             1,          0,      OPT_PORT },
Michel Kaempf's avatar
Michel Kaempf committed
77 78 79 80 81

    {   0,                  0,          0,      0 }
};

/* Short options */
82
static const char *psz_shortopts = "hg";
Michel Kaempf's avatar
Michel Kaempf committed
83

Vincent Seguin's avatar
Vincent Seguin committed
84 85 86 87
/*******************************************************************************
 * Global variable program_data - this is the one and only, see main.h
 *******************************************************************************/
main_t *p_main;
Michel Kaempf's avatar
Michel Kaempf committed
88

Vincent Seguin's avatar
Vincent Seguin committed
89
/*******************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
90
 * Local prototypes
Vincent Seguin's avatar
Vincent Seguin committed
91 92 93
 *******************************************************************************/
static void SetDefaultConfiguration ( void );
static int  GetConfiguration        ( int i_argc, char *ppsz_argv[], char *ppsz_env[] );
Michel Kaempf's avatar
Michel Kaempf committed
94
static void Usage                   ( void );
Vincent Seguin's avatar
Vincent Seguin committed
95

Michel Kaempf's avatar
Michel Kaempf committed
96 97 98 99 100 101 102 103
static void InitSignalHandler       ( void );
static void SignalHandler           ( int i_signal );

/*******************************************************************************
 * main: parse command line, start interface and spawn threads
 *******************************************************************************
 * Steps during program execution are:
 *      -configuration parsing and messages interface initialization
Vincent Seguin's avatar
Vincent Seguin committed
104
 *      -openning of audio output device and some global modules
Michel Kaempf's avatar
Michel Kaempf committed
105
 *      -execution of interface, which exit on error or on user request
Vincent Seguin's avatar
Vincent Seguin committed
106
 *      -closing of audio output device and some global modules
Michel Kaempf's avatar
Michel Kaempf committed
107 108 109 110
 * On error, the spawned threads are cancelled, and the openned devices closed.
 *******************************************************************************/
int main( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
{
Vincent Seguin's avatar
Vincent Seguin committed
111 112 113
    main_t  main_data;                        /* root of all data - see main.h */
    p_main = &main_data;                         /* set up the global variable */   

Michel Kaempf's avatar
Michel Kaempf committed
114 115
    /*
     * Read configuration, initialize messages interface and set up program
Vincent Seguin's avatar
Vincent Seguin committed
116 117 118
     */    
    p_main->p_msg = intf_MsgCreate();
    if( !p_main->p_msg )                           /* start messages interface */
Michel Kaempf's avatar
Michel Kaempf committed
119
    {
Vincent Seguin's avatar
Vincent Seguin committed
120
        fprintf(stderr, "critical error: can't initialize messages interface (%s)\n",
Michel Kaempf's avatar
Michel Kaempf committed
121 122 123
                strerror(errno));
        return(errno);
    }
Vincent Seguin's avatar
Vincent Seguin committed
124
    if( GetConfiguration( i_argc, ppsz_argv, ppsz_env ) )/* parse command line */
Michel Kaempf's avatar
Michel Kaempf committed
125
    {
Vincent Seguin's avatar
Vincent Seguin committed
126
        intf_MsgDestroy();
Michel Kaempf's avatar
Michel Kaempf committed
127 128
        return(errno);
    }
129
    intf_MsgImm( COPYRIGHT_MESSAGE "\n" );            /* print welcome message */
Michel Kaempf's avatar
Michel Kaempf committed
130 131 132 133

    /*
     * Initialize shared resources and libraries
     */
Vincent Seguin's avatar
Vincent Seguin committed
134
    if( main_data.b_vlans && input_VlanCreate() )
Michel Kaempf's avatar
Michel Kaempf committed
135 136
    {
        /* On error during vlans initialization, switch of vlans */
Vincent Seguin's avatar
Vincent Seguin committed
137 138
        intf_Msg("Virtual LANs initialization failed : vlans management is desactivated\n");
        main_data.b_vlans = 0;
Michel Kaempf's avatar
Michel Kaempf committed
139 140 141
    }
    
    /*
Vincent Seguin's avatar
Vincent Seguin committed
142
     * Open audio device and start aout thread
Michel Kaempf's avatar
Michel Kaempf committed
143
     */
Vincent Seguin's avatar
Vincent Seguin committed
144 145 146 147 148 149 150 151 152
    if( main_data.b_audio )
    {
        main_data.p_aout = aout_CreateThread( NULL );
	if( main_data.p_aout == NULL )
	{
	    /* On error during audio initialization, switch of audio */
            intf_Msg("Audio initialization failed : audio is desactivated\n");
            main_data.b_audio = 0;
	}
Michel Kaempf's avatar
Michel Kaempf committed
153 154 155 156 157
    }
    
    /*
     * Run interface
     */
Vincent Seguin's avatar
Vincent Seguin committed
158 159 160 161 162 163 164
    main_data.p_intf = intf_Create();
    if( main_data.p_intf != NULL )
    {
	InitSignalHandler();               /* prepare signals for interception */
 	intf_Run( main_data.p_intf );
	intf_Destroy( main_data.p_intf );
    }
Michel Kaempf's avatar
Michel Kaempf committed
165

Michel Kaempf's avatar
Michel Kaempf committed
166
    /*
Michel Kaempf's avatar
Michel Kaempf committed
167 168
     * Close audio device
     */
Vincent Seguin's avatar
Vincent Seguin committed
169
    if( main_data.b_audio )
Michel Kaempf's avatar
Michel Kaempf committed
170
    {
Vincent Seguin's avatar
Vincent Seguin committed
171
        aout_DestroyThread( main_data.p_aout, NULL );
Michel Kaempf's avatar
Michel Kaempf committed
172
    }
Michel Kaempf's avatar
Michel Kaempf committed
173 174 175 176

    /*
     * Free shared resources and libraries
     */
Vincent Seguin's avatar
Vincent Seguin committed
177
    if( main_data.b_vlans )
Michel Kaempf's avatar
Michel Kaempf committed
178
    {        
Vincent Seguin's avatar
Vincent Seguin committed
179
        input_VlanDestroy();    
Michel Kaempf's avatar
Michel Kaempf committed
180 181 182 183 184
    }    

    /*
     * Terminate messages interface and program
     */
Vincent Seguin's avatar
Vincent Seguin committed
185 186
    intf_Msg( "Program terminated.\n" );
    intf_MsgDestroy();
Michel Kaempf's avatar
Michel Kaempf committed
187 188 189
    return( 0 );
}

Vincent Seguin's avatar
Vincent Seguin committed
190 191 192 193 194 195 196
/*******************************************************************************
 * main_GetIntVariable: get the int value of an environment variable
 *******************************************************************************
 * This function is used to read some default parameters in modules.
 *******************************************************************************/
int main_GetIntVariable( char *psz_name, int i_default )
{
197 198 199
    char *      psz_env;                                  /* environment value */
    char *      psz_end;                               /* end of parsing index */
    long int    i_value;                                              /* value */
Vincent Seguin's avatar
Vincent Seguin committed
200 201 202

    psz_env = getenv( psz_name );
    if( psz_env )
203 204 205 206 207 208
    {        
        i_value = strtol( psz_env, &psz_end, 0 );
        if( (*psz_env != '\0') && (*psz_end == '\0') )
        {
            return( i_value );
        }        
Vincent Seguin's avatar
Vincent Seguin committed
209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224
    }	
    return( i_default );
}

/*******************************************************************************
 * main_GetPszVariable: get the string value of an environment variable
 *******************************************************************************
 * This function is used to read some default parameters in modules.
 *******************************************************************************/
char * main_GetPszVariable( char *psz_name, char *psz_default )
{
    char *psz_env;

    psz_env = getenv( psz_name );
    if( psz_env )
    {
225
        return( psz_env );
Vincent Seguin's avatar
Vincent Seguin committed
226 227 228 229
    }
    return( psz_default );    
}

230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270
/*******************************************************************************
 * main_PutPszVariable: set the string value of an environment variable
 *******************************************************************************
 * This function is used to set some default parameters in modules. The use of
 * this function will cause some memory leak: since some systems use the pointer
 * passed to putenv to store the environment string, it can't be freed.
 *******************************************************************************/
void main_PutPszVariable( char *psz_name, char *psz_value )
{
    char *psz_env;

    psz_env = malloc( strlen(psz_name) + strlen(psz_value) + 2 );
    if( psz_env == NULL )
    {
        intf_ErrMsg("error: %s\n", strerror(ENOMEM));        
    }
    else
    {
        sprintf( psz_env, "%s=%s", psz_name, psz_value );
        if( putenv( psz_env ) )
        {
            intf_ErrMsg("error: %s\n", strerror(errno));
        }        
    }
}

/*******************************************************************************
 * main_PutIntVariable: set the integer value of an environment variable
 *******************************************************************************
 * This function is used to set some default parameters in modules. The use of
 * this function will cause some memory leak: since some systems use the pointer
 * passed to putenv to store the environment string, it can't be freed.
 *******************************************************************************/
void main_PutIntVariable( char *psz_name, int i_value )
{
    char psz_value[ 256 ];                                 /* buffer for value */    

    sprintf(psz_value, "%d", i_value );        
    main_PutPszVariable( psz_name, psz_value );    
}

Michel Kaempf's avatar
Michel Kaempf committed
271 272 273 274 275 276
/* following functions are local */

/*******************************************************************************
 * SetDefaultConfiguration: set default options
 *******************************************************************************
 * This function is called by GetConfiguration before command line is parsed.
Vincent Seguin's avatar
Vincent Seguin committed
277 278 279
 * It sets all the default values required later by the program. At this stage,
 * most structure are not yet allocated, so initialization must be done using
 * environment.
Michel Kaempf's avatar
Michel Kaempf committed
280
 *******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
281
static void SetDefaultConfiguration( void )
Michel Kaempf's avatar
Michel Kaempf committed
282 283
{
    /*
Vincent Seguin's avatar
Vincent Seguin committed
284
     * All features are activated by default
Michel Kaempf's avatar
Michel Kaempf committed
285
     */
Vincent Seguin's avatar
Vincent Seguin committed
286 287 288
    p_main->b_audio  = 1;
    p_main->b_video  = 1;
    p_main->b_vlans  = 1;
Michel Kaempf's avatar
Michel Kaempf committed
289 290 291 292 293 294 295
}

/*******************************************************************************
 * GetConfiguration: parse command line
 *******************************************************************************
 * Parse command line and configuration file for configuration. If the inline
 * help is requested, the function Usage() is called and the function returns
Vincent Seguin's avatar
Vincent Seguin committed
296 297 298
 * -1 (causing main() to exit). The messages interface is initialized at this 
 * stage, but most structures are not allocated, so only environment should
 * be used.
Michel Kaempf's avatar
Michel Kaempf committed
299
 *******************************************************************************/
Vincent Seguin's avatar
Vincent Seguin committed
300
static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
Michel Kaempf's avatar
Michel Kaempf committed
301
{
Vincent Seguin's avatar
Vincent Seguin committed
302
    int c, i_opt;
Michel Kaempf's avatar
Michel Kaempf committed
303 304

    /* Set default configuration and copy arguments */
Vincent Seguin's avatar
Vincent Seguin committed
305 306 307 308
    p_main->i_argc    = i_argc;
    p_main->ppsz_argv = ppsz_argv;
    p_main->ppsz_env  = ppsz_env;    
    SetDefaultConfiguration();
Michel Kaempf's avatar
Michel Kaempf committed
309

Vincent Seguin's avatar
Vincent Seguin committed
310
    /* Parse command line options */
Michel Kaempf's avatar
Michel Kaempf committed
311 312 313 314 315 316 317 318 319 320 321 322 323
    opterr = 0;
    while( ( c = getopt_long( i_argc, ppsz_argv, psz_shortopts, longopts, 0 ) ) != EOF )
    {
        switch( c )
        {
        /* General/common options */   
        case 'h':                                                /* -h, --help */
            Usage();
            return( -1 );
            break;

        /* Audio options */
        case OPT_NOAUDIO:                                        /* --noaudio */
Vincent Seguin's avatar
Vincent Seguin committed
324
	    p_main->b_audio = 0;
Michel Kaempf's avatar
Michel Kaempf committed
325
            break;
326 327
        case OPT_STEREO:                                          /* --stereo */
            main_PutIntVariable( AOUT_STEREO_VAR, 1 );
Michel Kaempf's avatar
Michel Kaempf committed
328 329
            break;
        case OPT_MONO:                                              /* --mono */
330
            main_PutIntVariable( AOUT_STEREO_VAR, 0 );
Michel Kaempf's avatar
Michel Kaempf committed
331 332 333 334
            break;

        /* Video options */
        case OPT_NOVIDEO:                                         /* --novideo */
Vincent Seguin's avatar
Vincent Seguin committed
335
            p_main->b_video = 0;
Michel Kaempf's avatar
Michel Kaempf committed
336
            break;       
337 338 339 340 341 342 343 344 345 346
        case OPT_DISPLAY:                                         /* --display */
            main_PutPszVariable( VOUT_DISPLAY_VAR, optarg );
            break;            
        case OPT_WIDTH:                                             /* --width */
            main_PutPszVariable( VOUT_WIDTH_VAR, optarg );
            break;            
        case OPT_HEIGHT:                                           /* --height */            
            main_PutPszVariable( VOUT_HEIGHT_VAR, optarg );            
            break;            
            
347 348 349 350 351 352
        case 'g':                                           /* -g, --grayscale */
            main_PutIntVariable( VOUT_GRAYSCALE_VAR, 1 );
            break;            
        case OPT_COLOR:                                             /* --color */
            main_PutIntVariable( VOUT_GRAYSCALE_VAR, 0 );
            break;            
Michel Kaempf's avatar
Michel Kaempf committed
353

354
        /* Input options */
Michel Kaempf's avatar
Michel Kaempf committed
355
        case OPT_NOVLANS:                                         /* --novlans */
Vincent Seguin's avatar
Vincent Seguin committed
356 357
            p_main->b_vlans = 0;
            break;      
358 359 360 361 362 363
        case OPT_SERVER:                                           /* --server */
            main_PutPszVariable( INPUT_SERVER_VAR, optarg );
            break;            
        case OPT_PORT:                                               /* --port */
            main_PutPszVariable( INPUT_PORT_VAR, optarg );
            break;            
Michel Kaempf's avatar
Michel Kaempf committed
364 365 366 367 368 369 370 371 372 373
	    
        /* Internal error: unknown option */
        case '?':                          
        default:
            intf_ErrMsg("intf error: unknown option '%s'\n", ppsz_argv[optind - 1]);
            return( EINVAL );
            break;
        }
    }

Vincent Seguin's avatar
Vincent Seguin committed
374 375 376 377 378
    /* Parse command line parameters - no check is made for these options */
    for( i_opt = optind; i_opt < i_argc; i_opt++ )
    {
	putenv( ppsz_argv[ i_opt ] );
    }
Michel Kaempf's avatar
Michel Kaempf committed
379 380 381 382 383 384 385 386 387 388
    return( 0 );
}

/*******************************************************************************
 * Usage: print program usage
 *******************************************************************************
 * Print a short inline help. Message interface is initialized at this stage.
 *******************************************************************************/
static void Usage( void )
{
Vincent Seguin's avatar
Vincent Seguin committed
389 390
    intf_Msg(COPYRIGHT_MESSAGE "\n");

Vincent Seguin's avatar
Vincent Seguin committed
391
    /* Usage */
392
    intf_Msg("usage: vlc [options...] [parameters]\n" );
Vincent Seguin's avatar
Vincent Seguin committed
393 394

    /* Options */
Vincent Seguin's avatar
Vincent Seguin committed
395
    intf_Msg("Options:\n" \
396 397 398 399 400 401 402 403 404
             "  -h, --help                        \tprint usage\n" \
             "  --noaudio                         \tdisable audio\n" \
             "  --stereo, --mono                  \tstereo/mono audio\n" \
             "  --novideo                         \tdisable video\n" \
             "  --display <display>               \tdisplay string\n" \
             "  --width <w>, --height <h>         \tdisplay dimensions\n" \
             "  -g, --grayscale, --color          \tgrayscale/color video\n" \
             "  --novlans                         \tdisable vlans\n" \
             "  --server <host>, --port <port>    \tvideo server adress\n" \
Michel Kaempf's avatar
Michel Kaempf committed
405 406
             );

Vincent Seguin's avatar
Vincent Seguin committed
407 408
    /* Interface parameters */
    intf_Msg("Interface parameters:\n" \
409
	     "  " INTF_INIT_SCRIPT_VAR "=<filename>             \tinitialization script\n" \
Vincent Seguin's avatar
Vincent Seguin committed
410 411 412 413
	     );

    /* Audio parameters */
    intf_Msg("Audio parameters:\n" \
414 415 416
             "  " AOUT_DSP_VAR "=<filename>              \tdsp device path\n" \
             "  " AOUT_STEREO_VAR "={1|0}                \tstereo or mono output\n" \
             "  " AOUT_RATE_VAR "=<rate>             \toutput rate\n" \
Vincent Seguin's avatar
Vincent Seguin committed
417 418 419 420
	     );

    /* Video parameters */
    intf_Msg("Video parameters:\n" \
421 422 423 424 425
             "  " VOUT_DISPLAY_VAR "=<display name>      \tdisplay used\n" \
             "  " VOUT_WIDTH_VAR "=<width>               \tdisplay width\n" \
             "  " VOUT_HEIGHT_VAR "=<height>             \tdislay height\n" \
             "  " VOUT_FB_DEV_VAR "=<filename>           \tframebuffer device path\n" \
             "  " VOUT_GRAYSCALE_VAR "={1|0}             \tgrayscale or color output\n" \
Vincent Seguin's avatar
Vincent Seguin committed
426 427
	     ); 

428 429 430 431 432 433 434
    /* Input parameters */
    intf_Msg("Input parameters:\n" \
             "  " INPUT_SERVER_VAR "=<hostname>          \tvideo server\n" \
             "  " INPUT_PORT_VAR "=<port>            \tvideo server port\n" \
	     "  " INPUT_IFACE_VAR "=<interface>          \tnetwork interface\n" \
             "  " INPUT_VLAN_SERVER_VAR "=<hostname>     \tvlan server\n" \
             "  " INPUT_VLAN_PORT_VAR "=<port>           \tvlan server port\n" \
Vincent Seguin's avatar
Vincent Seguin committed
435
	     );
Vincent Seguin's avatar
Vincent Seguin committed
436 437

    /* Interfaces keys */
438
    intf_Msg("Interface keys: most interfaces accept the following commands:\n" \
439 440 441 442 443
             "  [esc], q                          \tquit\n" \
             "  +, -, m                           \tchange volume, mute\n" \
             "  g, G, c                           \tchange gamma, toggle grayscale\n" \
             "  0 - 9                             \tselect channel\n" \
             "  [space]                           \ttoggle info printing\n" \
Vincent Seguin's avatar
Vincent Seguin committed
444
             );    
Michel Kaempf's avatar
Michel Kaempf committed
445 446 447 448 449 450 451 452 453 454 455
}

/*******************************************************************************
 * InitSignalHandler: system signal handler initialization
 *******************************************************************************
 * Set the signal handlers. SIGTERM is not intercepted, because we need at
 * at least a method to kill the program when all other methods failed, and 
 * when we don't want to use SIGKILL.
 *******************************************************************************/
static void InitSignalHandler( void )
{
Vincent Seguin's avatar
Vincent Seguin committed
456 457 458 459
    /* Termination signals */
    signal( SIGHUP,  SignalHandler );
    signal( SIGINT,  SignalHandler );
    signal( SIGQUIT, SignalHandler );
Michel Kaempf's avatar
Michel Kaempf committed
460 461 462 463 464
}

/*******************************************************************************
 * SignalHandler: system signal handler
 *******************************************************************************
Vincent Seguin's avatar
Vincent Seguin committed
465 466
 * This function is called when a signal is received by the program. It tries to
 * end the program in a clean way.
Michel Kaempf's avatar
Michel Kaempf committed
467 468 469
 *******************************************************************************/
static void SignalHandler( int i_signal )
{
Vincent Seguin's avatar
Vincent Seguin committed
470 471 472 473 474 475 476 477 478 479 480 481 482 483 484
    /* Once a signal has been trapped, the termination sequence will be armed and 
     * following signals will be ignored to avoid sending messages to an interface
     * having been destroyed */
    signal( SIGHUP,  SIG_IGN );
    signal( SIGINT,  SIG_IGN );
    signal( SIGQUIT, SIG_IGN );

    /* Acknowledge the signal received */
    intf_ErrMsgImm("intf: signal %d received\n", i_signal );

    /* Try to terminate everything - this is done by requesting the end of the 
     * interface thread */
    p_main->p_intf->b_die = 1;
}

Michel Kaempf's avatar
Michel Kaempf committed
485 486