Code cleanup.

Author: edwbaker

include/audio_daemon/alsa_capture.hpp

@@ -4,7 +4,6 @@
 #include <alsa/asoundlib.h>
 #include <thread>
 #include <atomic>
-#include <functional>
 #include <vector>
 
 namespace audio_daemon {

include/audio_daemon/block_recorder.hpp

@@ -2,9 +2,7 @@
 
 #include "audio_daemon/common.hpp"
 #include <string>
-#include <thread>
 #include <mutex>
-#include <condition_variable>
 #include <atomic>
 #include <vector>
 #include <sndfile.h>
@@ -53,9 +51,6 @@ class BlockRecorder {
      */
     void push(const uint8_t* data, size_t frame_count);
 
-    /** Whether the recorder is actively writing. */
-    bool is_recording() const { return recording_.load(); }
-
     struct Stats {
         uint64_t blocks_written;
         uint64_t total_frames_written;

include/audio_daemon/capture_pipeline.hpp

@@ -10,7 +10,6 @@
 #include <atomic>
 #include <string>
 #include <vector>
-#include <cmath>
 
 namespace audio_daemon {
 
@@ -50,7 +49,6 @@ class CapturePipeline {
 
     struct Stats {
         uint64_t frames_captured;
-        double capture_fps;
         size_t ring_buffer_frames;
         int16_t peak_level;
         double rms_level;

include/audio_daemon/clip_extractor.hpp

@@ -57,17 +57,9 @@ class ClipExtractor {
     std::string request_clip_sync(int start_offset, int end_offset,
                                   const std::string& format = "");
 
-    struct Stats {
-        uint64_t clips_extracted;
-        uint64_t clips_failed;
-    };
-    Stats get_stats() const;
-
 private:
     void worker_func();
     std::string extract_clip(const ClipRequest& req);
-    std::string write_wav(const std::vector<uint8_t>& samples,
-                          const std::string& path);
     std::string write_sndfile(const std::vector<uint8_t>& samples,
                               const std::string& path,
                               const std::string& format);
@@ -86,8 +78,6 @@ class ClipExtractor {
     std::condition_variable queue_cv_;
 
     std::atomic<uint64_t> next_id_{1};
-    std::atomic<uint64_t> clips_extracted_{0};
-    std::atomic<uint64_t> clips_failed_{0};
 
     std::mutex results_mutex_;
     std::condition_variable results_cv_;

include/audio_daemon/common.hpp

@@ -4,7 +4,6 @@
 #include <cstddef>
 #include <string>
 #include <functional>
-#include <vector>
 #include <chrono>
 #include <audio_daemon/version.hpp>
 
@@ -20,7 +19,6 @@ constexpr const char* DEFAULT_SOCKET_PATH = "/run/ws-audiod/control.sock";
 constexpr const char* DEFAULT_CLIPS_DIR = "/var/ws/audiod/clips";
 constexpr const char* DEFAULT_BLOCKS_DIR = "/var/ws/audiod/blocks";
 constexpr const char* DEFAULT_SHM_NAME = "/ws_audiod_samples";
-constexpr const char* DEFAULT_FRAME_NOTIFY_PATH = "/run/ws-audiod/frames.sock";
 
 // Metadata for a chunk of captured audio
 struct AudioChunkMeta {

include/audio_daemon/control_socket.hpp

@@ -4,7 +4,6 @@
 #include <functional>
 #include <thread>
 #include <atomic>
-#include <vector>
 
 namespace audio_daemon {
 

include/audio_daemon/daemon.hpp

@@ -24,7 +24,6 @@ class Daemon {
     void stop();
 
     static void signal_handler(int signum);
-    static Daemon* instance() { return instance_; }
 
 private:
     Response handle_clip_command(const Command& cmd);

include/audio_daemon/logger.hpp

@@ -19,10 +19,9 @@ class Logger {
     }
 
     void set_level(LogLevel level) { level_ = level; }
-    LogLevel level() const { return level_; }
 
     template<typename... Args>
-    void log(LogLevel level, const char* file, int line, Args&&... args) {
+    void log(LogLevel level, Args&&... args) {
         if (level < level_) return;
 
         std::ostringstream oss;
@@ -64,10 +63,10 @@ class Logger {
     std::mutex mutex_;
 };
 
-#define LOG_DEBUG(...) audio_daemon::Logger::instance().log(audio_daemon::LogLevel::DEBUG, __FILE__, __LINE__, __VA_ARGS__)
-#define LOG_INFO(...)  audio_daemon::Logger::instance().log(audio_daemon::LogLevel::INFO,  __FILE__, __LINE__, __VA_ARGS__)
-#define LOG_WARN(...)  audio_daemon::Logger::instance().log(audio_daemon::LogLevel::WARN,  __FILE__, __LINE__, __VA_ARGS__)
-#define LOG_ERROR(...) audio_daemon::Logger::instance().log(audio_daemon::LogLevel::ERROR, __FILE__, __LINE__, __VA_ARGS__)
-#define LOG_FATAL(...) audio_daemon::Logger::instance().log(audio_daemon::LogLevel::FATAL, __FILE__, __LINE__, __VA_ARGS__)
+#define LOG_DEBUG(...) audio_daemon::Logger::instance().log(audio_daemon::LogLevel::DEBUG, __VA_ARGS__)
+#define LOG_INFO(...)  audio_daemon::Logger::instance().log(audio_daemon::LogLevel::INFO,  __VA_ARGS__)
+#define LOG_WARN(...)  audio_daemon::Logger::instance().log(audio_daemon::LogLevel::WARN,  __VA_ARGS__)
+#define LOG_ERROR(...) audio_daemon::Logger::instance().log(audio_daemon::LogLevel::ERROR, __VA_ARGS__)
+#define LOG_FATAL(...) audio_daemon::Logger::instance().log(audio_daemon::LogLevel::FATAL, __VA_ARGS__)
 
 } // namespace audio_daemon

include/audio_daemon/ring_buffer.hpp

@@ -45,8 +45,6 @@ class RingBuffer {
 
     uint16_t channels() const { return channels_; }
 
-    uint16_t bytes_per_sample() const { return bytes_per_sample_; }
-
     /** Bytes per frame (channels * bytes_per_sample). */
     size_t bytes_per_frame() const { return static_cast<size_t>(channels_) * bytes_per_sample_; }
 

include/audio_daemon/sample_publisher.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "audio_daemon/common.hpp"
 #include <string>
 #include <atomic>
 #include <cstdint>