Merge remote-tracking branch 'upstream/master'

osciwidget.cpp

@@ -47,6 +47,8 @@ void OsciWidget::renderSamples(const SamplePair *begin, const SamplePair *end)
 {
     m_callbacksCounter++;
 
+    m_samplesCounter += std::distance(begin, end);
+
     m_buffer.insert(m_buffer.end(), begin, end);
 }
 
@@ -57,9 +59,10 @@ void OsciWidget::paintEvent(QPaintEvent *event)
     m_frameCounter++;
     if (m_statsTimer.hasExpired(1000))
     {
-        emit statusUpdate(QString("%0FPS (%1 audio callbacks)").arg(m_frameCounter).arg(m_callbacksCounter));
+        emit statusUpdate(QString("%0FPS (%1 callbacks, %2 samples, %3 avg per callback)").arg(m_frameCounter).arg(m_callbacksCounter).arg(m_samplesCounter).arg(m_callbacksCounter>0?m_samplesCounter/m_callbacksCounter:0));
         m_frameCounter = 0;
         m_callbacksCounter = 0;
+        m_samplesCounter = 0;
         m_statsTimer.restart();
     }
 
@@ -73,7 +76,10 @@ void OsciWidget::updateFrameBuffer()
     if(m_buffer.empty()) return;
 
     if (m_pixmap.size() != size())
+    {
         m_pixmap = QPixmap(size());
+        m_pixmap.fill(Qt::black);
+    }
 
     QPainter painter(&m_pixmap);