diff --git a/CMakeLists.txt b/CMakeLists.txt index c1e62d1b9..6abd8a712 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,72 +121,72 @@ set(sdrbase_SOURCES ) set(sdrbase_HEADERS - include-gpl/mainwindow.h + include/mainwindow.h - include-gpl/audio/audiodeviceinfo.h - include-gpl/audio/audiofifo.h - include-gpl/audio/audiooutput.h + include/audio/audiodeviceinfo.h + include/audio/audiofifo.h + include/audio/audiooutput.h - include-gpl/dsp/afsquelch.h - include-gpl/dsp/channelizer.h + include/dsp/afsquelch.h + include/dsp/channelizer.h include/dsp/channelmarker.h - include-gpl/dsp/complex.h - include-gpl/dsp/decimators.h - include-gpl/dsp/dspcommands.h - include-gpl/dsp/dspengine.h + include/dsp/complex.h + include/dsp/decimators.h + include/dsp/dspcommands.h + include/dsp/dspengine.h include/dsp/dsptypes.h - include-gpl/dsp/fftengine.h - include-gpl/dsp/fftfilt.h - include-gpl/dsp/fftwengine.h - include-gpl/dsp/fftwindow.h - include-gpl/dsp/filesink.h - include-gpl/dsp/gfft.h - include-gpl/dsp/interpolator.h - include-gpl/dsp/inthalfbandfilter.h + include/dsp/fftengine.h + include/dsp/fftfilt.h + include/dsp/fftwengine.h + include/dsp/fftwindow.h + include/dsp/filesink.h + include/dsp/gfft.h + include/dsp/interpolator.h + include/dsp/inthalfbandfilter.h include/dsp/kissfft.h - include-gpl/dsp/kissengine.h - include-gpl/dsp/lowpass.h - include-gpl/dsp/misc.h - include-gpl/dsp/movingaverage.h - include-gpl/dsp/nco.h + include/dsp/kissengine.h + include/dsp/lowpass.h + include/dsp/misc.h + include/dsp/movingaverage.h + include/dsp/nco.h sdrbase/dsp/pidcontroller.h include/dsp/samplefifo.h include/dsp/samplesink.h - include-gpl/dsp/nullsink.h - include-gpl/dsp/scopevis.h - include-gpl/dsp/spectrumvis.h + include/dsp/nullsink.h + include/dsp/scopevis.h + include/dsp/spectrumvis.h include/dsp/threadedsamplesink.h - include-gpl/gui/aboutdialog.h - include-gpl/gui/addpresetdialog.h + include/gui/aboutdialog.h + include/gui/addpresetdialog.h include/gui/basicchannelsettingswidget.h - include-gpl/gui/buttonswitch.h - include-gpl/gui/channelwindow.h - include-gpl/gui/colormapper.h - include-gpl/gui/glscope.h - include-gpl/gui/glscopegui.h - include-gpl/gui/glspectrum.h - include-gpl/gui/glspectrumgui.h - include-gpl/gui/indicator.h - include-gpl/gui/physicalunit.h - include-gpl/gui/pluginsdialog.h - include-gpl/gui/preferencesdialog.h - include-gpl/gui/presetitem.h + include/gui/buttonswitch.h + include/gui/channelwindow.h + include/gui/colormapper.h + include/gui/glscope.h + include/gui/glscopegui.h + include/gui/glspectrum.h + include/gui/glspectrumgui.h + include/gui/indicator.h + include/gui/physicalunit.h + include/gui/pluginsdialog.h + include/gui/preferencesdialog.h + include/gui/presetitem.h include/gui/rollupwidget.h - include-gpl/gui/scale.h - include-gpl/gui/scaleengine.h - include-gpl/gui/valuedial.h + include/gui/scale.h + include/gui/scaleengine.h + include/gui/valuedial.h include/dsp/samplesource.h include/plugin/pluginapi.h include/plugin/plugingui.h include/plugin/plugininterface.h - include-gpl/plugin/pluginmanager.h + include/plugin/pluginmanager.h - include-gpl/settings/preferences.h - include-gpl/settings/preset.h - include-gpl/settings/mainsettings.h + include/settings/preferences.h + include/settings/preset.h + include/settings/mainsettings.h include/util/export.h include/util/message.h @@ -227,7 +227,7 @@ if(FFTW3F_FOUND) ) set(sdrbase_HEADERS ${sdrbase_HEADERS} - include-gpl/dsp/fftwengine.h + include/dsp/fftwengine.h ) add_definitions(-DUSE_FFTW) include_directories(${FFTW3F_INCLUDE_DIRS}) @@ -239,7 +239,7 @@ else(FFTW3F_FOUND) ) set(sdrbase_HEADERS ${sdrbase_HEADERS} - include-gpl/dsp/kissengine.h + include/dsp/kissengine.h ) add_definitions(-DUSE_KISSFFT) endif(FFTW3F_FOUND) @@ -279,7 +279,7 @@ qt5_use_modules(sdrbase Core Widgets OpenGL Multimedia) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/include-gpl + ${CMAKE_SOURCE_DIR}/include ${OPENGL_INCLUDE_DIR} ) diff --git a/Readme.md b/Readme.md index f8972936d..e09a66dce 100644 --- a/Readme.md +++ b/Readme.md @@ -181,6 +181,8 @@ Assuming Debian Jessie is used: - Corrected decimators bit shifting so that the number of effective output bits is constant and fill the internal sample width - Separate library to support all flavours of FunCube dongles. Rewritten FCD plugins. - Allow several sample source plugins to share the same presets for what is common + - Prepare grounds for future Tx operations with Tx spectrum display in the main window + - Merged include-gpl into include and removed GPL dribble in About dialog - Many other little things...

