[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/07: Merge remote-tracking branch 'arya/a
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 05/07: Merge remote-tracking branch 'arya/audio_registration' |
|
Date: |
Thu, 14 Aug 2014 15:23:30 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit c1d8a677464ac9f3f3eacfa20b634fe63e7f0082
Merge: 3924c9f 2fc6293
Author: Tom Rondeau <address@hidden>
Date: Wed Aug 13 17:22:04 2014 -0400
Merge remote-tracking branch 'arya/audio_registration'
cmake/Modules/GrComponent.cmake | 6 ++
gnuradio-runtime/include/gnuradio/logger.h.in | 15 ++++
gnuradio-runtime/lib/block.cc | 46 +----------
gnuradio-runtime/lib/logger.cc | 56 ++++++++++++++
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 ++-
20 files changed, 394 insertions(+), 170 deletions(-)
- [Commit-gnuradio] [gnuradio] branch master updated (2e691d8 -> 842d8c9), git, 2014/08/14
- [Commit-gnuradio] [gnuradio] 01/07: logger: adding new configure_default_logger function to make it easier to get log file info on logger setup., git, 2014/08/14
- [Commit-gnuradio] [gnuradio] 05/07: Merge remote-tracking branch 'arya/audio_registration',
git <=
- [Commit-gnuradio] [gnuradio] 02/07: cmake: adding a function to allow components to reference submodules for display., git, 2014/08/14
- [Commit-gnuradio] [gnuradio] 03/07: audio: modified the audio registration system., git, 2014/08/14
- [Commit-gnuradio] [gnuradio] 07/07: Merge branch 'maint', git, 2014/08/14
- [Commit-gnuradio] [gnuradio] 04/07: Merge branch 'maint', git, 2014/08/14
- [Commit-gnuradio] [gnuradio] 06/07: logger: poor placement of the function inside the ifdefs. Moving outside to make the function accessible with any logger setting., git, 2014/08/14