Skip to content

Commit

Permalink
Merge branch 'midi-playback' of github.com:EmoonX/Bottles into midi-p…
Browse files Browse the repository at this point in the history
…layback
  • Loading branch information
EmoonX committed Jan 1, 2025
2 parents 5c01fb8 + 6038748 commit e7849d4
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 527 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "build-aux/req2flatpak"]
path = build-aux/req2flatpak
url = https://github.com/johannesjh/req2flatpak.git
4 changes: 2 additions & 2 deletions bottles/backend/wine/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ def __init__(
env_dll_overrides = []

if (soundfont_path := midi_soundfont) not in (None, ""):
# FluidSynth is bounded to Executor object as a member
# to control the MIDI server's lifetime (deleted when zero references)
# FluidSynth instance is bound to WineExecutor as a member to control
# the former's lifetime (deleted when no more references from executors)
self.fluidsynth = FluidSynth.find_or_create(soundfont_path)
self.fluidsynth.register_as_current(config)

Expand Down
2 changes: 1 addition & 1 deletion build-aux/com.usebottles.bottles.Devel.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"mkdir -p /app/share/vulkan/implicit_layer.d/"
],
"modules": [
"com.usebottles.bottles.pypi-deps.yaml",
"pypi-deps.yaml",
{
"name": "vmtouch",
"buildsystem": "simple",
Expand Down
Loading

0 comments on commit e7849d4

Please sign in to comment.