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

cleanup when Android is suspending our app.

Browse source
This commit is contained in:
cnlohr 2020-05-10 21:28:24 -07:00
parent 79089566a1
commit 534c2186f0
2 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
colorchord2/android/DisplayTensigralAndroid.c
View file

@ -13,6 +13,7 @@
#include <linux/usbdevice_fs.h> #include <linux/usbdevice_fs.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
extern int is_suspended;
#define MAX_LEDS_PER_NOTE 512 #define MAX_LEDS_PER_NOTE 512
@ -43,10 +44,13 @@ static void DTAUpdate(void * id, struct NoteFinder*nf)
RequestPermissionOrGetConnectionFD( TensigralDebugStatus, 0xabcd, 0xf410 ); RequestPermissionOrGetConnectionFD( TensigralDebugStatus, 0xabcd, 0xf410 );
} }
CNFGPenX = 800; if( !is_suspended )
CNFGPenY = 800; {
CNFGColor( 0xffffff ); CNFGPenX = 800;
CNFGDrawText( TensigralDebugStatus, 2 ); CNFGPenY = 800;
CNFGColor( 0xffffff );
CNFGDrawText( TensigralDebugStatus, 2 );
}
if( !deviceConnectionFD ) return; if( !deviceConnectionFD ) return;

50
colorchord2/main.c
View file

@ -128,7 +128,7 @@ void HandleDestroy()
#endif #endif
int is_suspended = 0;
float DeltaFrameTime = 0; float DeltaFrameTime = 0;
double Now = 0; double Now = 0;
@ -290,12 +290,12 @@ void SoundCB( struct CNFADriver * sd, short * in, short * out, int samplesr, int
#ifdef ANDROID #ifdef ANDROID
void HandleSuspend() void HandleSuspend()
{ {
//Unused. is_suspended = 1;
} }
void HandleResume() void HandleResume()
{ {
//Unused. is_suspended = 0;
} }
#endif #endif
@ -488,7 +488,7 @@ int main(int argc, char ** argv)
//int maxdists = freqbins/2; //int maxdists = freqbins/2;
//Do a bunch of debugging. //Do a bunch of debugging.
if( show_debug_basic ) if( show_debug_basic && !is_suspended )
{ {
//char sttdebug[1024]; //char sttdebug[1024];
//char * sttend = sttdebug; //char * sttend = sttdebug;
@ -544,7 +544,7 @@ int main(int argc, char ** argv)
} }
//Extra debugging? //Extra debugging?
if( show_debug ) if( show_debug && !is_suspended )
{ {
//Draw the histogram //Draw the histogram
float lasthistval; float lasthistval;
@ -583,31 +583,33 @@ int main(int argc, char ** argv)
CNFGDrawText( stdebug, 2 ); CNFGDrawText( stdebug, 2 );
} }
CNFGColor( show_debug?0xffffff:0x000000 ); if( !is_suspended )
CNFGPenX = 0; CNFGPenY = screeny-10; {
CNFGDrawText( "Extra Debug (D)", 2 ); CNFGColor( show_debug?0xffffff:0x000000 );
CNFGPenX = 0; CNFGPenY = screeny-10;
CNFGDrawText( "Extra Debug (D)", 2 );
CNFGColor( show_debug_basic?0xffffff:0x000000 ); CNFGColor( show_debug_basic?0xffffff:0x000000 );
CNFGPenX = 120; CNFGPenY = screeny-10; CNFGPenX = 120; CNFGPenY = screeny-10;
CNFGDrawText( "Basic Debug (E)", 2 ); CNFGDrawText( "Basic Debug (E)", 2 );
CNFGColor( show_debug_basic?0xffffff:0x000000 ); CNFGColor( show_debug_basic?0xffffff:0x000000 );
CNFGPenX = 240; CNFGPenY = screeny-10; CNFGPenX = 240; CNFGPenY = screeny-10;
sprintf( stt, "[9] Key: %d [0] (%3.1f) [-]", gKey, nf->base_hz ); sprintf( stt, "[9] Key: %d [0] (%3.1f) [-]", gKey, nf->base_hz );
CNFGDrawText( stt, 2 ); CNFGDrawText( stt, 2 );
CNFGColor( 0xffffff ); CNFGColor( 0xffffff );
CNFGPenX = 440; CNFGPenY = screeny-10; CNFGPenX = 440; CNFGPenY = screeny-10;
sprintf( stt, "FPS: %d", lastfps ); sprintf( stt, "FPS: %d", lastfps );
CNFGDrawText( stt, 2 ); CNFGDrawText( stt, 2 );
#ifdef ANDROID #ifdef ANDROID
CNFGColor( 0xffffff ); CNFGColor( 0xffffff );
CNFGPenX = 10; CNFGPenY = 600; CNFGPenX = 10; CNFGPenY = 600;
CNFGDrawText( genlog, 3 ); CNFGDrawText( genlog, 3 );
#endif #endif
CNFGSwapBuffers();
CNFGSwapBuffers(); }
} }
//Finish Rawdraw with FPS counter, and a nice delay loop. //Finish Rawdraw with FPS counter, and a nice delay loop.