Skip to content

Switch opl2 to submodule#3962

Merged
tresf merged 2 commits into
LMMS:masterfrom
tresf:opl2
Nov 10, 2017
Merged

Switch opl2 to submodule#3962
tresf merged 2 commits into
LMMS:masterfrom
tresf:opl2

Conversation

@tresf

@tresf tresf commented Nov 10, 2017

Copy link
Copy Markdown
Member

Switch the "OpulenZ" (opl2) instrument plugin to pull directly from https://github.com/adplug/adplug.

There are some commits that have been added to the codebase that never made it upstream however upstream has been maintained as well, so some of them are redundant to apply.

One of my concerns is C++11 compatibility, specifically the use of the __inline combined with Clang, which caused problems in the past. Edit:, upstream removed __inline, may be OK.

Here's a full history of our (downstream) changes to the fmopl.c library. These will help resolve issues that occur as a result of this merge.
https://github.com/LMMS/lmms/commits/stable-1.2/plugins/opl2/fmopl.c

Tasks

  • Switch opl2 to use subdirectory
  • Rename plugin directory to "OpulenZ" to match convention, write upgrade task.
  • Handle edge-case compilation issues

@softrabbit FYI.

@tresf tresf mentioned this pull request Nov 10, 2017
@tresf

tresf commented Nov 10, 2017

Copy link
Copy Markdown
Member Author

There doesn't appear to be any issues with the build, even on Apple. Merging.

@tresf
tresf merged commit 289887f into LMMS:master Nov 10, 2017
@tresf
tresf deleted the opl2 branch November 10, 2017 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants