Continued:

[core.git] / contrib / audio.php

diff --git a/contrib/audio.php b/contrib/audio.php
index d0f753a3a3e30faf3165c8d2b89ab16a6ec4c3ba..7118af6a4b4e5c27dec32582dc081f57b4abd4b4 100644 (file)
--- a/contrib/audio.php
+++ b/contrib/audio.php
@@ -1,11 +1,11 @@
 <?php
-$GLOBALS['options'] = array(
+$GLOBALS['options'] = [
        'analyze_input' => FALSE,
        'reduce_noise'  => FALSE,
        'ignore_noise'  => FALSE,
        'keep_noise'    => FALSE,
        'buffer_size'   => 8,
-);
+];
 
 if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'a') {
        $GLOBALS['options']['analyze_input'] = TRUE;
@@ -24,7 +24,7 @@ if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'i') {
 }
 
 function analyzeForNoiseOnly ($data) {
-       $GLOBALS['analysis']['breakdown'] = array();
+       $GLOBALS['analysis']['breakdown'] = [];
        $GLOBALS['analysis']['average']   = 0;
 
        for ($i = 0; $i < strlen($data); $i++) {
@@ -35,17 +35,17 @@ function analyzeForNoiseOnly ($data) {
 
        if (!$GLOBALS['options']['keep_noise'] && !$GLOBALS['options']['ignore_noise'] && count($GLOBALS['analysis']['breakdown']) == 2 && isset($GLOBALS['analysis']['breakdown'][127]) && isset($GLOBALS['analysis']['breakdown'][128])) {
                if ($GLOBALS['options']['analyze_input']) {
-                       //echo 'NOISE1!' . PHP_EOL;
+                       //* NOISY: */ echo 'NOISE1!' . PHP_EOL;
                }
                return NULL;
        } elseif (!$GLOBALS['options']['keep_noise'] && !$GLOBALS['options']['ignore_noise'] && count($GLOBALS['analysis']['breakdown']) == 1 && isset($GLOBALS['analysis']['breakdown'][127])) {
                if ($GLOBALS['options']['analyze_input']) {
-                       //echo 'NOISE2!' . PHP_EOL;
+                       //* NOISY: */ echo 'NOISE2!' . PHP_EOL;
                }
                return NULL;
        } elseif (!$GLOBALS['options']['keep_noise'] && $GLOBALS['options']['ignore_noise'] && count($GLOBALS['analysis']['breakdown']) < 2) {
                if ($GLOBALS['options']['analyze_input']) {
-                       //echo 'NOISE3!' . PHP_EOL;
+                       //* NOISY: */ echo 'NOISE3!' . PHP_EOL;
                }
                return NULL;
        }
@@ -55,7 +55,7 @@ function analyzeForNoiseOnly ($data) {
 }
 
 //$pcm = fopen('output1.pcm', 'rb') or die('Cannot read from audio');
-$pcm = fopen('/dev/dsp2', 'rb') or die('Cannot read from audio');
+$pcm = fopen('/dev/dsp', 'rb') or die('Cannot read from audio' . PHP_EOL);
 
 $empty = str_repeat(chr(128), $GLOBALS['options']['buffer_size']);
 
@@ -64,7 +64,7 @@ while (TRUE) {
        $data = trim(fread($pcm, $GLOBALS['options']['buffer_size']));
        if ((empty($data)) || ($data == $empty)) {
                if ($GLOBALS['options']['analyze_input']) {
-                       //echo 'EMPTY!' . PHP_EOL;
+                       //* NOISY: */ echo 'EMPTY!' . PHP_EOL;
                }
                continue;
        }
@@ -76,7 +76,7 @@ while (TRUE) {
        if (empty($data)) {
                // Skip this
                continue;
-       } // END - if
+       }
 
        $GLOBALS['analysis']['average'] = floor($GLOBALS['analysis']['average'] / strlen($data));
 
@@ -103,7 +103,7 @@ while (TRUE) {
                if (empty($out)) {
                        // Skip this
                        continue;
-               } // END - if
+               }
 
                echo $out;
        } else {