VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 01:39:05 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1490 from CRD716/master

Browse Source 
Fix recurring typo
This commit is contained in:
Edouard Griffiths 2022-10-28 07:41:09 +02:00 committed by GitHub
commit c7eaacc098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channeltx/modatv/atvmodsource.h
View File

@ -208,7 +208,7 @@ private:
bool m_videoOK; bool m_videoOK;
std::vector<ATVCamera> m_cameras; //!< vector of available cameras std::vector<ATVCamera> m_cameras; //!< vector of available cameras
int m_cameraIndex; //!< curent camera index in list of available cameras int m_cameraIndex; //!< current camera index in list of available cameras
std::string m_overlayText; std::string m_overlayText;
QString m_imageFileName; QString m_imageFileName;

8
sdrbase/dsp/filerecord.cpp
View File

@ -117,11 +117,11 @@ bool FileRecord::startRecording()
if (!m_sampleFile.is_open()) if (!m_sampleFile.is_open())
{ {
qDebug() << "FileRecord::startRecording"; qDebug() << "FileRecord::startRecording";
m_curentFileName = QString("%1.%2.sdriq").arg(m_fileBase).arg(QDateTime::currentDateTimeUtc().toString("yyyy-MM-ddTHH_mm_ss_zzz")); m_currentFileName = QString("%1.%2.sdriq").arg(m_fileBase).arg(QDateTime::currentDateTimeUtc().toString("yyyy-MM-ddTHH_mm_ss_zzz"));
m_sampleFile.open(m_curentFileName.toStdString().c_str(), std::ios::binary); m_sampleFile.open(m_currentFileName.toStdString().c_str(), std::ios::binary);
if (!m_sampleFile.is_open()) if (!m_sampleFile.is_open())
{ {
qWarning() << "FileRecord::startRecording: failed to open file: " << m_curentFileName; qWarning() << "FileRecord::startRecording: failed to open file: " << m_currentFileName;
return false; return false;
} }
m_recordOn = true; m_recordOn = true;
@ -143,7 +143,7 @@ bool FileRecord::stopRecording()
m_recordStart = false; m_recordStart = false;
if (m_sampleFile.bad()) if (m_sampleFile.bad())
{ {
qWarning() << "FileRecord::stopRecording: an error occurred while writing to " << m_curentFileName; qWarning() << "FileRecord::stopRecording: an error occurred while writing to " << m_currentFileName;
return false; return false;
} }
} }

4
sdrbase/dsp/filerecord.h
View File

@ -50,7 +50,7 @@ public:
quint64 getByteCount() const { return m_byteCount; } quint64 getByteCount() const { return m_byteCount; }
void setMsShift(qint64 shift) { m_msShift = shift; } void setMsShift(qint64 shift) { m_msShift = shift; }
const QString& getCurrentFileName() { return m_curentFileName; } const QString& getCurrentFileName() { return m_currentFileName; }
void genUniqueFileName(uint deviceUID, int istream = -1); void genUniqueFileName(uint deviceUID, int istream = -1);
@ -74,7 +74,7 @@ private:
bool m_recordOn; bool m_recordOn;
bool m_recordStart; bool m_recordStart;
std::ofstream m_sampleFile; std::ofstream m_sampleFile;
QString m_curentFileName; QString m_currentFileName;
quint64 m_byteCount; quint64 m_byteCount;
qint64 m_msShift; qint64 m_msShift;
QRecursiveMutex m_mutex; QRecursiveMutex m_mutex;

8
sdrbase/dsp/wavfilerecord.cpp
View File

@ -129,11 +129,11 @@ bool WavFileRecord::startRecording()
if (!m_sampleFile.is_open()) if (!m_sampleFile.is_open())
{ {
qDebug() << "WavFileRecord::startRecording"; qDebug() << "WavFileRecord::startRecording";
m_curentFileName = QString("%1.%2.wav").arg(m_fileBase).arg(QDateTime::currentDateTimeUtc().toString("yyyy-MM-ddTHH_mm_ss_zzz")); m_currentFileName = QString("%1.%2.wav").arg(m_fileBase).arg(QDateTime::currentDateTimeUtc().toString("yyyy-MM-ddTHH_mm_ss_zzz"));
m_sampleFile.open(m_curentFileName.toStdString().c_str(), std::ios::binary); m_sampleFile.open(m_currentFileName.toStdString().c_str(), std::ios::binary);
if (!m_sampleFile.is_open()) if (!m_sampleFile.is_open())
{ {
qWarning() << "WavFileRecord::startRecording: failed to open file: " << m_curentFileName; qWarning() << "WavFileRecord::startRecording: failed to open file: " << m_currentFileName;
return false; return false;
} }
m_recordOn = true; m_recordOn = true;
@ -161,7 +161,7 @@ bool WavFileRecord::stopRecording()
m_recordStart = false; m_recordStart = false;
if (m_sampleFile.bad()) if (m_sampleFile.bad())
{ {
qWarning() << "WavFileRecord::stopRecording: an error occurred while writing to " << m_curentFileName; qWarning() << "WavFileRecord::stopRecording: an error occurred while writing to " << m_currentFileName;
return false; return false;
} }
} }

4
sdrbase/dsp/wavfilerecord.h
View File

@ -92,7 +92,7 @@ public:
quint64 getByteCount() const { return m_byteCount; } quint64 getByteCount() const { return m_byteCount; }
void setMsShift(qint64 shift) override { m_msShift = shift; } void setMsShift(qint64 shift) override { m_msShift = shift; }
virtual int getBytesPerSample() override { return 4; }; virtual int getBytesPerSample() override { return 4; };
const QString& getCurrentFileName() override { return m_curentFileName; } const QString& getCurrentFileName() override { return m_currentFileName; }
void genUniqueFileName(uint deviceUID, int istream = -1); void genUniqueFileName(uint deviceUID, int istream = -1);
@ -120,7 +120,7 @@ private:
bool m_recordOn; bool m_recordOn;
bool m_recordStart; bool m_recordStart;
std::ofstream m_sampleFile; std::ofstream m_sampleFile;
QString m_curentFileName; QString m_currentFileName;
quint64 m_byteCount; quint64 m_byteCount;
qint64 m_msShift; qint64 m_msShift;

2
sdrgui/mainwindow.cpp
View File

@ -2042,7 +2042,7 @@ void MainWindow::on_action_saveAll_triggered()
{ {
saveConfiguration(m_mainCore->m_settings.getWorkingConfiguration()); saveConfiguration(m_mainCore->m_settings.getWorkingConfiguration());
m_mainCore->m_settings.save(); m_mainCore->m_settings.save();
QMessageBox::information(this, tr("Done"), tr("All curent settings saved")); QMessageBox::information(this, tr("Done"), tr("All current settings saved"));
} }
void MainWindow::on_action_Quick_Start_triggered() void MainWindow::on_action_Quick_Start_triggered()