kitbash 1.5.1__tar.gz → 1.7.0__tar.gz

{kitbash-1.5.1 → kitbash-1.7.0}/PKG-INFO

@@ -1,18 +1,16 @@
 Metadata-Version: 2.1
 Name: kitbash
-Version: 1.5.1
+Version: 1.7.0
 Summary: Provides universal settings, styles, cached icons, and pixmaps, and the base
 Author-email: Leon Dionne <ldionne@dridesign.sh.cn>
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+Requires-Dist: log_soso >= 1.0.3
 Requires-Dist: PyQt5
-Requires-Dist: conn_jack >= 1.2.0, <= 1.3.0
-Requires-Dist: liquiphy
-Requires-Dist: soundfile
-Requires-Dist: sfzen >= 2.2.0
-Requires-Dist: midi_notes >= 1.1.0
-Requires-Dist: recent_items_list >= 1.1.1
-Requires-Dist: soso_qt_extras >= 1.2.0
+Requires-Dist: qt_liquid_pool >= 1.2.0
+Requires-Dist: recent_items_list >= 1.1.2
+Requires-Dist: sfzen >= 2.3.1
+Requires-Dist: soso_qt_extras >= 1.7.0
 Project-URL: Home, https://github.com/Zen-Master-SoSo/kitbash
 
 # KitBash

{kitbash-1.5.1 → kitbash-1.7.0}/kitbash/__init__.py

@@ -28,14 +28,14 @@ from functools import lru_cache
 from PyQt5.QtCore import QSettings
 from PyQt5.QtWidgets import QApplication, QSplitter
 from qt_extras import DevilBox
-from conn_jack import JackConnectError
 
-__version__ = "1.5.1"
+__version__ = "1.7.0"
 
 APPLICATION_NAME			= "kitbash"
 PACKAGE_DIR					= dirname(__file__)
 DEFAULT_STYLE				= 'system'
 AUDIO_ICON_SIZE				= 16
+KEY_PREVIEW_VELOCITY		= 'PreviewVelocity'
 KEY_STYLE					= 'Style'
 KEY_SAMPLES_MODE			= 'KitSaveDialog/SamplesMode'
 KEY_RECENT_DRUMKIT_FOLDER	= 'RecentDrumkitFolder'
@@ -44,8 +44,16 @@ KEY_RECENT_PROJECT_FOLDER	= 'RecentProjectFolder'
 KEY_RECENT_PROJECTS			= 'RecentProjects'
 KEY_SAMPLE_XPLORE_ROOT		= 'SampleExplorer/Root'
 KEY_SAMPLE_XPLORE_CURR		= 'SampleExplorer/Current'
+KEY_MIDI_SOURCE				= 'MIDISource'
+KEY_AUDIO_SINK				= 'AudioSink'
 
 
+def audio():
+	if not hasattr(audio, 'instance'):
+		from kitbash.jack_audio import Audio
+		audio.instance = Audio()
+	return audio.instance
+
 @lru_cache
 def __settings():
 	return QSettings('ZenSoSo', APPLICATION_NAME)

{kitbash-1.5.1 → kitbash-1.7.0}/kitbash/__main__.py

@@ -22,9 +22,8 @@ kitbash is a program you can use to combine parts of various SFZ files into a
 new SFZ with instruments "borrowed" from the originals.
 """
 import sys, os, argparse, logging
-from PyQt5.QtWidgets import QApplication
-from qt_extras import DevilBox
-from conn_jack import JackConnectError
+from PyQt5.QtWidgets import QApplication, QErrorMessage
+from qt_extras import exceptions_hook
 from kitbash.gui.main_window import MainWindow
 
 
@@ -61,11 +60,8 @@ def main():
 	#-----------------------------------------------------------------------
 
 	app = QApplication([])
-	try:
-		main_window = MainWindow(options)
-	except JackConnectError:
-		DevilBox('Could not connect to JACK server. Is it running?')
-		sys.exit(1)
+	sys.excepthook = exceptions_hook
+	main_window = MainWindow(options)
 	main_window.show()
 	sys.exit(app.exec())
 

{kitbash-1.5.1 → kitbash-1.7.0}/kitbash/gui/drumkit_widget.py

@@ -29,7 +29,7 @@ from PyQt5.QtWidgets import (QApplication, QVBoxLayout, QHBoxLayout, QLabel,
 	QFrame, QSizePolicy, QPushButton, QCheckBox)
 from qt_extras import SigBlock
 from sfzen.drumkits import PercussionInstrument
-from kitbash import PACKAGE_DIR
+from kitbash import PACKAGE_DIR, KEY_PREVIEW_VELOCITY, get_setting, audio
 
 
 @lru_cache
@@ -64,9 +64,9 @@ class DrumkitWidget(QFrame):
 		self.sfz_filename = filename
 		self.moniker = basename(self.sfz_filename)
 		self.drumkit = None
-		self.port_number = None
-		self.initial_height = None
+		self.synth = None
 
+		self.initial_height = None
 		self.setSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.Preferred)
 
 		main_layout = QVBoxLayout()
@@ -130,6 +130,7 @@ class DrumkitWidget(QFrame):
 		Fills the groups and instruments of this the DrumkitWidget.
 		"""
 		self.drumkit = drumkit
