w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cosmetic reformating

This commit is contained in:
Bill Somerville 2020-08-13 10:30:49 +01:00
parent e69226b29a
commit 11abe7c60f
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Audio/AudioDevice.hpp
View File

@ -43,23 +43,23 @@ protected:
qint16 const * begin (reinterpret_cast<qint16 const *> (source)); qint16 const * begin (reinterpret_cast<qint16 const *> (source));
for ( qint16 const * i = begin; i != begin + numFrames * (bytesPerFrame () / sizeof (qint16)); i += bytesPerFrame () / sizeof (qint16)) for ( qint16 const * i = begin; i != begin + numFrames * (bytesPerFrame () / sizeof (qint16)); i += bytesPerFrame () / sizeof (qint16))
{ {
switch (m_channel) switch (m_channel)
{ {
case Mono: case Mono:
*dest++ = *i; *dest++ = *i;
break; break;
case Right: case Right:
*dest++ = *(i + 1); *dest++ = *(i + 1);
break; break;
case Both: // should be able to happen but if it case Both: // should be able to happen but if it
// does we'll take left // does we'll take left
Q_ASSERT (Both == m_channel); Q_ASSERT (Both == m_channel);
case Left: case Left:
*dest++ = *i; *dest++ = *i;
break; break;
} }
} }
} }
@ -68,23 +68,23 @@ protected:
switch (m_channel) switch (m_channel)
{ {
case Mono: case Mono:
*dest++ = sample; *dest++ = sample;
break; break;
case Left: case Left:
*dest++ = sample; *dest++ = sample;
*dest++ = 0; *dest++ = 0;
break; break;
case Right: case Right:
*dest++ = 0; *dest++ = 0;
*dest++ = sample; *dest++ = sample;
break; break;
case Both: case Both:
*dest++ = sample; *dest++ = sample;
*dest++ = sample; *dest++ = sample;
break; break;
} }
return dest; return dest;
} }

20
widgets/mainwindow.cpp
View File

@ -484,8 +484,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
{ {
MessageBox::warning_message (this MessageBox::warning_message (this
, tr ("Audio Source") , tr ("Audio Source")
, tr ("Excessive dropped samples") , tr ("Reduce system load")
, tr ("Reduce system load")); , tr ("Excessive dropped samples - %1 (%2 sec) audio frames dropped").arg (dropped_frames).arg (usec / 1.e6, 5, 'f', 3));
} }
}); });
connect (&m_audioThread, &QThread::finished, m_soundInput, &QObject::deleteLater); connect (&m_audioThread, &QThread::finished, m_soundInput, &QObject::deleteLater);
@ -2950,7 +2950,7 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
<td><b>Click</b> to set Rx frequency.<br/> <td><b>Click</b> to set Rx frequency.<br/>
<b>Shift-click</b> to set Tx frequency.<br/> <b>Shift-click</b> to set Tx frequency.<br/>
<b>Ctrl-click</b> or <b>Right-click</b> to set Rx and Tx frequencies.<br/> <b>Ctrl-click</b> or <b>Right-click</b> to set Rx and Tx frequencies.<br/>
<b>Double-click</b> to also decode at Rx frequency.<br/> <b>Double-click</b> to also decode at Rx frequency.<br/>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -2958,10 +2958,10 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
<td><b>Double-click</b> to copy second callsign to Dx Call,<br/> <td><b>Double-click</b> to copy second callsign to Dx Call,<br/>
locator to Dx Grid, change Rx and Tx frequency to<br/> locator to Dx Grid, change Rx and Tx frequency to<br/>
decoded signal's frequency, and generate standard<br/> decoded signal's frequency, and generate standard<br/>
messages.<br/> messages.<br/>
If <b>Hold Tx Freq</b> is checked or first callsign in message<br/> If <b>Hold Tx Freq</b> is checked or first callsign in message<br/>
is your own call, Tx frequency is not changed unless <br/> is your own call, Tx frequency is not changed unless <br/>
<b>Ctrl</b> is held down.<br/> <b>Ctrl</b> is held down.<br/>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -5270,11 +5270,11 @@ bool MainWindow::stdCall(QString const& w)
{ {
static QRegularExpression standard_call_re { static QRegularExpression standard_call_re {
R"( R"(
^\s* # optional leading spaces ^\s* # optional leading spaces
( [A-Z]{0,2} | [A-Z][0-9] | [0-9][A-Z] ) # part 1 ( [A-Z]{0,2} | [A-Z][0-9] | [0-9][A-Z] ) # part 1
( [0-9][A-Z]{0,3} ) # part 2 ( [0-9][A-Z]{0,3} ) # part 2
(/R | /P)? # optional suffix (/R | /P)? # optional suffix
\s*$ # optional trailing spaces \s*$ # optional trailing spaces
)", QRegularExpression::CaseInsensitiveOption | QRegularExpression::ExtendedPatternSyntaxOption}; )", QRegularExpression::CaseInsensitiveOption | QRegularExpression::ExtendedPatternSyntaxOption};
return standard_call_re.match (w).hasMatch (); return standard_call_re.match (w).hasMatch ();
} }