From 5f7444d7956a6cc517ada1b8b96c4f9cdd408fd5 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Mon, 21 Nov 2022 08:00:52 +1100
Subject: WIP

---
 src/main/app_console.cpp | 12 +++++++-----
 src/main/app_console.hpp |  8 +++-----
 src/main/main.cpp        |  8 +++-----
 3 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'src/main')

diff --git a/src/main/app_console.cpp b/src/main/app_console.cpp
index 74225534..765b17d2 100644
--- a/src/main/app_console.cpp
+++ b/src/main/app_console.cpp
@@ -12,8 +12,6 @@
 
 namespace console {
 
-static AppConsole* sInstance = nullptr;
-
 std::string toSdPath(std::string filepath) {
   return std::string(drivers::kStoragePath) + "/" + filepath;
 }
@@ -59,10 +57,12 @@ int CmdPlayFile(int argc, char** argv) {
     return 1;
   }
 
+  /*
   sInstance->playback_->Play(toSdPath(argv[1]));
   if (argc == 3) {
     sInstance->playback_->SetNextFile(toSdPath(argv[2]));
   }
+  */
 
   return 0;
 }
@@ -83,7 +83,7 @@ int CmdToggle(int argc, char** argv) {
     return 1;
   }
 
-  sInstance->playback_->Toggle();
+  //sInstance->playback_->Toggle();
 
   return 0;
 }
@@ -110,7 +110,7 @@ int CmdVolume(int argc, char** argv) {
     return 1;
   }
 
-  sInstance->playback_->SetVolume((uint8_t)raw_vol);
+  //sInstance->playback_->SetVolume((uint8_t)raw_vol);
 
   return 0;
 }
@@ -125,12 +125,14 @@ void RegisterVolume() {
   esp_console_cmd_register(&cmd);
 }
 
-AppConsole::AppConsole(drivers::AudioPlayback* playback) : playback_(playback) {
+/*
+AppConsole::AppConsole() {
   sInstance = this;
 }
 AppConsole::~AppConsole() {
   sInstance = nullptr;
 }
+*/
 
 auto AppConsole::RegisterExtraComponents() -> void {
   RegisterListDir();
diff --git a/src/main/app_console.hpp b/src/main/app_console.hpp
index 0beffd76..9cd9d50c 100644
--- a/src/main/app_console.hpp
+++ b/src/main/app_console.hpp
@@ -2,17 +2,15 @@
 
 #include <memory>
 
-#include "audio_playback.hpp"
+#include "storage.hpp"
 #include "console.hpp"
 
 namespace console {
 
 class AppConsole : public Console {
  public:
-  AppConsole(drivers::AudioPlayback* playback);
-  virtual ~AppConsole();
-
-  drivers::AudioPlayback* playback_;
+  AppConsole() {};
+  virtual ~AppConsole() {};
 
  protected:
   virtual auto RegisterExtraComponents() -> void;
diff --git a/src/main/main.cpp b/src/main/main.cpp
index a18e12d0..24d47e9a 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -5,9 +5,6 @@
 #include <cstdint>
 #include <memory>
 
-#include "audio_common.h"
-#include "audio_element.h"
-#include "audio_pipeline.h"
 #include "core/lv_disp.h"
 #include "core/lv_obj_pos.h"
 #include "driver/gpio.h"
@@ -27,7 +24,6 @@
 #include "widgets/lv_label.h"
 
 #include "app_console.hpp"
-#include "audio_playback.hpp"
 #include "battery.hpp"
 #include "dac.hpp"
 #include "display.hpp"
@@ -123,6 +119,7 @@ extern "C" void app_main(void) {
   }
   std::unique_ptr<drivers::IAudioOutput> sink = std::move(sink_res.value());
 
+  /*
   ESP_LOGI(TAG, "Init audio pipeline");
   auto playback_res = drivers::AudioPlayback::create(std::move(sink));
   if (playback_res.has_error()) {
@@ -132,13 +129,14 @@ extern "C" void app_main(void) {
   std::unique_ptr<drivers::AudioPlayback> playback =
       std::move(playback_res.value());
   playback->SetVolume(130);
+  */
 
   ESP_LOGI(TAG, "Launch console");
   console::AppConsole console(playback.get());
   console.Launch();
 
   while (1) {
-    playback->ProcessEvents(5);
+    //playback->ProcessEvents(5);
     vTaskDelay(pdMS_TO_TICKS(100));
   }
 }
-- 
cgit v1.2.3