audio monitor functional with float system

rendering/audio.cpp

@@ -209,33 +209,25 @@ int AudioSenderThread::send_audio_to_output(qint64 offset, int max) {
   // send audio to device
   audio_write_lock.lock();
 
-  qint64 actual_write = audio_io_device->write(reinterpret_cast<const char*>(audio_ibuffer+offset), max);
+  qint64 actual_write = audio_io_device->write(reinterpret_cast<const char*>(&audio_ibuffer[offset]), max);
 
-  /*
   if (actual_write > 0) {
     // average values and send to audio monitor
     int channels = audio_output->format().channelCount();
-    qint64 lim = offset + actual_write;
-    QVector<double> averages;
+    qint64 lim = offset + (actual_write/sizeof(float));
+    QVector<float> averages;
     averages.resize(channels);
-    averages.fill(0);
+    averages.fill(0.0);
 
-    int counter = 0;
-    qint16 sample;
-    for (qint64 i=offset;i<lim;i+=2) {
-      sample = qint16(((audio_ibuffer[i+1] & 0xFF) << 8) | (audio_ibuffer[i] & 0xFF));
-      averages[counter] = qMax((double(qAbs(sample))/32768.0), averages[counter]);
-      counter = (counter+1)%channels;
-    }
-    for (int i=0;i<channels;i++) {
-      averages[i] = log_volume(1.0-(averages[i]));
+    for (qint64 i=offset;i<lim;i++) {
+      int channel = i%channels;
+      averages[channel] = qMax(qAbs(audio_ibuffer[i]), averages[channel]);
     }
 
     panel_timeline.first()->audio_monitor->set_value(averages);
   }
-  */
 
-  memset(audio_ibuffer+offset, 0, actual_write);
+  memset(&audio_ibuffer[offset], 0, actual_write);
 
   audio_ibuffer_read += (actual_write / sizeof(float));
 
@@ -246,7 +238,7 @@ int AudioSenderThread::send_audio_to_output(qint64 offset, int max) {
 
 double log_volume(double linear) {
   // expects a value between 0 and 1 (or more if amplifying)
-  return (qExp(linear)-1)/(M_E-1);
+  return (qExp(linear)-1.0f)/(M_E-1.0f);
 }
 
 void int32_to_char_array(qint32 i, char* array) {

ui/audiomonitor.cpp

@@ -37,25 +37,33 @@ extern "C" {
 }
 
 AudioMonitor::AudioMonitor(QWidget *parent) :
-  QWidget(parent)
+  QWidget(parent),
+  peaked_(false)
 {
   clear_timer.setInterval(500);
   connect(&clear_timer, SIGNAL(timeout()), this, SLOT(clear()));
 }
 
-void AudioMonitor::set_value(const QVector<double> &ivalues) {
-  value_lock.lock();
-  values = ivalues;
-  value_lock.unlock();
+void AudioMonitor::set_value(const QVector<float> &ivalues) {
+  if (value_lock.tryLock()) {
+    values = ivalues;
 
-  QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
-  QMetaObject::invokeMethod(&clear_timer, "start", Qt::QueuedConnection);
+    if (peaked_.size() != values.size()) {
+      peaked_.resize(values.size());
+      peaked_.fill(false);
+    }
+
+    value_lock.unlock();
+
+    QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(&clear_timer, "start", Qt::QueuedConnection);
+  }
 }
 
 void AudioMonitor::clear() {
   clear_timer.stop();
-
-  values.fill(1);
+  peaked_.fill(false);
+  values.fill(0.0);
   update();
 }
 
@@ -67,6 +75,12 @@ void AudioMonitor::resizeEvent(QResizeEvent *e) {
   QWidget::resizeEvent(e);
 }
 
+void AudioMonitor::mousePressEvent(QMouseEvent *)
+{
+  peaked_.fill(false);
+  update();
+}
+
 void AudioMonitor::paintEvent(QPaintEvent *) {
   value_lock.lock();
   if (values.size() > 0) {
@@ -74,18 +88,26 @@ void AudioMonitor::paintEvent(QPaintEvent *) {
     int channel_x = AUDIO_MONITOR_GAP;
     int channel_count = values.size();
     int channel_width = (width()/channel_count) - AUDIO_MONITOR_GAP;
-    int i;
-    for (i=0;i<channel_count;i++) {
+
+    for (int i=0;i<channel_count;i++) {
+
+      // Fill audio monitor with red-yellow-green gradient
       QRect r(channel_x, AUDIO_MONITOR_PEAK_HEIGHT + AUDIO_MONITOR_GAP, channel_width, height());
       p.fillRect(r, gradient);
 
-      bool peak = false;
+      // Check if we've peaked
+      if (!peaked_[i] && values.at(i) > 1.0f) {
+        peaked_[i] = true;
+      }
 
-      r.setHeight(qRound(r.height()*(values.at(i))));
-      peak = (r.height() == 0);
+      // We draw an inverted dark shadow over the gradient to represent to are not lit up
+      // TODO change to decibel representation
+      float val = 1.0f - qMin(1.0f, values.at(i));
+      r.setHeight(qRound(r.height()*val));
 
       QRect peak_rect(channel_x, 0, channel_width, AUDIO_MONITOR_PEAK_HEIGHT);
-      if (peak) {
+      if (peaked_[i]) {
+        // We're peaked on this channel, so we light up the peak light
         p.fillRect(peak_rect, QColor(255, 0, 0));
       } else {
         p.fillRect(peak_rect, QColor(64, 0, 0));

ui/audiomonitor.h

@@ -53,22 +53,29 @@ public:
    * An array of doubles between 0.0 and 1.0 to display the amplitude. 0.0 is no audio, 1.0 is full volume. Each array
    * entry is a channel and the audio monitor will automatically adjust to the channel count in the array.
    */
-  void set_value(const QVector<double>& values);
+  void set_value(const QVector<float> &values);
 
 protected:
   /**
    * @brief Internal paint event
    *
-   * Paints the
+   * Paints the audio monitor
    */
-  void paintEvent(QPaintEvent *);
+  virtual void paintEvent(QPaintEvent *) override;
 
   /**
    * @brief Internal resize event handler
    *
    * Triggers a repaint when the widget is resized.
    */
-  void resizeEvent(QResizeEvent *);
+  virtual void resizeEvent(QResizeEvent *) override;
+
+  /**
+   * @brief Internal mouse press handler
+   *
+   * @param event
+   */
+  virtual void mousePressEvent(QMouseEvent *event) override;
 
 signals:
 
@@ -83,7 +90,7 @@ private:
   /**
    * @brief Internal value storage
    */
-  QVector<double> values;
+  QVector<float> values;
 
   /**
    * @brief Value mutex
@@ -100,6 +107,11 @@ private:
    */
   QTimer clear_timer;
 
+  /**
+   * @brief Internal variable for whether audio played as peaked or not
+   */
+  QVector<bool> peaked_;
+
 private slots:
   /**
    * @brief Slot to clear the audio monitor