fabian/esmp3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made player and playlist_manager pubilc members of Controller.

Browse Source
This commit is contained in:
Fabian Schlenz
2019-11-19 20:46:04 +01:00
parent 5fad39ee0e
commit 68ecc05712
2 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/controller.h
View File

@ -18,7 +18,6 @@ class Controller {
private:
MFRC522* _rfid;
HTTPServer* _http_server;
PlaylistManager* _pm;
ControllerState _state = NORMAL;
bool _rfid_enabled = true;
void _check_rfid();
@ -30,7 +29,7 @@ private:
bool _rfid_present = false;
String _last_rfid_uid = "";
String _last_rfid_data = "";
Player* _player;
unsigned long _last_rfid_scan_at = 0;
unsigned long _last_position_info_at = 0;
String _serial_buffer = String();
@ -42,6 +41,8 @@ private:
bool _check_button(uint8_t btn);
public:
Controller(Player* p, PlaylistManager* pm);
PlaylistManager* pm;
Player* player;
void register_http_server(HTTPServer* h);
void loop();
void send_controller_status();