Преглед изворни кода

Allow user and global media paths

Zachary Kotlarek пре 13 година
родитељ
комит
09f7c4cbaf
2 измењених фајлова са 8 додато и 6 уклоњено
  1. 6 5
      dmx/rave.pl
  2. 2 1
      dmx/state.pl

+ 6 - 5
dmx/rave.pl

@@ -17,10 +17,11 @@ sub rave_init($$);
 sub lsr_loop();
 sub lsr_loop();
 
 
 # User config
 # User config
-my @CHANNELS = (1, 2, 4, 5, 6, 7, 8, 9, 13, 14, 15);
-my %EFFECTS = (
+my $MEDIA_PATH = `~/bin/video/mediaPath`;
+my @CHANNELS   = (1, 2, 4, 5, 6, 7, 8, 9, 13, 14, 15);
+my %EFFECTS    = (
 	'RED_ALERT' => { 'cmd' => \&red_alert },
 	'RED_ALERT' => { 'cmd' => \&red_alert },
-	'LSR'       => { 'cmd' => \&rave_init, 'file' => '/mnt/media/DMX/Rave.mp3', 'next' => \&lsr_loop },
+	'LSR'       => { 'cmd' => \&rave_init, 'file' => $MEDIA_PATH . '/DMX/Rave.mp3', 'next' => \&lsr_loop },
 );
 );
 
 
 # App config
 # App config
@@ -172,7 +173,7 @@ sub red_alert($$) {
 		print STDERR "red_alert()\n";
 		print STDERR "red_alert()\n";
 	}
 	}
 
 
-	my $file  = '/mnt/media/DMX/Red Alert.mp3';
+	my $file  = $MEDIA_PATH . '/DMX/Red Alert.mp3';
 	my @sound = ('afplay', $file);
 	my @sound = ('afplay', $file);
 	my $ramp  = 450;
 	my $ramp  = 450;
 	my $sleep = $ramp;
 	my $sleep = $ramp;
@@ -222,7 +223,7 @@ sub rave_init($$) {
 
 
 	# Config
 	# Config
 	my $SND_APP   = 'afplay';
 	my $SND_APP   = 'afplay';
-	my $SILENCE   = '/mnt/media/DMX/Silence.wav';
+	my $SILENCE   = $MEDIA_PATH . '/DMX/Silence.wav';
 	my $SIL_DELAY = 1.3;
 	my $SIL_DELAY = 1.3;
 	my $AMP_SHORT = 5;
 	my $AMP_SHORT = 5;
 	my $AMP_LONG  = $AMP_SHORT + 5;
 	my $AMP_LONG  = $AMP_SHORT + 5;

+ 2 - 1
dmx/state.pl

@@ -17,6 +17,7 @@ sub mtime($);
 
 
 # User config
 # User config
 my $STATE_TIMEOUT = 180;
 my $STATE_TIMEOUT = 180;
+my $MEDIA_PATH    = `~/bin/video/mediaPath`;
 my %MON_FILES     = (
 my %MON_FILES     = (
 	'GUI'             => 'MTIME',
 	'GUI'             => 'MTIME',
 	'MOTION'          => 'MTIME',
 	'MOTION'          => 'MTIME',
@@ -35,7 +36,7 @@ my %MON_FILES     = (
 	'AMPLIFIER_INPUT' => 'STATUS_VALUE',
 	'AMPLIFIER_INPUT' => 'STATUS_VALUE',
 	'AUDIO'           => 'STATUS_VALUE',
 	'AUDIO'           => 'STATUS_VALUE',
 
 
-	'/mnt/media/DMX/cmd/GARAGE_CMD' => 'EXISTS_CLEAR',
+	$MEDIA_PATH . '/DMX/cmd/GARAGE_CMD' => 'EXISTS_CLEAR',
 );
 );
 
 
 # App config
 # App config