diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-14 10:47:40 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-23 13:23:28 +0000 |
commit | e275299e9aef84fd9ab8401fba54b34873a43af2 (patch) | |
tree | 6f902f727963acef874a479ed2dd213fcb501e7a /examples/multimedia/camera | |
parent | 72fff9728579b60643282bf7ccba5659975ca052 (diff) |
PySide6/QtMultiMedia: Adapt to API recent changes
Build against qtmultimedia/a6e014eb088cb9b7bf55bf87c814e75cd4037dc2:
- Re-add QAudioInput, QAudioOutput,
qtmultimedia/9fd208f11a218d8a8b07fc525258eea3b3596d62
- Rename QCameraImageCapture to QImageCapture,
qtmultimedia/83a031c56b74d68fe6d349f78c48a1681e40374e
- Remove QImageEncoderSettings,
qtmultimedia/d58d93b8e45b2bf62221b104914df771849c007c
- Remove QMediaEncoderSettings,
qtmultimedia/9c309ede2feb598908b1476062b79d0d23759bf3
- Changes around QMediaEncoder,
qtmultimedia/fde5d6f7cce6118cac4ce7b92cd056225737917f
qtmultimedia/994bcb23af8399485ddfdd16d2ba34c20326b432
- Comment out QMediaPlaylist,
qtmultimedia/5773f7214c7430a98dea3974c0597cb3ee0ea7f5
Pick-to: 6.1
Change-Id: I9beb96c34ebe6132ad68e3628fcbbf0bc48127ef
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'examples/multimedia/camera')
-rw-r--r-- | examples/multimedia/camera/camera.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/multimedia/camera/camera.py b/examples/multimedia/camera/camera.py index cd1a460a0..c3cfe5384 100644 --- a/examples/multimedia/camera/camera.py +++ b/examples/multimedia/camera/camera.py @@ -48,7 +48,7 @@ from PySide6.QtGui import QAction, QGuiApplication, QDesktopServices, QIcon from PySide6.QtGui import QImage, QPixmap from PySide6.QtWidgets import (QApplication, QHBoxLayout, QLabel, QMainWindow, QPushButton, QTabWidget, QToolBar, QVBoxLayout, QWidget) -from PySide6.QtMultimedia import (QCamera, QCameraImageCapture, +from PySide6.QtMultimedia import (QCamera, QImageCapture, QCameraDevice, QMediaCaptureSession, QMediaDevices) from PySide6.QtMultimediaWidgets import QVideoWidget @@ -104,7 +104,7 @@ class MainWindow(QMainWindow): self._camera_info = available_cameras[0] self._camera = QCamera(self._camera_info) self._camera.errorOccurred.connect(self._camera_error) - self._image_capture = QCameraImageCapture(self._camera) + self._image_capture = QImageCapture(self._camera) self._image_capture.imageCaptured.connect(self.image_captured) self._image_capture.imageSaved.connect(self.image_saved) self._image_capture.errorOccurred.connect(self._capture_error) @@ -141,7 +141,7 @@ class MainWindow(QMainWindow): self._camera_viewfinder = QVideoWidget() self._tab_widget.addTab(self._camera_viewfinder, "Viewfinder") - if self._camera and self._camera.status() != QCamera.UnavailableStatus: + if self._camera and self._camera.error() == QCamera.NoError: name = self._camera_info.description() self.setWindowTitle(f"PySide6 Camera Example ({name})") self.show_status_message(f"Starting: '{name}'") @@ -158,7 +158,7 @@ class MainWindow(QMainWindow): self.statusBar().showMessage(message, 5000) def closeEvent(self, event): - if self._camera and self._camera.status() == QCamera.ActiveStatus: + if self._camera and self._camera.isActive(): self._camera.stop() event.accept() @@ -190,7 +190,7 @@ class MainWindow(QMainWindow): self._tab_widget.addTab(image_view, f"Capture #{index}") self._tab_widget.setCurrentIndex(index) - @Slot(int, QCameraImageCapture.Error, str) + @Slot(int, QImageCapture.Error, str) def _capture_error(self, id, error, error_string): print(error_string, file=sys.stderr) self.show_status_message(error_string) |