From d77cb084d6ea6d27c96b112d4e7d41ac21b00a29 Mon Sep 17 00:00:00 2001 From: Diadlo Date: Fri, 5 May 2017 14:50:09 +0300 Subject: [PATCH] refactor: Remove unused MicFeedback widget --- CMakeLists.txt | 2 - src/widget/tool/micfeedbackwidget.cpp | 86 --------------------------- src/widget/tool/micfeedbackwidget.h | 46 -------------- 3 files changed, 134 deletions(-) delete mode 100644 src/widget/tool/micfeedbackwidget.cpp delete mode 100644 src/widget/tool/micfeedbackwidget.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 91dd39c5c..8164b4ab5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -409,8 +409,6 @@ set(${PROJECT_NAME}_SOURCES src/widget/tool/flyoutoverlaywidget.h src/widget/tool/friendrequestdialog.cpp src/widget/tool/friendrequestdialog.h - src/widget/tool/micfeedbackwidget.cpp - src/widget/tool/micfeedbackwidget.h src/widget/tool/movablewidget.cpp src/widget/tool/movablewidget.h src/widget/tool/profileimporter.cpp diff --git a/src/widget/tool/micfeedbackwidget.cpp b/src/widget/tool/micfeedbackwidget.cpp deleted file mode 100644 index 20712e429..000000000 --- a/src/widget/tool/micfeedbackwidget.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - Copyright © 2015 by The qTox Project Contributors - - This file is part of qTox, a Qt-based graphical interface for Tox. - - qTox is libre software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - qTox is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with qTox. If not, see . -*/ - -#include "micfeedbackwidget.h" -#include "src/audio/audio.h" -#include -#include - -MicFeedbackWidget::MicFeedbackWidget(QWidget* parent) - : QWidget(parent) - , mMeterListener(nullptr) -{ - setFixedHeight(20); -} - -void MicFeedbackWidget::paintEvent(QPaintEvent*) -{ - const int w = width(); - const int h = height(); - QPainter painter(this); - painter.setPen(QPen(Qt::gray)); - painter.drawRoundedRect(QRect(0, 0, w - 1, h - 1), 3., 3.); - - int gradientWidth = qMax(0, qRound(w * current) - 4); - - QRect gradientRect(2, 2, gradientWidth, h - 4); - - QPainterPath path; - QLinearGradient gradient(0, 0, w, 0); - gradient.setColorAt(0.0, Qt::green); - gradient.setColorAt(0.5, Qt::yellow); - gradient.setColorAt(1.0, Qt::red); - path.addRoundedRect(gradientRect, 2.0, 2.0); - painter.fillPath(path, gradient); - - const float slice = w / 5.f; - const int padding = qRound(slice / 2); - - for (int i = 0; i < 5; ++i) { - int pos = qRound(slice * i + padding); - painter.drawLine(pos, 2, pos, h - 4); - } -} - -void MicFeedbackWidget::showEvent(QShowEvent*) -{ -#if 0 - mMeterListener = Audio::getInstance().createAudioMeterListener(); - connect(mMeterListener, &AudioMeterListener::gainChanged, - this, &MicFeedbackWidget::onGainMetered); - mMeterListener->start(); -#endif -} - -void MicFeedbackWidget::hideEvent(QHideEvent*) -{ -#if 0 - mMeterListener->stop(); -#endif -} - -void MicFeedbackWidget::onGainMetered(qreal value) -{ - Q_UNUSED(value); -#if 0 - current = value; - update(); - mMeterListener->processed(); -#endif -} diff --git a/src/widget/tool/micfeedbackwidget.h b/src/widget/tool/micfeedbackwidget.h deleted file mode 100644 index 211dfdca4..000000000 --- a/src/widget/tool/micfeedbackwidget.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - Copyright © 2015 by The qTox Project Contributors - - This file is part of qTox, a Qt-based graphical interface for Tox. - - qTox is libre software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - qTox is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with qTox. If not, see . -*/ - -#ifndef MICFEEDBACKWIDGET_H -#define MICFEEDBACKWIDGET_H - -#include - -class AudioMeterListener; - -class MicFeedbackWidget : public QWidget -{ - Q_OBJECT -public: - explicit MicFeedbackWidget(QWidget* parent = 0); - -protected: - void paintEvent(QPaintEvent* event) override; - void showEvent(QShowEvent* event) override; - void hideEvent(QHideEvent* event) override; - -private slots: - void onGainMetered(qreal value); - -private: - qreal current; - AudioMeterListener* mMeterListener; -}; - -#endif // MICFEEDBACKWIDGET_H