Mercurial > octave

changeset 30751:71ca1db02426 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't delete audiodevinfo.oct until objects it creates are deleted (bug #61994) * audiodevinfo.cc (class audioplayer, class audiorecorder): Derive from octave_base_dld_value to require that all audioplayer and audiorecorder objects will be deleted before the dynamic_library object that manages the audiodevinfo.oct file is deleted. * (F__recorder_audiorecorder__, get_recorder F__recorder_getaudiodata__, F__recorder_get_channels__, F__recorder_get_fs__, F__recorder_get_id__, F__recorder_get_nbits__, F__recorder_get_sample_number__, F__recorder_get_tag__, F__recorder_get_total_samples__, F__recorder_get_userdata__, F__recorder_isrecording__, F__recorder_pause__, F__recorder_recordblocking__, F__recorder_record__, F__recorder_resume__, F__recorder_set_fs__, F__recorder_set_tag__, F__recorder_set_userdata__, F__recorder_stop__, F__player_audioplayer__, get_player F__player_get_channels__, F__player_get_fs__, F__player_get_id__, F__player_get_nbits__, F__player_get_sample_number__, F__player_get_tag__, F__player_get_total_samples__, F__player_get_userdata__, F__player_isplaying__, F__player_pause__, F__player_playblocking__, F__player_play__, F__player_resume__, F__player_set_fs__, F__player_set_tag__, F__player_set_userdata__, F__player_stop__): Delete the now unnecessary interpreter argument and calls to interpreter::mlock.
author John W. Eaton <jwe@octave.org>
date Thu, 17 Feb 2022 22:26:35 -0500
parents b92316e295a2
children d31d4f2504de b124e123a759
files libinterp/dldfcn/audiodevinfo.cc
diffstat 1 files changed, 114 insertions(+), 159 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/audiodevinfo.cc	Thu Feb 17 22:24:37 2022 -0500
+++ b/libinterp/dldfcn/audiodevinfo.cc	Thu Feb 17 22:26:35 2022 -0500
@@ -44,7 +44,6 @@
 #include "defun-dld.h"
 #include "error.h"
 #include "errwarn.h"
-#include "interpreter.h"
 #include "oct-map.h"
 #include "ov-int32.h"
 #include "ov.h"
@@ -518,7 +517,7 @@
 
 enum audio_type { TYPE_INT8, TYPE_UINT8, TYPE_UINT16, TYPE_DOUBLE };
 
-class audioplayer : public octave_base_value
+class audioplayer : public octave_base_dld_value
 {
 public:
   audioplayer (void);
@@ -1268,7 +1267,7 @@
   return (err == 1);
 }
 
-class audiorecorder : public octave_base_value
+class audiorecorder : public octave_base_dld_value
 {
 public:
   audiorecorder (void);
@@ -1910,8 +1909,8 @@
 
 #endif
 
-DEFMETHOD_DLD (__recorder_audiorecorder__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_audiorecorder__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn  {} {@var{recorder} =} __recorder_audiorecorder__ (@var{fs}, @var{nbits}, @var{channels})
 @deftypefnx {} {@var{recorder} =} __recorder_audiorecorder__ (@var{fs}, @var{nbits}, @var{channels}, @var{id})
 @deftypefnx {} {@var{recorder} =} __recorder_audiorecorder__ (@var{fcn}, @dots{})
@@ -1922,8 +1921,6 @@
 
 #if defined (HAVE_PORTAUDIO)
 
-  interp.mlock ();
-
   int nargin = args.length ();
 
   audiorecorder *recorder = new audiorecorder ();
@@ -1953,7 +1950,6 @@
   retval = recorder;
 
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_audiorecorder__",
@@ -1966,10 +1962,8 @@
 #if defined (HAVE_PORTAUDIO)
 
 static audiorecorder *
-get_recorder (interpreter& interp, const octave_value& ov)
+get_recorder (const octave_value& ov)
 {
-  interp.mlock ();
-
   const octave_base_value& rep = ov.get_rep ();
 
   octave_base_value *ncrep = const_cast<octave_base_value *> (&rep);
@@ -1983,8 +1977,8 @@
 
 #endif
 
-DEFMETHOD_DLD (__recorder_getaudiodata__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_getaudiodata__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{data} =} __recorder_getaudiodata__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
@@ -1992,9 +1986,8 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  retval = get_recorder (interp, args(0))->getaudiodata ();
+  retval = get_recorder (args(0))->getaudiodata ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_getaudiodata__",
@@ -2004,8 +1997,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__recorder_get_channels__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_get_channels__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{n} =} __recorder_get_channels__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
@@ -2013,9 +2006,8 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  retval = get_recorder (interp, args(0))->get_channels ();
+  retval = get_recorder (args(0))->get_channels ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_get_channels__",
@@ -2025,8 +2017,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__recorder_get_fs__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_get_fs__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{fs} =} __recorder_get_fs__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
@@ -2034,9 +2026,8 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  retval = get_recorder (interp, args(0))->get_fs ();
+  retval = get_recorder (args(0))->get_fs ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_get_fs__",
@@ -2046,8 +2037,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__recorder_get_id__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_get_id__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{id} =} __recorder_get_id__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
@@ -2055,9 +2046,8 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  retval = get_recorder (interp, args(0))->get_id ();
+  retval = get_recorder (args(0))->get_id ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_get_id__",
@@ -2067,8 +2057,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__recorder_get_nbits__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_get_nbits__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{nbits} =} __recorder_get_nbits__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
@@ -2076,9 +2066,8 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  retval = get_recorder (interp, args(0))->get_nbits ();
+  retval = get_recorder (args(0))->get_nbits ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_get_nbits__",
@@ -2088,8 +2077,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__recorder_get_sample_number__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_get_sample_number__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{n} =} __recorder_get_sample_number__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
@@ -2097,9 +2086,8 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  retval = get_recorder (interp, args(0))->get_sample_number ();
+  retval = get_recorder (args(0))->get_sample_number ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_get_sample_number__",
@@ -2109,8 +2097,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__recorder_get_tag__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_get_tag__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{tag} =} __recorder_get_tag__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
@@ -2118,9 +2106,8 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  retval = get_recorder (interp, args(0))->get_tag ();
+  retval = get_recorder (args(0))->get_tag ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_get_tag__",
@@ -2130,8 +2117,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__recorder_get_total_samples__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_get_total_samples__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{n} =} __recorder_get_total_samples__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
@@ -2139,9 +2126,8 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  retval = get_recorder (interp, args(0))->get_total_samples ();
+  retval = get_recorder (args(0))->get_total_samples ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_get_total_samples__",
@@ -2151,8 +2137,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__recorder_get_userdata__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_get_userdata__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{data} =} __recorder_get_userdata__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
@@ -2160,9 +2146,8 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  retval = get_recorder (interp, args(0))->get_userdata ();
+  retval = get_recorder (args(0))->get_userdata ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_get_userdata__",
@@ -2172,8 +2157,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__recorder_isrecording__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_isrecording__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __recorder_isrecording__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
@@ -2181,9 +2166,8 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  retval = get_recorder (interp, args(0))->isrecording ();
+  retval = get_recorder (args(0))->isrecording ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_isrecording__",
@@ -2193,17 +2177,16 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__recorder_pause__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_pause__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __recorder_pause__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
-  get_recorder (interp, args(0))->pause ();
+  get_recorder (args(0))->pause ();
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_pause__",
@@ -2211,18 +2194,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__recorder_recordblocking__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_recordblocking__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __recorder_recordblocking__ (@var{recorder}, @var{seconds})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   float seconds = args(1).float_value ();
-  get_recorder (interp, args(0))->recordblocking (seconds);
+  get_recorder (args(0))->recordblocking (seconds);
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_recordblocking__",
@@ -2230,15 +2212,15 @@
 #endif
 }
 
-DEFMETHOD_DLD (__recorder_record__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_record__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn  {} {} __recorder_record__ (@var{recorder})
 @deftypefnx {} {} __recorder_record__ (@var{recorder}, @var{seconds})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
-  audiorecorder *recorder = get_recorder (interp, args(0));
+  audiorecorder *recorder = get_recorder (args(0));
 
   if (args.length () == 2)
     recorder->set_end_sample (args(1).int_value () * recorder->get_fs ());
@@ -2246,7 +2228,6 @@
   recorder->record ();
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_record__",
@@ -2254,18 +2235,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__recorder_resume__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_resume__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __recorder_resume__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    get_recorder (interp, args(0))->resume ();
+    get_recorder (args(0))->resume ();
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_resume__",
@@ -2273,18 +2253,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__recorder_set_fs__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_set_fs__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __recorder_set_fs__ (@var{recorder}, @var{fs})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 2)
-    get_recorder (interp, args(0))->set_fs (args(1).int_value ());
+    get_recorder (args(0))->set_fs (args(1).int_value ());
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_set_fs__",
@@ -2292,18 +2271,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__recorder_set_tag__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_set_tag__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __recorder_set_tag__ (@var{recorder}, @var{tag})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 2)
-    get_recorder (interp, args(0))->set_tag (args(1).char_matrix_value ());
+    get_recorder (args(0))->set_tag (args(1).char_matrix_value ());
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_set_tag__",
@@ -2311,18 +2289,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__recorder_set_userdata__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_set_userdata__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __recorder_set_userdata__ (@var{recorder}, @var{data})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 2)
-    get_recorder (interp, args(0))->set_userdata (args(1));
+    get_recorder (args(0))->set_userdata (args(1));
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_set_userdata__",
@@ -2330,18 +2307,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__recorder_stop__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__recorder_stop__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __recorder_stop__ (@var{recorder})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    get_recorder (interp, args(0))->stop ();
+    get_recorder (args(0))->stop ();
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__recorder_stop__",
@@ -2349,8 +2325,8 @@
 #endif
 }
 
-DEFMETHOD_DLD (__player_audioplayer__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_audioplayer__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn  {} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs})
 @deftypefnx {} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs}, @var{nbits})
 @deftypefnx {} {@var{player} =} __player_audioplayer__ (@var{y}, @var{fs}, @var{nbits}, @var{id})
@@ -2360,7 +2336,6 @@
   octave_value retval;
 
 #if defined (HAVE_PORTAUDIO)
-  interp.mlock ();
 
   audioplayer *recorder = new audioplayer ();
 
@@ -2400,7 +2375,6 @@
 
   retval = recorder;
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_audioplayer__",
@@ -2413,10 +2387,8 @@
 #if defined (HAVE_PORTAUDIO)
 
 static audioplayer *
-get_player (interpreter& interp, const octave_value& ov)
+get_player (const octave_value& ov)
 {
-  interp.mlock ();
-
   const octave_base_value& rep = ov.get_rep ();
 
   octave_base_value *ncrep = const_cast<octave_base_value *> (&rep);
@@ -2430,8 +2402,8 @@
 
 #endif
 
-DEFMETHOD_DLD (__player_get_channels__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_get_channels__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{n} =} __player_get_channels__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
@@ -2440,9 +2412,8 @@
 
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    retval = get_player (interp, args(0))->get_channels ();
+    retval = get_player (args(0))->get_channels ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_get_channels__",
@@ -2452,8 +2423,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__player_get_fs__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_get_fs__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{fs} =} __player_get_fs__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
@@ -2462,9 +2433,8 @@
 
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    retval = get_player (interp, args(0))->get_fs ();
+    retval = get_player (args(0))->get_fs ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_get_fs__",
@@ -2474,8 +2444,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__player_get_id__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_get_id__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{id} =} __player_get_id__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
@@ -2484,9 +2454,8 @@
 
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    retval = get_player (interp, args(0))->get_id ();
+    retval = get_player (args(0))->get_id ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_get_id__",
@@ -2496,8 +2465,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__player_get_nbits__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_get_nbits__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{nbits} =} __player_get_nbits__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
@@ -2506,9 +2475,8 @@
 
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    retval = get_player (interp, args(0))->get_nbits ();
+    retval = get_player (args(0))->get_nbits ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_get_nbits__",
@@ -2518,8 +2486,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__player_get_sample_number__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_get_sample_number__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{n} =} __player_get_sample_number__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
@@ -2528,9 +2496,8 @@
 
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    retval = get_player (interp, args(0))->get_sample_number ();
+    retval = get_player (args(0))->get_sample_number ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_get_sample_number__",
@@ -2540,8 +2507,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__player_get_tag__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_get_tag__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{tag} =} __player_get_tag__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
@@ -2550,9 +2517,8 @@
 
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    retval = get_player (interp, args(0))->get_tag ();
+    retval = get_player (args(0))->get_tag ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_get_tag__",
@@ -2562,8 +2528,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__player_get_total_samples__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_get_total_samples__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{n} =} __player_get_total_samples__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
@@ -2572,9 +2538,8 @@
 
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    retval = get_player (interp, args(0))->get_total_samples ();
+    retval = get_player (args(0))->get_total_samples ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_get_total_samples__",
@@ -2584,8 +2549,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__player_get_userdata__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_get_userdata__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {@var{data} =} __player_get_userdata__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
@@ -2594,9 +2559,8 @@
 
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    retval = get_player (interp, args(0))->get_userdata ();
+    retval = get_player (args(0))->get_userdata ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_get_userdata__",
@@ -2606,8 +2570,8 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__player_isplaying__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_isplaying__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __player_isplaying__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
@@ -2616,9 +2580,8 @@
 
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    retval = get_player (interp, args(0))->isplaying ();
+    retval = get_player (args(0))->isplaying ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_isplaying__",
@@ -2628,18 +2591,17 @@
   return retval;
 }
 
