Mercurial > octave

changeset 22736:44d9d526d1e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
importdata.m: Allow importing of sound files via audioread. * importdata.m: Remove special code for 'wav' files that used wavread. Replace call to error() with call to audioread() for input file extensions that are sound files.
author Rik <rik@octave.org>
date Mon, 07 Nov 2016 15:48:46 -0800
parents 6f111a0f32c3
children 7abc25e6206a
files scripts/io/importdata.m
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/io/importdata.m	Mon Nov 07 15:41:57 2016 -0800
+++ b/scripts/io/importdata.m	Mon Nov 07 15:48:46 2016 -0800
@@ -97,8 +97,8 @@
   ext = lower (ext);
 
   switch (ext)
-    case {".au", ".snd", ".flac", ".ogg"}
-      error ("importdata: not implemented for file format %s", ext);
+    case {".au", ".snd", ".flac", ".ogg", ".wav", ".wave"}
+      [output.data, output.fs] = audioread (fname);
     case {".avi", ".mj2", ".mpg", ".asf", ".asx", ".wmv", ".mp4", ".m4v", ...
           ".mov"}
       error ("importdata: not implemented for file format %s", ext);
@@ -123,10 +123,6 @@
         ## Fall back to unimplemented.m.
         output = xlsread (fname);
       end_try_catch
-    case {".wav", ".wave"}
-      delimiter = NaN;
-      header_rows = 0;
-      [output.data, output.fs] = wavread (fname);
     otherwise
       ## Assume the file is in ASCII format.
       [output, delimiter, header_rows] = ...