+		self.synth = audio().create_synth(self.sfz_filename)
 		for group in self.drumkit.percussion_groups.values():
 			if group.is_empty():
 				continue
@@ -162,14 +163,21 @@ class DrumkitWidget(QFrame):
 		"""
 		Triggered by InstrumentButton mouse press.
 		"""
-		self.sig_note_on.emit(inst.pitch)
+		self.synth.noteon(
+			self.drumkit.midi_channel,
+			inst.pitch,
+			get_setting(KEY_PREVIEW_VELOCITY, 80, int)
+		)
 
 	@pyqtSlot(PercussionInstrument)
 	def slot_instrument_released(self, inst):
 		"""
 		Triggered by InstrumentButton mouse relase.
 		"""
-		self.sig_note_off.emit(inst.pitch)
+		self.synth.noteoff(
+			self.drumkit.midi_channel,
+			inst.pitch
+		)
 
 	@pyqtSlot(QPushButton)
 	def slot_instrument_toggled(self, button):
@@ -187,6 +195,7 @@ class DrumkitWidget(QFrame):
 		"""
 		Triggered by the "remove" button click event.
 		"""
+		audio().delete_synth(self.synth)
 		self.sig_remove_drumkit.emit(self)
 
 	@pyqtSlot(bool)

{kitbash-1.5.1 → kitbash-1.7.0}/kitbash/gui/kit_save_dialog.py

@@ -20,7 +20,6 @@
 """
 Provides KitSaveDialog.
 """
-import logging
 from os.path import realpath, splitext
 from functools import partial
 from PyQt5.QtCore import Qt, pyqtSlot, QCoreApplication

{kitbash-1.5.1 → kitbash-1.7.0}/kitbash/gui/main_window.py

@@ -31,18 +31,18 @@ from PyQt5.QtCore import Qt, QObject, pyqtSlot, QTimer, QThreadPool, QPoint, QCo
 from PyQt5.QtWidgets import (
 	QApplication, QMainWindow, QMessageBox, QFileDialog, QAction, QActionGroup, QMenu)
 from PyQt5.QtGui import QIcon
-from qt_extras import ShutUpQT, SigBlock, DevilBox
+from qt_extras import ShutUpQT, DevilBox
 from qt_extras.list_layout import VListLayout
 from recent_items_list import RecentItemsList
 from sfzen import SAMPLES_ABSPATH
 from sfzen.drumkits import Drumkit
 from kitbash import (
 	APPLICATION_NAME, PACKAGE_DIR, DEFAULT_STYLE,
-	styles, set_application_style, get_setting, set_setting, GeometrySaver,
-	KEY_STYLE, KEY_SAMPLES_MODE, KEY_RECENT_DRUMKIT_FOLDER, KEY_RECENT_DRUMKITS,
+	styles, set_application_style, get_setting, set_setting, GeometrySaver, audio,
+	KEY_PREVIEW_VELOCITY, KEY_STYLE, KEY_SAMPLES_MODE,
+	KEY_RECENT_DRUMKIT_FOLDER, KEY_RECENT_DRUMKITS,
 	KEY_RECENT_PROJECT_FOLDER, KEY_RECENT_PROJECTS)
 from kitbash.worker_threads import KitLoader, KitBasher
-from kitbash.jack_audio import Audio
 from kitbash.gui.drumkit_widget import DrumkitWidget
 from kitbash.gui.kit_save_dialog import KitSaveDialog
 
@@ -94,7 +94,18 @@ class MainWindow(QMainWindow, GeometrySaver):
 		# Setup background threadpool for KitLoader and KitBasher workers
 		self.background_threadpool = QThreadPool()
 		# Setup jack audio
