Merge branch 'master' of https://github.com/cnlohr/colorchord
This commit is contained in:
commit
3703ac096f
|
@ -34,7 +34,6 @@ static void * LEDOutThread( void * v )
|
||||||
{
|
{
|
||||||
int total_bytes = (led->total_leds*3)+1;
|
int total_bytes = (led->total_leds*3)+1;
|
||||||
total_bytes = ((total_bytes-1)&0xffc0) + 0x40; //Round up.
|
total_bytes = ((total_bytes-1)&0xffc0) + 0x40; //Round up.
|
||||||
printf( "TL: %d\n", total_bytes );
|
|
||||||
if( led->readyFlag )
|
if( led->readyFlag )
|
||||||
{
|
{
|
||||||
int r = libusb_control_transfer( led->devh,
|
int r = libusb_control_transfer( led->devh,
|
||||||
|
|
|
@ -6,7 +6,7 @@ SOUND:=sound.o sound_alsa.o sound_pulse.o sound_null.o
|
||||||
OUTS := OutputVoronoi.o DisplayArray.o OutputLinear.o DisplayPie.o DisplayNetwork.o DisplayUSB2812.o DisplayDMX.o OutputProminent.o RecorderPlugin.o OutputCells.o
|
OUTS := OutputVoronoi.o DisplayArray.o OutputLinear.o DisplayPie.o DisplayNetwork.o DisplayUSB2812.o DisplayDMX.o OutputProminent.o RecorderPlugin.o OutputCells.o
|
||||||
|
|
||||||
WINGCC:= i686-w64-mingw32-gcc
|
WINGCC:= i686-w64-mingw32-gcc
|
||||||
WINGCCFLAGS:= -g -DICACHE_FLASH_ATTR= -I../embeddedcommon -I. -O0 #-O2 -Wl,--relax -Wl,--gc-sections -ffunction-sections -fdata-sections
|
WINGCCFLAGS:= -g -DICACHE_FLASH_ATTR= -I../embeddedcommon -I. -O1 #-O2 -Wl,--relax -Wl,--gc-sections -ffunction-sections -fdata-sections
|
||||||
WINLDFLAGS:=-lwinmm -lgdi32 -lws2_32
|
WINLDFLAGS:=-lwinmm -lgdi32 -lws2_32
|
||||||
|
|
||||||
RAWDRAWLIBS:=-lX11 -lm -lpthread -lXinerama -lXext
|
RAWDRAWLIBS:=-lX11 -lm -lpthread -lXinerama -lXext
|
||||||
|
|
|
@ -30,7 +30,7 @@ sourcename = default
|
||||||
#default
|
#default
|
||||||
# alsa_output.pci-0000_00_1b.0.analog-stereo.monitor
|
# alsa_output.pci-0000_00_1b.0.analog-stereo.monitor
|
||||||
#alsa_output.pci-0000_00_1f.3.analog-stereo.monitor << New laptop
|
#alsa_output.pci-0000_00_1f.3.analog-stereo.monitor << New laptop
|
||||||
#use pactl list | grep pci-
|
#use pactl list | grep pci- | grep monitor
|
||||||
|
|
||||||
##################################
|
##################################
|
||||||
# General ColorChord properties. #
|
# General ColorChord properties. #
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
outdrivers = DisplayUSB2812, OutputLinear
|
outdrivers = DisplayUSB2812, OutputLinear
|
||||||
|
|
||||||
|
headless = 1
|
||||||
leds = 27
|
leds = 27
|
||||||
shape_cutoff = 0.03
|
shape_cutoff = 0.03
|
||||||
satamp = 2.000
|
satamp = 3.000
|
||||||
amppow = 2.5
|
amppow = 2.5
|
||||||
distpow = 1.500
|
distpow = 1.500
|
||||||
ledoutamp = .4
|
ledoutamp = 1
|
||||||
|
|
||||||
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
|
#alsa_output.pci-0000_00_1f.3.analog-stereo.monitor
|
||||||
|
|
||||||
note_attach_amp_iir = .3000
|
note_attach_amp_iir = .3000
|
||||||
|
@ -17,3 +18,7 @@ steady_bright = 0
|
||||||
|
|
||||||
skipfirst = 1
|
skipfirst = 1
|
||||||
firstval = 0
|
firstval = 0
|
||||||
|
|
||||||
|
octaves = 5
|
||||||
|
#base_hz = 110
|
||||||
|
base_hz = 55
|
||||||
|
|
Loading…
Reference in a new issue