# HG changeset patch
# User Rik <rik@octave.org>
# Date 1584309251 25200
# Node ID b98b6e2490b24504843f2e6348187ef79a662498
# Parent  ef349f5c320bc3c9755afe7b4acd73fb54013b06# Parent  41750ce4752ca255bec57a362c46229242fbd229
maint: merge stable to default.

diff -r ef349f5c320b -r b98b6e2490b2 doc/interpreter/intro.txi
--- 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
diff -r ef349f5c320b -r b98b6e2490b2 libinterp/dldfcn/audiodevinfo.cc
--- 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)