search

mixxxdj / mixxx

Mixxx is Free DJ software that gives you everything you need to perform live mixes.
http://mixxx.org
Other
4.25k stars 1.24k forks source link

Waveforms break when using a derivative of LateNight #13434

Open morgannunan opened 2 days ago

morgannunan commented 2 days ago

Bug Description

I have a custom theme based on LateNight, and in 2.5 the waveforms disappear. This is also true of the built-in 64-sampler version of the theme.

I have a fix on my fork of Mixxx, but I'm not actually sure how to open a pr from my fork to this version, or if that's even the correct way to do this. Please advise.

Version

2.5

OS

Ubuntu 22.04

ronso0 commented 2 days ago

I suggest you create a new branch (late-wave-fix ?) and cherry-pick 0c020b35d4db5836f93a3cfa27305acae7643de0, then push and git cli should print a link for opening a PR (this assumes you work with the command line, if you did the changes in the Github web UI it's different, and not sure if that's possible if you worked on the dfault branch, main)

ronso0 commented 2 days ago

Anyway, I wonder why it broke for you, I switch between 2.4 and 2.5 all the time. Just tested: 2.5 with the skin resources of 2.4 shows me waveforms as expected.

morgannunan commented 2 days ago

Did you switch to LateNight (64 Samplers)?

ronso0 commented 2 days ago

Yes. I'm running the 2.5-beta binary with the 2.4 res/ directory.

Where did you put that modded skin? /usr/share/mixxx/skins or ~/.mixxx/skins (/home/[username]/.mixxx/skins)

~/.mixxx is recommended for downloaded/user skins (that are created in a way that they work without references to official skins).

/usr/.. is recommended for skins that reference files of existing (built-in) skins. Pay attention to not just mod an existing skin but copy & rename an existing skin directory, otherwise that might be overriden when installing another Mixxx version. https://github.com/mixxxdj/mixxx/wiki/Creating-Skins#change-an-existing-skin In this case you can actually remove all templates from the mod directory that you don't intend to change. For example, if you create a LateNight mod with a stripped mixer, you'd copy /usr/../LateNight to /usr/../LateNight_StrippedMixer and could remove all irrelevant files, i.e. everything except skin.xml, mixer.xml and the /mixer dir. That way all other parts of the skin use the (potentially updated) templates of the official version with your mixer mods.

I need to update the wiki accordingly.

ronso0 commented 2 days ago

That said, your fix is welcome anyway as we/I indeed missed to change the LateNight waveform file paths in #12463

Let me know if you want to issue the PR yourself (maybe just in order to get used to the process ; ) If not, I'll push this fix to 2.5 directly.

ronso0 commented 2 days ago

I just noticed that there are more paths in LateNight that need to be fixed

controls/button_4state_display.xml:26: skin:/<Variable ... controls/button_4state_display.xml:27: skin:/<Variable ... controls/button_4state_display.xml:33: skin:/<Variable ... controls/button_4state_display.xml:34: skin:/<Variable ... controls/button_4state_display.xml:40: skin:/<Variable ... controls/button_4state_display.xml:41: skin:/<Variable ... controls/button_4state_display.xml:47: skin:/<Variable ... controls/button_4state_display.xml:48: skin:/<Variable ... style_classic.qss:2234: image: url(skin:../LateNight/classic/buttons/.. style_classic.qss:2237: image: url(skin:../LateNight/classic/buttons/.. style_palemoon.qss:2716: image: url(skin:../LateNight/palemoon/buttons/.. style.qss:201: image: url(skin:../LateNight/palemoon/buttons/btnsearch.svg); style.qss:211: image: url(skin:../LateNight/palemoon/buttons/btnsearch_disabled.svg); toolbar.xml:273: