shithub: sox

Info  •  Files  •  Log  •  Branches

Fix nul file hander ignoring other format options if rate
option has not been given.

--- a/Changelog

+++ b/Changelog

@@ -32,6 +32,8 @@

     parameters. (robs)

   o Allow command-line time parameters of < 1 sec to omit the

     leading 0. (robs)

+  o Fix nul file hander ignoring other format options if rate

+    option has not been given. (robs)

 sox-12.18.2

 -----------

--- a/src/nulfile.c

+++ b/src/nulfile.c

@@ -27,17 +27,12 @@

  */

 int st_nulstartread(ft_t ft) 

 {

-    /* if no input rate is given as parameter, switch to 

-     * default parameter

-     */

-    if(ft->info.rate == 0)

-    {

-        /* input rate not set, switch to default */

-        ft->info.rate = 44100;

-        ft->info.size = ST_SIZE_WORD;

-        ft->info.encoding = ST_ENCODING_SIGN2;

-        ft->info.channels = 2;

-    }

+    /* If format parameters are not given, set defaults: */

+    if (ft->info.rate     ==  0) ft->info.rate     = 44100;

+    if (ft->info.size     == -1) ft->info.size     = ST_SIZE_WORD;

+    if (ft->info.encoding == -1) ft->info.encoding = ST_ENCODING_SIGN2;

+    if (ft->info.channels == -1) ft->info.channels = 2;

+

     ft->comment = "nul file";

     return (ST_SUCCESS);