musecbox 0.2.0__tar.gz → 0.2.2__tar.gz

{musecbox-0.2.0 → musecbox-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: musecbox
-Version: 0.2.0
+Version: 0.2.2
 Summary: "MusecBox" is A GUI application designed to be an SFZ -based synth replacement
 Author-email: Leon Dionne <ldionne@dridesign.sh.cn>
 Description-Content-Type: text/markdown

{musecbox-0.2.0 → musecbox-0.2.2}/musecbox/__init__.py

@@ -77,7 +77,7 @@ from simple_carla.qt import CarlaQt
 from qt_extras import DevilBox
 from log_soso import StreamToLogger
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"
 
 APPLICATION_NAME		= 'MusecBox'
 APP_PATH				= dirname(realpath(__file__))

{musecbox-0.2.0 → musecbox-0.2.2}/musecbox/dialogs/missing_sfzs_dialog.py

@@ -127,7 +127,7 @@ class MissingSFZ(QFrame):
 	def slot_select(self):
 		sfz_dialog = SFZFileDialog(self.track_widget.voice_name)
 		if sfz_dialog.exec():
-			self.track_widget.synth.change_sfz(sfz_dialog.sfz_filename)
+			self.track_widget.synth.load_sfz(sfz_dialog.sfz_filename)
 			self.lbl_filename.setText(self.track_widget.synth.sfz_filename)
 			self.lbl_icon.setText(CHAR_OKAY)
 			self.is_missing = False

{musecbox-0.2.0 → musecbox-0.2.2}/musecbox/dialogs/score_import_dialog.py

@@ -22,7 +22,7 @@ Provides a dialog used for importing MuseScore3 files
 """
 
 import logging
-from os.path import join, basename, dirname, splitext
+from os.path import join, basename, dirname, realpath, splitext
 from functools import partial, reduce
 from collections import defaultdict
 from operator import and_
@@ -58,7 +58,7 @@ class ScoreImportDialog(QDialog):
 		super().__init__(parent)
 		with ShutUpQT():
 			uic.loadUi(join(dirname(__file__), 'score_import_dialog.ui'), self)
-		self.filename = filename
+		self.filename = realpath(filename)
 		self.restore_geometry()
 		self.setFixedWidth(704)
 		self.finished.connect(self.save_geometry)

{musecbox-0.2.0 → musecbox-0.2.2}/musecbox/gui/balance_control_widget.py

@@ -131,15 +131,10 @@ class BalanceControlWidget(QWidget):
 	# Screen / internal plugin value conversions
 
 	def resizeEvent(self, event):
-		# Returns a new rectangle with dx1, dy1, dx2 and dy2 added respectively to the
-		# existing coordinates of this rectangle.
 		self.bounds_rect = QRect(QPoint(0, 0), event.size()).adjusted(
 			TRACK_HALF_WIDTH + 1, 1, -TRACK_HALF_WIDTH - 1, -1)
 		self.center_x = self.bounds_rect.center().x()
-		# f_scale is what you divide event x by in order to get a value in a range
-		# from -1.0 to 1.0 (proportion)
 		self.f_scale = float(self.bounds_rect.width() / 2)
-		self.f_track_half_width = TRACK_HALF_WIDTH / self.f_scale
 		for group in self._groups.values():
 			group.reposition()
 		self.update()
@@ -304,7 +299,8 @@ class BalanceControlWidget(QWidget):
 		"""
 		Called from TrackWidget when mouse hovers over it
 		"""
-		self.change_focused_group(self._groups[pan_group_key], False)
+		if pan_group_key in self._groups:
+			self.change_focused_group(self._groups[pan_group_key], False)
 
 	def hover_out(self):
 		"""
@@ -342,7 +338,8 @@ class BalanceControlWidget(QWidget):
 
 	def _create_group(self, key, track):
 		self._groups[key] = BCGroup(self, key, track)
-		self._groups[key].reposition()
+		if self.isVisible():
+			self._groups[key].reposition()
 		self._groups[key].show()
 
 	def orphan(self, track):

{musecbox-0.2.0 → musecbox-0.2.2}/musecbox/gui/main_window.py

@@ -30,7 +30,7 @@ from signal import signal, SIGINT, SIGTERM
 from socket import socket, AF_UNIX, SOCK_DGRAM, SOL_SOCKET, SO_REUSEADDR
 from qt_extras import SigBlock, ShutUpQT, DevilBox
 from qt_extras.list_layout import HListLayout, VListLayout
-from sfzen import SFZ
+from sfzen import SFZ, SAMPLES_ABSPATH
 from sfzen.cleaners.liquidsfz import clean as liquid_clean
 from mscore import VoiceName
 from simple_carla import	Plugin, Parameter, \
@@ -470,6 +470,7 @@ class MainWindow(QMainWindow):
 				self.source_score = self.project_definition['source_score']
 				set_application_style()
 				self.show_hide_window_elements()
+				self.balance_control_widget.slot_set_lines(setting(KEY_BCWIDGET_LINES, int, 3))
 				if 'exported_wav_file' in self.project_definition:
 					self.wav_filename = self.project_definition['exported_wav_file']
 				if ProjectLoadDialog(self, self.project_definition).exec():
@@ -587,7 +588,8 @@ class MainWindow(QMainWindow):
 
 	def copy_sfzs(self):
 		self.setCursor(Qt.WaitCursor)
-		samples_mode = setting(KEY_SAMPLES_MODE, bool)
+		samples_mode = setting(KEY_SAMPLES_MODE, int, SAMPLES_ABSPATH)
+		logging.debug('Copying SFZs; samples_mode is %d', samples_mode)
 		clean_sfzs = setting(KEY_CLEAN_SFZS, bool)
 		title, _ = splitext(basename(self.project_filename))
 		sfz_dir = join(self.project_dir(), title)

{musecbox-0.2.0 → musecbox-0.2.2}/musecbox/gui/track_widget.py

@@ -21,7 +21,7 @@
 Provides vertical and horizontal track widgets.
 """
 import logging, os
-from os.path import join, dirname, relpath, abspath, exists
+from os.path import join, dirname, relpath, realpath, exists
 from math import floor
 from functools import partial
 from itertools import chain
@@ -751,9 +751,8 @@ class TrackSynth(LiquidSFZ):
 	def __init__(self, port, slot, sfz_filename, *, saved_state = None):
 		self.port = port
 		self.slot = slot
-		if not exists(sfz_filename):
-			sfz_filename = abspath(join(main_window().project_dir(), sfz_filename))
-		super().__init__(sfz_filename, saved_state = saved_state)
+		super().__init__(self._get_real(sfz_filename), saved_state = saved_state)
+		logging.debug('Loaded synth "%s"; SFZ filename: %s', self, self.sfz_filename)
 
 	def track_widget(self):
 		return main_window().port_widget(self.port).track_widget(self.slot)
@@ -764,13 +763,16 @@ class TrackSynth(LiquidSFZ):
 
 	def load_sfz(self, sfz_filename):
 		oldpath = self.sfz_filename
-		if not exists(sfz_filename):
-			sfz_filename = abspath(join(main_window().project_dir(), sfz_filename))
-		super().load_sfz(sfz_filename)
+		super().load_sfz(self._get_real(sfz_filename))
 		if oldpath != self.sfz_filename:
 			main_window().unwatch(oldpath)
 			main_window().watch(self.sfz_filename)
 
+	def _get_real(self, sfz_filename):
+		if exists(sfz_filename):
+			return realpath(sfz_filename)
+		return realpath(join(main_window().project_dir(), sfz_filename))
+
 	def auto_load_complete(self):
 		super().auto_load_complete()
 		self.sig_sfz_loaded.emit(self.sfz_filename)

{musecbox-0.2.0 → musecbox-0.2.2}/pyproject.toml

@@ -31,7 +31,7 @@ requires = ["flit_core >=3.2,<4"]
 build-backend = "flit_core.buildapi"
 
 [bumpver]
-current_version = "0.2.0"
+current_version = "0.2.2"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "Bump version {old_version} -> {new_version}"
 commit = true