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

Switch search paths + update CNFA

Browse source
This commit is contained in:
cnlohr 2020-05-18 15:29:35 -07:00
parent 911f60ae56
commit 9d11a76f69
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
colorchord2/cnfa

@ -1 +1 @@
Subproject commit 8fed9b680a217afabd0d9ce4b459499d370a0719 Subproject commit f34087cf216cfa8a885fde616659fef3e862c048

20
colorchord2/configs.c
View file

@ -48,16 +48,19 @@ void LoadFile( const char * filename )
void SetEnvValues( int force ) void SetEnvValues( int force )
{ {
int i; static int ifcheck;
int hits = 0; int hits = 0;
for( i = 0; i < InitialFileCount; i++ )
if( InitialFileCount )
{ {
double ft = OGGetFileTime( InitialFile[i] ); //Only check one location per frame.
if( FileTimes[i] != ft ) double ft = OGGetFileTime( InitialFile[ifcheck] );
if( FileTimes[ifcheck] != ft )
{ {
FileTimes[i] = ft; FileTimes[ifcheck] = ft;
hits++; hits++;
} }
ifcheck = ( ifcheck + 1 ) % InitialFileCount;
} }
if( !hits && !force ) return; if( !hits && !force ) return;
@ -109,6 +112,7 @@ 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
int i;
for( i = 0; i < InitialFileCount; i++ ) for( i = 0; i < InitialFileCount; i++ )
{ {
LoadFile( InitialFile[i] ); LoadFile( InitialFile[i] );
@ -151,8 +155,10 @@ void SetupConfigs()
{ {
#ifdef ANDROID #ifdef ANDROID
InitialFile[0] = "/sdcard/colorchord-android.txt"; InitialFile[0] = "/sdcard/colorchord-android.txt";
InitialFile[1] = "/sdcard/colorchord-android-overlay.txt"; InitialFile[1] = "/storage/emulated/0/colorchord-android.txt";
InitialFileCount = 2; InitialFile[2] = "/sdcard/colorchord-android-overlay.txt";
InitialFile[3] = "/storage/emulated/0/colorchord-android-overlay.txt";
InitialFileCount = 4;
#else #else
InitialFile[0] = "default.conf"; InitialFile[0] = "default.conf";
#endif #endif