Mercurial > octave-nkf

changeset 19541:dac3191a5301

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes for audioplayer and audiorecorder .m files * @audioplayer/__get_properties__.m, @audioplayer/audioplayer.m, @audioplayer/get.m, @audioplayer/set.m, @audiorecorder/__get_properties__.m, @audiorecorder/audiorecorder.m, @audiorecorder/get.m, @audiorecorder/getaudiodata.m, @audiorecorder/getplayer.m, @audiorecorder/play.m, @audiorecorder/set.m: Style fixes.
author John W. Eaton <jwe@octave.org>
date Wed, 31 Dec 2014 14:56:52 -0500
parents fdb8a62ef17a
children bf27e21f0bfb
files scripts/audio/@audioplayer/__get_properties__.m scripts/audio/@audioplayer/audioplayer.m scripts/audio/@audioplayer/get.m scripts/audio/@audioplayer/set.m scripts/audio/@audiorecorder/__get_properties__.m scripts/audio/@audiorecorder/audiorecorder.m scripts/audio/@audiorecorder/get.m scripts/audio/@audiorecorder/getaudiodata.m scripts/audio/@audiorecorder/getplayer.m scripts/audio/@audiorecorder/play.m scripts/audio/@audiorecorder/set.m
diffstat 11 files changed, 93 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/audio/@audioplayer/__get_properties__.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audioplayer/__get_properties__.m	Wed Dec 31 14:56:52 2014 -0500
@@ -22,20 +22,41 @@
 ## object @var{player}.
 ## @end deftypefn
 
-function properties = __get_properties__ (player)
-  properties.BitsPerSample = __player_get_nbits__ (struct (player).player);
-  properties.CurrentSample = __player_get_sample_number__ (struct (player).player);
-  properties.DeviceID = __player_get_id__ (struct (player).player);
-  properties.NumberOfChannels = __player_get_channels__ (struct (player).player);
-  if __player_isplaying__ (struct (player).player)
+function props = __get_properties__ (player)
+  if (__player_isplaying__ (struct (player).player))
     running = "on";
   else
     running = "off";
   endif
-  properties.Running = running;
-  properties.SampleRate = __player_get_fs__ (struct (player).player);
-  properties.TotalSamples = __player_get_total_samples__ (struct (player).player);
-  properties.Tag = __player_get_tag__ (struct (player).player);
-  properties.Type = "audioplayer";
-  properties.UserData = __player_get_userdata__ (struct (player).player);
+
+  props = struct ("BitsPerSample",
+                  __player_get_nbits__ (struct (player).player),
+
+                  "CurrentSample",
+                  __player_get_sample_number__ (struct (player).player),
+
+                  "DeviceID",
+                  __player_get_id__ (struct (player).player),
+
+                  "NumberOfChannels",
+                  __player_get_channels__ (struct (player).player),
+
+                  "Running",
+                  running,
+
+                  "SampleRate",
+                  __player_get_fs__ (struct (player).player),
+
+                  "TotalSamples",
+                  __player_get_total_samples__ (struct (player).player),
+
+                  "Tag",
+                  __player_get_tag__ (struct (player).player),
+
+                  "Type",
+                  "audioplayer",
+
+                  "UserData",
+                  __player_get_userdata__ (struct (player).player));
+
 endfunction
--- a/scripts/audio/@audioplayer/audioplayer.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audioplayer/audioplayer.m	Wed Dec 31 14:56:52 2014 -0500
@@ -76,7 +76,8 @@
   if (nargin < 1 || nargin > 4)
     print_usage ();
   endif
-  if ((isa (varargin{1}, "function_handle") || ischar (varargin{1})) && nargin < 2)
+  if ((isa (varargin{1}, "function_handle")
+       || ischar (varargin{1})) && nargin < 2)
     print_usage ();
   endif
   if isa (varargin{1}, "audiorecorder")
@@ -85,12 +86,13 @@
     elseif nargin == 2
       recorder = varargin{1};
       data = getaudiodata (recorder);
