Просмотр исходного кода

RAVE is now needed only on Loki

Zachary Kotlarek 13 лет назад
Родитель
Сommit
6f51781ef8
2 измененных файлов с 7 добавлено и 21 удалено
  1. 0 4
      dmx/launchd/com.uberzach.ola.rave.plist
  2. 7 17
      dmx/rave.pl

+ 0 - 4
dmx/launchd/com.uberzach.ola.rave.plist

@@ -8,10 +8,6 @@
 	<array>
 		<string>Loki.local</string>
 		<string>loki.uberzach.com</string>
-		<string>Beddy.local</string>
-		<string>beddy.uberzach.com</string>
-		<string>Heady.local</string>
-		<string>heady.uberzach.com</string>
 	</array>
 	<key>RunAtLoad</key>
 	<true/>

+ 7 - 17
dmx/rave.pl

@@ -23,27 +23,17 @@ sub lsr_loop($$$);
 
 # User config
 my $MEDIA_PATH = `~/bin/video/mediaPath` . '/DMX';
-my @CHANNELS   = ();
+my @CHANNELS   = (1, 2, 4, 5, 6, 7, 8, 9, 13, 14, 15);
 my %EFFECTS    = ();
 my %FILES      = ();
 
-# Host-specific config
-my $HOST = Sys::Hostname::hostname();
-if ($HOST =~ /loki/i) {
+# Red Alert
+$FILES{'RED_ALERT'} = 'DMX/Red Alert.mp3';
+$EFFECTS{'RED_ALERT'} = { 'cmd' => \&red_alert };
 
-	# Rave-controlled channels
-	push(@CHANNELS, 1, 2, 4, 5, 6, 7, 8, 9, 13, 14, 15);
-
-	# Red Alert
-	$FILES{'RED_ALERT'} = 'DMX/Red Alert.mp3';
-	$EFFECTS{'RED_ALERT'} = { 'cmd' => \&red_alert };
-
-	# Light-switch rave
-	$EFFECTS{'LSR'} = { 'cmd' => \&lsr_init, 'next' => \&lsr_run, 'loop' => \&lsr_loop, 'done' => \&lsr_done };
-	$FILES{'LSR'} = 'DMX/Rave.mp3';
-} elsif ($HOST =~ /beddy/i) {
-} elsif ($HOST =~ /heady/i) {
-}
+# Light-switch rave
+$EFFECTS{'LSR'} = { 'cmd' => \&lsr_init, 'next' => \&lsr_run, 'loop' => \&lsr_loop, 'done' => \&lsr_done };
+$FILES{'LSR'} = 'DMX/Rave.mp3';
 
 # Utility prototypes
 sub ampWait($$$);