Mercurial > hg > octave-nkf

changeset 19878:0f557da98f5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
record.m: Overhaul function. * record.m: Rewrite as a simple wrapper around audiorecorder. Rewrite docstring. Add seealso link to audiorecorder. Add %!assert (1) to mark function as not needing tests.
author Mike Miller <mtmiller@ieee.org>
date Sun, 08 Feb 2015 01:09:32 -0500
parents f4361ca47463
children c17e1cefdbd3
files scripts/audio/record.m
diffstat 1 files changed, 18 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/audio/record.m
+++ b/scripts/audio/record.m
@@ -1,3 +1,4 @@
+## Copyright (C) 2015 Mike Miller
 ## Copyright (C) 1995-2013 John W. Eaton
 ##
 ## This file is part of Octave.
@@ -17,50 +18,33 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {} record (@var{sec}, @var{sampling_rate})
-## Record @var{sec} seconds of audio input into the vector @var{x}.  The
-## default value for @var{sampling_rate} is 8000 samples per second, or
-## 8kHz.  The program waits until the user types @key{RET} and then
-## immediately starts to record.
-## @seealso{lin2mu, mu2lin}
+## @deftypefn  {Function File} {} record (@var{sec})
+## @deftypefnx {Function File} {} record (@var{sec}, @var{fs})
+## Record @var{sec} seconds of audio from the system's default audio input at
+## a sampling rate of 8000 samples per second.  If the optional argument
+## @var{fs} is given, it specifies the sampling rate for recording.
+##
+## For more control over audio recording, use the @code{audiorecorder} class.
+## @seealso{@audiorecorder/audiorecorder}
 ## @end deftypefn
 
-## Author: AW <Andreas.Weingessel@ci.tuwien.ac.at>
-## Created: 19 September 1994
-## Adapted-By: jwe
-
-function X = record (sec, sampling_rate)
+function x = record (sec, fs)
 
   if (nargin == 1)
-    sampling_rate = 8000;
+    fs = 8000;
   elseif (nargin != 2)
     print_usage ();
   endif
 
-  unwind_protect
-
-    file = tempname ();
-
-    input ("Please hit ENTER and speak afterwards!\n", 1);
-
-    cmd = sprintf ("dd if=/dev/dsp of=\"%s\" bs=%d count=%d",
-                   file, sampling_rate, sec);
-
-    system (cmd);
+  rec = audiorecorder (fs, 16, 1);
 
-    num = fopen (file, "rb");
-
-    [Y, c] = fread (num, sampling_rate * sec, "uchar");
-
-    fclose (num);
+  recordblocking (rec, sec);
 
-  unwind_protect_cleanup
-
-    unlink (file);
-
-  end_unwind_protect
-
-  X = Y - 127;
+  x = getaudiodata (rec);
 
 endfunction
 
+
+## No test possible for recording audio.
+%!assert (1)
+