Changeset - 724d38d30fb1
[Not reviewed]
new-reader
0 2 0
Hasan Yavuz Ă–ZDERYA - 9 years ago 2016-05-29 14:16:30
hy@ozderya.net
renamed hasFrameByte to hasSizeByte
2 files changed with 5 insertions and 5 deletions:
0 comments (0 inline, 0 general)
src/framedreader.cpp
Show inline comments
 
@@ -28,13 +28,13 @@ FramedReader::FramedReader(QIODevice* de
 
{
 
    paused = false;
 

	
 
    // initial settings
 
    settingsInvalid = 0;
 
    _numOfChannels = _settingsWidget.numOfChannels();
 
    hasFrameByte = _settingsWidget.frameSize() == 0;
 
    hasSizeByte = _settingsWidget.frameSize() == 0;
 
    frameSize = _settingsWidget.frameSize();
 
    syncWord = _settingsWidget.syncWord();
 
    checksumEnabled = _settingsWidget.isChecksumEnabled();
 
    onNumberFormatChanged(_settingsWidget.numberFormat());
 
    checkSettings();
 

	
 
@@ -150,13 +150,13 @@ void FramedReader::checkSettings()
 
    else // sync word is valid
 
    {
 
        settingsInvalid &= ~SYNCWORD_INVALID;
 
    }
 

	
 
    // check if fixed frame size is multiple of a sample set size
 
    if (!hasFrameByte && frameSize % (_numOfChannels * sampleSize) != 0)
 
    if (!hasSizeByte && frameSize % (_numOfChannels * sampleSize) != 0)
 
    {
 
        settingsInvalid |= FRAMESIZE_INVALID;
 
    }
 
    else
 
    {
 
        settingsInvalid &= ~FRAMESIZE_INVALID;
 
@@ -194,15 +194,15 @@ void FramedReader::onSyncWordChanged(QBy
 
}
 

	
 
void FramedReader::onFrameSizeChanged(unsigned value)
 
{
 
    if (value == 0)
 
    {
 
        hasFrameByte = true;
 
        hasSizeByte = true;
 
    }
 
    else
 
    {
 
        hasFrameByte = false;
 
        hasSizeByte = false;
 
        frameSize = value;
 
    }
 
    checkSettings();
 
}
src/framedreader.h
Show inline comments
 
@@ -51,13 +51,13 @@ private:
 
    unsigned _numOfChannels;
 
    unsigned sampleSize;
 
    bool paused;
 
    unsigned settingsInvalid;   /// settings are all valid if this is 0, if not no reading is done
 
    QByteArray syncWord;
 
    bool checksumEnabled;
 
    bool hasFrameByte;
 
    bool hasSizeByte;
 
    unsigned frameSize;
 

	
 
    // TODO: create a base class that contains common functionality between binary readers
 

	
 
    /// points to the readSampleAs function for currently selected number format
 
    double (FramedReader::*readSample)();
0 comments (0 inline, 0 general)