StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor(avform): fixed type conversion warnings and coding style

Browse Source
This commit is contained in:
Nils Fenner 2016-07-14 10:54:35 +02:00
parent 0b2dfc0305
commit da94b4b83f
No known key found for this signature in database
GPG Key ID: 9591A163FF9BE04C
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/widget/form/settings/avform.cpp
View File

@ -38,8 +38,8 @@
#define ALC_ALL_DEVICES_SPECIFIER ALC_DEVICE_SPECIFIER
#endif
AVForm::AVForm() :
GenericForm(QPixmap(":/img/settings/av.png"))
AVForm::AVForm()
: GenericForm(QPixmap(":/img/settings/av.png"))
, subscribedToAudioIn(false)
, camVideoSurface(nullptr)
, camera(CameraSource::getInstance())
@ -69,8 +69,7 @@ AVForm::AVForm() :
microphoneSlider->setToolTip(
tr("Use slider to set the gain of your input device ranging"
" from %1dB to %2dB.")
.arg(audio.minInputGain())
" from %1dB to %2dB.").arg(audio.minInputGain())
.arg(audio.maxInputGain()));
microphoneSlider->setMinimum(qRound(audio.minInputGain()) * 10);
microphoneSlider->setMaximum(qRound(audio.maxInputGain()) * 10);
@ -136,7 +135,7 @@ void AVForm::open(const QString &devName, const VideoMode &mode)
{
QRect rect = mode.toRect();
Settings::getInstance().setCamVideoRes(rect);
Settings::getInstance().setCamVideoFPS(mode.FPS);
Settings::getInstance().setCamVideoFPS(static_cast<quint16>(mode.FPS));
camera.open(devName, mode);
}
@ -244,7 +243,7 @@ void AVForm::selectBestModes(QVector<VideoMode> &allVideoModes)
}
bool better = CameraDevice::betterPixelFormat(mode.pixel_format, best.pixel_format);
if (mode.FPS == best.FPS && better)
if (mode.FPS >= best.FPS && better)
bestModeInds[res] = i;
}
}
@ -291,14 +290,14 @@ void AVForm::fillCameraModesComboBox()
int AVForm::searchPreferredIndex()
{
QRect prefRes = Settings::getInstance().getCamVideoRes();
unsigned short prefFPS = Settings::getInstance().getCamVideoFPS();
quint16 prefFPS = Settings::getInstance().getCamVideoFPS();
for (int i = 0; i < videoModes.size(); i++)
{
VideoMode mode = videoModes[i];
if (mode.width == prefRes.width()
&& mode.height == prefRes.height()
&& mode.FPS == prefFPS)
&& static_cast<quint16>(mode.FPS) == prefFPS)
return i;
}
@ -314,7 +313,9 @@ void AVForm::fillScreenModesComboBox()
{
VideoMode mode = videoModes[i];
QString pixelFormat = CameraDevice::getPixelFormatString(mode.pixel_format);
qDebug("%dx%d+%d,%d FPS: %f, pixel format: %s\n", mode.width, mode.height, mode.x, mode.y, mode.FPS, pixelFormat.toStdString().c_str());
qDebug("%dx%d+%d,%d FPS: %f, pixel format: %s\n", mode.width,
mode.height, mode.x, mode.y, mode.FPS,
pixelFormat.toStdString().c_str());
QString name;
if (mode.width && mode.height)
@ -544,7 +545,8 @@ void AVForm::killVideoSurface()
bool AVForm::eventFilter(QObject *o, QEvent *e)
{
if ((e->type() == QEvent::Wheel) &&
(qobject_cast<QComboBox*>(o) || qobject_cast<QAbstractSpinBox*>(o) || qobject_cast<QSlider*>(o)))
(qobject_cast<QComboBox*>(o) || qobject_cast<QAbstractSpinBox*>(o) ||
qobject_cast<QSlider*>(o)))
{
e->ignore();
return true;

7
src/widget/tool/micfeedbackwidget.cpp
View File

@ -48,12 +48,12 @@ void MicFeedbackWidget::paintEvent(QPaintEvent*)
path.addRoundedRect(gradientRect, 2.0, 2.0);
painter.fillPath(path, gradient);
float slice = w / 5.f;
int padding = slice / 2;
const float slice = w / 5.f;
const int padding = qRound(slice / 2);
for (int i = 0; i < 5; ++i)
{
float pos = slice * i + padding;
int pos = qRound(slice * i + padding);
painter.drawLine(pos, 2, pos, h - 4);
}
}
@ -77,6 +77,7 @@ void MicFeedbackWidget::hideEvent(QHideEvent*)
void MicFeedbackWidget::onGainMetered(qreal value)
{
Q_UNUSED(value);
#if 0
current = value;
update();