-      player = audioplayer (data, get (recorder, "SampleRate"), get (recorder, "BitsPerSample"), varargin{2});
+      player = audioplayer (data, get (recorder, "SampleRate"),
+                            get (recorder, "BitsPerSample"), varargin{2});
     else
       print_usage ();
     endif
   else
-    if ischar (varargin{1})
+    if (ischar (varargin{1}))
       varargin{1} = str2func (varargin{1});
     endif
     player.player = __player_audioplayer__ (varargin{:});
--- a/scripts/audio/@audioplayer/get.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audioplayer/get.m	Wed Dec 31 14:56:52 2014 -0500
@@ -30,10 +30,10 @@
 function result = get (varargin)
   player = varargin{1};
   properties = __get_properties__ (player);
-  if nargin == 1
+  if (nargin == 1)
     result = properties;
-  elseif nargin == 2
-    if ischar (varargin{2})
+  elseif (nargin == 2)
+    if (ischar (varargin{2}))
       result = getfield (properties, varargin{2});
     else
       result = {};
--- a/scripts/audio/@audioplayer/set.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audioplayer/set.m	Wed Dec 31 14:56:52 2014 -0500
@@ -29,20 +29,20 @@
 ## @end deftypefn
 
 function settable = set (varargin)
-  if nargin < 1 || nargin > 3
+  if (nargin < 1 || nargin > 3)
     print_usage ();
   endif
   player = struct (varargin{1}).player;
-  if nargin == 1
+  if (nargin == 1)
     settable.SampleRate = {};
     settable.Tag = {};
     settable.UserData = {};
-  elseif nargin == 2
+  elseif (nargin == 2)
     for [value, property] = varargin{2}
       setproperty (player, property, value);
     endfor
-  elseif nargin == 3
-    if iscell (varargin{2})
+  elseif (nargin == 3)
+    if (iscell (varargin{2}))
       index = 1;
       for property = varargin{2}
         setproperty (player, char (property), varargin{3}{index});
--- a/scripts/audio/@audiorecorder/__get_properties__.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audiorecorder/__get_properties__.m	Wed Dec 31 14:56:52 2014 -0500
@@ -22,20 +22,41 @@
 ## @var{recorder}.
 ## @end deftypefn
 
-function properties = __get_properties__ (recorder)
-  properties.BitsPerSample = __recorder_get_nbits__ (struct (recorder).recorder);
-  properties.CurrentSample = __recorder_get_sample_number__ (struct (recorder).recorder);
-  properties.DeviceID = __recorder_get_id__ (struct (recorder).recorder);
-  properties.NumberOfChannels = __recorder_get_channels__ (struct (recorder).recorder);
-  if __recorder_isrecording__ (struct (recorder).recorder)
+function props = __get_properties__ (recorder)
+  if (__recorder_isrecording__ (struct (recorder).recorder))
     running = "on";
   else
     running = "off";
   endif
-  properties.Running = running;
-  properties.SampleRate = __recorder_get_fs__ (struct (recorder).recorder);
-  properties.TotalSamples = __recorder_get_total_samples__ (struct (recorder).recorder);
-  properties.Tag = __recorder_get_tag__ (struct (recorder).recorder);
-  properties.Type = "audiorecorder";
-  properties.UserData = __recorder_get_userdata__ (struct (recorder).recorder);
+
+  props = struct ("BitsPerSample",
+                  __recorder_get_nbits__ (struct (recorder).recorder),
+
+                  "CurrentSample",
+                  __recorder_get_sample_number__ (struct (recorder).recorder),
+
+                  "DeviceID",
+                  __recorder_get_id__ (struct (recorder).recorder),
+
+                  "NumberOfChannels",
+                  __recorder_get_channels__ (struct (recorder).recorder),
+
+                  "Running",
+                  running,
+
+                  "SampleRate",
+                  __recorder_get_fs__ (struct (recorder).recorder),
+
+                  "TotalSamples",
+                  __recorder_get_total_samples__ (struct (recorder).recorder),
+
+                  "Tag",
+                  __recorder_get_tag__ (struct (recorder).recorder),
+
+                  "Type",
+                  "audiorecorder",
+
+                  "UserData",
+                  __recorder_get_userdata__ (struct (recorder).recorder));
+
 endfunction
