Commit fbbe2a20 authored by sagnowski's avatar sagnowski
Browse files

Include missing change from last commit

parent b900e1f5

apps/renderer.c

+8 −9
Original line number Diff line number Diff line
@@ -1263,31 +1263,30 @@ static IVAS_REND_AudioConfig parseAudioConfig( const char *configString ) 
    return IVAS_REND_AUDIO_CONFIG_UNKNOWN;

}



static CmdLnParser_Option findOptionById( int32_t id )

static const CmdLnParser_Option* findOptionById( int32_t id )

{



    for ( int32_t i = 0; i < numCliOptions; ++i )

    {

        if ( cliOptions[i].id == id )

        {

            return cliOptions[i];

            return &cliOptions[i];

        }

    }



    /* Return first option if ID not matched */

    return cliOptions[0];

    return NULL;

}



static bool checkRequiredArgs( CmdlnArgs args )

{

    CmdLnParser_Option tmpOption;

    const CmdLnParser_Option* tmpOption;



    /* Check required arguments */

    bool missingRequiredArg = false;

    if ( isEmptyString( args.inputFilePath ) )

    {

        tmpOption = findOptionById( CmdLnOptionId_inputFile );

        fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption.match, tmpOption.matchShort );

        fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption->match, tmpOption->matchShort );

        missingRequiredArg = true;

    }

    const bool singleInputSpecified = args.inConfig.numAudioObjects != 0 ||
@@ -1298,19 +1297,19 @@ static bool checkRequiredArgs( CmdlnArgs args ) 
    {

        /* Neither scene description input nor single-type input was specified on command line */

        tmpOption = findOptionById( CmdLnOptionId_inputFormat );

        fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption.match, tmpOption.matchShort );

        fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption->match, tmpOption->matchShort );

        missingRequiredArg = true;

    }

    if ( isEmptyString( args.outputFilePath ) )

    {

        tmpOption = findOptionById( CmdLnOptionId_outputFile );

        fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption.match, tmpOption.matchShort );

        fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption->match, tmpOption->matchShort );

        missingRequiredArg = true;

    }

    if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_UNKNOWN )

    {

        tmpOption = findOptionById( CmdLnOptionId_outputFormat );

        fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption.match, tmpOption.matchShort );

        fprintf( stderr, "Missing required argument: %s (%s)\n", tmpOption->match, tmpOption->matchShort );

        missingRequiredArg = true;

    }

    if ( missingRequiredArg )