portapack-mayhem/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2026-08-17 21:24:02 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Rename time files/namespace to not conflict with existing defs.

Browse Source
This commit is contained in:
Jared Boone
2016-08-21 17:49:06 -07:00
parent f20647feb4
commit 43a11ba048
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/ui_record_view.cpp
+3 -3
View File
@@ -25,7 +25,7 @@
using namespace portapack;
#include "file.hpp"
#include "time.hpp"
#include "rtc_time.hpp"
#include "string_format.hpp"
#include "utility.hpp"
@@ -188,13 +188,13 @@ RecordView::RecordView(
this->toggle();
};
signal_token_tick_second = time::signal_tick_second += [this]() {
signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
this->on_tick_second();
};
}
RecordView::~RecordView() {
time::signal_tick_second -= signal_token_tick_second;
rtc_time::signal_tick_second -= signal_token_tick_second;
}
void RecordView::focus() {