More speaking

dmx/projectorPower.pl

@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use POSIX;
 
 # Local modules
 use Cwd qw(abs_path);
@@ -57,27 +56,16 @@ my $color        = $COLOR_LOW;
 # Loop forever
 while (1) {
 
-	# Reap zombie children (from say)
-	while (waitpid(-1, WNOHANG) > 0) { }
-
 	# State is calculated; use newState to gather data
 	my $newState = $state;
 
 	# Wait for state updates
 	{
-		my %mtimeTmp  = ();
-		my %existsTmp = ();
-		my $cmdState  = DMX::readState($DELAY, \%existsTmp, \%mtimeTmp, undef());
+		my $cmdState = DMX::readState($DELAY, \%exists, \%mtime, undef());
 		if (defined($cmdState)) {
 			$newState = $cmdState;
 			$pullLast = time();
 		}
-
-		# Only record valid exists/mtime hashes
-		if (scalar(keys(%existsTmp)) > 0) {
-			%mtime  = %mtimeTmp;
-			%exists = %existsTmp;
-		}
 	}
 
 	# Die if we don't see regular updates

dmx/rave.pl

@@ -25,7 +25,7 @@ my $MEDIA_PATH = `~/bin/video/mediaPath` . '/DMX';
 my @CHANNELS   = (1, 2, 4, 5, 6, 7, 8, 9, 13, 14, 15);
 my %EFFECTS    = (
 	'RED_ALERT' => { 'cmd' => \&red_alert },
-	'LSR'       => { 'cmd' => \&lsr_init, 'next' => \&lsr_run, 'loop' => \&lsr_loop },
+	'LSR'       => { 'cmd' => \&lsr_init, 'next' => \&lsr_run, 'loop' => \&lsr_loop, 'done' => \&lsr_done },
 );
 my %FILES = (
 	'RED_ALERT' => 'DMX/Red Alert.mp3',
@@ -65,6 +65,7 @@ DMX::stateSubscribe($STATE_SOCK);
 
 # State
 my %exists   = ();
+my %last     = ();
 my $pullLast = time();
 my $update   = 0;
 my $PID      = undef();
@@ -85,6 +86,7 @@ while (1) {
 
 	# State is transient during a RAVE
 	my $newState = 'OFF';
+	%last = %exists;
 
 	# Reduce the select delay when we're processing background effects
 	# We don't want to hang waiting for event updates while we're running the show
@@ -97,17 +99,11 @@ while (1) {
 
 	# Wait for state updates
 	{
-		my %existsTmp = ();
-		my $cmdState = DMX::readState($delay, \%existsTmp, undef(), undef());
+		my $cmdState = DMX::readState($delay, \%exists, undef(), undef());
 		if (defined($cmdState)) {
 			$newState = $cmdState;
 			$pullLast = time();
 		}
-
-		# Only record valid exists hashes
-		if (scalar(keys(%existsTmp)) > 0) {
-			%exists = %existsTmp;
-		}
 	}
 
 	# Die if we don't see regular updates
@@ -136,6 +132,11 @@ while (1) {
 				print STDERR 'Reaped child: ' . $PID . "\n";
 			}
 
+			# Run the cleanup routine (if any)
+			if ($EFFECTS{$NAME}{'done'}) {
+				$EFFECTS{$NAME}{'done'}($NAME, \%exists, $EFFECTS{$NAME});
+			}
+
 			# Forget our local bypass state
 			$PID      = undef();
 			$NAME     = undef();
@@ -297,6 +298,7 @@ sub lsr_init($$$) {
 	}
 
 	# Initiate the RAVE state
+	DMX::say('Light switch rave: initiated');
 	touch($RAVE_FILE);
 
 	# Save data for future runs
@@ -427,3 +429,11 @@ sub lsr_loop($$$) {
 	# Wait for the fade interval
 	usleep($wait * 1000);
 }
+
+sub lsr_done($$$) {
+	my ($name, $exists, $params) = @_;
+	if ($DEBUG) {
+		print STDERR "lsr_done()\n";
+	}
+	DMX::say('Light switch rave: terminated');
+}

dmx/rifftrax.pl

@@ -112,6 +112,7 @@ my $url       = '';
 my $urlLast   = $url;
 my $nudge     = 0;
 my %exists    = ();
+my %last      = ();
 my $pullLast  = time();
 
 # Loop forever
@@ -120,6 +121,7 @@ while (1) {
 	# Save the last RIFF and state
 	$stateLast = $state;
 	$riffLast  = $riff;
+	%last      = %exists;
 
 	# Force a change if our riff is clearly invalid (first loop, reset, etc.)
 	if ($riff < 0) {
@@ -165,6 +167,7 @@ while (1) {
 			Audio::drop('RIFF');
 			$riff  = 0;
 			$nudge = 0;
+			say('RiffTrax complete');
 		}
 
 		# Activate a new RIFF, if applicable
@@ -178,6 +181,7 @@ while (1) {
 				Audio::addLoad('RIFF', $RIFFS{$riff}->{'path'});
 				Audio::rate('RIFF', $RIFFS{$riff}->{'rate'});
 				Audio::background('RIFF');
+				say('RiffTrax initiated');
 			}
 		}
 	}