Mercurial > hg > fapweb

changeset 948:1334b93939a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change how output options are handled in wtConvertSample().
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 28 Nov 2014 08:14:02 +0200
parents f709816c71cd
children 2179600710d1
files faptool.php
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/faptool.php	Fri Nov 28 07:38:07 2014 +0200
+++ b/faptool.php	Fri Nov 28 08:14:02 2014 +0200
@@ -101,17 +101,13 @@
 }
 
 
-function wtConvertSample($inFilename, $outFilename, $type)
+function wtConvertSample($inFilename, $outFilename, $outOpts)
 {
   $sfreq     = intval(stGetSetting("sampleFreq"));
   $sduration = intval(stGetSetting("sampleDuration"));
   $schannels = intval(stGetSetting("sampleChannels"));
 
-  $stypes = stGetSetting("sampleTypes");
-  if (!isset($stypes[$type]))
-    die("ERROR: Specified sample type '".$type."' not defined in sampleTypes in mconfig.inc.php\n");
-
-  foreach ($stypes[$type] as $okey => $oval)
+  foreach ($outOpts as $okey => $oval)
     $optStr .= $okey." ".$oval." ";
 
   return wtExec(