From 80be2ff0b83a29fb704653658289530d0ee7105b Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Tue, 17 Sep 2019 20:44:28 +0200 Subject: [PATCH 1/3] Improved stats --- osciwidget.cpp | 8 +++++++- osciwidget.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/osciwidget.cpp b/osciwidget.cpp index b55ece1..745d6fe 100644 --- a/osciwidget.cpp +++ b/osciwidget.cpp @@ -40,6 +40,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); } @@ -50,14 +52,18 @@ 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(); } if (m_pixmap.size() != size()) + { m_pixmap = QPixmap(size()); + m_pixmap.fill(Qt::black); + } QPainter painter; painter.begin(&m_pixmap); diff --git a/osciwidget.h b/osciwidget.h index 6a596cb..b0c7b2e 100644 --- a/osciwidget.h +++ b/osciwidget.h @@ -46,7 +46,7 @@ private: std::vector m_buffer; - int m_frameCounter{0}, m_callbacksCounter{0}; + int m_frameCounter{0}, m_callbacksCounter{0}, m_samplesCounter{0}; QElapsedTimer m_statsTimer; int m_redrawTimerId; From 0efd4713bd65e4e53d26984bfdefea2a6e9f907e Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Tue, 17 Sep 2019 21:15:04 +0200 Subject: [PATCH 2/3] Added .travis.yml --- .travis.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b86e2d0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,31 @@ + +language: cpp +os: linux +sudo: false +dist: trusty +compiler: + - gcc + - clang + +cache: + directories: + - ~/.ccache + - qt5 + +install: + - mkdir -p qt5 + - if [ ! -d qt5/.git ] ; then rm qt5 -Rf ; git clone --branch=5.12.5 git://code.qt.io/qt/qt5.git ; fi + - pushd qt5 + - if [ ! -d qtbase/.git ] ; then perl init-repository --module-subset=qtbase,qtimageformats,qtmultimedia,qttools ; fi + - if [ ! -f config.summary ] ; then ./configure -prefix `pwd`/build -opensource -confirm-license -nomake examples -nomake tests ; fi + - if [ ! -d build ] ; then make -j2 > /dev/null && make install ; fi + - popd + - ccache -s + +script: + - mkdir -p build + - pushd build + - ../qt5/build/bin/qmake CONFIG+=ccache .. -config release + - make -j2 + - make install + - popd From 9c573faba15001488b8c8a32ea2844f2a6216f63 Mon Sep 17 00:00:00 2001 From: Daniel Brunner Date: Tue, 17 Sep 2019 21:56:57 +0200 Subject: [PATCH 3/3] qt 5.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit edit on phone 🤣 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b86e2d0..e7a3db6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: install: - mkdir -p qt5 - - if [ ! -d qt5/.git ] ; then rm qt5 -Rf ; git clone --branch=5.12.5 git://code.qt.io/qt/qt5.git ; fi + - if [ ! -d qt5/.git ] ; then rm qt5 -Rf ; git clone --branch=5.10 git://code.qt.io/qt/qt5.git ; fi - pushd qt5 - if [ ! -d qtbase/.git ] ; then perl init-repository --module-subset=qtbase,qtimageformats,qtmultimedia,qttools ; fi - if [ ! -f config.summary ] ; then ./configure -prefix `pwd`/build -opensource -confirm-license -nomake examples -nomake tests ; fi