tempo-plotter Changeset - c3e7e4cfc78d · protofusion repositories

Changeset - c3e7e4cfc78d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 8 years ago 2018-03-30 10:39:35
hy@ozderya.net

prefer early failure of if statement, skip requests are rare

1 file changed with 2 insertions and 2 deletions:

src/binarystreamreader.cpp

0 comments (0 inline, 0 general)

src/binarystreamreader.cpp

➞

Show inline comments

@@ @@ -112,57 +112,57 @@ void BinaryStreamReader::onNumberFormatC @@
             readSample = &BinaryStreamReader::readSampleAs<qint32>;
             break;
         case NumberFormat_float:
             sampleSize = 4;
             readSample = &BinaryStreamReader::readSampleAs<float>;
             break;
         case NumberFormat_INVALID:
             Q_ASSERT(1); // never
             break;
+    }
+}
 void BinaryStreamReader::onNumOfChannelsChanged(unsigned value)
+{
     _numOfChannels = value;
+}
 void BinaryStreamReader::onDataReady()
+{
     // a package is a set of channel data like {CHAN0_SAMPLE, CHAN1_SAMPLE...}
     int packageSize = sampleSize * _numOfChannels;
     int bytesAvailable = _device->bytesAvailable();
     // skip 1 byte if requested
-    if (bytesAvailable > 0 && skipByteRequested)
+    if (skipByteRequested && bytesAvailable > 0)
+    {
         _device->read(1);
         skipByteRequested = false;
         bytesAvailable--;
+    }
     // skip 1 sample (channel) if requested
-    if (bytesAvailable >= (int) sampleSize && skipSampleRequested)
+    if (skipSampleRequested && bytesAvailable >= (int) sampleSize)
+    {
         _device->read(sampleSize);
         skipSampleRequested = false;
         bytesAvailable -= sampleSize;
+    }
     if (bytesAvailable < packageSize) return;
     int numOfPackagesToRead =
         (bytesAvailable - (bytesAvailable % packageSize)) / packageSize;
     if (paused)
+    {
         // read and discard data
         _device->read(numOfPackagesToRead*packageSize);
         return;
+    }
     double* channelSamples = new double[numOfPackagesToRead*_numOfChannels];
     for (int i = 0; i < numOfPackagesToRead; i++)
+    {
         for (unsigned int ci = 0; ci < _numOfChannels; ci++)
+        {

0 comments (0 inline, 0 general)