highfidelity/hifi — pull request #3323 by chansensturm (2014-08-27 01:44:09+00:00)
Title: Wangyix qt stats for audiomixer

Merge between HEAD and wangyix-qt_stats_for_audiomixer.

Most of this merge merge was rather straightforward; however, there were conflicts in AudioMixer.h/.cpp where Stephen's decoupling of audio mixer's packet receipt from the main thread changes
https://github.com/highfidelity/hifi/commit/1e65a093f23606f9afa0e76f43753e1b39dac1fd
interfere with Yixin's work. In particular, Yixin was working off of a now-obsoleted version of readPendingDatagrams(void). Merging this stat collection into the new readPendingDataGram(args) will require additional work given the threading structure.

Have tested this on OS X, but strongly recommend the reviewer smoke test on Windows or Linux as well.