-		self.audio = Audio()
+		self.audio = audio()
+		# Setup source/sink combo boxes:
+		self.cmb_midi_sources = self.audio.midi_in_combo_box(self)
+		self.lo_source_combo.replaceWidget(self.cmb_midi_src_placeholder, self.cmb_midi_sources)
+		self.cmb_midi_src_placeholder.setVisible(False)
+		self.cmb_midi_src_placeholder.deleteLater()
+		del self.cmb_midi_src_placeholder
+		self.cmb_audio_sinks = self.audio.audio_out_combo_box(self)
+		self.lo_sink_combo.replaceWidget(self.cmb_audio_sink_placeholder, self.cmb_audio_sinks)
+		self.cmb_audio_sink_placeholder.setVisible(False)
+		self.cmb_audio_sink_placeholder.deleteLater()
+		del self.cmb_audio_sink_placeholder
 		# Setup GUI elements
 		self.fill_style_menu()
 		self.setup_kits_area()
@@ -122,7 +133,7 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.action_save_project.triggered.connect(self.slot_save_project)
 		self.action_save_project_as.triggered.connect(self.slot_save_project_as)
 		self.action_save_bashed_kit.triggered.connect(self.slot_save_kit)
-		self.action_save_kit_as.triggered.connect(self.slot_save_kit_as)
+		self.action_save_bashed_kit_as.triggered.connect(self.slot_save_kit_as)
 		self.action_add_drumkit.triggered.connect(self.slot_add_drumkit)
 		self.action_remove_all_kits.triggered.connect(self.slot_remove_all_kits)
 		self.action_reload_style.triggered.connect(self.slot_reload_style)
@@ -137,14 +148,8 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.b_copy_path.clicked.connect(self.slot_copy_kit_path)
 		self.b_add_drumkit.clicked.connect(self.slot_add_drumkit)
 		self.b_xruns.clicked.connect(self.slot_xruns_clicked)
-		self.cmb_midi_srcs.currentTextChanged.connect(
-			self.audio.slot_midi_src_selected)
-		self.cmb_audio_sinks.currentTextChanged.connect(
-			self.audio.slot_audio_sink_selected)
-		self.audio.sig_sources_changed.connect(
-			self.slot_sources_changed)
-		self.audio.sig_sinks_changed.connect(
-			self.slot_sinks_changed)
+		self.spn_velocity.valueChanged.connect(self.slot_velocity_value_changed)
+		self.audio.sig_jack_ready.connect(self.slot_jack_ready)
 
 	def update_ui(self):
 		title = APPLICATION_NAME \
@@ -158,7 +163,11 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.action_new_project.setEnabled(has_kits)
 		self.action_save_project.setEnabled(has_kits and self.dirty)
 		self.action_save_project_as.setEnabled(has_kits)
-		self.action_save_bashed_kit.setEnabled(has_kits)
+		self.action_save_bashed_kit.setEnabled(has_kits and self.saved_sfz_filename is not None)
+		self.action_save_bashed_kit.setText(
+			'Save bashed kit' if self.saved_sfz_filename is None
+			else f'Save "{self.saved_sfz_filename}"')
+		self.action_save_bashed_kit_as.setEnabled(has_kits)
 		self.b_save_project.setEnabled(has_kits)
 		self.b_save_kit.setEnabled(has_kits)
 		self.b_copy_path.setVisible(bool(self.saved_sfz_filename))
