[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Thu, 14 Aug 2014 15:23:38 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 1331564c6da7b2c2b26fb49d195da567f3ff11f6
Merge: 4e7a996 842d8c9
Author: Tom Rondeau <address@hidden>
Date: Thu Aug 14 11:23:34 2014 -0400
Merge branch 'master' into next
cmake/Modules/GrComponent.cmake | 6 +
gnuradio-runtime/include/gnuradio/logger.h.in | 15 +++
gnuradio-runtime/lib/block.cc | 46 +-------
gnuradio-runtime/lib/logger.cc | 61 +++++++++++
gr-audio/doc/audio.dox | 56 ++++++++++
gr-audio/lib/CMakeLists.txt | 24 +++-
gr-audio/lib/alsa/alsa_sink.cc | 34 +++---
gr-audio/lib/alsa/alsa_source.cc | 29 +++--
gr-audio/lib/audio_registry.cc | 105 ++++++++++++++----
gr-audio/lib/audio_registry.h | 83 +++++++++++---
gr-audio/lib/jack/jack_sink.cc | 22 ++--
gr-audio/lib/jack/jack_source.cc | 22 ++--
gr-audio/lib/oss/oss_sink.cc | 7 +-
gr-audio/lib/oss/oss_source.cc | 7 +-
gr-audio/lib/osx/osx_sink.cc | 8 +-
gr-audio/lib/osx/osx_source.cc | 8 +-
gr-audio/lib/portaudio/portaudio_sink.cc | 9 +-
gr-audio/lib/portaudio/portaudio_source.cc | 9 +-
gr-audio/lib/windows/windows_sink.cc | 9 +-
gr-audio/lib/windows/windows_source.cc | 9 +-
gr-blocks/include/gnuradio/blocks/delay.h | 14 ++-
gr-blocks/lib/delay_impl.cc | 3 +
.../python/modtool/gr-newmod/python/__init__.py | 24 ----
volk/lib/CMakeLists.txt | 12 ++
volk/lib/volk_malloc.c | 122 ++++++---------------
25 files changed, 461 insertions(+), 283 deletions(-)