slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GStreamer: cleanup system includes.

Browse Source 
Replaced some linux includes with <private/qcore_unix_p.h> to be more
portable.
Use qt_safe_open() and qt_safe_close() instead of ::open() and
::close().

Task-number: QTBUG-38061
Change-Id: Idb3f50d070ec1701cafba98e79e2e85824653a3a
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes
2014-04-03 15:17:49 +02:00
committed by The Qt Project
parent b0c68a1a07
commit d3ba2d6f3f
9 changed files with 12 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gsttools/gsttools.pro
View File

@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = qgsttools_p
QPRO_PWD = $$PWD
QT = core multimedia-private gui-private
QT = core-private multimedia-private gui-private
!static:DEFINES += QT_MAKEDLL

15
src/gsttools/qgstreamervideoinputdevicecontrol.cpp
View File

@@ -44,16 +44,7 @@
#include <QtCore/QDir>
#include <QtCore/QDebug>
#include <linux/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
#include <sys/poll.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <private/qcore_unix_p.h>
#include <linux/videodev2.h>
QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent)
@@ -135,7 +126,7 @@ void QGstreamerVideoInputDeviceControl::update()
foreach( const QFileInfo &entryInfo, entries ) {
//qDebug() << "Try" << entryInfo.filePath();
int fd = ::open(entryInfo.filePath().toLatin1().constData(), O_RDWR );
int fd = qt_safe_open(entryInfo.filePath().toLatin1().constData(), O_RDWR );
if (fd == -1)
continue;
@@ -165,6 +156,6 @@ void QGstreamerVideoInputDeviceControl::update()
m_names.append(entryInfo.filePath());
m_descriptions.append(name);
}
::close(fd);
qt_safe_close(fd);
}
}