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

RecorderPlugin.c

@@ -130,6 +130,7 @@ static void PlaybackEvent(void * v, int samples, float * samps, int channel_ct)
 	if( r != samples )
 	{
 		StopRecording( rp );
+		return;
 	}
 	rp->TimeSinceStart += samples;
 
@@ -140,22 +141,16 @@ static void PlaybackEvent(void * v, int samples, float * samps, int channel_ct)
 		else
 			force_white = 0;
 
-		if( rp->TimeSinceStart > rp->BypassLength )
+		int r = fwrite( samps, channel_ct * sizeof( float ), samples, rp->fRec );
+		if( r != samples )
 		{
-			rp->DunBoop = 1;
+			StopRecording( rp );
-		}
-		else
-		{
-			int r = fwrite( samps, channel_ct * sizeof( float ), samples, rp->fRec );
-			if( r != samples )
-			{
-				StopRecording( rp );
-			}
 		}
 	}
 	else
 	{
 		force_white = 0;
+		rp->DunBoop = 1;
 	}
 }
 

dmx.conf

@@ -1,5 +1,12 @@
 outdrivers = DisplayDMX, OutputLinear, DisplayArray, RecorderPlugin
 
+
+play = 1
+buffer = 512
+player_filename = lora1.raw
+recorder_filename = recfile.raw
+recorder_bypass = 44100
+
 byte_offset = 32
 ledoutamp = 1.0
 leds = 4
@@ -18,3 +25,5 @@ firstval = 0
 port = 7777
 address = 192.168.0.245
 
+
+

main.c

@@ -55,11 +55,13 @@ int show_debug = 0;
 int show_debug_basic = 1;
 
 int gKey = 0;
+extern int force_white;
 
 void HandleKey( int keycode, int bDown )
 {
 	char c = toupper( keycode );
 	if( c == 'D' && bDown ) show_debug = !show_debug;
+	if( c == 'W' ) force_white = bDown;
 	if( c == '9' && bDown ) { gKey--; 		nf->base_hz = 55 * pow( 2, gKey / 12.0 ); ChangeNFParameters( nf ); }
 	if( c == '-' && bDown ) { gKey++; 		nf->base_hz = 55 * pow( 2, gKey / 12.0 ); ChangeNFParameters( nf ); }
 	if( c == '0' && bDown ) { gKey = 0;		nf->base_hz = 55 * pow( 2, gKey / 12.0 ); ChangeNFParameters( nf ); }