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

Fix some allignment issues noticed in github

Browse source
This commit is contained in:
Sam Ellicott 2021-03-13 14:12:19 -05:00
parent 793e72df42
commit ad23066976
1 changed files with 23 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
colorchord2/main.c
View file

@ -129,14 +129,14 @@ int lastfps;
short screenx, screeny; short screenx, screeny;
struct DriverInstances *outdriver[ MAX_OUT_DRIVERS ]; struct DriverInstances *outdriver[ MAX_OUT_DRIVERS ];
int headless = 0; REGISTER_PARAM( headless, PAINT ); int headless = 0; REGISTER_PARAM( headless, PAINT );
int set_screenx = 640; REGISTER_PARAM( set_screenx, PAINT ); int set_screenx = 640; REGISTER_PARAM( set_screenx, PAINT );
int set_screeny = 480; REGISTER_PARAM( set_screeny, PAINT ); int set_screeny = 480; REGISTER_PARAM( set_screeny, PAINT );
char sound_source[ 16 ]; REGISTER_PARAM( sound_source, PABUFFER ); char sound_source[ 16 ]; REGISTER_PARAM( sound_source, PABUFFER );
int cpu_autolimit = 1; REGISTER_PARAM( cpu_autolimit, PAINT ); int cpu_autolimit = 1; REGISTER_PARAM( cpu_autolimit, PAINT );
float cpu_autolimit_interval = 0.016; REGISTER_PARAM( cpu_autolimit_interval, PAFLOAT ); float cpu_autolimit_interval = 0.016; REGISTER_PARAM( cpu_autolimit_interval, PAFLOAT );
int sample_channel = -1; REGISTER_PARAM( sample_channel, PAINT ); int sample_channel = -1; REGISTER_PARAM( sample_channel, PAINT );
int showfps = 1; REGISTER_PARAM( showfps, PAINT ); int showfps = 1; REGISTER_PARAM( showfps, PAINT );
#if defined( ANDROID ) || defined( __android__ ) #if defined( ANDROID ) || defined( __android__ )
float in_amplitude = 2; float in_amplitude = 2;
@ -178,7 +178,7 @@ void HandleKey( int keycode, int bDown )
return; return;
} }
#endif #endif
if( keycode == ESCAPE_KEY ) exit( 0 ); if( keycode == ESCAPE_KEY ) exit( 0 );
if( c == 'W' ) force_white = bDown; if( c == 'W' ) force_white = bDown;
if( c == 'D' && bDown ) show_debug = !show_debug; if( c == 'D' && bDown ) show_debug = !show_debug;
if( c == '9' && bDown ) { gKey--; RecalcBaseHz(); } if( c == '9' && bDown ) { gKey--; RecalcBaseHz(); }
@ -234,7 +234,7 @@ void SoundCB( struct CNFADriver *sd, short *out, short *in, int framesp, int fra
fo += f; fo += f;
else else
fo += ( f > 0 ) ? 1 : -1; fo += ( f > 0 ) ? 1 : -1;
} }
fo /= channelin; fo /= channelin;
sound[ soundhead ] = fo * in_amplitude; sound[ soundhead ] = fo * in_amplitude;
soundhead = ( soundhead + 1 ) % SOUNDCBSIZE; soundhead = ( soundhead + 1 ) % SOUNDCBSIZE;
@ -245,7 +245,7 @@ void SoundCB( struct CNFADriver *sd, short *out, short *in, int framesp, int fra
if ( f > 1 || f < -1 ) f = ( f > 0 ) ? 1 : -1; if ( f > 1 || f < -1 ) f = ( f > 0 ) ? 1 : -1;
sound[ soundhead ] = f * in_amplitude; sound[ soundhead ] = f * in_amplitude;
soundhead = ( soundhead + 1 ) % SOUNDCBSIZE; soundhead = ( soundhead + 1 ) % SOUNDCBSIZE;
} }
} }
SoundEventHappened( framesr, in, 0, channelin ); SoundEventHappened( framesr, in, 0, channelin );
} }
@ -279,11 +279,11 @@ void RegisterConstructorFunctions()
REGISTERheadless(); REGISTERheadless();
REGISTERset_screenx(); REGISTERset_screenx();
REGISTERset_screeny(); REGISTERset_screeny();
REGISTERsound_source(); REGISTERsound_source();
REGISTERcpu_autolimit(); REGISTERcpu_autolimit();
REGISTERcpu_autolimit_interval(); REGISTERcpu_autolimit_interval();
REGISTERsample_channel(); REGISTERsample_channel();
REGISTERshowfps(); REGISTERshowfps();
REGISTERin_amplitude(); REGISTERin_amplitude();
// Audio stuff // Audio stuff
@ -326,19 +326,13 @@ int main( int argc, char **argv )
#if defined( WIN32 ) || defined( USE_WINDOWS ) #if defined( WIN32 ) || defined( USE_WINDOWS )
// In case something needs network access. // In case something needs network access.
WSADATA wsaData; WSADATA wsaData;
WSAStartup( 0x202, &wsaData ); WSAStartup( 0x202, &wsaData );
#elif defined( ANDROID ) #elif defined( ANDROID )
int hasperm = AndroidHasPermissions( "READ_EXTERNAL_STORAGE" ); int hasperm = AndroidHasPermissions( "READ_EXTERNAL_STORAGE" );
if ( !hasperm )
{
AndroidRequestAppPermissions( "READ_EXTERNAL_STORAGE" );
}
int haspermInternet = AndroidHasPermissions( "INTERNET" ); int haspermInternet = AndroidHasPermissions( "INTERNET" );
if ( !haspermInternet ) if ( !hasperm ) AndroidRequestAppPermissions( "READ_EXTERNAL_STORAGE" );
{ if ( !haspermInternet ) AndroidRequestAppPermissions( "INTERNET" );
AndroidRequestAppPermissions( "INTERNET" );
}
#else #else
// Linux // Linux
#endif #endif
@ -351,11 +345,11 @@ int main( int argc, char **argv )
// Initialize Rawdraw // Initialize Rawdraw
int frames = 0; int frames = 0;
double ThisTime; double ThisTime;
double LastFPSTime = OGGetAbsoluteTime();
double LastFrameTime = OGGetAbsoluteTime();
double SecToWait; double SecToWait;
CNFGBGColor = 0x800000; double LastFPSTime = OGGetAbsoluteTime();
CNFGDialogColor = 0x444444; double LastFrameTime = OGGetAbsoluteTime();
CNFGBGColor = 0x800000;
CNFGDialogColor = 0x444444;
// Generate the window title // Generate the window title
char title[ 1024 ]; char title[ 1024 ];