Skip to content

MSVC: Always use Win32 ANSI functions #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

messmerd
Copy link
Member

@messmerd messmerd commented Feb 20, 2025

No functional changes here, but allows building veal regardless of whether the UNICODE macro is defined

No functional changes here, but allows building veal regardless of
whether the UNICODE macro is set
@messmerd messmerd changed the title MSVC: Always use Win32 A functions MSVC: Always use Win32 ANSI functions Feb 20, 2025
@JohannesLorenz
Copy link

Would that make sense on upstream? If yes, I would rather suggest to do it there, and then merge upstream?

@messmerd
Copy link
Member Author

@JohannesLorenz I just opened a PR upstream: calf-studio-gear#362

@tresf
Copy link
Member

tresf commented Feb 24, 2025

@messmerd @JohannesLorenz how do you want to sync this into our branch? Commit it directly, cherry-pick it or fast forward everything from upstream? It's one of just a few remaining blockers for:

If fast-forward is the preference, I'd kindly ask @JohannesLorenz to do that.

@tresf
Copy link
Member

tresf commented Mar 12, 2025

Pinging @JohannesLorenz again so we can get this merged.

@messmerd
Copy link
Member Author

It looks like the upstream repo is substantially different from this fork (since this fork is the "Last remaining LADSPA-capable fork"), so I think this PR should simply be merged without trying to incorporate any changes from upstream.

@tresf
Copy link
Member

tresf commented Mar 12, 2025

It looks like the upstream repo is substantially different from this fork (since this fork is the "Last remaining LADSPA-capable fork"), so I think this PR should simply be merged without trying to incorporate any changes from upstream.

This fork was explicitly created by @JohannesLorenz for the purposes of keeping up with upstream, otherwise, we'd use this snapshot in time: https://github.com/LMMS/veal/commits/ladspa-0.18/

@tresf
Copy link
Member

tresf commented Mar 12, 2025

Reference: #2

@JohannesLorenz
Copy link

Sorry @tresf I forgot about this. I will check now.

@JohannesLorenz
Copy link

It looks like the upstream repo is substantially different from this fork (since this fork is the "Last remaining LADSPA-capable fork"), so I think this PR should simply be merged without trying to incorporate any changes from upstream.

In the past, we intentionally always merged from calf/master (even if some older versions) into veal/ladspa.

I don't see a reason to to merge in today's master. I checked all commits since our last merge, they are

  1. build system changes (not relevant to us)
  2. a new effect
  3. update of SF2 files
  4. minor bugfixes (some of which were even made to test our Lv2 plugins)
  5. MSVC/macOS compatibility

Also, this has the nice effect that we help testing calf/master. So I'm all for a normal merge calf/master -> veal/ladspa. Of course, it should be tested prior to the merge.

@tresf
Copy link
Member

tresf commented Mar 12, 2025

I don't see a reason to to merge in today's master. I checked all commits since our last merge, they are

So... merge this as-is?

@JohannesLorenz
Copy link

So... merge this as-is?

Depends on what you mean with "this"? 😄

@tresf
Copy link
Member

tresf commented Mar 13, 2025

So... merge this as-is?

Depends on what you mean with "this"? 😄

- master(this)
+ this(this);

@JohannesLorenz
Copy link

I merged and pushed it as branch merge-6d6ad781 to veal and did some basic tests. The resulting commit 789d0fa can be added to the appropriate PR for testing, and IMO this PR can be closed (sorry, and thanks anyways!).

@tresf
Copy link
Member

tresf commented Mar 15, 2025

I merged and pushed it as branch merge-6d6ad781 to veal and did some basic tests. The resulting commit 789d0fa can be added to the appropriate PR for testing, and IMO this PR can be closed (sorry, and thanks anyways!).

Thanks!

To be clear, you'd like to wait until testing is done before merging back into the ladspa branch, right? The qt6 branch doesn't have a lot of testing as it stands now, so I'm afraid that this is putting a Calf testing burden on an unrelated initiative.

@JohannesLorenz what's your criteria for acceptance? Do you plan on doing a bit more testing and merging or is there an expectation on people working on the qt6 branch to do this?

@JohannesLorenz
Copy link

Yes, my plan was to await testing.

what's your criteria for acceptance? Do you plan on doing a bit more testing and merging or is there an expectation on people working on the qt6 branch to do this?

I suggest:

  1. LMMS build CI works on all systems
  2. Simple regression tests: A user with some LMMS projects that use CALF tests if they sound the same

Given that, it might be easier to open an LMMS PR for testing, possibly even merge it to lmms/master and then merge it back to qt6?

@tresf
Copy link
Member

tresf commented Mar 15, 2025

Understood. I don't mind if it's against master or qt6 but I also really don't want to be the one testing this right now. Were there any issues during the merge that would suggest that there may be regressions?

@JohannesLorenz
Copy link

Nothing that suggests it, but a few quick regression tests may never harm. Build failures are more likely (though not too likely). I created #7783 - anyone can test it, if no one will test I'll merge this after a few days and inform you to update the qt6 branch. I will close this PR - thanks again.

@tresf
Copy link
Member

tresf commented Mar 15, 2025

Build failures are more likely

Well, your instincts were right! LMMS/lmms#7783.

Thanks for making the PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants