Mercurial > octave-nkf
diff scripts/audio/@audiorecorder/get.m @ 19557:5802ea7037d4
style fixes for audioplayer and audiorecorder classes
* @audioplayer/__get_properties__.m, @audioplayer/audioplayer.m,
@audioplayer/display.m, @audioplayer/get.m, @audioplayer/isplaying.m,
@audioplayer/pause.m, @audioplayer/play.m,
@audioplayer/playblocking.m, @audioplayer/resume.m,
@audioplayer/set.m, @audioplayer/stop.m, @audioplayer/subsasgn.m,
@audioplayer/subsref.m, @audiorecorder/__get_properties__.m,
@audiorecorder/audiorecorder.m, @audiorecorder/display.m,
@audiorecorder/get.m, @audiorecorder/getaudiodata.m,
@audiorecorder/getplayer.m, @audiorecorder/isrecording.m,
@audiorecorder/pause.m, @audiorecorder/play.m,
@audiorecorder/record.m, @audiorecorder/recordblocking.m,
@audiorecorder/resume.m, @audiorecorder/set.m, @audiorecorder/stop.m,
@audiorecorder/subsasgn.m, @audiorecorder/subsref.m: Style fixes.
Do more basic argument checking. Use consistent style for error
messages.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 02 Jan 2015 17:23:38 -0500 |
| parents | dac3191a5301 |
| children | 72304a4e010a |
line wrap: on
line diff
--- a/scripts/audio/@audiorecorder/get.m Fri Jan 02 16:54:34 2015 -0500 +++ b/scripts/audio/@audiorecorder/get.m Fri Jan 02 17:23:38 2015 -0500 @@ -27,23 +27,28 @@ ## correspond to property names. ## @end deftypefn -function result = get (varargin) - recorder = varargin{1}; - properties = __get_properties__ (recorder); +function retval = get (varargin) + + if (nargin < 1 || nargin > 2) + print_usage (); + endif + + properties = __get_properties__ (varargin{1}); + if (nargin == 1) - result = properties; + retval = properties; elseif (nargin == 2) - if (ischar (varargin{2})) - result = getfield (properties, varargin{2}); + pnames = varargin{2}; + if (ischar (pnames)) + retval = getfield (properties, pnames); + elseif (iscellstr (pnames)) + retval = cell (size (pnames)); + for i = 1:numel (pnames) + retval{i} = getfield (properties, pnames{i}); + endfor else - result = {}; - index = 1; - for property = varargin{2} - result{index} = getfield (properties, char (property)); - index = index + 1; - endfor + error ("@audiorecorder/get: invalid name argument"); endif - else - error ("audiorecorder: wrong number of arguments to the get method"); endif + endfunction