kitbash 1.5.2__tar.gz → 1.8.0__tar.gz

kitbash-1.8.0/PKG-INFO

@@ -0,0 +1,128 @@
+Metadata-Version: 2.1
+Name: kitbash
+Version: 1.8.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: qt_liquid_pool >= 1.2.0
+Requires-Dist: recent_items_list >= 1.1.2
+Requires-Dist: sfzen >= 2.3.2
+Requires-Dist: soso_qt_extras >= 1.7.0
+Requires-Dist: xdg_soso >= 0.2.0
+Project-URL: Home, https://github.com/Zen-Master-SoSo/kitbash
+
+# KitBash
+
+A GUI application which you can use to create a new SFZ drumkit from pieces of other drumkits.
+
+## Intro
+
+Got a drumkit [SFZ](https://sfzformat.com/) that sounds pretty good, but
+there's just one instrument that doesn't quite cut it? Want to replace that one
+snare, or even that whole set of tom-toms?
+
+That's what kitbash was written for!
+
+Kitbash allows you to create projects in which you can import mutiple drumkits
+from SFZ files, select the pieces of each kit you want, then export the
+finished drumkit to a new SFZ.
+
+## Usage
+
+Starting with an empty project, use the "Edit" -> "Load Drumkit" menu, or click
+on the "plus" symbol in the toolbar. You'll see all the instruments defined in
+the drumkit you just loaded, grouped into categories, such as "Snares", "Tom
+toms", "Hi-hats", etc.
+
+### Audio preview
+
+To listen to audio playback, you need to select an "Audio sink" from the dropdown
+list at the top-right of the window. You audio out devices should be listed
+there. Note that this is a JACK application, and your JACK audio connection kit
+server must be running to play audio.
+
+To preview the sound of each instrument, click on the instrument name.
+Releasing the mouse stops the playback.
+
+To preview the drumkit you are assembling, you need to send it MIDI note
+events. Choose the MIDI source from the dropdown list at the top-right area of
+the window, and send MIDI events. A MIDI source can be an external device, like
+a MIDI keyboard, or the MIDI output of another program, such as
+[qtractor](https://qtractor.org/), [MuseScore](https://musescore.com/), or
+[JackMIDILooper](https://github.com/Zen-Master-SoSo/jack_midi_looper).
+
+### Instrument selection
+
+The instruments selected to be included in your final drumkit are indicated by
+the check boxes next to the instrument and category names.
+
+Check the box next to a category to select all the instruments in that category
+for inclusion in your new drumkit. Check the checkbox next to any individual
+instrument (i.e. "Ride Bell"), to include only that instrument.
+
+When you load the first drumkit, all categories and instruments are selected.
+Load another drumkit in the same way as you did the first (using the menu or
+the toolbar). Selecting an instrument from one drumkit de-selects that
+instrument from all other loaded drumkits.
+
+You can make changes while playing a loop from the incoming MIDI source, and
+the changes are (almost) immediately made to the "bashed" drumkit you are
+making.
+
+### Exporting SFZ
+
+When you're satisfied with what you've selected, you can save the "bashed"
+drumkit as an .sfz file in a new location. From the menu, select "File" ->
+"Save Bashed Kit As..." and choose the location. Or, click the corresponding
+icon in the toolbar.
+
+
+### Saving a project
+
+A "project" is a list of the source SFZs and which groups and instruments from
+each them are selected. You can save a project for later, make whatever changes
+you desire, and then export the SFZ you created again. This way, you don't have
+to start from scratch every time you wish to make that one small change.
+
+
+## Install
+
+Install in the usual way:
+
+```bash
+$ pip install kitbash
+```
+
+### Requirements
+
+You'll need both [JACK audio connection kit](https://jackaudio.org/) and
+[liquidsfz](https://github.com/swesterfeld/liquidsfz) in order to have live
+previews. You can run the program without either, but you won't be able to
+listen to your changes as you are making them.
+
+To install JACK:
+
+```bash
+$ sudo apt install jackd
+```
+
+...or...
+
+```bash
+$ sudo dnf install jackd
+```
+
+To install liquidsfz:
+
+```bash
+$ git clone https://github.com/swesterfeld/liquidsfz.git
+```
+
+... and follow the instructions found in the liquidsfz README to install it.
+
+
+
+

kitbash-1.8.0/README.md

@@ -0,0 +1,111 @@
+# KitBash
+
+A GUI application which you can use to create a new SFZ drumkit from pieces of other drumkits.
+
+## Intro
+
+Got a drumkit [SFZ](https://sfzformat.com/) that sounds pretty good, but
+there's just one instrument that doesn't quite cut it? Want to replace that one
+snare, or even that whole set of tom-toms?
+
+That's what kitbash was written for!
+
+Kitbash allows you to create projects in which you can import mutiple drumkits
+from SFZ files, select the pieces of each kit you want, then export the
+finished drumkit to a new SFZ.
+
+## Usage
+
+Starting with an empty project, use the "Edit" -> "Load Drumkit" menu, or click
+on the "plus" symbol in the toolbar. You'll see all the instruments defined in
+the drumkit you just loaded, grouped into categories, such as "Snares", "Tom
+toms", "Hi-hats", etc.
+
+### Audio preview
+
+To listen to audio playback, you need to select an "Audio sink" from the dropdown
+list at the top-right of the window. You audio out devices should be listed
+there. Note that this is a JACK application, and your JACK audio connection kit
+server must be running to play audio.
+
+To preview the sound of each instrument, click on the instrument name.
+Releasing the mouse stops the playback.
+
+To preview the drumkit you are assembling, you need to send it MIDI note
+events. Choose the MIDI source from the dropdown list at the top-right area of
+the window, and send MIDI events. A MIDI source can be an external device, like
+a MIDI keyboard, or the MIDI output of another program, such as
+[qtractor](https://qtractor.org/), [MuseScore](https://musescore.com/), or
+[JackMIDILooper](https://github.com/Zen-Master-SoSo/jack_midi_looper).
+
+### Instrument selection
+
+The instruments selected to be included in your final drumkit are indicated by
+the check boxes next to the instrument and category names.
+
+Check the box next to a category to select all the instruments in that category
+for inclusion in your new drumkit. Check the checkbox next to any individual
+instrument (i.e. "Ride Bell"), to include only that instrument.
+
+When you load the first drumkit, all categories and instruments are selected.
+Load another drumkit in the same way as you did the first (using the menu or
+the toolbar). Selecting an instrument from one drumkit de-selects that
+instrument from all other loaded drumkits.
+
+You can make changes while playing a loop from the incoming MIDI source, and
+the changes are (almost) immediately made to the "bashed" drumkit you are
+making.
+
+### Exporting SFZ
+
+When you're satisfied with what you've selected, you can save the "bashed"
+drumkit as an .sfz file in a new location. From the menu, select "File" ->
+"Save Bashed Kit As..." and choose the location. Or, click the corresponding
+icon in the toolbar.
+
+
+### Saving a project
+
+A "project" is a list of the source SFZs and which groups and instruments from
+each them are selected. You can save a project for later, make whatever changes
+you desire, and then export the SFZ you created again. This way, you don't have
+to start from scratch every time you wish to make that one small change.
+
+
+## Install
+
+Install in the usual way:
+
+```bash
+$ pip install kitbash
+```
+
+### Requirements
+
+You'll need both [JACK audio connection kit](https://jackaudio.org/) and
+[liquidsfz](https://github.com/swesterfeld/liquidsfz) in order to have live
+previews. You can run the program without either, but you won't be able to
+listen to your changes as you are making them.
+
+To install JACK:
+
+```bash
+$ sudo apt install jackd
+```
+
+...or...
+
+```bash
+$ sudo dnf install jackd
+```
+
+To install liquidsfz:
+
+```bash
+$ git clone https://github.com/swesterfeld/liquidsfz.git
+```
+
+... and follow the instructions found in the liquidsfz README to install it.
+
+
+

{kitbash-1.5.2 → kitbash-1.8.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.2"
+__version__ = "1.8.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.2 → kitbash-1.8.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.2 → kitbash-1.8.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.2 → kitbash-1.8.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.2 → kitbash-1.8.0}/kitbash/gui/main_window.py

@@ -31,20 +31,21 @@ 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
+from kitbash.install import install
 
 
 UPDATES_DEBOUNCE = 680
@@ -94,7 +95,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()
@@ -108,6 +120,7 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.audio.connect()
 		if self.options.Filename:
 			self.load_project(self.options.Filename)
+		install()
 
 	def setup_kits_area(self):
 		self.drumkit_widgets = VListLayout(end_space = 10)
@@ -122,7 +135,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 +150,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 +165,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 +229,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 +261,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 +330,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 +369,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 +433,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 +578,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 +606,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):