-DEFMETHOD_DLD (__player_pause__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_pause__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __player_pause__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    get_player (interp, args(0))->pause ();
+    get_player (args(0))->pause ();
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_pause__",
@@ -2647,8 +2609,8 @@
 #endif
 }
 
-DEFMETHOD_DLD (__player_playblocking__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_playblocking__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn  {} {} __player_playblocking__ (@var{player})
 @deftypefnx {} {} __player_playblocking__ (@var{player}, @var{start})
 @deftypefnx {} {} __player_playblocking__ (@var{player}, [@var{start}, @var{end}])
@@ -2657,7 +2619,7 @@
 {
 #if defined (HAVE_PORTAUDIO)
 
-  audioplayer *player = get_player (interp, args(0));
+  audioplayer *player = get_player (args(0));
 
   if (args.length () == 1)
     {
@@ -2694,7 +2656,6 @@
 
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_playblocking__",
@@ -2702,8 +2663,8 @@
 #endif
 }
 
-DEFMETHOD_DLD (__player_play__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_play__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn  {} {} __player_play__ (@var{player})
 @deftypefnx {} {} __player_play__ (@var{player}, @var{start})
 @deftypefnx {} {} __player_play__ (@var{player}, [@var{start}, @var{end}])
@@ -2714,11 +2675,11 @@
 
   if (args.length () == 1)
     {
-      get_player (interp, args(0))->play ();
+      get_player (args(0))->play ();
     }
   else if (args.length () == 2)
     {
-      audioplayer *player = get_player (interp, args(0));
+      audioplayer *player = get_player (args(0));
 
       if (args(1).is_matrix_type ())
         {
@@ -2749,7 +2710,6 @@
 
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_play__",
@@ -2757,18 +2717,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__player_resume__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_resume__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __player_resume__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    get_player (interp, args(0))->resume ();
+    get_player (args(0))->resume ();
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_resume__",
@@ -2776,18 +2735,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__player_set_fs__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_set_fs__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __player_set_fs__ (@var{player}, @var{fs})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 2)
-    get_player (interp, args(0))->set_fs (args(1).int_value ());
+    get_player (args(0))->set_fs (args(1).int_value ());
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_set_fs__",
@@ -2795,18 +2753,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__player_set_tag__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_set_tag__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __player_set_tag__ (@var{player}, @var{tag})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 2)
-    get_player (interp, args(0))->set_tag (args(1).char_matrix_value ());
+    get_player (args(0))->set_tag (args(1).char_matrix_value ());
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_set_tag__",
@@ -2814,18 +2771,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__player_set_userdata__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_set_userdata__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __player_set_userdata__ (@var{player}, @var{data})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 2)
-    get_player (interp, args(0))->set_userdata (args(1));
+    get_player (args(0))->set_userdata (args(1));
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_set_userdata__",
@@ -2833,18 +2789,17 @@
 #endif
 }
 
-DEFMETHOD_DLD (__player_stop__, interp, args, ,
-               doc: /* -*- texinfo -*-
+DEFUN_DLD (__player_stop__, args, ,
+           doc: /* -*- texinfo -*-
 @deftypefn {} {} __player_stop__ (@var{player})
 Undocumented internal function.
 @end deftypefn */)
 {
 #if defined (HAVE_PORTAUDIO)
   if (args.length () == 1)
-    get_player (interp, args(0))->stop ();
+    get_player (args(0))->stop ();
   return ovl ();
 #else
-  octave_unused_parameter (interp);
   octave_unused_parameter (args);
 
   err_disabled_feature ("__player_stop__",