fruchti/colorchord
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Allow other configuration schemes.

Browse source
This commit is contained in:
cnlohr 2020-05-11 14:25:25 -07:00
parent 6c6e724325
commit c891563efd
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
colorchord2/configs.c
View file

@ -19,6 +19,7 @@ void LoadFile( const char * filename )
char * buffer; char * buffer;
int r; int r;
printf( "Loading file: %s\n", filename );
FILE * f = fopen( filename, "rb" ); FILE * f = fopen( filename, "rb" );
if( !f ) if( !f )
{ {
@ -108,9 +109,11 @@ void SetEnvValues( int force )
printf( "On Android, looking for configuration file in: %s\n", InitialFile[0] ); printf( "On Android, looking for configuration file in: %s\n", InitialFile[0] );
#endif #endif
LoadFile( InitialFile[0] ); for( i = 0; i < InitialFileCount; i++ )
{
for( i = 1; i < gargc; i++ ) LoadFile( InitialFile[i] );
}
for( ; i < gargc; i++ )
{ {
if( strchr( gargv[i], '=' ) != 0 ) if( strchr( gargv[i], '=' ) != 0 )
{ {
@ -147,7 +150,9 @@ void ProcessArgs()
void SetupConfigs() void SetupConfigs()
{ {
#ifdef ANDROID #ifdef ANDROID
InitialFile[0] = "/sdcard/colorchord-android.conf"; InitialFile[0] = "/sdcard/colorchord-android.txt";
InitialFile[1] = "/sdcard/colorchord-android-overlay.txt";
InitialFileCount = 2;
#else #else
InitialFile[0] = "default.conf"; InitialFile[0] = "default.conf";
#endif #endif