shithub: sox

Info  •  Files  •  Log  •  Branches

Create st_encoding_t.

--- a/src/alsa.c

+++ b/src/alsa.c

@@ -562,6 +562,8 @@

                     ft->info.encoding = ST_ENCODING_SIGN2;

                 }

                 break;

+            default:

+                    break;

         }

         switch (ft->info.encoding)

         {

@@ -581,6 +583,8 @@

                 }

                 *fmt = SND_PCM_FORMAT_U8;

                 break;

+            default:

+                    break;

         }

     }

     else if (ft->info.size == ST_SIZE_WORD) {

@@ -600,6 +604,8 @@

                     ft->info.encoding = ST_ENCODING_SIGN2;

                 }

                 break;

+            default:

+                    break;

         }

         switch (ft->info.encoding)

         {

@@ -619,6 +625,8 @@

                 }

                 *fmt = SND_PCM_FORMAT_U16_LE;

                 break;

+            default:

+                    break;

         }

     }

     else {

--- a/src/au.c

+++ b/src/au.c

@@ -61,7 +61,7 @@

 static void auwriteheader(ft_t ft, st_size_t data_size);

-static int st_auencodingandsize(int sun_encoding, signed char *encoding, signed char *size)

+static int st_auencodingandsize(int sun_encoding, st_encoding_t * encoding, signed char *size)

 {

     switch (sun_encoding) {

     case SUN_ULAW:

@@ -436,7 +436,7 @@

          * useful when there is no comments.

          */

         if (ft->comment == NULL)

-                ft->comment = "SOX";

+                ft->comment = strdup("SOX");

         hdr_size = SUN_HDRSIZE;

--- a/src/maud.c

+++ b/src/maud.c

@@ -342,7 +342,9 @@

                 st_writew(ft, (int) 8); /* number of bits per sample as stored in MDAT */

                 st_writew(ft, (int) 16); /* number of bits per sample after decompression */

                 break;

-                

+

+        default:

+                break;

         }

         st_writedw(ft, ft->info.rate); /* clock source frequency */

@@ -371,7 +373,9 @@

         case ST_ENCODING_ALAW:

                 st_writew(ft, (int) 2);

                 break;

-                

+

+        default:

+                break;

         }

         st_writedw(ft, 0); /* reserved */

--- a/src/stio.c

+++ b/src/stio.c

@@ -68,7 +68,7 @@

                 return ST_EOF;

         }

-        if (ft->info.encoding <= 0  || ft->info.encoding > ST_ENCODING_MAX)

+        if (ft->info.encoding <= 0  || ft->info.encoding >= ST_ENCODINGS)

         {

                 st_fail_errno(ft,ST_EFMT,"data encoding %i is invalid");

                 return ST_EOF;

--- a/src/wav.c

+++ b/src/wav.c

@@ -1499,6 +1499,8 @@

             wExtSize=2;        /* length of format extension */

             wSamplesPerBlock = 320;

             break;

+        default:

+                break;

     }

     wav->formatTag = wFormatTag;

     wav->blockAlign = wBlockAlign;