diff options
Diffstat (limited to 'src/plugins')
7 files changed, 8 insertions, 76 deletions
diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp index 3085d1391..e6d24216f 100644 --- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp +++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecoderserviceplugin.cpp @@ -49,19 +49,6 @@ #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 <linux/videodev2.h> -#include <gst/gst.h> - // #define QT_SUPPORTEDMIMETYPES_DEBUG QMediaService* QGstreamerAudioDecoderServicePlugin::create(const QString &key) diff --git a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp index c84ebc41a..2ba9b07e8 100644 --- a/src/plugins/gstreamer/camerabin/camerabincontrol.cpp +++ b/src/plugins/gstreamer/camerabin/camerabincontrol.cpp @@ -50,18 +50,6 @@ #include <QtCore/qfile.h> #include <QtCore/qmetaobject.h> -#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 <linux/videodev2.h> - QT_BEGIN_NAMESPACE //#define CAMEABIN_DEBUG 1 diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp index 37641b001..3decd6070 100644 --- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp @@ -50,18 +50,8 @@ #include "camerabinservice.h" #include <private/qgstutils_p.h> -#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> -#include <gst/gst.h> QT_BEGIN_NAMESPACE @@ -148,7 +138,7 @@ void CameraBinServicePlugin::updateDevices() const QFileInfoList entries = devDir.entryInfoList(QStringList() << "video*"); foreach (const QFileInfo &entryInfo, entries) { - int fd = ::open(entryInfo.filePath().toLatin1().constData(), O_RDWR ); + int fd = qt_safe_open(entryInfo.filePath().toLatin1().constData(), O_RDWR ); if (fd == -1) continue; @@ -178,7 +168,7 @@ void CameraBinServicePlugin::updateDevices() const m_cameraDevices.append(entryInfo.filePath().toLocal8Bit()); m_cameraDescriptions.append(name); } - ::close(fd); + qt_safe_close(fd); } if (!m_cameraDevices.isEmpty()) diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri index 98e427d71..8b421b8d1 100644 --- a/src/plugins/gstreamer/common.pri +++ b/src/plugins/gstreamer/common.pri @@ -1,5 +1,5 @@ -QT += multimedia-private network +QT += core-private multimedia-private network CONFIG += no_private_qt_headers_warning qtHaveModule(widgets) { diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp index 657b9806f..8b88fbb71 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp @@ -51,18 +51,8 @@ #include "qgstreamercaptureservice.h" #include <private/qgstutils_p.h> -#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> -#include <gst/gst.h> QMediaService* QGstreamerCaptureServicePlugin::create(const QString &key) { @@ -155,7 +145,7 @@ void QGstreamerCaptureServicePlugin::updateDevices() const 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; @@ -185,7 +175,7 @@ void QGstreamerCaptureServicePlugin::updateDevices() const m_cameraDevices.append(entryInfo.filePath().toLocal8Bit()); m_cameraDescriptions.append(name); } - ::close(fd); + qt_safe_close(fd); } if (!m_cameraDevices.isEmpty()) diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp index b618ab997..450bc51ea 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp @@ -44,16 +44,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qfile.h> -#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> QT_BEGIN_NAMESPACE diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp index b2ad24899..a9052ca4b 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp @@ -51,20 +51,6 @@ #include "qgstreamerplayerservice.h" #include <private/qgstutils_p.h> -#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 <linux/videodev2.h> -#include <gst/gst.h> - - QMediaService* QGstreamerPlayerServicePlugin::create(const QString &key) { QGstUtils::initializeGst(); |