Permalink
Browse files

Switch to new nbrx hier block.

  • Loading branch information...
1 parent 1452438 commit cb89e90e4259070c475316fe3a873046c971e177 @csete committed May 13, 2012
Showing with 104 additions and 213 deletions.
  1. +8 −4 gqrx.pro
  2. +8 −7 mainwindow.cpp
  3. +68 −163 receiver.cpp
  4. +20 −39 receiver.h
View
@@ -49,7 +49,6 @@ SOURCES += \
qtgui/ioconfig.cpp \
qtgui/dockfcdctl.cpp \
qtgui/dockaudio.cpp \
- dsp/resampler_ff.cpp \
qtgui/dockfft.cpp \
dsp/sniffer_f.cpp \
dsp/afsk1200/costabf.c \
@@ -72,7 +71,10 @@ SOURCES += \
fcdctl/fcd.c \
fcdctl/hid-libusb.c \ # FIXME: Linux only
qtgui/demod-options.cpp \
- dsp/rx_noise_blanker_cc.cpp
+ dsp/rx_noise_blanker_cc.cpp \
+ receivers/receiver_base.cpp \
+ receivers/nbrx.cpp \
+ dsp/resampler_xx.cpp
# fcdctl/hidwin.c \
# fcdctl/hidmac.c \
@@ -91,7 +93,6 @@ HEADERS += \
qtgui/ioconfig.h \
qtgui/dockfcdctl.h \
qtgui/dockaudio.h \
- dsp/resampler_ff.h \
qtgui/dockfft.h \
dsp/sniffer_f.h \
dsp/afsk1200/filter-i386.h \
@@ -119,7 +120,10 @@ HEADERS += \
fcdctl/fcd.h \
gqrx.h \
qtgui/demod-options.h \
- dsp/rx_noise_blanker_cc.h
+ dsp/rx_noise_blanker_cc.h \
+ receivers/receiver_base.h \
+ receivers/nbrx.h \
+ dsp/resampler_xx.h
FORMS += \
qtgui/dockrxopt.ui \
View
@@ -407,7 +407,7 @@ void MainWindow::selectDemod(int index)
/* AM */
case 1:
- rx->set_demod(receiver::DEMOD_AM);
+ rx->set_demod(receiver::RX_DEMOD_AM);
ui->plotter->SetDemodRanges(-20000, -100, 100, 20000, true);
uiDockAudio->setFftRange(0,15000);
switch (filter_preset) {
@@ -428,7 +428,7 @@ void MainWindow::selectDemod(int index)
/* FM */
case 2:
- rx->set_demod(receiver::DEMOD_FM);
+ rx->set_demod(receiver::RX_DEMOD_FM);
maxdev = uiDockRxOpt->currentMaxdev();
if (maxdev < 20000.0) {
ui->plotter->SetDemodRanges(-25000, -100, 100, 25000, true);
@@ -471,7 +471,7 @@ void MainWindow::selectDemod(int index)
/* LSB */
case 3:
- rx->set_demod(receiver::DEMOD_SSB);
+ rx->set_demod(receiver::RX_DEMOD_SSB);
ui->plotter->SetDemodRanges(-10000, -100, -5000, 0, false);
uiDockAudio->setFftRange(0,3500);
switch (filter_preset) {
@@ -492,7 +492,7 @@ void MainWindow::selectDemod(int index)
/* USB */
case 4:
- rx->set_demod(receiver::DEMOD_SSB);
+ rx->set_demod(receiver::RX_DEMOD_SSB);
ui->plotter->SetDemodRanges(0, 5000, 100, 10000, false);
uiDockAudio->setFftRange(0,3500);
switch (filter_preset) {
@@ -513,7 +513,7 @@ void MainWindow::selectDemod(int index)
/* CWL */
case 5:
- rx->set_demod(receiver::DEMOD_SSB);
+ rx->set_demod(receiver::RX_DEMOD_SSB);
ui->plotter->SetDemodRanges(-10000, -100, -5000, 0, false);
uiDockAudio->setFftRange(0,1500);
switch (filter_preset) {
@@ -534,7 +534,7 @@ void MainWindow::selectDemod(int index)
/* CWU */
case 6:
- rx->set_demod(receiver::DEMOD_SSB);
+ rx->set_demod(receiver::RX_DEMOD_SSB);
ui->plotter->SetDemodRanges(0, 5000, 100, 10000, false);
uiDockAudio->setFftRange(0,1500);
switch (filter_preset) {
@@ -607,7 +607,8 @@ void MainWindow::setFmEmph(double tau)
*/
void MainWindow::setAmDcrStatus(bool enabled)
{
- rx->set_am_dcr(enabled);
+ /** FIXME: obsolete */
+ //rx->set_am_dcr(enabled);
}
/*! \brief Audio gain changed.
Oops, something went wrong.

0 comments on commit cb89e90

Please sign in to comment.