simple-carla 2.1.1__tar.gz → 2.1.2__tar.gz

{simple_carla-2.1.1 → simple_carla-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_carla
-Version: 2.1.1
+Version: 2.1.2
 Summary: An easy-to-use, object-oriented interface to the carla plugin host.
 Author-email: Leon Dionne <ldionne@dridesign.sh.cn>
 Description-Content-Type: text/markdown

{simple_carla-2.1.1 → simple_carla-2.1.2}/pyproject.toml

@@ -18,7 +18,7 @@ build-backend = "flit_core.buildapi"
 sc-plugin-def = "simple_carla.scripts.sc_plugin_def:main"
 
 [bumpver]
-current_version = "2.1.1"
+current_version = "2.1.2"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "Bump version {old_version} -> {new_version}"
 commit = true

{simple_carla-2.1.1 → simple_carla-2.1.2}/simple_carla/__init__.py

@@ -240,7 +240,7 @@ from carla_backend import (
 )
 
 
-__version__ = "2.1.1"
+__version__ = "2.1.2"
 
 
 # -------------------------------------------------------------------

{simple_carla-2.1.1 → simple_carla-2.1.2}/tests/qt_carla.py

@@ -3,10 +3,7 @@
 #  Copyright 2024 liyang <liyang@veronica>
 #
 import logging
-from time import sleep
-from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QApplication
-from PyQt5.QtWidgets import QMainWindow
+from PyQt5.QtCore import Qt, QCoreApplication, QObject, pyqtSignal, pyqtSlot, QTimer
 from simple_carla import Plugin, PatchbayPort
 from simple_carla.qt import CarlaQt, QtPlugin
 
@@ -14,22 +11,24 @@ from simple_carla.qt import CarlaQt, QtPlugin
 APPLICATION_NAME = 'qt_carla'
 
 
-class TestApp(QMainWindow):
+class TestApp(QObject):
 
-	def __init__(self):
-		super().__init__()
-		self.ready = False
-		carla = CarlaQt(APPLICATION_NAME)
-		carla.sig_engine_started.connect(self.carla_started)
-		carla.sig_engine_stopped.connect(self.carla_stopped)
+	sig_finished = pyqtSignal()
+
+	def run(self):
+		carla = CarlaQt('carla')
+		for src, tgt in [
+			(carla.sig_engine_started, self.slot_engine_started),
+			(carla.sig_engine_stopped, self.slot_engine_stopped)
+		]: src.connect(tgt, type = Qt.QueuedConnection)
 		if not carla.engine_init():
-			audioError = carla.get_last_error()
-			if audioError:
-				raise Exception("Could not connect to JACK; possible reasons:\n%s" % audioError)
-			raise Exception('Could not connect to JACK')
+			audio_error = carla.get_last_error()
+			if audio_error:
+				raise RuntimeError(f'Could not start carla; possible reasons:\n{audio_error}')
+			raise RuntimeError('Could not start carla')
 
 	@pyqtSlot(int, int, int, int, float, str)
-	def carla_started(self, plugin_count, process_mode, transport_mode, buffer_size, sample_rate, driver_name):
+	def slot_engine_started(self, *_):
 		logging.debug('======= Engine started ======== ')
 		self.meter = EBUMeter()
 		self.meter.sig_ready.connect(self.meter_ready)
@@ -37,7 +36,7 @@ class TestApp(QMainWindow):
 		self.meter.add_to_carla()
 
 	@pyqtSlot()
-	def carla_stopped(self):
+	def slot_engine_stopped(self):
 		logging.debug('======= Engine stopped ========')
 
 	@pyqtSlot(Plugin)
@@ -49,13 +48,11 @@ class TestApp(QMainWindow):
 	@pyqtSlot(PatchbayPort, PatchbayPort, bool)
 	def meter_connect(self, self_port, other_port, state):
 		logging.debug('Received sig_connection_change: %s to %s: %s', self_port, other_port, state)
-		self.close()
+		self.finish()
 
-	def closeEvent(self, event):
-		logging.debug('Closing');
+	def finish(self):
 		CarlaQt.instance.delete()
-		event.accept()
-
+		self.sig_finished.emit()
 
 
 class EBUMeter(QtPlugin):
@@ -86,12 +83,12 @@ if __name__ == "__main__":
 		level = logging.DEBUG,
 		format = "[%(filename)24s:%(lineno)-4d] %(message)s"
 	)
-	app = QApplication([])
-	main_window = TestApp()
-	main_window.show()
-	logging.debug('Done')
+	app = QCoreApplication([])
+	tester = TestApp(app)
+	tester.sig_finished.connect(app.quit)
+	QTimer.singleShot(0, tester.run)
 	app.exec()
-
+	logging.debug('Done')
 
 
 #  end simple_carla/tests/qt_carla.py