Mercurial > octave-nkf

changeset 19549:0f7788e2d677

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* audiodevinfo.cc: Use "||" and "&&", not "or" and "and".
author John W. Eaton <jwe@octave.org>
date Fri, 02 Jan 2015 02:18:51 -0500
parents ef6875adb053
children fc85d9026bb6
files libinterp/dldfcn/audiodevinfo.cc
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/audiodevinfo.cc	Fri Jan 02 02:16:18 2015 -0500
+++ b/libinterp/dldfcn/audiodevinfo.cc	Fri Jan 02 02:18:51 2015 -0500
@@ -1084,7 +1084,7 @@
 
   PaError err;
   err = Pa_IsStreamActive (stream);
-  if (err != 0 and err != 1)
+  if (err != 0 && err != 1)
     {
       error ("audiorecorder: Error checking stream activity status");
       return false;
@@ -1383,7 +1383,7 @@
 void
 audiorecorder::set_channels (int channels)
 {
-  assert (channels == 1 or channels == 2);
+  assert (channels == 1 || channels == 2);
   this->channels = channels;
 }
 
@@ -1490,7 +1490,7 @@
 
   PaError err;
   err = Pa_IsStreamActive (stream);
-  if (err != 0 and err != 1)
+  if (err != 0 && err != 1)
     {
       error ("audiorecorder: Error checking stream activity status");
       return false;
@@ -2334,8 +2334,8 @@
           RowVector range = args(1).row_vector_value ();
           start = range.elem (0) - 1;
           end = range.elem (1) - 1;
-          if (start > player->get_total_samples () or
-              start > end or end > player->get_total_samples ())
+          if (start > player->get_total_samples ()
+              || start > end || end > player->get_total_samples ())
             error ("audioplayer: invalid range specified for playback");
           player->set_sample_number (start);
           player->set_end_sample (end);
@@ -2381,8 +2381,8 @@
           RowVector range = args(1).row_vector_value ();
           start = range.elem (0) - 1;
           end = range.elem (1) - 1;
-          if (start > player->get_total_samples () or
-              start > end or end > player->get_total_samples ())
+          if (start > player->get_total_samples ()
+              || start > end || end > player->get_total_samples ())
             error ("audioplayer: invalid range specified for playback");
           player->set_sample_number (start);
           player->set_end_sample (end);