To Do

diff --git a/include-gpl/audio/audiodeviceinfo.h b/include/audio/audiodeviceinfo.h similarity index 100% rename from include-gpl/audio/audiodeviceinfo.h rename to include/audio/audiodeviceinfo.h diff --git a/include-gpl/audio/audiofifo.h b/include/audio/audiofifo.h similarity index 100% rename from include-gpl/audio/audiofifo.h rename to include/audio/audiofifo.h diff --git a/include-gpl/audio/audiooutput.h b/include/audio/audiooutput.h similarity index 100% rename from include-gpl/audio/audiooutput.h rename to include/audio/audiooutput.h diff --git a/include-gpl/dsp/afsquelch.h b/include/dsp/afsquelch.h similarity index 100% rename from include-gpl/dsp/afsquelch.h rename to include/dsp/afsquelch.h diff --git a/include-gpl/dsp/agc.h b/include/dsp/agc.h similarity index 100% rename from include-gpl/dsp/agc.h rename to include/dsp/agc.h diff --git a/include-gpl/dsp/bandpass.h b/include/dsp/bandpass.h similarity index 100% rename from include-gpl/dsp/bandpass.h rename to include/dsp/bandpass.h diff --git a/include-gpl/dsp/channelizer.h b/include/dsp/channelizer.h similarity index 100% rename from include-gpl/dsp/channelizer.h rename to include/dsp/channelizer.h diff --git a/include-gpl/dsp/complex.h b/include/dsp/complex.h similarity index 100% rename from include-gpl/dsp/complex.h rename to include/dsp/complex.h diff --git a/include-gpl/dsp/ctcssdetector.h b/include/dsp/ctcssdetector.h similarity index 100% rename from include-gpl/dsp/ctcssdetector.h rename to include/dsp/ctcssdetector.h diff --git a/include-gpl/dsp/decimators.h b/include/dsp/decimators.h similarity index 100% rename from include-gpl/dsp/decimators.h rename to include/dsp/decimators.h diff --git a/include-gpl/dsp/dspcommands.h b/include/dsp/dspcommands.h similarity index 100% rename from include-gpl/dsp/dspcommands.h rename to include/dsp/dspcommands.h diff --git a/include-gpl/dsp/dspengine.h b/include/dsp/dspengine.h similarity index 100% rename from include-gpl/dsp/dspengine.h rename to include/dsp/dspengine.h diff --git a/include-gpl/dsp/fftengine.h b/include/dsp/fftengine.h similarity index 100% rename from include-gpl/dsp/fftengine.h rename to include/dsp/fftengine.h diff --git a/include-gpl/dsp/fftfilt.h b/include/dsp/fftfilt.h similarity index 100% rename from include-gpl/dsp/fftfilt.h rename to include/dsp/fftfilt.h diff --git a/include-gpl/dsp/fftwengine.h b/include/dsp/fftwengine.h similarity index 100% rename from include-gpl/dsp/fftwengine.h rename to include/dsp/fftwengine.h diff --git a/include-gpl/dsp/fftwindow.h b/include/dsp/fftwindow.h similarity index 100% rename from include-gpl/dsp/fftwindow.h rename to include/dsp/fftwindow.h diff --git a/include-gpl/dsp/filesink.h b/include/dsp/filesink.h similarity index 100% rename from include-gpl/dsp/filesink.h rename to include/dsp/filesink.h diff --git a/include-gpl/dsp/gfft.h b/include/dsp/gfft.h similarity index 100% rename from include-gpl/dsp/gfft.h rename to include/dsp/gfft.h diff --git a/include-gpl/dsp/highpass.h b/include/dsp/highpass.h similarity index 100% rename from include-gpl/dsp/highpass.h rename to include/dsp/highpass.h diff --git a/include-gpl/dsp/interpolator.h b/include/dsp/interpolator.h similarity index 100% rename from include-gpl/dsp/interpolator.h rename to include/dsp/interpolator.h diff --git a/include-gpl/dsp/inthalfbandfilter.h b/include/dsp/inthalfbandfilter.h similarity index 100% rename from include-gpl/dsp/inthalfbandfilter.h rename to include/dsp/inthalfbandfilter.h diff --git a/include-gpl/dsp/kissengine.h b/include/dsp/kissengine.h similarity index 100% rename from include-gpl/dsp/kissengine.h rename to include/dsp/kissengine.h diff --git a/include-gpl/dsp/lowpass.h b/include/dsp/lowpass.h similarity index 100% rename from include-gpl/dsp/lowpass.h rename to include/dsp/lowpass.h diff --git a/include-gpl/dsp/misc.h b/include/dsp/misc.h similarity index 100% rename from include-gpl/dsp/misc.h rename to include/dsp/misc.h diff --git a/include-gpl/dsp/movingaverage.h b/include/dsp/movingaverage.h similarity index 100% rename from include-gpl/dsp/movingaverage.h rename to include/dsp/movingaverage.h diff --git a/include-gpl/dsp/nco.h b/include/dsp/nco.h similarity index 100% rename from include-gpl/dsp/nco.h rename to include/dsp/nco.h diff --git a/include-gpl/dsp/nullsink.h b/include/dsp/nullsink.h similarity index 100% rename from include-gpl/dsp/nullsink.h rename to include/dsp/nullsink.h diff --git a/include-gpl/dsp/pidcontroller.h b/include/dsp/pidcontroller.h similarity index 100% rename from include-gpl/dsp/pidcontroller.h rename to include/dsp/pidcontroller.h diff --git a/include-gpl/dsp/scopevis.h b/include/dsp/scopevis.h similarity index 100% rename from include-gpl/dsp/scopevis.h rename to include/dsp/scopevis.h diff --git a/include-gpl/dsp/spectrumscopecombovis.h b/include/dsp/spectrumscopecombovis.h similarity index 100% rename from include-gpl/dsp/spectrumscopecombovis.h rename to include/dsp/spectrumscopecombovis.h diff --git a/include-gpl/dsp/spectrumvis.h b/include/dsp/spectrumvis.h similarity index 100% rename from include-gpl/dsp/spectrumvis.h rename to include/dsp/spectrumvis.h diff --git a/include-gpl/gui/aboutdialog.h b/include/gui/aboutdialog.h similarity index 100% rename from include-gpl/gui/aboutdialog.h rename to include/gui/aboutdialog.h diff --git a/include-gpl/gui/addpresetdialog.h b/include/gui/addpresetdialog.h similarity index 100% rename from include-gpl/gui/addpresetdialog.h rename to include/gui/addpresetdialog.h diff --git a/include-gpl/gui/buttonswitch.h b/include/gui/buttonswitch.h similarity index 100% rename from include-gpl/gui/buttonswitch.h rename to include/gui/buttonswitch.h diff --git a/include-gpl/gui/channelwindow.h b/include/gui/channelwindow.h similarity index 100% rename from include-gpl/gui/channelwindow.h rename to include/gui/channelwindow.h diff --git a/include-gpl/gui/colormapper.h b/include/gui/colormapper.h similarity index 100% rename from include-gpl/gui/colormapper.h rename to include/gui/colormapper.h diff --git a/include-gpl/gui/glscope.h b/include/gui/glscope.h similarity index 100% rename from include-gpl/gui/glscope.h rename to include/gui/glscope.h diff --git a/include-gpl/gui/glscopegui.h b/include/gui/glscopegui.h similarity index 100% rename from include-gpl/gui/glscopegui.h rename to include/gui/glscopegui.h diff --git a/include-gpl/gui/glspectrum.h b/include/gui/glspectrum.h similarity index 100% rename from include-gpl/gui/glspectrum.h rename to include/gui/glspectrum.h diff --git a/include-gpl/gui/glspectrumgui.h b/include/gui/glspectrumgui.h similarity index 100% rename from include-gpl/gui/glspectrumgui.h rename to include/gui/glspectrumgui.h diff --git a/include-gpl/gui/indicator.h b/include/gui/indicator.h similarity index 100% rename from include-gpl/gui/indicator.h rename to include/gui/indicator.h diff --git a/include-gpl/gui/physicalunit.h b/include/gui/physicalunit.h similarity index 100% rename from include-gpl/gui/physicalunit.h rename to include/gui/physicalunit.h diff --git a/include-gpl/gui/pluginsdialog.h b/include/gui/pluginsdialog.h similarity index 100% rename from include-gpl/gui/pluginsdialog.h rename to include/gui/pluginsdialog.h diff --git a/include-gpl/gui/preferencesdialog.h b/include/gui/preferencesdialog.h similarity index 100% rename from include-gpl/gui/preferencesdialog.h rename to include/gui/preferencesdialog.h diff --git a/include-gpl/gui/presetitem.h b/include/gui/presetitem.h similarity index 100% rename from include-gpl/gui/presetitem.h rename to include/gui/presetitem.h diff --git a/include-gpl/gui/scale.h b/include/gui/scale.h similarity index 100% rename from include-gpl/gui/scale.h rename to include/gui/scale.h diff --git a/include-gpl/gui/scaleengine.h b/include/gui/scaleengine.h similarity index 100% rename from include-gpl/gui/scaleengine.h rename to include/gui/scaleengine.h diff --git a/include-gpl/gui/scopewindow.h b/include/gui/scopewindow.h similarity index 100% rename from include-gpl/gui/scopewindow.h rename to include/gui/scopewindow.h diff --git a/include-gpl/gui/valuedial.h b/include/gui/valuedial.h similarity index 100% rename from include-gpl/gui/valuedial.h rename to include/gui/valuedial.h diff --git a/include-gpl/mainwindow.h b/include/mainwindow.h similarity index 100% rename from include-gpl/mainwindow.h rename to include/mainwindow.h diff --git a/include-gpl/plugin/pluginmanager.h b/include/plugin/pluginmanager.h similarity index 100% rename from include-gpl/plugin/pluginmanager.h rename to include/plugin/pluginmanager.h diff --git a/include-gpl/settings/mainsettings.h b/include/settings/mainsettings.h similarity index 100% rename from include-gpl/settings/mainsettings.h rename to include/settings/mainsettings.h diff --git a/include-gpl/settings/preferences.h b/include/settings/preferences.h similarity index 100% rename from include-gpl/settings/preferences.h rename to include/settings/preferences.h diff --git a/include-gpl/settings/preset.h b/include/settings/preset.h similarity index 100% rename from include-gpl/settings/preset.h rename to include/settings/preset.h diff --git a/sdrbase/gui/aboutdialog.ui b/sdrbase/gui/aboutdialog.ui index 7c0dfe026..14fd73c89 100644 --- a/sdrbase/gui/aboutdialog.ui +++ b/sdrbase/gui/aboutdialog.ui @@ -78,18 +78,7 @@ - <p>Copyright (C) 2015 Edouard Griffiths, F4EXB. </p> -<p>Code at <a href="https://github.com/f4exb/sdrangel">https://github.com/f4exb/sdrangel</a> This is a complete redesign from RTL-SDRangelove at <a href="https://github.com/hexameron/rtl-sdrangelove">https://github.com/hexameron/rtl-sdrangelove</a></p> -<p>Many thanks to the original developers:</p> -<p>The osmocom developer team - especially horizon, Hoernchen &amp; tnt.</p> -<p>Christian Daniel from maintech GmbH.<p> -<p>John Greb (hexameron) for the contributions in RTL-SDRangelove<p> -<p>SDRangel itself is licensed as "GPL2+" with the added exception, that plugins using only header files from the "include"-subdirectory and not from the "include-gpl"-subdirectory do not count as derived works.</p> -<p>The following rules apply to the SDRangel main application and libsdrbase:<br> -This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -You should have received a copy of the GNU General Public License along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p> -<p>For the license of installed plugins, look into the plugin list.</p> + <html><head/><body><p>Copyright (C) 2015 Edouard Griffiths, F4EXB. </p><p>Code at <a href="https://github.com/f4exb/sdrangel"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/f4exb/sdrangel</span></a> This is a complete redesign from RTL-SDRangelove at <a href="https://github.com/hexameron/rtl-sdrangelove"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/hexameron/rtl-sdrangelove</span></a></p><p>Many thanks to the original developers:</p><p>The osmocom developer team - especially horizon, Hoernchen &amp; tnt.</p><p>Christian Daniel from maintech GmbH.</p><p>John Greb (hexameron) for the contributions in RTL-SDRangelove</p><p>The following rules apply to the SDRangel main application and libsdrbase:<br/>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. You should have received a copy of the GNU General Public License along with this program. If not, see <a href="http://www.gnu.org/licenses/"><span style=" text-decoration: underline; color:#0000ff;">http://www.gnu.org/licenses/</span></a>.</p><p>For the license of installed plugins, look into the plugin list.</p></body></html> true