ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #856 from ZoneMinder/fix_x10 

Correct bareword config entries with newer {} style
This commit is contained in:
Isaac Connor 2015-06-08 10:35:48 -04:00
parent c391325457 f6a226e700
commit bff6176797
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/zmx10.pl.in
View File

@ -191,7 +191,7 @@ sub runServer
$dbh = zmDbConnect();
$x10 = new X10::ActiveHome( port=>ZM_X10_DEVICE, house_code=>ZM_X10_HOUSE_CODE, debug=>0 );
$x10 = new X10::ActiveHome( port=>$Config{ZM_X10_DEVICE}, house_code=>$Config{ZM_X10_HOUSE_CODE}, debug=>0 );
loadTasks();
@ -204,7 +204,7 @@ sub runServer
#print( "F:".fileno(SERVER)."\n" );
my $reload = undef;
my $reload_count = 0;
my $reload_limit = &ZM_X10_DB_RELOAD_INTERVAL / $timeout;
my $reload_limit = $Config{ZM_X10_DB_RELOAD_INTERVAL} / $timeout;
while( 1 )
{
my $nfound = select( my $rout = $rin, undef, undef, $timeout );
@ -750,7 +750,7 @@ sub x10listen
foreach my $event ( @_ )
{
#print( Data::Dumper( $_ )."\n" );
if ( $event->house_code() eq ZM_X10_HOUSE_CODE )
if ( $event->house_code() eq $Config{ZM_X10_HOUSE_CODE} )
{
my $unit_code = $event->unit_code();
my $device = $device_hash{$unit_code};