-
Notifications
You must be signed in to change notification settings - Fork 228
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
Define JACK headers and sources globally and add some documentation #3046
Conversation
Jamulus.pro
Outdated
@@ -68,6 +68,35 @@ INCLUDEPATH_OPUS = libs/opus/include \ | |||
libs/opus/silk/fixed \ | |||
libs/opus | |||
|
|||
# Add include paths and headers for new audio APIs here | |||
|
|||
# ASIO |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd split this into two parts:
- provided by the SDK
- "part of Jamulus"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd also make all the variable definitions be either
VARNAME =
or
VARNAME = value
depending on the config that makes them relevant.
730be46
to
3fd0f3a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
3fd0f3a
to
cb4867f
Compare
Hmm. Then I misunderstood you. I thought you were referring to splitting the ASIO part out to another variable? Can you please provide a suggestion what you'd like to see? |
Jamulus.pro
Outdated
# Oboe | ||
HEADERS_OBOE = src/sound/oboe/sound.h | ||
SOURCES_OBOE = src/sound/oboe/sound.cpp \ | ||
src/android/androiddebug.cpp # TODO: Remove debugging code if no longer needed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should line 97 be done more like
SOURCES_OBOE = src/sound/oboe/sound.cpp
# TODO: Remove debugging code if no longer needed else move to src/sound if part of sound
SOURCES_OBOE += src/android/androiddebug.cpp
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok. Yes. Done.
I'm starting to think this is creating a lot of variables for no benefit. The variables should only be added to the overall HEADERS, etc, variables conditionally - so wouldn't it be better to do this (addding the headers, etc, separately) where that conditional adding of the variables is done? |
cb4867f
to
5b6fdbc
Compare
@pljones so you mean basically that we should revert this? I think @pgScorpio mainly wanted to get rid of the duplication introduced by the JACK headers. |
Are the variables used in multiple places? Otherwise there's no duplication being removed. |
The JACK headers are used for all three main OS. |
OK, so it's probably best done just for the JACK values, right? |
5b6fdbc
to
a5c7074
Compare
a5c7074
to
94ae268
Compare
@pljones I've now updated my PR and split it into two commits. I hope that's ok for all. |
Looks good. |
Short description of changes
Instead of using hardcoded paths to the sound files @pgScorpio suggested to use variables. This PR uses global definitions for JACK sources and headers and adds some small comments.
CHANGELOG: Internal: Improved maintainability of Jamulus.pro by using global definitions.
Context: Fixes an issue?
Fixes: #2573
Does this change need documentation? What needs to be documented and how?
No
Status of this Pull Request
Ready for testing
What is missing until this pull request can be merged?
Needs whole CI to pass
Checklist
AUTOBUILD: Please build all targets