diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-03 15:53:18 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-03 15:53:18 -0700 |
| commit | a1d8b94647b6149ca38282eefac6a5f1e89fad5b (patch) | |
| tree | 7d1fcc50bee55159aa0206f148ee45188da963ec /host/examples/network_relay.cpp | |
| parent | 40884c9411bf7d4bc91d24c939c22a3a04193d82 (diff) | |
| parent | 51c81a39cc15ac221376e5acc4eceb572e0467f9 (diff) | |
| download | uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.tar.gz uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.tar.bz2 uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.zip | |
Merge branch 'master' into next
Conflicts:
host/examples/CMakeLists.txt
Diffstat (limited to 'host/examples/network_relay.cpp')
| -rw-r--r-- | host/examples/network_relay.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp index a7fdb7e2e..e8f9e667f 100644 --- a/host/examples/network_relay.cpp +++ b/host/examples/network_relay.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2011 Ettus Research LLC +// Copyright 2010-2012 Ettus Research LLC // // 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 @@ -34,10 +34,10 @@ static const size_t insane_mtu = 9000; boost::mutex spawn_mutex; -#if defined(UHD_PLATFORM_MACOS) || defined(UHD_PLATFORM_BSD) +#if defined(UHD_PLATFORM_MACOS) //limit buffer resize on macos or it will error const size_t rx_dsp_buff_size = size_t(1e6); -#elif defined(UHD_PLATFORM_LINUX) || defined(UHD_PLATFORM_WIN32) +#else //set to half-a-second of buffering at max rate const size_t rx_dsp_buff_size = size_t(50e6); #endif |