Fix some compiler warnings.
As it turns out, we had an overloaded virtual from an earlier era, with the extra parameter never used. So cleaning that up was a bonus to remove the compiler warning. Change-Id: I780287f8a5d2b0a1ec84ec62c88ba50e051f372b Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
committed by
Qt by Nokia
parent
bd9484ddca
commit
4f38f950b0
@@ -70,8 +70,7 @@ public:
|
||||
QList<QVideoFrame::PixelFormat> supportedPixelFormats(
|
||||
QAbstractVideoBuffer::HandleType handleType) const;
|
||||
|
||||
bool isFormatSupported(
|
||||
const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const;
|
||||
bool isFormatSupported(const QVideoSurfaceFormat &format) const;
|
||||
|
||||
QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format);
|
||||
void stop();
|
||||
@@ -117,8 +116,7 @@ QList<QVideoFrame::PixelFormat> QVideoSurfaceGenericPainter::supportedPixelForma
|
||||
return QList<QVideoFrame::PixelFormat>();
|
||||
}
|
||||
|
||||
bool QVideoSurfaceGenericPainter::isFormatSupported(
|
||||
const QVideoSurfaceFormat &format, QVideoSurfaceFormat *) const
|
||||
bool QVideoSurfaceGenericPainter::isFormatSupported(const QVideoSurfaceFormat &format) const
|
||||
{
|
||||
switch (format.handleType()) {
|
||||
case QAbstractVideoBuffer::QPixmapHandle:
|
||||
@@ -246,8 +244,7 @@ public:
|
||||
QList<QVideoFrame::PixelFormat> supportedPixelFormats(
|
||||
QAbstractVideoBuffer::HandleType handleType) const;
|
||||
|
||||
bool isFormatSupported(
|
||||
const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const;
|
||||
bool isFormatSupported(const QVideoSurfaceFormat &format) const;
|
||||
|
||||
QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame);
|
||||
|
||||
@@ -327,8 +324,7 @@ QList<QVideoFrame::PixelFormat> QVideoSurfaceGLPainter::supportedPixelFormats(
|
||||
return QList<QVideoFrame::PixelFormat>();
|
||||
}
|
||||
|
||||
bool QVideoSurfaceGLPainter::isFormatSupported(
|
||||
const QVideoSurfaceFormat &format, QVideoSurfaceFormat *) const
|
||||
bool QVideoSurfaceGLPainter::isFormatSupported(const QVideoSurfaceFormat &format) const
|
||||
{
|
||||
if (format.frameSize().isEmpty()) {
|
||||
return false;
|
||||
@@ -1349,13 +1345,12 @@ QList<QVideoFrame::PixelFormat> QPainterVideoSurface::supportedPixelFormats(
|
||||
|
||||
/*!
|
||||
*/
|
||||
bool QPainterVideoSurface::isFormatSupported(
|
||||
const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const
|
||||
bool QPainterVideoSurface::isFormatSupported(const QVideoSurfaceFormat &format) const
|
||||
{
|
||||
if (!m_painter)
|
||||
const_cast<QPainterVideoSurface *>(this)->createPainter();
|
||||
|
||||
return m_painter->isFormatSupported(format, similar);
|
||||
return m_painter->isFormatSupported(format);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
@@ -97,8 +97,7 @@ QList<QVideoFrame::PixelFormat> QVideoSurfaceCoreGraphicsPainter::supportedPixel
|
||||
: QList<QVideoFrame::PixelFormat>();
|
||||
}
|
||||
|
||||
bool QVideoSurfaceCoreGraphicsPainter::isFormatSupported(
|
||||
const QVideoSurfaceFormat &format, QVideoSurfaceFormat *) const
|
||||
bool QVideoSurfaceCoreGraphicsPainter::isFormatSupported(const QVideoSurfaceFormat &format) const
|
||||
{
|
||||
return m_supportedHandles.contains(format.handleType())
|
||||
&& m_imagePixelFormats.contains(format.pixelFormat())
|
||||
|
||||
@@ -73,8 +73,7 @@ public:
|
||||
QList<QVideoFrame::PixelFormat> supportedPixelFormats(
|
||||
QAbstractVideoBuffer::HandleType handleType) const;
|
||||
|
||||
bool isFormatSupported(
|
||||
const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const;
|
||||
bool isFormatSupported(const QVideoSurfaceFormat &format) const;
|
||||
|
||||
QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format);
|
||||
void stop();
|
||||
|
||||
@@ -82,8 +82,7 @@ public:
|
||||
virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(
|
||||
QAbstractVideoBuffer::HandleType handleType) const = 0;
|
||||
|
||||
virtual bool isFormatSupported(
|
||||
const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar) const = 0;
|
||||
virtual bool isFormatSupported(const QVideoSurfaceFormat &format) const = 0;
|
||||
|
||||
virtual QAbstractVideoSurface::Error start(const QVideoSurfaceFormat &format) = 0;
|
||||
virtual void stop() = 0;
|
||||
@@ -108,8 +107,7 @@ public:
|
||||
QList<QVideoFrame::PixelFormat> supportedPixelFormats(
|
||||
QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const;
|
||||
|
||||
bool isFormatSupported(
|
||||
const QVideoSurfaceFormat &format, QVideoSurfaceFormat *similar = 0) const;
|
||||
bool isFormatSupported(const QVideoSurfaceFormat &format) const;
|
||||
|
||||
bool start(const QVideoSurfaceFormat &format);
|
||||
void stop();
|
||||
|
||||
@@ -471,7 +471,7 @@ qint64 QPulseAudioInput::read(char *data, qint64 len)
|
||||
if (m_pullMode) {
|
||||
actualLength = m_audioSource->write(static_cast<const char *>(audioBuffer), readLength);
|
||||
|
||||
if (actualLength < readLength) {
|
||||
if (actualLength < qint64(readLength)) {
|
||||
pa_threaded_mainloop_unlock(pulseEngine->mainloop());
|
||||
|
||||
m_errorState = QAudio::UnderrunError;
|
||||
@@ -489,7 +489,7 @@ qint64 QPulseAudioInput::read(char *data, qint64 len)
|
||||
qDebug() << "QPulseAudioInput::read -- wrote " << actualLength << " to client";
|
||||
#endif
|
||||
|
||||
if (actualLength < readLength) {
|
||||
if (actualLength < qint64(readLength)) {
|
||||
#ifdef DEBUG_PULSE
|
||||
qDebug() << "QPulseAudioInput::read -- appending " << readLength - actualLength << " bytes of data to temp buffer";
|
||||
#endif
|
||||
|
||||
@@ -401,6 +401,8 @@ void QT7MovieRenderer::setMovie(void *movie)
|
||||
|
||||
setupVideoOutput();
|
||||
}
|
||||
#else
|
||||
Q_UNUSED(movie);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user