Merge branch 'master' of https://github.com/cnlohr/colorchord into cnlohr-master
Fixing merge conflicts
This commit is contained in:
commit
64a01179ef
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -1,2 +1,3 @@
|
|||
colorchord2/windows/colorchord.def
|
||||
colorchord2/colorchord.def
|
||||
colorchord2/colorchord.def
|
||||
*.o
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" package="org.cnlohr.colorchord"
|
||||
android:versionCode="5">
|
||||
android:versionCode="8">
|
||||
|
||||
<uses-sdk android:minSdkVersion="22"
|
||||
android:targetSdkVersion="28" />
|
||||
|
||||
<uses-permission android:name="android.permission.SET_RELEASE_APP"/>
|
||||
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
||||
|
||||
<application android:debuggable="false" android:hasCode="false" android:label="colorchord" tools:replace="android:icon,android:theme,android:allowBackup,label" android:icon="@mipmap/icon" android:requestLegacyExternalStorage="true">
|
||||
<application android:debuggable="false" android:hasCode="false" android:label="colorchord" tools:replace="android:icon,android:theme,android:allowBackup,label" android:icon="@mipmap/icon" > <!--android:requestLegacyExternalStorage="true" Not needed til Android 29 -->
|
||||
<activity android:configChanges="keyboardHidden|orientation" android:label="colorchord" android:name="android.app.NativeActivity">
|
||||
|
||||
<!-- This device filter seems to do nothing at all! If you figure out how to use it or what it does, let me know!! -->
|
||||
|
|
|
@ -7,7 +7,8 @@ CFLAGS:=-I. -I.. -Irawdrawandroid/rawdraw -I../cnfa -I../../embeddedcommon \
|
|||
-ffunction-sections -Os -s -DPRINTF_NO_OVERRIDDE -fvisibility=hidden \
|
||||
-DRDALOGFNCB=example_log_function
|
||||
|
||||
#ANDROIDVERSION=24
|
||||
ANDROIDVERSION=22
|
||||
ANDROIDTARGET=28
|
||||
|
||||
LDFLAGS:=-s -lOpenSLES
|
||||
|
||||
|
|
|
@ -48,16 +48,19 @@ void LoadFile( const char * filename )
|
|||
|
||||
void SetEnvValues( int force )
|
||||
{
|
||||
int i;
|
||||
static int ifcheck;
|
||||
int hits = 0;
|
||||
for( i = 0; i < InitialFileCount; i++ )
|
||||
|
||||
if( InitialFileCount )
|
||||
{
|
||||
double ft = OGGetFileTime( InitialFile[i] );
|
||||
if( FileTimes[i] != ft )
|
||||
//Only check one location per frame.
|
||||
double ft = OGGetFileTime( InitialFile[ifcheck] );
|
||||
if( FileTimes[ifcheck] != ft )
|
||||
{
|
||||
FileTimes[i] = ft;
|
||||
FileTimes[ifcheck] = ft;
|
||||
hits++;
|
||||
}
|
||||
ifcheck = ( ifcheck + 1 ) % InitialFileCount;
|
||||
}
|
||||
|
||||
if( !hits && !force ) return;
|
||||
|
@ -109,6 +112,7 @@ void SetEnvValues( int force )
|
|||
printf( "On Android, looking for configuration file in: %s\n", InitialFile[0] );
|
||||
#endif
|
||||
|
||||
int i;
|
||||
for( i = 0; i < InitialFileCount; i++ )
|
||||
{
|
||||
LoadFile( InitialFile[i] );
|
||||
|
@ -151,8 +155,10 @@ void SetupConfigs()
|
|||
{
|
||||
#ifdef ANDROID
|
||||
InitialFile[0] = "/sdcard/colorchord-android.txt";
|
||||
InitialFile[1] = "/sdcard/colorchord-android-overlay.txt";
|
||||
InitialFileCount = 2;
|
||||
InitialFile[1] = "/storage/emulated/0/colorchord-android.txt";
|
||||
InitialFile[2] = "/sdcard/colorchord-android-overlay.txt";
|
||||
InitialFile[3] = "/storage/emulated/0/colorchord-android-overlay.txt";
|
||||
InitialFileCount = 4;
|
||||
#else
|
||||
InitialFile[0] = "default.conf";
|
||||
#endif
|
||||
|
|
|
@ -227,7 +227,7 @@ void HandleMotion( int x, int y, int mask )
|
|||
{
|
||||
}
|
||||
|
||||
void SoundCB( struct CNFADriver * sd, short * in, short * out, int samplesr, int samplesp )
|
||||
void SoundCB( struct CNFADriver * sd, short * in, short * out, int framesr, int framesp )
|
||||
{
|
||||
int channelin = sd->channelsRec;
|
||||
int channelout = sd->channelsPlay;
|
||||
|
@ -241,7 +241,7 @@ void SoundCB( struct CNFADriver * sd, short * in, short * out, int samplesr, int
|
|||
|
||||
if( in )
|
||||
{
|
||||
for( i = 0; i < samplesr; i++ )
|
||||
for( i = 0; i < framesr; i++ )
|
||||
{
|
||||
if( sample_channel < 0 )
|
||||
{
|
||||
|
@ -280,17 +280,17 @@ void SoundCB( struct CNFADriver * sd, short * in, short * out, int samplesr, int
|
|||
|
||||
}
|
||||
}
|
||||
SoundEventHappened( samplesr, in, 0, channelin );
|
||||
SoundEventHappened( framesr, in, 0, channelin );
|
||||
}
|
||||
|
||||
|
||||
if( out )
|
||||
{
|
||||
for( j = 0; j < samplesp * channelout; j++ )
|
||||
for( j = 0; j < framesp * channelout; j++ )
|
||||
{
|
||||
out[j] = 0;
|
||||
}
|
||||
SoundEventHappened( samplesp, out, 1, channelout );
|
||||
SoundEventHappened( framesp, out, 1, channelout );
|
||||
}
|
||||
|
||||
|
||||
|
@ -430,7 +430,7 @@ int main(int argc, char ** argv)
|
|||
//Initialize Sound
|
||||
sd = CNFAInit( sound_source, "colorchord", &SoundCB, GetParameterI( "samplerate", 44100 ),
|
||||
GetParameterI( "channels", 2 ), GetParameterI( "channels", 2 ), GetParameterI( "buffer", 1024 ),
|
||||
GetParameterS( "devrecord", 0 ), GetParameterS( "devplay", 0 ) );
|
||||
GetParameterS( "devrecord", 0 ), GetParameterS( "devplay", 0 ), 0 );
|
||||
|
||||
if( sd ) break;
|
||||
|
||||
|
|
Loading…
Reference in a new issue