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

Merge branch 'master' of https://github.com/cnlohr/colorchord

Browse source
This commit is contained in:
cnlohr 2017-05-23 22:55:54 -04:00
commit 093633044d
9 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
colorchord2/Makefile
View file

@ -13,7 +13,7 @@ RAWDRAWLIBS:=-lX11 -lm -lpthread -lXinerama -lXext
LDLIBS:=-lpthread -lasound -lm -lpulse-simple -lpulse
CFLAGS:=-g -O0 -flto -Wall -ffast-math -I../embeddedcommon -I. -DICACHE_FLASH_ATTR=
CFLAGS:=-g -Os -flto -Wall -ffast-math -I../embeddedcommon -I. -DICACHE_FLASH_ATTR=
EXTRALIBS:=-lusb-1.0
colorchord : os_generic.o main.o dft.o decompose.o filter.o color.o notefinder.o util.o outdrivers.o $(RAWDRAW) $(SOUND) $(OUTS) parameters.o chash.o hook.o ../embeddedcommon/DFT32.o configs.o

5
colorchord2/main.c
View file

@ -50,6 +50,7 @@ int set_screeny = 480; REGISTER_PARAM( set_screeny, PAINT );
char sound_source[16]; REGISTER_PARAM( sound_source, PABUFFER );
int cpu_autolimit = 1; REGISTER_PARAM( cpu_autolimit, PAINT );
int sample_channel = -1;REGISTER_PARAM( sample_channel, PAINT );
int showfps = 0; REGISTER_PARAM( showfps, PAINT );
struct NoteFinder * nf;
@ -421,9 +422,9 @@ int main(int argc, char ** argv)
frames++;
ThisTime = OGGetAbsoluteTime();
if( ThisTime > LastFPSTime + 1 )
if( ThisTime > LastFPSTime + 1 && showfps )
{
// printf( "FPS: %d\n", frames );
printf( "FPS: %d\n", frames );
lastfps = frames;
frames = 0;
LastFPSTime+=1;

2
colorchord2/netlight.conf
View file

@ -12,7 +12,7 @@ steady_bright = 0
#dft_q = 20.0000
#dft_speedup = 1000.0000
sourcename = alsa_output.pci-0000_00_1b.0.analog-stereo.monitor
sourcename = alsa_output.pci-0000_01_00.1.hdmi-stereo-extra1.monitor
#alsa_output.pci-0000_00_1f.3.analog-stereo.monitor
skipfirst = 1
firstval = 0

4
colorchord2/netlight_esp8266.conf
View file

@ -12,7 +12,9 @@ steady_bright = 0
#dft_q = 20.0000
#dft_speedup = 1000.0000
sourcename = alsa_output.pci-0000_00_1b.0.analog-stereo.monitor
sourcename = alsa_output.pci-0000_01_00.1.hdmi-stereo-extra1.monitor
#sourcename = alsa_output.pci-0000_00_1b.0.analog-stereo.monitor
#alsa_output.pci-0000_00_1f.3.analog-stereo.monitor
skipfirst = 1

5
colorchord2/usb_line.conf
View file

@ -1,10 +1,11 @@
outdrivers = DisplayUSB2812, OutputLinear
headless = 1
cpu_autolimit = 1
leds = 27
shape_cutoff = 0.03
satamp = 3.000
amppow = 2.5
satamp = 5.000
amppow = 3.5
distpow = 1.500
ledoutamp = 1