Merge 'upstream/master' - At least it builds...

This commit is contained in:
furrtek 2017-01-16 03:45:44 +00:00
commit 5e40669cbc
298 changed files with 8122 additions and 4685 deletions

View file

@ -31,7 +31,7 @@
#include "ui_receiver.hpp"
#include "utility.hpp"
#include "message.hpp"
#include "wavfile.hpp"
#include "io_wave.hpp"
#include "ctcss.hpp"
namespace ui {
@ -56,8 +56,7 @@ private:
tx_modes tx_mode = NORMAL;
struct sound {
std::string filename = "";
std::string shortname = "";
std::filesystem::path path { };
bool sixteenbit = false;
uint32_t sample_rate = 0;
uint32_t size = 0;