new cspot/bell

components/spotify/cspot/bell/main/audio-sinks/include/unix/ALSAAudioSink.h

@@ -1,124 +1,106 @@
 #pragma once
 
-#include <vector>
-#include <fstream>
-#include "AudioSink.h"
+#include <BellTask.h>
 #include <alsa/asoundlib.h>
 #include <stdio.h>
-#include <BellTask.h>
 #include <unistd.h>
+#include <fstream>
 #include <memory>
 #include <mutex>
+#include <vector>
+#include "AudioSink.h"
 
 #define PCM_DEVICE "default"
 
 template <typename T, int SIZE>
-class RingbufferPointer
-{
-    typedef std::unique_ptr<T> TPointer;
+class RingbufferPointer {
+  typedef std::unique_ptr<T> TPointer;
 
-public:
-    explicit RingbufferPointer()
-    {
-        // create objects
-        for (int i = 0; i < SIZE; i++)
-        {
-            buf_[i] = std::make_unique<T>();
-        }
+ public:
+  explicit RingbufferPointer() {
+    // create objects
+    for (int i = 0; i < SIZE; i++) {
+      buf_[i] = std::make_unique<T>();
+    }
+  }
+
+  bool push(TPointer& item) {
+    std::lock_guard<std::mutex> lock(mutex_);
+    if (full())
+      return false;
+
+    std::swap(buf_[head_], item);
+
+    if (full_)
+      tail_ = (tail_ + 1) % max_size_;
+
+    head_ = (head_ + 1) % max_size_;
+    full_ = head_ == tail_;
+
+    return true;
+  }
+
+  bool pop(TPointer& item) {
+    std::lock_guard<std::mutex> lock(mutex_);
+    if (empty())
+      return false;
+
+    std::swap(buf_[tail_], item);
+
+    full_ = false;
+    tail_ = (tail_ + 1) % max_size_;
+
+    return true;
+  }
+
+  void reset() {
+    std::lock_guard<std::mutex> lock(mutex_);
+    head_ = tail_;
+    full_ = false;
+  }
+
+  bool empty() const { return (!full_ && (head_ == tail_)); }
+
+  bool full() const { return full_; }
+
+  int capacity() const { return max_size_; }
+
+  int size() const {
+    int size = max_size_;
+
+    if (!full_) {
+      if (head_ >= tail_)
+        size = head_ - tail_;
+      else
+        size = max_size_ + head_ - tail_;
     }
 
-    bool push(TPointer &item)
-    {
-        std::lock_guard<std::mutex> lock(mutex_);
-        if (full())
-            return false;
+    return size;
+  }
 
-        std::swap(buf_[head_], item);
+ private:
+  TPointer buf_[SIZE];
 
-        if (full_)
-            tail_ = (tail_ + 1) % max_size_;
-
-        head_ = (head_ + 1) % max_size_;
-        full_ = head_ == tail_;
-
-        return true;
-    }
-
-    bool pop(TPointer &item)
-    {
-        std::lock_guard<std::mutex> lock(mutex_);
-        if (empty())
-            return false;
-
-        std::swap(buf_[tail_], item);
-
-        full_ = false;
-        tail_ = (tail_ + 1) % max_size_;
-
-        return true;
-    }
-
-    void reset()
-    {
-        std::lock_guard<std::mutex> lock(mutex_);
-        head_ = tail_;
-        full_ = false;
-    }
-
-    bool empty() const
-    {
-        return (!full_ && (head_ == tail_));
-    }
-
-    bool full() const
-    {
-        return full_;
-    }
-
-    int capacity() const
-    {
-        return max_size_;
-    }
-
-    int size() const
-    {
-        int size = max_size_;
-
-        if (!full_)
-        {
-            if (head_ >= tail_)
-                size = head_ - tail_;
-            else
-                size = max_size_ + head_ - tail_;
-        }
-
-        return size;
-    }
-
-private:
-    TPointer buf_[SIZE];
-
-    std::mutex mutex_;
-    int head_ = 0;
-    int tail_ = 0;
-    const int max_size_ = SIZE;
-    bool full_ = 0;
+  std::mutex mutex_;
+  int head_ = 0;
+  int tail_ = 0;
+  const int max_size_ = SIZE;
+  bool full_ = 0;
 };
 
-class ALSAAudioSink : public AudioSink, public bell::Task
-{
-public:
-    ALSAAudioSink();
-    ~ALSAAudioSink();
-    void feedPCMFrames(const uint8_t *buffer, size_t bytes);
-    void runTask();
+class ALSAAudioSink : public AudioSink, public bell::Task {
+ public:
+  ALSAAudioSink();
+  ~ALSAAudioSink();
+  void feedPCMFrames(const uint8_t* buffer, size_t bytes);
+  void runTask();
 
-private:
-    RingbufferPointer<std::vector<uint8_t>, 3> ringbuffer;
-    unsigned int pcm;
-    snd_pcm_t *pcm_handle;
-    snd_pcm_hw_params_t *params;
-    snd_pcm_uframes_t frames;
-    int buff_size;
-    std::vector<uint8_t> buff;
+ private:
+  RingbufferPointer<std::vector<uint8_t>, 3> ringbuffer;
+  unsigned int pcm;
+  snd_pcm_t* pcm_handle;
+  snd_pcm_hw_params_t* params;
+  snd_pcm_uframes_t frames;
+  int buff_size;
+  std::vector<uint8_t> buff;
 };

components/spotify/cspot/bell/main/audio-sinks/include/unix/NamedPipeAudioSink.h

@@ -1,16 +1,17 @@
 #pragma once
 
-#include <vector>
-#include <fstream>
-#include "AudioSink.h"
+#include <stddef.h>  // for size_t
+#include <stdint.h>  // for uint8_t
+#include <fstream>   // for ofstream
 
-class NamedPipeAudioSink : public AudioSink
-{
-public:
-    NamedPipeAudioSink();
-    ~NamedPipeAudioSink();
-    void feedPCMFrames(const uint8_t *buffer, size_t bytes);
-    
-private:
-    std::ofstream namedPipeFile;
+#include "AudioSink.h"  // for AudioSink
+
+class NamedPipeAudioSink : public AudioSink {
+ public:
+  NamedPipeAudioSink();
+  ~NamedPipeAudioSink();
+  void feedPCMFrames(const uint8_t* buffer, size_t bytes);
+
+ private:
+  std::ofstream namedPipeFile;
 };