diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2019-08-07 22:21:18 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-08-09 23:04:28 +0200 |
| commit | d24b0c8f1ebe1a9681271c014659bf2ecc613e50 (patch) | |
| tree | a18051dccba5266904571dce8a93128ad62e8453 /gr-audio/lib | |
| parent | 65599ad299f030d302386fcda9bc0e3175d9a828 (diff) | |
clang-format: Ordering all the includes
clang-format: ordering includes in gnuradio-runtime
clang-format: ordering includes in gr-filter
clang-format: ordering includes in gr-fft
clang-format: ordering includes in gr-audio
clang-format: ordering includes in gr-analog
clang-format: ordering includes in gr-fec
clang-format: ordering includes in gr-wavelet
clang-format: ordering includes in gr-zeromq
clang-format: ordering includes in gr-vocoder
clang-format: ordering includes in gr-video-sdl
clang-format: ordering includes in gr-trellis
clang-format: ordering includes in gr-blocks
clang-format: ordering includes in gr-digital
clang-format: ordering includes in gr-uhd
clang-format: ordering includes in gr-dtv
clang-format: ordering includes in gr-channels
clang-format: ordering includes in gr-qtgui
clang_format.py: re-enable include reordering
Diffstat (limited to 'gr-audio/lib')
23 files changed, 45 insertions, 45 deletions
diff --git a/gr-audio/lib/alsa/alsa_impl.h b/gr-audio/lib/alsa/alsa_impl.h index a85ef166f7..b9eeeaedb5 100644 --- a/gr-audio/lib/alsa/alsa_impl.h +++ b/gr-audio/lib/alsa/alsa_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ALSA_IMPL_H #define INCLUDED_ALSA_IMPL_H -#include <stdio.h> #include <alsa/asoundlib.h> +#include <stdio.h> void gri_alsa_dump_hw_params(snd_pcm_t* pcm, snd_pcm_hw_params_t* hwparams, FILE* fp); diff --git a/gr-audio/lib/alsa/alsa_sink.cc b/gr-audio/lib/alsa/alsa_sink.cc index 5df5a83dc6..7de5de650b 100644 --- a/gr-audio/lib/alsa/alsa_sink.cc +++ b/gr-audio/lib/alsa/alsa_sink.cc @@ -25,8 +25,8 @@ #endif #include "../audio_registry.h" -#include "alsa_sink.h" #include "alsa_impl.h" +#include "alsa_sink.h" #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> #include <stdio.h> diff --git a/gr-audio/lib/alsa/alsa_sink.h b/gr-audio/lib/alsa/alsa_sink.h index 50edc99616..3e60d20b7f 100644 --- a/gr-audio/lib/alsa/alsa_sink.h +++ b/gr-audio/lib/alsa/alsa_sink.h @@ -29,8 +29,8 @@ #include <gnuradio/audio/sink.h> #include <alsa/asoundlib.h> -#include <string> #include <stdexcept> +#include <string> namespace gr { namespace audio { diff --git a/gr-audio/lib/alsa/alsa_source.cc b/gr-audio/lib/alsa/alsa_source.cc index 82443268c4..c0bea10c71 100644 --- a/gr-audio/lib/alsa/alsa_source.cc +++ b/gr-audio/lib/alsa/alsa_source.cc @@ -25,8 +25,8 @@ #endif #include "../audio_registry.h" -#include "alsa_source.h" #include "alsa_impl.h" +#include "alsa_source.h" #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> #include <stdio.h> diff --git a/gr-audio/lib/alsa/alsa_source.h b/gr-audio/lib/alsa/alsa_source.h index 66d349a840..9008d858b3 100644 --- a/gr-audio/lib/alsa/alsa_source.h +++ b/gr-audio/lib/alsa/alsa_source.h @@ -29,8 +29,8 @@ #include <gnuradio/audio/source.h> #include <alsa/asoundlib.h> -#include <string> #include <stdexcept> +#include <string> namespace gr { namespace audio { diff --git a/gr-audio/lib/audio_registry.cc b/gr-audio/lib/audio_registry.cc index 5c0c6317cb..2fb085b859 100644 --- a/gr-audio/lib/audio_registry.cc +++ b/gr-audio/lib/audio_registry.cc @@ -20,12 +20,12 @@ */ #include "audio_registry.h" -#include <boost/foreach.hpp> -#include <gnuradio/prefs.h> #include <gnuradio/logger.h> +#include <gnuradio/prefs.h> +#include <boost/foreach.hpp> +#include <iostream> #include <stdexcept> #include <vector> -#include <iostream> namespace gr { namespace audio { diff --git a/gr-audio/lib/jack/jack_sink.cc b/gr-audio/lib/jack/jack_sink.cc index 7a7e14706d..a244c9e9eb 100644 --- a/gr-audio/lib/jack/jack_sink.cc +++ b/gr-audio/lib/jack/jack_sink.cc @@ -25,8 +25,8 @@ #endif #include "../audio_registry.h" -#include "jack_sink.h" #include "jack_impl.h" +#include "jack_sink.h" #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> #include <stdio.h> diff --git a/gr-audio/lib/jack/jack_sink.h b/gr-audio/lib/jack/jack_sink.h index 80fc7312d1..c417000106 100644 --- a/gr-audio/lib/jack/jack_sink.h +++ b/gr-audio/lib/jack/jack_sink.h @@ -25,8 +25,8 @@ #include <gnuradio/audio/sink.h> #include <jack/jack.h> #include <jack/ringbuffer.h> -#include <string> #include <stdexcept> +#include <string> namespace gr { namespace audio { diff --git a/gr-audio/lib/jack/jack_source.cc b/gr-audio/lib/jack/jack_source.cc index e24e1af637..7b931f36c2 100644 --- a/gr-audio/lib/jack/jack_source.cc +++ b/gr-audio/lib/jack/jack_source.cc @@ -25,8 +25,8 @@ #endif #include "../audio_registry.h" -#include "jack_source.h" #include "jack_impl.h" +#include "jack_source.h" #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> #include <stdio.h> diff --git a/gr-audio/lib/jack/jack_source.h b/gr-audio/lib/jack/jack_source.h index f91b2fad5a..2fbc97479e 100644 --- a/gr-audio/lib/jack/jack_source.h +++ b/gr-audio/lib/jack/jack_source.h @@ -25,8 +25,8 @@ #include <gnuradio/audio/source.h> #include <jack/jack.h> #include <jack/ringbuffer.h> -#include <string> #include <stdexcept> +#include <string> namespace gr { namespace audio { diff --git a/gr-audio/lib/oss/oss_sink.cc b/gr-audio/lib/oss/oss_sink.cc index 972271d6d1..58a6fdccac 100644 --- a/gr-audio/lib/oss/oss_sink.cc +++ b/gr-audio/lib/oss/oss_sink.cc @@ -28,13 +28,13 @@ #include "oss_sink.h" #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <sys/soundcard.h> +#include <fcntl.h> +#include <stdio.h> #include <sys/ioctl.h> -#include <sys/types.h> +#include <sys/soundcard.h> #include <sys/stat.h> -#include <fcntl.h> +#include <sys/types.h> #include <unistd.h> -#include <stdio.h> #include <iostream> #include <stdexcept> diff --git a/gr-audio/lib/oss/oss_source.cc b/gr-audio/lib/oss/oss_source.cc index 14b8a0c969..267eef7d20 100644 --- a/gr-audio/lib/oss/oss_source.cc +++ b/gr-audio/lib/oss/oss_source.cc @@ -28,13 +28,13 @@ #include "oss_source.h" #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> -#include <sys/soundcard.h> +#include <fcntl.h> +#include <stdio.h> #include <sys/ioctl.h> -#include <sys/types.h> +#include <sys/soundcard.h> #include <sys/stat.h> -#include <fcntl.h> +#include <sys/types.h> #include <unistd.h> -#include <stdio.h> #include <iostream> #include <stdexcept> diff --git a/gr-audio/lib/osx/osx_sink.h b/gr-audio/lib/osx/osx_sink.h index db7763e188..1697739721 100644 --- a/gr-audio/lib/osx/osx_sink.h +++ b/gr-audio/lib/osx/osx_sink.h @@ -25,8 +25,8 @@ #include <gnuradio/audio/sink.h> -#include "osx_common.h" #include "circular_buffer.h" +#include "osx_common.h" namespace gr { namespace audio { diff --git a/gr-audio/lib/osx/osx_source.h b/gr-audio/lib/osx/osx_source.h index 688ff3c32d..324e25b0d6 100644 --- a/gr-audio/lib/osx/osx_source.h +++ b/gr-audio/lib/osx/osx_source.h @@ -25,8 +25,8 @@ #include <gnuradio/audio/source.h> -#include "osx_common.h" #include "circular_buffer.h" +#include "osx_common.h" namespace gr { namespace audio { diff --git a/gr-audio/lib/portaudio/portaudio_impl.h b/gr-audio/lib/portaudio/portaudio_impl.h index f57a601ac7..779d7f91ef 100644 --- a/gr-audio/lib/portaudio/portaudio_impl.h +++ b/gr-audio/lib/portaudio/portaudio_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_AUDIO_PORTAUDIO_IMPL_H #define INCLUDED_AUDIO_PORTAUDIO_IMPL_H -#include <stdio.h> #include <portaudio.h> +#include <stdio.h> namespace gr { namespace audio { diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc index e9ff3759da..5619f80a9f 100644 --- a/gr-audio/lib/portaudio/portaudio_sink.cc +++ b/gr-audio/lib/portaudio/portaudio_sink.cc @@ -29,15 +29,15 @@ #endif #include "../audio_registry.h" -#include "portaudio_sink.h" #include "portaudio_impl.h" +#include "portaudio_sink.h" #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> #include <stdio.h> -#include <iostream> +#include <string.h> #include <unistd.h> +#include <iostream> #include <stdexcept> -#include <string.h> #ifdef _MSC_VER #include <io.h> #endif diff --git a/gr-audio/lib/portaudio/portaudio_sink.h b/gr-audio/lib/portaudio/portaudio_sink.h index 98e72fc2c2..6fb4ebc2b7 100644 --- a/gr-audio/lib/portaudio/portaudio_sink.h +++ b/gr-audio/lib/portaudio/portaudio_sink.h @@ -25,9 +25,9 @@ #include <gnuradio/audio/sink.h> #include <gnuradio/buffer.h> #include <gnuradio/thread/thread.h> -#include <string> #include <portaudio.h> #include <stdexcept> +#include <string> //#include <gri_logger.h> namespace gr { diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc index f785362946..efaf3589ea 100644 --- a/gr-audio/lib/portaudio/portaudio_source.cc +++ b/gr-audio/lib/portaudio/portaudio_source.cc @@ -29,15 +29,15 @@ #endif #include "../audio_registry.h" -#include "portaudio_source.h" #include "portaudio_impl.h" +#include "portaudio_source.h" #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> #include <stdio.h> -#include <iostream> +#include <string.h> #include <unistd.h> +#include <iostream> #include <stdexcept> -#include <string.h> #ifdef _MSC_VER #include <io.h> #endif diff --git a/gr-audio/lib/portaudio/portaudio_source.h b/gr-audio/lib/portaudio/portaudio_source.h index a72cdd4129..ba5fb4e241 100644 --- a/gr-audio/lib/portaudio/portaudio_source.h +++ b/gr-audio/lib/portaudio/portaudio_source.h @@ -26,9 +26,9 @@ #include <gnuradio/audio/source.h> #include <gnuradio/buffer.h> #include <gnuradio/thread/thread.h> -#include <string> #include <portaudio.h> #include <stdexcept> +#include <string> namespace gr { namespace audio { diff --git a/gr-audio/lib/windows/windows_sink.cc b/gr-audio/lib/windows/windows_sink.cc index 7c220ff831..daf460e10c 100644 --- a/gr-audio/lib/windows/windows_sink.cc +++ b/gr-audio/lib/windows/windows_sink.cc @@ -27,17 +27,17 @@ #include "../audio_registry.h" #include "windows_sink.h" #include <gnuradio/io_signature.h> -#include <gnuradio/prefs.h> #include <gnuradio/logger.h> -#include <sys/types.h> -#include <sys/stat.h> +#include <gnuradio/prefs.h> #include <fcntl.h> -#include <unistd.h> #include <stdio.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> #include <iostream> +#include <sstream> #include <stdexcept> #include <string> -#include <sstream> namespace gr { namespace audio { diff --git a/gr-audio/lib/windows/windows_sink.h b/gr-audio/lib/windows/windows_sink.h index fcfae94dcb..2186e3ce35 100644 --- a/gr-audio/lib/windows/windows_sink.h +++ b/gr-audio/lib/windows/windows_sink.h @@ -26,8 +26,8 @@ #define WIN32_LEAN_AND_MEAN #define NOMINMAX // stops windef.h defining max/min under cygwin -#include <windows.h> #include <mmsystem.h> +#include <windows.h> #include <gnuradio/audio/sink.h> #include <string> diff --git a/gr-audio/lib/windows/windows_source.cc b/gr-audio/lib/windows/windows_source.cc index 5389a2383b..ae74e53c8f 100644 --- a/gr-audio/lib/windows/windows_source.cc +++ b/gr-audio/lib/windows/windows_source.cc @@ -26,17 +26,17 @@ #include "../audio_registry.h" #include "windows_source.h" -#include <sys/types.h> -#include <sys/stat.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/logger.h> +#include <gnuradio/prefs.h> #include <fcntl.h> -#include <unistd.h> #include <stdio.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> #include <iostream> -#include <stdexcept> #include <sstream> -#include <gnuradio/io_signature.h> -#include <gnuradio/prefs.h> -#include <gnuradio/logger.h> +#include <stdexcept> namespace gr { diff --git a/gr-audio/lib/windows/windows_source.h b/gr-audio/lib/windows/windows_source.h index cf858647aa..2df16670db 100644 --- a/gr-audio/lib/windows/windows_source.h +++ b/gr-audio/lib/windows/windows_source.h @@ -26,8 +26,8 @@ #define WIN32_LEAN_AND_MEAN #define NOMINMAX // stops windef.h defining max/min under cygwin -#include <windows.h> #include <mmsystem.h> +#include <windows.h> #include <gnuradio/audio/source.h> #include <string> |