Imported Upstream version 16.5~dfsg

1 files changed, 4 insertions, 37 deletions

diff --git a/snd-file.c b/snd-file.c
index 6cca733..52a7ab6 100644
--- a/snd-file.c
+++ b/snd-file.c
@@ -509,10 +509,6 @@ void init_sound_file_extensions(void)
   add_sound_file_extension("mp3");
 #endif
 
-#if HAVE_TTA
-  add_sound_file_extension("tta");
-#endif
-
 #if HAVE_WAVPACK
   add_sound_file_extension("wv");
 #endif
@@ -1977,12 +1973,12 @@ bool run_before_save_as_hook(snd_info *sp, const char *save_as_filename, bool se
 /* -------- file dialog header/data choices -------- */
 
 enum {H_NEXT, H_AIFC, H_RIFF, H_RF64, H_RAW, H_AIFF, H_IRCAM, H_NIST, H_CAFF, /* the "built-in" choices for output */
-      H_OGG, H_FLAC, H_SPEEX, H_TTA, H_WAVPACK,                               /* readable/writable via external programs */
+      H_OGG, H_FLAC, H_SPEEX, H_WAVPACK,                                      /* readable/writable via external programs */
       H_MPEG, H_MIDI,                                                         /* readable via external programs */
       H_SIZE};
 
 static int h_num_sample_types[H_SIZE] = {12 /* next */, 13 /* aifc */,  8 /* riff */, 8 /* rf64 */, 18 /* raw */, 4 /* aiff */, 5  /* ircam */, 7 /* nist */, 13 /* caff */,
-				    1 /* ogg */,  1  /* flac */,  1 /* speex */, 1 /* tta */, 1 /*wavpack */,
+				    1 /* ogg */,  1  /* flac */,  1 /* speex */, 1 /*wavpack */,
 				    1 /* mpeg */, 1  /* midi */};
 #define H_DFS_MAX 18
 
@@ -2003,18 +1999,17 @@ static mus_sample_t h_dfs[H_SIZE][H_DFS_MAX] = { /* next */  {MUS_BFLOAT, MUS_BS
 					/* ogg */   {MUS_LSHORT},
 					/* flac */  {MUS_LSHORT},
 					/* speex */ {MUS_LSHORT},
-					/* tta */   {MUS_LSHORT},
 					/* wavpack */ {MUS_LSHORT},
 					/* readonly */  {MUS_UNKNOWN_SAMPLE}, {MUS_UNKNOWN_SAMPLE}
 };
 static const char *h_df_names[H_SIZE][H_DFS_MAX];
 
 static const char *h_names[H_SIZE] = {"au/next  ", "aifc   ", "wave   ", "rf64  ", "raw    ", "aiff   ", "ircam ", "nist  ", "caff  ",
-				      "ogg   ", "flac  ", "speex ", "tta   ", "wavpack",
+				      "ogg   ", "flac  ", "speex ", "wavpack",
 				      "mpeg  ", "midi  "};
 static mus_header_t h_pos_to_type[H_SIZE] = {MUS_NEXT, MUS_AIFC, MUS_RIFF, MUS_RF64, MUS_RAW, MUS_AIFF, MUS_IRCAM, MUS_NIST, MUS_CAFF, 
 					     MUS_UNKNOWN_HEADER, MUS_UNKNOWN_HEADER, MUS_UNKNOWN_HEADER, MUS_UNKNOWN_HEADER, 
-					     MUS_UNKNOWN_HEADER, MUS_UNKNOWN_HEADER, MUS_UNKNOWN_HEADER};
+					     MUS_UNKNOWN_HEADER, MUS_UNKNOWN_HEADER};
 static int h_type_to_pos[MUS_NUM_HEADERS];
 static int h_type_to_h[MUS_NUM_HEADERS];
 
@@ -2086,7 +2081,6 @@ void initialize_sample_type_lists(void)
   h_type_to_h[MUS_SPEEX] = H_SPEEX;
   h_type_to_h[MUS_MIDI] = H_MIDI;
   h_type_to_h[MUS_MPEG] = H_MPEG;
-  h_type_to_h[MUS_TTA] = H_TTA;
   h_type_to_h[MUS_WAVPACK] = H_WAVPACK;
   
   i = 9;
@@ -2106,11 +2100,6 @@ void initialize_sample_type_lists(void)
   h_pos_to_type[i++] = MUS_SPEEX;
 #endif
 
-#if HAVE_TTA
-  h_type_to_pos[MUS_TTA] = i;
-  h_pos_to_type[i++] = MUS_TTA;
-#endif
-
 #if HAVE_WAVPACK
   h_type_to_pos[MUS_WAVPACK] = i;
   h_pos_to_type[i++] = MUS_WAVPACK;
@@ -2172,11 +2161,6 @@ const char **short_writable_headers(int *len)
       writable_headers[i++] = h_names[H_SPEEX];
 #endif
 
-#if HAVE_TTA
-      /* ttaenc -e in out */
-      writable_headers[i++] = h_names[H_TTA];
-#endif
-
 #if HAVE_WAVPACK
       /* wavpack in -o out */
       writable_headers[i++] = h_names[H_WAVPACK];
@@ -2239,10 +2223,6 @@ const char **short_readable_headers(int *len)
       readable_headers[i++] = h_names[H_MIDI];
 #endif
 
-#if HAVE_TTA
-      readable_headers[i++] = h_names[H_TTA];
-#endif
-
 #if HAVE_WAVPACK
       readable_headers[i++] = h_names[H_WAVPACK];
 #endif
@@ -2305,7 +2285,6 @@ bool header_is_encoded(mus_header_t header_type)
 	 (header_type == MUS_SPEEX) ||
 	 (header_type == MUS_MPEG) ||
 	 (header_type == MUS_MIDI) ||
-	 (header_type == MUS_TTA) ||
 	 (header_type == MUS_WAVPACK)
 	 );
 }
@@ -2376,12 +2355,6 @@ void snd_encode(mus_header_t type, const char *input_filename, const char *outpu
       break;
 #endif
 
-#if HAVE_TTA
-    case MUS_TTA:
-      command = mus_format("%s -e %s -o %s", PATH_TTA, ifile, ofile);
-      break;
-#endif
-
 #if HAVE_WAVPACK
     case MUS_WAVPACK:
       command = mus_format("%s %s -o %s", PATH_WAVPACK, ifile, ofile);
@@ -2455,12 +2428,6 @@ int snd_decode(mus_header_t type, const char *input_filename, const char *output
       break;
 #endif
 
-#if HAVE_TTA
-    case MUS_TTA:
-      command = mus_format("%s -d %s -o %s", PATH_TTA, ifile, ofile);
-      break;
-#endif
-
 #if HAVE_WAVPACK
     case MUS_WAVPACK:
       command = mus_format("%s %s -o %s", PATH_WVUNPACK, ifile, ofile);