diff --git a/plugins/channelrx/udpsrc/udpsrc.cpp b/plugins/channelrx/udpsrc/udpsrc.cpp index a0a10f70b..fb727450e 100644 --- a/plugins/channelrx/udpsrc/udpsrc.cpp +++ b/plugins/channelrx/udpsrc/udpsrc.cpp @@ -25,6 +25,8 @@ #include "udpsrcgui.h" #include "udpsrc.h" +const Real UDPSrc::m_agcTarget = 16384.0f; + MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigure, Message) MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigureImmediate, Message) MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcSpectrum, Message) diff --git a/plugins/channelrx/udpsrc/udpsrc.h b/plugins/channelrx/udpsrc/udpsrc.h index 5a49aba84..2d871dd19 100644 --- a/plugins/channelrx/udpsrc/udpsrc.h +++ b/plugins/channelrx/udpsrc/udpsrc.h @@ -333,7 +333,7 @@ protected: char *m_udpAudioBuf; static const int m_udpAudioPayloadSize = 8192; //!< UDP audio samples buffer. No UDP block on Earth is larger than this - static const Real m_agcTarget = 16384.0f; + static const Real m_agcTarget; PhaseDiscriminators m_phaseDiscri; diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro index 363b577cc..0e41e3d60 100644 --- a/sdrangel.windows.pro +++ b/sdrangel.windows.pro @@ -1,54 +1,55 @@ -#-------------------------------------------------------- -# -# Pro file for Android and Windows builds with Qt Creator -# -#-------------------------------------------------------- - -TEMPLATE = subdirs -SUBDIRS = sdrbase -CONFIG(MINGW64)SUBDIRS += nanomsg -SUBDIRS += fcdhid -SUBDIRS += fcdlib -SUBDIRS += librtlsdr -SUBDIRS += libhackrf -SUBDIRS += libairspy -SUBDIRS += libbladerf -SUBDIRS += libsqlite3 -SUBDIRS += liblimesuite -SUBDIRS += devices -SUBDIRS += mbelib -SUBDIRS += dsdcc -SUBDIRS += serialdv -CONFIG(MINGW64)SUBDIRS += cm256cc -SUBDIRS += plugins/samplesource/filesource -CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemonsource -SUBDIRS += plugins/samplesource/rtlsdr -SUBDIRS += plugins/samplesource/hackrfinput -SUBDIRS += plugins/samplesource/airspy -SUBDIRS += plugins/samplesource/bladerfinput -SUBDIRS += plugins/samplesource/limesdrinput -SUBDIRS += plugins/samplesink/filesink -SUBDIRS += plugins/samplesink/bladerfoutput -SUBDIRS += plugins/samplesink/hackrfoutput -SUBDIRS += plugins/samplesink/limesdroutput -SUBDIRS += plugins/channelrx/chanalyzer -SUBDIRS += plugins/channelrx/chanalyzerng -SUBDIRS += plugins/channelrx/demodam -SUBDIRS += plugins/channelrx/demodatv -SUBDIRS += plugins/channelrx/demodbfm -SUBDIRS += plugins/channelrx/demoddsd -SUBDIRS += plugins/channelrx/demodlora -SUBDIRS += plugins/channelrx/demodnfm -SUBDIRS += plugins/channelrx/demodssb -SUBDIRS += plugins/channelrx/demodwfm -SUBDIRS += plugins/channelrx/tcpsrc -SUBDIRS += plugins/channelrx/udpsrc -SUBDIRS += plugins/channeltx/modam -CONFIG(macx)SUBDIRS += plugins/channeltx/modatv -SUBDIRS += plugins/channeltx/modnfm -SUBDIRS += plugins/channeltx/modssb -SUBDIRS += plugins/channeltx/modwfm - -# Main app must be last -CONFIG += ordered -SUBDIRS += app +#-------------------------------------------------------- +# +# Pro file for Android and Windows builds with Qt Creator +# +#-------------------------------------------------------- + +TEMPLATE = subdirs +SUBDIRS = sdrbase +CONFIG(MINGW64)SUBDIRS += nanomsg +SUBDIRS += fcdhid +SUBDIRS += fcdlib +SUBDIRS += librtlsdr +SUBDIRS += libhackrf +SUBDIRS += libairspy +SUBDIRS += libbladerf +SUBDIRS += libsqlite3 +SUBDIRS += liblimesuite +SUBDIRS += devices +SUBDIRS += mbelib +SUBDIRS += dsdcc +SUBDIRS += serialdv +CONFIG(MINGW64)SUBDIRS += cm256cc +SUBDIRS += plugins/samplesource/filesource +CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemonsource +SUBDIRS += plugins/samplesource/rtlsdr +SUBDIRS += plugins/samplesource/hackrfinput +SUBDIRS += plugins/samplesource/airspy +SUBDIRS += plugins/samplesource/bladerfinput +SUBDIRS += plugins/samplesource/limesdrinput +SUBDIRS += plugins/samplesink/filesink +SUBDIRS += plugins/samplesink/bladerfoutput +SUBDIRS += plugins/samplesink/hackrfoutput +SUBDIRS += plugins/samplesink/limesdroutput +SUBDIRS += plugins/channelrx/chanalyzer +SUBDIRS += plugins/channelrx/chanalyzerng +SUBDIRS += plugins/channelrx/demodam +SUBDIRS += plugins/channelrx/demodatv +SUBDIRS += plugins/channelrx/demodbfm +SUBDIRS += plugins/channelrx/demoddsd +SUBDIRS += plugins/channelrx/demodlora +SUBDIRS += plugins/channelrx/demodnfm +SUBDIRS += plugins/channelrx/demodssb +SUBDIRS += plugins/channelrx/demodwfm +SUBDIRS += plugins/channelrx/tcpsrc +SUBDIRS += plugins/channelrx/udpsrc +SUBDIRS += plugins/channeltx/modam +CONFIG(macx)SUBDIRS += plugins/channeltx/modatv +SUBDIRS += plugins/channeltx/modnfm +SUBDIRS += plugins/channeltx/modssb +SUBDIRS += plugins/channeltx/modwfm +SUBDIRS += plugins/channeltx/udpsink + +# Main app must be last +CONFIG += ordered +SUBDIRS += app diff --git a/windows64.install.bat b/windows64.install.bat index 926237ed3..cab316ca3 100644 --- a/windows64.install.bat +++ b/windows64.install.bat @@ -1,67 +1,68 @@ -SET libusbdir="D:\softs\libusb-1.0.20\MinGW64" -SET msys2dir="D:\msys64" -SET opencvdir="D:\softs\opencv\build\mw64\install\x64\mingw\bin" - -copy %msys2dir%\mingw64\bin\libbz2-1.dll %2 -copy %msys2dir%\mingw64\bin\libfreetype-6.dll %2 -copy %msys2dir%\mingw64\bin\libglib-2.0-0.dll %2 -copy %msys2dir%\mingw64\bin\libharfbuzz-0.dll %2 -copy %msys2dir%\mingw64\bin\libiconv-2.dll %2 -copy %msys2dir%\mingw64\bin\libintl-8.dll %2 -copy %msys2dir%\mingw64\bin\libpcre-1.dll %2 -copy %msys2dir%\mingw64\bin\libpcre16-0.dll %2 -copy %msys2dir%\mingw64\bin\libpng16-16.dll %2 -copy %msys2dir%\mingw64\bin\zlib1.dll %2 -move %2\icudt56.dll %2\libicudt56.dll -copy app\%1\sdrangel.exe %2 -copy sdrbase\%1\sdrbase.dll %2 -copy devices\%1\devices.dll %2 -copy cm256cc\%1\cm256cc.dll %2 -copy mbelib\%1\mbelib.dll %2 -copy dsdcc\%1\dsdcc.dll %2 -copy serialdv\%1\serialdv.dll %2 -copy nanomsg\%1\nanomsg.dll %2 -copy libhackrf\%1\libhackrf.dll %2 -copy librtlsdr\%1\librtlsdr.dll %2 -copy libairspy\%1\libairspy.dll %2 -copy libbladerf\%1\libbladerf.dll %2 -copy libsqlite3\%1\libsqlite3.dll %2 -copy liblimesuite\%1\liblimesuite.dll %2 -copy %libusbdir%\dll\libusb-1.0.dll %2 -copy %opencvdir%\opencv_ffmpeg2413_64.dll %2 -copy %opencvdir%\libopencv_imgproc2413.dll %2 -copy %opencvdir%\libopencv_highgui2413.dll %2 -copy %opencvdir%\libopencv_core2413.dll %2 -mkdir %2\plugins -mkdir %2\plugins\channelrx -mkdir %2\plugins\channeltx -mkdir %2\plugins\samplesource -mkdir %2\plugins\samplesink -copy plugins\channelrx\chanalyzer\%1\chanalyzer.dll %2\plugins\channelrx -copy plugins\channelrx\chanalyzerng\%1\chanalyzerng.dll %2\plugins\channelrx -copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx -copy plugins\channelrx\demodatv\%1\demodatv.dll %2\plugins\channelrx -copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx -copy plugins\channelrx\demoddsd\%1\demoddsd.dll %2\plugins\channelrx -copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx -copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx -copy plugins\channelrx\demodssb\%1\demodssb.dll %2\plugins\channelrx -copy plugins\channelrx\demodwfm\%1\demodwfm.dll %2\plugins\channelrx -copy plugins\channelrx\tcpsrc\%1\tcpsrc.dll %2\plugins\channelrx -copy plugins\channelrx\udpsrc\%1\udpsrc.dll %2\plugins\channelrx -copy plugins\channeltx\modam\%1\modam.dll %2\plugins\channeltx -copy plugins\channeltx\modatv\%1\modatv.dll %2\plugins\channeltx -copy plugins\channeltx\modnfm\%1\modnfm.dll %2\plugins\channeltx -copy plugins\channeltx\modssb\%1\modssb.dll %2\plugins\channeltx -copy plugins\channeltx\modwfm\%1\modwfm.dll %2\plugins\channeltx -copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource -copy plugins\samplesource\sdrdaemonsource\%1\inputsdrdaemonsource.dll %2\plugins\samplesource -copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource -copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource -copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource -copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource -copy plugins\samplesource\limesdrinput\%1\inputlimesdr.dll %2\plugins\samplesource -copy plugins\samplesink\filesink\%1\outputfilesink.dll %2\plugins\samplesink -copy plugins\samplesink\bladerfoutput\%1\outputbladerf.dll %2\plugins\samplesink -copy plugins\samplesink\hackrfoutput\%1\outputhackrf.dll %2\plugins\samplesink -copy plugins\samplesink\limesdroutput\%1\outputlimesdr.dll %2\plugins\samplesink +SET libusbdir="D:\softs\libusb-1.0.20\MinGW64" +SET msys2dir="D:\msys64" +SET opencvdir="D:\softs\opencv\build\mw64\install\x64\mingw\bin" + +copy %msys2dir%\mingw64\bin\libbz2-1.dll %2 +copy %msys2dir%\mingw64\bin\libfreetype-6.dll %2 +copy %msys2dir%\mingw64\bin\libglib-2.0-0.dll %2 +copy %msys2dir%\mingw64\bin\libharfbuzz-0.dll %2 +copy %msys2dir%\mingw64\bin\libiconv-2.dll %2 +copy %msys2dir%\mingw64\bin\libintl-8.dll %2 +copy %msys2dir%\mingw64\bin\libpcre-1.dll %2 +copy %msys2dir%\mingw64\bin\libpcre16-0.dll %2 +copy %msys2dir%\mingw64\bin\libpng16-16.dll %2 +copy %msys2dir%\mingw64\bin\zlib1.dll %2 +move %2\icudt56.dll %2\libicudt56.dll +copy app\%1\sdrangel.exe %2 +copy sdrbase\%1\sdrbase.dll %2 +copy devices\%1\devices.dll %2 +copy cm256cc\%1\cm256cc.dll %2 +copy mbelib\%1\mbelib.dll %2 +copy dsdcc\%1\dsdcc.dll %2 +copy serialdv\%1\serialdv.dll %2 +copy nanomsg\%1\nanomsg.dll %2 +copy libhackrf\%1\libhackrf.dll %2 +copy librtlsdr\%1\librtlsdr.dll %2 +copy libairspy\%1\libairspy.dll %2 +copy libbladerf\%1\libbladerf.dll %2 +copy libsqlite3\%1\libsqlite3.dll %2 +copy liblimesuite\%1\liblimesuite.dll %2 +copy %libusbdir%\dll\libusb-1.0.dll %2 +copy %opencvdir%\opencv_ffmpeg2413_64.dll %2 +copy %opencvdir%\libopencv_imgproc2413.dll %2 +copy %opencvdir%\libopencv_highgui2413.dll %2 +copy %opencvdir%\libopencv_core2413.dll %2 +mkdir %2\plugins +mkdir %2\plugins\channelrx +mkdir %2\plugins\channeltx +mkdir %2\plugins\samplesource +mkdir %2\plugins\samplesink +copy plugins\channelrx\chanalyzer\%1\chanalyzer.dll %2\plugins\channelrx +copy plugins\channelrx\chanalyzerng\%1\chanalyzerng.dll %2\plugins\channelrx +copy plugins\channelrx\demodam\%1\demodam.dll %2\plugins\channelrx +copy plugins\channelrx\demodatv\%1\demodatv.dll %2\plugins\channelrx +copy plugins\channelrx\demodbfm\%1\demodbfm.dll %2\plugins\channelrx +copy plugins\channelrx\demoddsd\%1\demoddsd.dll %2\plugins\channelrx +copy plugins\channelrx\demodlora\%1\demodlora.dll %2\plugins\channelrx +copy plugins\channelrx\demodnfm\%1\demodnfm.dll %2\plugins\channelrx +copy plugins\channelrx\demodssb\%1\demodssb.dll %2\plugins\channelrx +copy plugins\channelrx\demodwfm\%1\demodwfm.dll %2\plugins\channelrx +copy plugins\channelrx\tcpsrc\%1\tcpsrc.dll %2\plugins\channelrx +copy plugins\channelrx\udpsrc\%1\udpsrc.dll %2\plugins\channelrx +copy plugins\channeltx\modam\%1\modam.dll %2\plugins\channeltx +copy plugins\channeltx\modatv\%1\modatv.dll %2\plugins\channeltx +copy plugins\channeltx\modnfm\%1\modnfm.dll %2\plugins\channeltx +copy plugins\channeltx\modssb\%1\modssb.dll %2\plugins\channeltx +copy plugins\channeltx\modwfm\%1\modwfm.dll %2\plugins\channeltx +copy plugins\channeltx\udpsink\%1\udpsink.dll %2\plugins\channeltx +copy plugins\samplesource\filesource\%1\inputfilesource.dll %2\plugins\samplesource +copy plugins\samplesource\sdrdaemonsource\%1\inputsdrdaemonsource.dll %2\plugins\samplesource +copy plugins\samplesource\rtlsdr\%1\inputrtlsdr.dll %2\plugins\samplesource +copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource +copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource +copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource +copy plugins\samplesource\limesdrinput\%1\inputlimesdr.dll %2\plugins\samplesource +copy plugins\samplesink\filesink\%1\outputfilesink.dll %2\plugins\samplesink +copy plugins\samplesink\bladerfoutput\%1\outputbladerf.dll %2\plugins\samplesink +copy plugins\samplesink\hackrfoutput\%1\outputhackrf.dll %2\plugins\samplesink +copy plugins\samplesink\limesdroutput\%1\outputlimesdr.dll %2\plugins\samplesink