|
From: | git |
Subject: | [Commit-gnuradio] [gnuradio] 03/06: Merge remote-tracking branch 'michaelld/fix_gr_audio_osx' into master_osx |
Date: | Sat, 8 Mar 2014 16:32:45 +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 ab9e1d0b5f1a529bbe0191f4f4489e9c2755a6fe Merge: 8f75515 39208e2 Author: Tom Rondeau <address@hidden> Date: Fri Mar 7 16:21:50 2014 -0500 Merge remote-tracking branch 'michaelld/fix_gr_audio_osx' into master_osx gr-audio/CMakeLists.txt | 2 +- gr-audio/include/gnuradio/audio/CMakeLists.txt | 14 +- gr-audio/include/gnuradio/audio/osx_impl.h | 84 ++ gr-audio/lib/CMakeLists.txt | 9 + gr-audio/lib/osx/gr-audio-osx.conf | 11 + gr-audio/lib/osx/osx_common.h | 73 + gr-audio/lib/osx/osx_impl.cc | 313 ++++ gr-audio/lib/osx/osx_impl.h | 78 - gr-audio/lib/osx/osx_sink.cc | 1015 ++++++++++--- gr-audio/lib/osx/osx_sink.h | 117 +- gr-audio/lib/osx/osx_source.cc | 1881 +++++++++++++++--------- gr-audio/lib/osx/osx_source.h | 192 ++- 12 files changed, 2648 insertions(+), 1141 deletions(-)
[Prev in Thread] | Current Thread | [Next in Thread] |