Tidy

dmx/DMX.pm

@@ -19,17 +19,17 @@ my $SOCK_TIMEOUT = 5;
 my $MAX_CMD_LEN  = 1024;
 my $TEMP_DIR     = `getconf DARWIN_USER_TEMP_DIR`;
 chomp($TEMP_DIR);
-my $DATA_DIR     = $TEMP_DIR . 'plexMonitor/';
-my $DMX_SOCK     = $DATA_DIR . 'DMX.socket';
-my $SUB_SOCK     = $DATA_DIR . 'STATE.socket';
-my %CHANNEL_ADJ  = (
+my $DATA_DIR    = $TEMP_DIR . 'plexMonitor/';
+my $DMX_SOCK    = $DATA_DIR . 'DMX.socket';
+my $SUB_SOCK    = $DATA_DIR . 'STATE.socket';
+my %CHANNEL_ADJ = (
 	'13' => 1.00,
 	'14' => 1.14,
 	'15' => 1.19,
 );
 
 # Sanity check
-if (! -d $DATA_DIR) {
+if (!-d $DATA_DIR) {
 	die('Data directory not available: ' . $DATA_DIR . "\n");
 }
 
@@ -114,13 +114,12 @@ sub parseState($$) {
 	}
 	if ($DEBUG) {
 		my @exists_tmp = ();
-		foreach my $key (keys(%{ $exists })) {
+		foreach my $key (keys(%{$exists})) {
 			push(@exists_tmp, $key . ':' . $exists->{$key});
 		}
 		print STDERR 'Got state: ' . $cmdState . ' (' . join(', ', @exists_tmp) . ")\n";
 	}
 
-
 	# Translate INIT to OFF
 	if ($cmdState eq 'INIT') {
 		$cmdState = 'OFF';
@@ -146,8 +145,8 @@ sub dim($) {
 
 	# Adjust for the color curve (for channels where we have such data)
 	my $value = $args->{'value'};
-	if ($CHANNEL_ADJ{$args->{'channel'}}) {
-		$value *= $CHANNEL_ADJ{$args->{'channel'}};
+	if ($CHANNEL_ADJ{ $args->{'channel'} }) {
+		$value *= $CHANNEL_ADJ{ $args->{'channel'} };
 	}
 
 	# 8-bit values
@@ -173,7 +172,7 @@ sub printDataset($) {
 	my ($data_set) = @_;
 
 	my $sum = 0;
-	foreach my $data (@{ $data_set }) {
+	foreach my $data (@{$data_set}) {
 		$sum += $data->{'value'};
 		my $str = $data->{'channel'} . ' => ' . int($data->{'value'}) . ' @ ' . $data->{'time'};
 		if ($data->{'delay'}) {
@@ -198,7 +197,7 @@ sub applyDataset($$$) {
 
 	# Send the dim command
 	my @values = ();
-	foreach my $data (@{ $data_set }) {
+	foreach my $data (@{$data_set}) {
 		dim($data);
 		my $str = $data->{'channel'} . ' => ' . $data->{'value'} . ' @ ' . $data->{'time'};
 		if ($data->{'delay'}) {

dmx/bias.pl

@@ -41,7 +41,7 @@ if ($ENV{'DEBUG'}) {
 # Construct a list of valid states
 my %VALID = ();
 foreach my $key (keys(%DIM)) {
-        $VALID{$key} = 1;
+	$VALID{$key} = 1;
 }
 
 # Sockets
@@ -96,6 +96,7 @@ while (1) {
 
 	# Update the lighting
 	if ($update) {
+
 		# Update
 		DMX::applyDataset($DIM{$state}, $state, $OUTPUT_FILE);
 

dmx/fan.pl

@@ -88,6 +88,7 @@ while (1) {
 
 	# Update the fan
 	if ($update) {
+
 		# Update
 		DMX::applyDataset($DIM{$state}, $state, $OUTPUT_FILE);
 

dmx/leds.pl

@@ -147,8 +147,8 @@ while (1) {
 			kill(SIGTERM, $PID);
 		}
 
-		$newState    = $state;
-		$update = 1;
+		$newState = $state;
+		$update   = 1;
 	}
 
 	# Reap zombie children
@@ -172,7 +172,7 @@ while (1) {
 			# Reset to standard
 			@COLOR       = ();
 			$colorChange = time() + $COLOR_TIME_MIN;
-			$update = 1;
+			$update      = 1;
 		}
 	}
 
@@ -187,7 +187,7 @@ while (1) {
 
 		# Dispatch the handler
 		# Optionally skip the rest of this loop
-		if($EFFECTS{$newState}->()) {
+		if ($EFFECTS{$newState}->()) {
 			next;
 		}
 
@@ -196,7 +196,7 @@ while (1) {
 		%exists      = %existsLast;
 		@COLOR       = ();
 		$colorChange = time() + $COLOR_TIME_MIN;
-		$update = 1;
+		$update      = 1;
 	}
 
 	# Calculate the new state
@@ -234,7 +234,7 @@ while (1) {
 		}
 
 		# Update
-		$update = 1;
+		$update      = 1;
 		$colorChange = time();
 		if ($DEBUG) {
 			print STDERR "New color\n";
@@ -346,15 +346,15 @@ sub rave() {
 	# Play the sound in a child (i.e. in the background)
 	$PID = fork();
 	if (defined($PID) && $PID == 0) {
-	    exec(@sound)
-		or die('Unable to play sound: ' . join(' ', @sound) . "\n");
+		exec(@sound)
+		  or die('Unable to play sound: ' . join(' ', @sound) . "\n");
 	}
 
 	# Setup our loop handler
 	$EFFECT = \&rave_loop;
 
 	# Save data for future runs
-	my %data  = ();
+	my %data = ();
 	$PID_DATA = \%data;
 
 	# Record our start time
@@ -397,7 +397,7 @@ sub rave_loop() {
 	my $max_val  = 255;
 
 	# How long have we been playing
-	my $elapsed  = Time::HiRes::time() - $PID_DATA->{'start'};
+	my $elapsed = Time::HiRes::time() - $PID_DATA->{'start'};
 	if ($DEBUG) {
 		print STDERR 'Elapsed: ' . $elapsed . "\n";
 	}
@@ -408,10 +408,10 @@ sub rave_loop() {
 		if ($PID_DATA->{'live_channels'} < 1 || $ratio < $elapsed / $ramp_dur) {
 			my @keys  = keys(%{ $PID_DATA->{'channels'} });
 			my $index = int(rand($PID_DATA->{'num_channels'}));
-			while ($PID_DATA->{'channels'}->{$keys[$index]} > 0) {
+			while ($PID_DATA->{'channels'}->{ $keys[$index] } > 0) {
 				$index = int(rand($PID_DATA->{'num_channels'}));
 			}
-			$PID_DATA->{'channels'}->{$keys[$index]} = 1;
+			$PID_DATA->{'channels'}->{ $keys[$index] } = 1;
 			$PID_DATA->{'live_channels'}++;
 		}
 	} else {

dmx/overhead.pl

@@ -44,7 +44,7 @@ if ($ENV{'DEBUG'}) {
 # Construct a list of valid states
 my %VALID = ();
 foreach my $key (keys(%DIM)) {
-        $VALID{$key} = 1;
+	$VALID{$key} = 1;
 }
 
 # Sockets
@@ -117,6 +117,7 @@ while (1) {
 
 	# Update the lighting
 	if ($update) {
+
 		# Update
 		DMX::applyDataset($DIM{$state}, $state, $OUTPUT_FILE);
 

dmx/rope.pl

@@ -72,7 +72,7 @@ if ($ENV{'DEBUG'}) {
 # Construct a list of valid states
 my %VALID = ();
 foreach my $key (keys(%DIM)) {
-        $VALID{$key} = 1;
+	$VALID{$key} = 1;
 }
 
 # Sockets
@@ -145,6 +145,7 @@ while (1) {
 
 	# Update the lighting
 	if ($update) {
+
 		# Update
 		DMX::applyDataset($DIM{$state}, $state, $OUTPUT_FILE);
 

dmx/state.pl

@@ -16,7 +16,7 @@ sub mtime($);
 
 # User config
 my $STATE_TIMEOUT = 180;
-my %MON_FILES = (
+my %MON_FILES     = (
 	'PLAYING'     => 'MTIME',
 	'GUI'         => 'MTIME',
 	'MOTION'      => 'MTIME',
@@ -126,8 +126,9 @@ while (1) {
 
 	# Monitor files of all types
 	foreach my $file (values(%files)) {
+
 		# Always record the previous status and clear the new one
-		$file->{'last'} = $file->{'status'};
+		$file->{'last'}   = $file->{'status'};
 		$file->{'status'} = 0;
 
 		# Record the last update