@@ -218,7 +227,6 @@ class MainWindow(QMainWindow, GeometrySaver):
 		Starts project load; saves recent file name.
 		Permission to clear must already have been given.
 		"""
-		logging.debug('load_project %s', filename)
 		if exists(filename):
 			try:
 				with open(filename, 'r', encoding = 'utf-8') as fh:
@@ -251,18 +259,6 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.set_dirty(False)
 		self.statusbar.showMessage(f'Saved project at {self.project_filename}', MESSAGE_TIMEOUT)
 
-	def save_kit(self):
-		kit = self.bashed_kit.simplified()
-		kit.default_path = dirname(self.saved_sfz_filename)
-		try:
-			kit.save_as(self.saved_sfz_filename, self.saved_sfz_samples_mode)
-			logging.debug('Saved bashed SFZ at %s', self.saved_sfz_filename)
-			self.statusbar.showMessage(f'Saved {self.saved_sfz_filename}', MESSAGE_TIMEOUT)
-		except OSError as e:
-			DevilBox('Hardlinks between devices are not allowed.\n' +\
-				'Choose a different path or sample mode.' if e.errno == 18 \
-				else str(e))
-
 	def register_recent_project(self):
 		self.recent_projects.bump(self.project_filename)
 		set_setting(KEY_RECENT_PROJECT_FOLDER, dirname(self.project_filename))
@@ -332,41 +328,10 @@ class MainWindow(QMainWindow, GeometrySaver):
 	# -----------------------------------------------------------------
 	# JACK audio / source / sink management
 
-	@pyqtSlot(int)
-	def slot_jack_ready(self, samplerate):
-		self.lbl_jack_state.setText(f'JACK samplerate: {samplerate}')
-
-	@pyqtSlot()
-	def slot_jack_down(self):
-		self.lbl_jack_state.setText('JACK is down')
-
-	@pyqtSlot()
-	def slot_sources_changed(self):
-		with SigBlock(self.cmb_midi_srcs):
-			self.cmb_midi_srcs.clear()
-			self.cmb_midi_srcs.addItem('')
-			for port in self.audio.conn_man.output_ports():
-				if port.is_midi:
-					self.cmb_midi_srcs.addItem(port.name)
-			if self.audio.synth.connected_midi_src_port:
-				self.cmb_midi_srcs.setCurrentText(self.audio.midi_src)
-
-	@pyqtSlot()
-	def slot_sinks_changed(self):
-		with SigBlock(self.cmb_audio_sinks):
-			self.cmb_audio_sinks.clear()
-			self.cmb_audio_sinks.addItem('')
-			valid_clients = set(
-				port.client_name for port in self.audio.conn_man.input_ports()
-				if port.is_audio )
-			for client in valid_clients:
-				self.cmb_audio_sinks.addItem(client)
-			if self.audio.synth.connected_audio_sink_ports:
-				self.cmb_audio_sinks.setCurrentText(self.audio.audio_sink)
-
-	@pyqtSlot(str)
-	def slot_midi_connected(self, port_name):
-		self.statusbar.showMessage(f'Connected to "{port_name}"', MESSAGE_TIMEOUT)
+	@pyqtSlot(bool, int)
+	def slot_jack_ready(self, state, _):
+		if not state:
+			DevilBox('JACK is down')
 
 	# -----------------------------------------------------------------
 	# Drumkit load / delete / instrument selection
@@ -402,8 +367,6 @@ class MainWindow(QMainWindow, GeometrySaver):
 		"""
 		drumkit_widget.set_drumkit(drumkit)
 		drumkit_widget.sig_inst_toggle.connect(self.slot_inst_toggle)
