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

@ -46,7 +46,7 @@ public:
ReplayView(
const Rect parent_rect,
std::string filename_stem_pattern,
std::string filename,
FileType file_type,
const size_t read_size,
const size_t buffer_count
@ -71,8 +71,7 @@ private:
void handle_replay_thread_done(const File::Error error);
void handle_error(const File::Error error);
bool pwmrssi_enabled = false;
const std::string filename_stem_pattern;
const std::filesystem::path filename;
const FileType file_type;
const size_t read_size;
const size_t buffer_count;