From 8a2a2d226558d099243eea0aa9ae22b2791e0e0e Mon Sep 17 00:00:00 2001 From: jacqueline Date: Tue, 6 Jun 2023 10:20:46 +1000 Subject: Get basic audio playback going again --- src/app_console/app_console.cpp | 8 ++++---- src/app_console/include/app_console.hpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/app_console') diff --git a/src/app_console/app_console.cpp b/src/app_console/app_console.cpp index 39d6d8e0..0483bde9 100644 --- a/src/app_console/app_console.cpp +++ b/src/app_console/app_console.cpp @@ -69,7 +69,7 @@ void RegisterListDir() { esp_console_cmd_register(&cmd); } - //sInstance->playback_->Play(path + argv[1]); +// sInstance->playback_->Play(path + argv[1]); int CmdPlayFile(int argc, char** argv) { static const std::string usage = "usage: play [file]"; if (argc != 2) { @@ -80,7 +80,7 @@ int CmdPlayFile(int argc, char** argv) { std::string path = "/"; events::Dispatch( - audio::PlayFile{ .filename = path + argv[1] }); + audio::PlayFile{.filename = path + argv[1]}); return 0; } @@ -200,7 +200,7 @@ void RegisterDbDump() { esp_console_cmd_register(&cmd); } -AppConsole::AppConsole(std::weak_ptr database) +AppConsole::AppConsole(const std::weak_ptr& database) : database_(database) { sInstance = this; } @@ -210,8 +210,8 @@ AppConsole::~AppConsole() { auto AppConsole::RegisterExtraComponents() -> void { RegisterListDir(); - /* RegisterPlayFile(); + /* RegisterToggle(); RegisterVolume(); RegisterAudioStatus(); diff --git a/src/app_console/include/app_console.hpp b/src/app_console/include/app_console.hpp index 9df3996b..32242d16 100644 --- a/src/app_console/include/app_console.hpp +++ b/src/app_console/include/app_console.hpp @@ -15,10 +15,10 @@ namespace console { class AppConsole : public Console { public: - explicit AppConsole(std::weak_ptr database); + explicit AppConsole(const std::weak_ptr& database); virtual ~AppConsole(); - std::weak_ptr database_; + const std::weak_ptr& database_; protected: virtual auto RegisterExtraComponents() -> void; -- cgit v1.2.3