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

Add Carla Support to AppImage #4026

Merged
merged 6 commits into from Dec 1, 2017

Conversation

Projects
None yet
2 participants
@tresf
Member

tresf commented Nov 30, 2017

This adds the following functionality to the AppImage:

  • If Carla IS found, uses the system provided version (e.g. /usr/share/carla/resources/carla-plugin)
  • If Carla is NOT found, notifies the user via console that Carla won't be available, removes it from the plugin listing. Some console warnings appear, these are safe to ignore.

Download:
You can get it here... #3688

Note: This PR also disables HiDPI in the AppImage due to some issues found during testing. It can be re-enabled via export QT_AUTO_SCREEN_SCALE_FACTOR=1.

Closes #3976, #2429
Supersedes #2643

@tresf tresf changed the base branch from master to stable-1.2 Nov 30, 2017

Show outdated Hide outdated cmake/linux/package_linux.sh.in Outdated
Show outdated Hide outdated .travis/linux..install.sh Outdated
@tresf

This comment has been minimized.

Show comment
Hide comment
@tresf

tresf Nov 30, 2017

Member

@falkTX opinions welcome here: 5ea683d, attempts to address the following error from Travis-CI:

/home/travis/build/LMMS/lmms/plugins/carlabase/carla.cpp: In member function ‘intptr_t CarlaInstrument::handleDispatcher(NativeHostDispatcherOpcode, int32_t, intptr_t, void*, float)’:
/home/travis/build/LMMS/lmms/plugins/carlabase/carla.cpp:261:12: error: enumeration value ‘NATIVE_HOST_OPCODE_INTERNAL_PLUGIN’ not handled in switch [-Werror=switch]
     switch (opcode)
            ^
cc1plus: all warnings being treated as errors
Member

tresf commented Nov 30, 2017

@falkTX opinions welcome here: 5ea683d, attempts to address the following error from Travis-CI:

/home/travis/build/LMMS/lmms/plugins/carlabase/carla.cpp: In member function ‘intptr_t CarlaInstrument::handleDispatcher(NativeHostDispatcherOpcode, int32_t, intptr_t, void*, float)’:
/home/travis/build/LMMS/lmms/plugins/carlabase/carla.cpp:261:12: error: enumeration value ‘NATIVE_HOST_OPCODE_INTERNAL_PLUGIN’ not handled in switch [-Werror=switch]
     switch (opcode)
            ^
cc1plus: all warnings being treated as errors
Show outdated Hide outdated cmake/linux/package_linux.sh.in Outdated
Show outdated Hide outdated .travis/linux..install.sh Outdated
Show outdated Hide outdated plugins/carlabase/carla.cpp Outdated
case NATIVE_HOST_OPCODE_UI_UNAVAILABLE:
handleUiClosed();
break;
case NATIVE_HOST_OPCODE_HOST_IDLE:
qApp->processEvents();
break;
default:

This comment has been minimized.

@falkTX

falkTX Dec 1, 2017

Contributor

Just to confirm you this change makes sense.
I added a new enum to this part of Carla, but a return 0/ignored is the default backwards-compatible behaviour.
I usually don't expect people to build with -Werror :D

@falkTX

falkTX Dec 1, 2017

Contributor

Just to confirm you this change makes sense.
I added a new enum to this part of Carla, but a return 0/ignored is the default backwards-compatible behaviour.
I usually don't expect people to build with -Werror :D

Various fixes
Make QString use implicit initializer
Detect carla prefix in AppRun
Fix ppa comment/wording
@tresf

This comment has been minimized.

Show comment
Hide comment
@tresf

tresf Dec 1, 2017

Member

@falkTX all conversation points addressed via 4fb162b.

Member

tresf commented Dec 1, 2017

@falkTX all conversation points addressed via 4fb162b.

@tresf tresf merged commit d711b8b into LMMS:stable-1.2 Dec 1, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@tresf tresf referenced this pull request Dec 5, 2017

Closed

Toggle automatic uploads for PRs #4035

7 of 7 tasks complete

PhysSong added a commit to PhysSong/lmms that referenced this pull request Dec 20, 2017

Travis: install jack2 in Linux build
Per #4026: Installing Carla will remove jack1 if it's installed, since Carla requires jack2.

@tresf tresf deleted the tresf:carla branch Dec 23, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment