From 3564b8ba5811deba0be702b6750880b9866d3fe1 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 25 Dec 2015 20:12:50 +0100 Subject: [PATCH] BFM demod: re-introducing LSB stereo GUI controls --- plugins/channel/bfm/bfmdemodgui.cpp | 9 +++++++++ plugins/channel/bfm/bfmdemodgui.h | 1 + plugins/channel/bfm/bfmdemodgui.ui | 22 +++++++++++++++++++++- sdrbase/resources/lsb.png | Bin 0 -> 350 bytes sdrbase/resources/res.qrc | 1 + 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 sdrbase/resources/lsb.png diff --git a/plugins/channel/bfm/bfmdemodgui.cpp b/plugins/channel/bfm/bfmdemodgui.cpp index c0c4f81b9..5c169fcf1 100644 --- a/plugins/channel/bfm/bfmdemodgui.cpp +++ b/plugins/channel/bfm/bfmdemodgui.cpp @@ -110,6 +110,7 @@ QByteArray BFMDemodGUI::serialize() const s.writeU32(7, m_channelMarker.getColor().rgb()); s.writeBlob(8, ui->spectrumGUI->serialize()); s.writeBool(9, ui->audioStereo->isChecked()); + s.writeBool(10, ui->lsbStereo->isChecked()); return s.final(); } @@ -162,6 +163,9 @@ bool BFMDemodGUI::deserialize(const QByteArray& data) d.readBool(9, &booltmp, false); ui->audioStereo->setChecked(booltmp); + d.readBool(10, &booltmp, false); + ui->lsbStereo->setChecked(booltmp); + blockApplySettings(false); m_channelMarker.blockSignals(false); @@ -243,6 +247,11 @@ void BFMDemodGUI::on_audioStereo_toggled(bool stereo) applySettings(); } +void BFMDemodGUI::on_lsbStereo_toggled(bool lsb) +{ + applySettings(); +} + void BFMDemodGUI::on_showPilot_clicked() { applySettings(); diff --git a/plugins/channel/bfm/bfmdemodgui.h b/plugins/channel/bfm/bfmdemodgui.h index 017589db5..391e87663 100644 --- a/plugins/channel/bfm/bfmdemodgui.h +++ b/plugins/channel/bfm/bfmdemodgui.h @@ -63,6 +63,7 @@ private slots: void on_volume_valueChanged(int value); void on_squelch_valueChanged(int value); void on_audioStereo_toggled(bool stereo); + void on_lsbStereo_toggled(bool lsb); void on_showPilot_clicked(); void on_rds_clicked(); void on_g14ProgServiceNames_currentIndexChanged(int index); diff --git a/plugins/channel/bfm/bfmdemodgui.ui b/plugins/channel/bfm/bfmdemodgui.ui index f82516ee5..77480be03 100644 --- a/plugins/channel/bfm/bfmdemodgui.ui +++ b/plugins/channel/bfm/bfmdemodgui.ui @@ -21,7 +21,7 @@ 10 20 - 311 + 411 121 @@ -160,6 +160,26 @@ + + + + Use only LSB from stereo subcarrier + + + + + + + :/lsb.png:/lsb.png + + + true + + + true + + + diff --git a/sdrbase/resources/lsb.png b/sdrbase/resources/lsb.png new file mode 100644 index 0000000000000000000000000000000000000000..00dfbda14284f4eb76f4ee6678de39551503235a GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYYs>cdx@v7EBk#OaaJbt)rXp;fkLl6T^vI^j=#OK(aYIUfc3)W*&f`X+yVfpBXgR&f zKa^8R>9K_M|I)b0O|^5@C%;u|VvZ?s5)l0R=x1U$*SCV*dEcMkcVjxn{ch#DgpT7< zpSATXYx(^xR{I4USU%&*tOI{pA4uCg_|pGJch7c3kEILBZ|KU-HjJNi`>^!9V6XMs r!Xm7F@a>m%uVGp+ARG`{`=^frU1tDnm{r-UW|NE(gm literal 0 HcmV?d00001 diff --git a/sdrbase/resources/res.qrc b/sdrbase/resources/res.qrc index 79d3f8c12..8d605b41d 100644 --- a/sdrbase/resources/res.qrc +++ b/sdrbase/resources/res.qrc @@ -48,5 +48,6 @@ carrier.png rds.png recycle.png + lsb.png