--- a/scripts/audio/@audiorecorder/audiorecorder.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audiorecorder/audiorecorder.m	Wed Dec 31 14:56:52 2014 -0500
@@ -33,7 +33,7 @@
   if (nargin > 5)
     print_usage ();
   endif
-  if nargin > 0 && ischar (varargin{1})
+  if (nargin > 0 && ischar (varargin{1}))
     varargin{1} = str2func (varargin{1});
   endif
   recorder.recorder = __recorder_audiorecorder__ (varargin{:});
--- a/scripts/audio/@audiorecorder/get.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audiorecorder/get.m	Wed Dec 31 14:56:52 2014 -0500
@@ -30,10 +30,10 @@
 function result = get (varargin)
   recorder = varargin{1};
   properties = __get_properties__ (recorder);
-  if nargin == 1
+  if (nargin == 1)
     result = properties;
-  elseif nargin == 2
-    if ischar (varargin{2})
+  elseif (nargin == 2)
+    if (ischar (varargin{2}))
       result = getfield (properties, varargin{2});
     else
       result = {};
--- a/scripts/audio/@audiorecorder/getaudiodata.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audiorecorder/getaudiodata.m	Wed Dec 31 14:56:52 2014 -0500
@@ -45,7 +45,7 @@
         data = uint8 ((data + 1.0) * 0.5 * (2.0 ^ 8 - 1));
     endswitch
   endif
-  if get (recorder, "NumberOfChannels") == 2
+  if (get (recorder, "NumberOfChannels") == 2)
     data = data';
   else
     data = data(1,:)';
--- a/scripts/audio/@audiorecorder/getplayer.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audiorecorder/getplayer.m	Wed Dec 31 14:56:52 2014 -0500
@@ -28,5 +28,6 @@
   endif
   recorder = varargin{1};
   data = getaudiodata (recorder);
-  player = audioplayer (data, get (recorder, "SampleRate"), get (recorder, "BitsPerSample"));
+  player = audioplayer (data, get (recorder, "SampleRate"),
+                        get (recorder, "BitsPerSample"));
 endfunction
--- a/scripts/audio/@audiorecorder/play.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audiorecorder/play.m	Wed Dec 31 14:56:52 2014 -0500
@@ -33,7 +33,8 @@
   endif
   recorder = varargin{1};
   data = getaudiodata (recorder);
-  player = audioplayer (data, get (recorder, "SampleRate"), get (recorder, "BitsPerSample"));
+  player = audioplayer (data, get (recorder, "SampleRate"),
+                        get (recorder, "BitsPerSample"));
   if (nargin == 1)
     play (player);
   else
--- a/scripts/audio/@audiorecorder/set.m	Wed Dec 31 13:45:45 2014 -0500
+++ b/scripts/audio/@audiorecorder/set.m	Wed Dec 31 14:56:52 2014 -0500
@@ -30,20 +30,20 @@
 ## @end deftypefn
 
 function settable = set (varargin)
-  if nargin < 1 || nargin > 3
+  if (nargin < 1 || nargin > 3)
     print_usage ();
   endif
   recorder = struct (varargin{1}).recorder;
-  if nargin == 1
+  if (nargin == 1)
     settable.SampleRate = {};
     settable.Tag = {};
     settable.UserData = {};
-  elseif nargin == 2
+  elseif (nargin == 2)
     for [value, property] = varargin{2}
       setproperty (recorder, property, value);
     endfor
-  elseif nargin == 3
-    if iscell (varargin{2})
+  elseif (nargin == 3)
+    if (iscell (varargin{2}))
       index = 1;
       for property = varargin{2}
         setproperty (recorder, char (property), varargin{3}{index});