Mercurial > octave

changeset 28163:b98b6e2490b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Sun, 15 Mar 2020 14:54:11 -0700
parents ef349f5c320b (current diff) 41750ce4752c (diff)
children a7ba8d4a1da2
files
diffstat 2 files changed, 18 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/intro.txi	Wed Apr 19 15:06:31 2017 +0200
+++ b/doc/interpreter/intro.txi	Sun Mar 15 14:54:11 2020 -0700
@@ -358,7 +358,7 @@
 command.  For example,
 
 @example
-print -dpdf foo.pdf
+print foo.pdf
 @end example
 
 @noindent
--- a/libinterp/dldfcn/audiodevinfo.cc	Wed Apr 19 15:06:31 2017 +0200
+++ b/libinterp/dldfcn/audiodevinfo.cc	Sun Mar 15 14:54:11 2020 -0700
@@ -2378,16 +2378,24 @@
   recorder->set_y (args(0));
   recorder->set_fs (args(1).int_value ());
 
-  switch (args.length ())
+  if (args.length () > 2)
     {
-    case 3:
-      recorder->set_nbits (args(2).int_value ());
-      break;
-
-    case 4:
-      recorder->set_nbits (args(2).int_value ());
-      recorder->set_id (args(3).int_value ());
-      break;
+      // FIXME: Should be able to support 32-bit streams (bug #57939)
+      int nbits = args(2).int_value ();
+      if (nbits != 8 || nbits != 16 || nbits != 24)
+        error ("audioplayer: NBITS must be 8, 16, or 24");
+
+      switch (args.length ())
+        {
+        case 3:
+          recorder->set_nbits (nbits);
+          break;
+
+        case 4:
+          recorder->set_nbits (nbits);
+          recorder->set_id (args(3).int_value ());
+          break;
+        }
     }
 
   if (is_function)