-		drumkit_widget.sig_note_on.connect(self.slot_note_on)
-		drumkit_widget.sig_note_off.connect(self.slot_note_off)
 		drumkit_widget.sig_remove_drumkit.connect(self.slot_remove_drumkit)
 		if self.project_loading:
 			drumkit_widget.apply_selections(
@@ -468,26 +431,23 @@ class MainWindow(QMainWindow, GeometrySaver):
 		Triggered from KitBasher signal when bashing is finished.
 		"""
 		self.bashed_kit = bashed_kit
-		with open(self.tempfile, 'w') as fob:
-			self.bashed_kit.write(fob)
-		self.audio.synth.load(self.tempfile)	# pylint: disable = no-member
+		self.audio.load_kit(self.bashed_kit)
 		self.statusbar.showMessage('Drumkit updated', MESSAGE_TIMEOUT)
 
-	@pyqtSlot(int)
-	def slot_note_on(self, pitch):
-		self.audio.synth.noteon(0, pitch, self.spn_velocity.value())
-
-	@pyqtSlot(int)
-	def slot_note_off(self, pitch):
-		self.audio.synth.noteoff(0, pitch)
-
 	# -----------------------------------------------------------------
 	# UI handling slots:
 
+	@pyqtSlot(int)
+	def slot_velocity_value_changed(self, value):
+		"""
+		Triggered by spn_velocity.valueChanged
+		"""
+		set_setting(KEY_PREVIEW_VELOCITY, value)
+
 	@pyqtSlot()
 	def slot_xruns_clicked(self):
 		"""
-		Triggered by b_xruns.click()
+		Triggered by b_xruns.click
 		"""
 		self.base_xruns = self.current_xruns
 		self.b_xruns.setText('0')
@@ -616,15 +576,26 @@ class MainWindow(QMainWindow, GeometrySaver):
 	@pyqtSlot()
 	def slot_save_kit(self):
 		if self.saved_sfz_filename is None:
-			self.slot_save_kit_as()
+			return self.slot_save_kit_as()
+		try:
+			self.bashed_kit.save_as(
+				self.saved_sfz_filename, samples_mode = self.saved_sfz_samples_mode)
+		except OSError as e:
+			if e.errno == 18:
+				DevilBox('Hardlinks between devices are not allowed.\n' +
+					'Choose a different path or sample mode.')
+			elif e.errno == 2:
+				return self.slot_save_kit_as()
+			else:
+				DevilBox(str(e))
 		else:
-			self.save_kit()
+			self.statusbar.showMessage(f'Saved {self.saved_sfz_filename}', MESSAGE_TIMEOUT)
+			self.update_ui()
 
 	@pyqtSlot()
 	def slot_save_kit_as(self):
 		"""
 		Triggered by "File -> Save bashed kit" menu
-		See also: slot_drumkit_bashed
 		"""
 		dlg = KitSaveDialog(self,
 			int(get_setting(KEY_SAMPLES_MODE, SAMPLES_ABSPATH)) \
@@ -633,7 +604,7 @@ class MainWindow(QMainWindow, GeometrySaver):
 		if dlg.exec_() and dlg.selected_file:
 			self.saved_sfz_filename = dlg.selected_file
 			self.saved_sfz_samples_mode = dlg.samples_mode
-			self.save_kit()
+			self.slot_save_kit()
 
 	@pyqtSlot()
 	def slot_add_drumkit(self):

{kitbash-1.5.1 → kitbash-1.7.0}/kitbash/gui/main_window.ui

@@ -180,7 +180,7 @@
         </spacer>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="hz1">
+        <layout class="QHBoxLayout" name="lo_source_combo">
          <property name="spacing">
           <number>3</number>
          </property>
@@ -192,7 +192,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QComboBox" name="cmb_midi_srcs">
+          <widget class="QComboBox" name="cmb_midi_src_placeholder">
            <property name="toolTip">
             <string>Get MIDI input from this JACK client</string>
            </property>
@@ -204,7 +204,7 @@
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="hz2">
+        <layout class="QHBoxLayout" name="lo_sink_combo">
          <property name="spacing">
           <number>3</number>
          </property>
@@ -216,7 +216,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QComboBox" name="cmb_audio_sinks">
+          <widget class="QComboBox" name="cmb_audio_sink_placeholder">
            <property name="toolTip">
             <string>Send audio out to this JACK client</string>
            </property>
@@ -314,7 +314,7 @@
          <x>0</x>
          <y>0</y>
          <width>767</width>
-         <height>390</height>
+         <height>389</height>
         </rect>
        </property>
       </widget>
@@ -331,7 +331,7 @@
      <height>22</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu_File">
+   <widget class="QMenu" name="menu_file">
     <property name="title">
      <string>&amp;File</string>
     </property>
@@ -351,11 +351,11 @@
     <addaction name="menu_recent_project"/>
     <addaction name="separator"/>
     <addaction name="action_save_bashed_kit"/>
-    <addaction name="action_save_kit_as"/>
+    <addaction name="action_save_bashed_kit_as"/>
     <addaction name="separator"/>
     <addaction name="action_quit"/>
    </widget>
-   <widget class="QMenu" name="menu_View">
+   <widget class="QMenu" name="menu_view">
     <property name="title">
      <string>&amp;View</string>
     </property>
@@ -373,7 +373,7 @@
     <addaction name="menu_style"/>
     <addaction name="action_reload_style"/>
    </widget>
-   <widget class="QMenu" name="menu_Edit">
+   <widget class="QMenu" name="menu_edit">
     <property name="title">
      <string>&amp;Edit</string>
     </property>
@@ -391,9 +391,9 @@
     <addaction name="separator"/>
     <addaction name="action_remove_all_kits"/>
    </widget>
-   <addaction name="menu_File"/>
-   <addaction name="menu_Edit"/>
-   <addaction name="menu_View"/>
+   <addaction name="menu_file"/>
+   <addaction name="menu_edit"/>
+   <addaction name="menu_view"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <action name="action_add_drumkit">
@@ -537,7 +537,7 @@
     <string>Remove All Drumkits</string>
    </property>
   </action>
-  <action name="action_save_kit_as">
+  <action name="action_save_bashed_kit_as">
    <property name="text">
     <string>Save Bashed Kit &amp;As ...</string>
    </property>

kitbash-1.7.0/kitbash/jack_audio.py

@@ -0,0 +1,78 @@
+#  kitbash/kitbash/jack_audio.py
+#
+#  Copyright 2026 Leon Dionne <ldionne@dridesign.sh.cn>
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+#  MA 02110-1301, USA.
+#
+"""
+Provides MainWindow of the kitbash application.
+"""
+import logging	# pylint: disable = unused-import
+from tempfile import mkstemp
+from os import unlink
+from qt_liquid_pool import LiquidPool
+from kitbash import get_setting, set_setting, KEY_MIDI_SOURCE, KEY_AUDIO_SINK
+
+
+class Audio(LiquidPool):
+	"""
+	Handles audio, including hosting LiquidSFZ instances.
+	"""
+
+	def __init__(self):
+		super().__init__()
+		_, self.tempfile = mkstemp(suffix='.sfz')
+		self.kit_synth = None
+		self.sig_jack_ready.connect(self.slot_jack_ready)
+
+	def quit(self):
+		super().quit()
+		unlink(self.tempfile)
+
+	def slot_jack_ready(self, state):
+		if state:
+			with open(self.tempfile, 'w', encoding = 'utf-8') as fob:
+				fob.write('// Empty\n')
+			self.kit_synth = self.create_synth(self.tempfile)
+
+	def get_preferred_midi_source(self):
+		return get_setting(KEY_MIDI_SOURCE)
+
+	def set_preferred_midi_source(self, value):
+		set_setting(KEY_MIDI_SOURCE, value)
+		super().set_preferred_midi_source(value)
+
+	def get_preferred_audio_sink(self):
+		return get_setting(KEY_AUDIO_SINK)
+
+	def set_preferred_audio_sink(self, value):
+		set_setting(KEY_AUDIO_SINK, value)
+		super().set_preferred_audio_sink(value)
+
+	def connect_midi_source(self, port):
+		"""
+		Override in order to prevent all but the main window bashed drumkit synth from
+		connecting to the midi source.
+		"""
+		self.conn_man.connect(port, self.kit_synth.input_port)
+
+	def load_kit(self, drumkit):
+		with open(self.tempfile, 'w', encoding = 'utf-8') as fob:
+			drumkit.write(fob)
+		self.kit_synth.load(self.tempfile)	# pylint: disable = no-member
+
+
+#  end kitbash/kitbash/jack_audio.py

{kitbash-1.5.1 → kitbash-1.7.0}/kitbash/worker_threads.py

@@ -18,9 +18,8 @@
 #  MA 02110-1301, USA.
 #
 """
-Provides MainWindow.
+Provides worker threads that load and bash drumkits.
 """
-import logging
 from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, QRunnable
 from sfzen.drumkits import Drumkit
 
@@ -36,7 +35,7 @@ class KitWorkerSignals(QObject):
 
 class KitLoader(QRunnable):
 	"""
-	Loads a Drumkit in a background thread and emits "sig_drumkit_loaded" when done.
+	Loads a Drumkit in a background thread.
 	"""
 
 	def __init__(self, drumkit_widget):
@@ -47,6 +46,7 @@ class KitLoader(QRunnable):
 	@pyqtSlot()
 	def run(self):
 		drumkit = Drumkit(self.drumkit_widget.sfz_filename)
+		drumkit.midi_channel = 10 if 'lochan' in drumkit.opcodes_used() else 0
 		self.signals.sig_loaded.emit(self.drumkit_widget, drumkit)
 
 

{kitbash-1.5.1 → kitbash-1.7.0}/pyproject.toml

@@ -6,14 +6,12 @@ license = {file = "LICENSE"}
 classifiers = ["License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)"]
 dynamic = ["version", "description"]
 dependencies = [
+	"log_soso >= 1.0.3",
 	"PyQt5",
-	"conn_jack >= 1.2.0, <= 1.3.0",
-	"liquiphy",
-	"soundfile",
-	"sfzen >= 2.2.0",
-	"midi_notes >= 1.1.0",
-	"recent_items_list >= 1.1.1",
-	"soso_qt_extras >= 1.2.0"
+	"qt_liquid_pool >= 1.2.0",
+	"recent_items_list >= 1.1.2",
+	"sfzen >= 2.3.1",
+	"soso_qt_extras >= 1.7.0"
 ]
 
 [project.urls]
@@ -28,7 +26,7 @@ requires = ["flit_core >=3.2,<4"]
 build-backend = "flit_core.buildapi"
 
 [bumpver]
-current_version = "1.5.1"
+current_version = "1.7.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "Bump version {old_version} -> {new_version}"
 commit = true

kitbash-1.5.1/kitbash/jack_audio.py

@@ -1,243 +0,0 @@
-#  kitbash/kitbash/jack_audio.py
-#
-#  Copyright 2026 Leon Dionne <ldionne@dridesign.sh.cn>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-#  MA 02110-1301, USA.
-#
-"""
-Provides MainWindow of the kitstarter application.
-"""
-import logging, tempfile
-from os import unlink
-from PyQt5.QtCore import Qt, QObject, pyqtSignal, pyqtSlot, QTimer
-from liquiphy import LiquidSFZ
-from conn_jack import JackConnectionManager, JackConnectError
-from kitstarter import get_setting, set_setting, KEY_MIDI_SOURCE, KEY_AUDIO_SINK
-
-
-SYNTH_NAME = 'liquidsfz'
-AUDIO_PLAYER_CLIENT = 'kitstarter_jack_player'
-CONNECT_RETRY_INTERVAL = 1776
-
-
-class Audio(QObject):
-	"""
-	Handles audio, including hosting an instance of liquidsfz, and playing samples.
-	"""
-
-	sig_ports_complete = pyqtSignal()	# \
-	sig_sources_changed = pyqtSignal()	#  Used to decouple JackConnectionManager callbacks
-	sig_sinks_changed = pyqtSignal()	# /
-	sig_jack_down = pyqtSignal()		#
-	sig_jack_ready = pyqtSignal(int)
-	sig_midi_connected = pyqtSignal(str)
-
-	def __init__(self):
-		super().__init__()
-		self.conn_man = None
-		self.synth = None
-		_, self.tempfile = tempfile.mkstemp(suffix='.sfz')
-		self.sig_ports_complete.connect(self.slot_ports_complete, type = Qt.QueuedConnection)
-		self.sig_sources_changed.connect(self.slot_sources_changed, type = Qt.QueuedConnection)
-		self.sig_sinks_changed.connect(self.slot_sinks_changed, type = Qt.QueuedConnection)
-		self.sig_jack_down.connect(self.slot_jack_down, type = Qt.QueuedConnection)
-		self.connect_retry_timer = QTimer()
-		self.connect_retry_timer.setInterval(CONNECT_RETRY_INTERVAL)
-		self.connect_retry_timer.setSingleShot(True)
-		self.connect_retry_timer.timeout.connect(self.connect)
-
-	def connect(self):
-		try:
-			self.conn_man = JackConnectionManager()
-		except JackConnectError:
-			self.connect_retry_timer.start()
-		else:
-			self.conn_man.on_error(self.jack_error)
-			self.conn_man.on_shutdown(self.jack_shutdown)
-			self.conn_man.on_client_registration(self.jack_client_registration)
-			self.conn_man.on_port_registration(self.jack_port_registration)
-			self.synth = JackLiquidSFZ(self.tempfile)
-			self.sig_jack_ready.emit(self.conn_man.samplerate)
-			self.synth.start()
-
-	def quit(self):
-		if self.synth and hasattr(self.synth, 'quit'):
-			self.synth.ports_ready = False
-			self.synth.quit()	# pylint: disable = no-member
-		unlink(self.tempfile)
-
-	# -----------------------------------------------------------------
-	# JACK callbacks
-
-	def jack_client_registration(self, client_name, action):
-		if action and not self.synth.client_name and client_name.startswith(SYNTH_NAME):
-			self.synth.client_name = client_name
-
-	def jack_port_registration(self, port, action):
-		if action and self.synth.client_name and port.name.startswith(self.synth.client_name + ':'):
-			if port.is_input and port.is_midi:
-				self.synth.input_port = port
-			elif port.is_output and port.is_audio:
-				self.synth.output_ports.append(port)
-			if self.synth.input_port and len(self.synth.output_ports) == 2:
-				self.synth.ports_ready = True
-				self.sig_ports_complete.emit()
-		if port.is_input:
-			self.sig_sinks_changed.emit()
-		else:
-			self.sig_sources_changed.emit()
-
-	def jack_error(self, error_message):
-		logging.error('JACK ERROR: "%s"', error_message)
-
-	def jack_shutdown(self):
-		logging.warning('JACK is shutting down')
-		self.sig_jack_down.emit()
-
-	@pyqtSlot()
-	def slot_jack_down(self):
-		"""
-		Triggered by sig_jack_down emitted from another thread in "jack_shutdown"
-		"""
-		self.conn_man.close()
-		self.conn_man = None
-		self.connect_retry_timer.start()
-
-	# -----------------------------------------------------------------
-	# Source / sink management
-
-	@pyqtSlot()
-	def slot_ports_complete(self):
-		"""
-		Triggered by sig_ports_complete, emitted in "jack_port_registration".
-		"""
-		self.connect_midi_source()
-		self.connect_audio_sinks()
-
-	@pyqtSlot(str)
-	def slot_midi_src_selected(self, value):
-		"""
-		Triggered from combo box selection
-		"""
-		self.midi_src = value
-
-	@pyqtSlot(str)
-	def slot_audio_sink_selected(self, value):
-		"""
-		Triggered from combo box selection
-		"""
-		self.audio_sink = value
-
-	@pyqtSlot()
-	def slot_sources_changed(self):
-		"""
-		Triggered by sig_sources_changed, emitted in "jack_port_registration".
-		"""
-		if self.synth.ports_ready:
-			self.connect_midi_source()
-
-	@pyqtSlot()
-	def slot_sinks_changed(self):
-		"""
-		Triggered by sig_sinks_changed, emitted in "jack_port_registration".
-		"""
-		if self.synth.ports_ready:
-			self.connect_audio_sinks()
-
-	@property
-	def midi_src(self):
-		return get_setting(KEY_MIDI_SOURCE)
-
-	@midi_src.setter
-	def midi_src(self, value):
-		set_setting(KEY_MIDI_SOURCE, value)
-		self.connect_midi_source()
-
-	@property
-	def audio_sink(self):
-		return get_setting(KEY_AUDIO_SINK)
-
-	@audio_sink.setter
-	def audio_sink(self, value):
-		set_setting(KEY_AUDIO_SINK, value)
-		self.connect_audio_sinks()
-
-	def connect_midi_source(self):
-		if self.synth and self.synth.ports_ready:
-			# Look for source port if midi_src has a str value:
-			if self.midi_src:
-				src_port = self.conn_man.get_port_by_name(self.midi_src)
-				# No need to disconnect / reconnect if they are equal:
-				if src_port == self.synth.connected_midi_src_port:
-					return
-			else:
-				src_port = None
-			# Disconnect existing:
-			if self.synth.connected_midi_src_port:
-				self.conn_man.disconnect(self.synth.connected_midi_src_port, self.synth.input_port)
-			# Connect if midi_src has a str value:
-			if src_port:
-				self.conn_man.connect(src_port, self.synth.input_port)
-				self.sig_midi_connected.emit(src_port.name)
-			# Update connected port (may be none):
-			self.synth.connected_midi_src_port = src_port
-
-	def connect_audio_sinks(self):
-		if self.synth and self.synth.ports_ready:
-			# Look for target ports if audio_sink has a str value:
-			if self.audio_sink:
-				tgt_ports = [ port for port in self.conn_man.get_client_ports(self.audio_sink)
-					if port.is_audio and port.is_input ]
-				# No need to disconnect / reconnect if they are equal:
-				if tgt_ports == self.synth.connected_audio_sink_ports:
-					return
-			else:
-				tgt_ports = []
-			# Disconnect existing:
-			if self.synth.connected_audio_sink_ports:
-				for src, tgt in zip(
-					self.synth.output_ports, self.synth.connected_audio_sink_ports):
-					self.conn_man.disconnect(src, tgt)
-			# Connect if audio_sink has a str value:
-			if tgt_ports:
-				for src, tgt in zip(self.synth.output_ports, tgt_ports):
-					self.conn_man.connect(src, tgt)
-			# Update connected ports (may be none):
-			self.synth.connected_audio_sink_ports = tgt_ports
-
-	def load_kit(self, kit):
-		with open(self.tempfile, 'w', encoding = 'utf-8') as fob:
-			kit.write(fob)
-		self.synth.load(self.tempfile)	# pylint: disable = no-member
-
-
-class JackLiquidSFZ(LiquidSFZ):
-	"""
-	Wraps a LiquidSFZ instance in order to hold references to jacklib ports created
-	by JackConnectionManager.
-	"""
-
-	def __init__(self, filename):
-		self.client_name = None
-		self.ports_ready = False
-		self.input_port = None
-		self.output_ports = []
-		self.connected_midi_src_port = None
-		self.connected_audio_sink_ports = []
-		super().__init__(filename, defer_start = True)
-
-
-#  end kitbash/kitbash/jack_audio.py