Skip to content
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.

Sign up for GitHub

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

Migrate to new LV2 header paths #6990

Merged
merged 3 commits into from
May 19, 2024
Merged

Migrate to new LV2 header paths #6990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fb3081
Fix lv2 headers to comply to this: https://github.com/lv2/lv2#headers
MaciejMalczyk Nov 18, 2023
724f57b
Fix to <> in one header
MaciejMalczyk Nov 18, 2023
954f2f9
Merge pull request #1 from LMMS/master
MaciejMalczyk May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/Lv2Options.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#ifdef LMMS_HAVE_LV2

#include <cstdint>
#include <lv2/lv2plug.in/ns/ext/options/options.h>
#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
#include <lv2/options/options.h>
#include <lv2/urid/urid.h>
#include <map>
#include <memory>
#include <set>
Expand Down
2 changes: 1 addition & 1 deletion include/Lv2UridMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#ifdef LMMS_HAVE_LV2

#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
#include <lv2/urid/urid.h>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like our automated Linux builds can't find this. This is probably another reason why our Linux builds need to be upgraded to ubuntu-20.04 or ubuntu-22.04, since I believe we're still using 18.04.

#include <mutex> // TODO: use semaphore, even though this is not realtime critical
#include <string>
#include <unordered_map>
Expand Down
2 changes: 1 addition & 1 deletion include/Lv2Worker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#ifdef LMMS_HAVE_LV2

#include <lilv/lilv.h>
#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
#include <lv2/worker/worker.h>
#include <thread>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion src/core/lv2/Lv2Evbuf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <cstdlib>
#include <cstring>

#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
#include <lv2/atom/atom.h>

namespace lmms
{
Expand Down
6 changes: 3 additions & 3 deletions src/core/lv2/Lv2Manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
#include <algorithm>
#include <cstdlib>
#include <lilv/lilv.h>
#include <lv2/lv2plug.in/ns/ext/buf-size/buf-size.h>
#include <lv2/lv2plug.in/ns/ext/options/options.h>
#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
#include <lv2/buf-size/buf-size.h>
#include <lv2/options/options.h>
#include <lv2/worker/worker.h>
#include <QDebug>
#include <QElapsedTimer>

Expand Down
4 changes: 2 additions & 2 deletions src/core/lv2/Lv2Ports.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

#ifdef LMMS_HAVE_LV2

#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
#include <lv2/lv2plug.in/ns/ext/port-props/port-props.h>
#include <lv2/atom/atom.h>
#include <lv2/port-props/port-props.h>

#include "Engine.h"
#include "Lv2Basics.h"
Expand Down
8 changes: 4 additions & 4 deletions src/core/lv2/Lv2Proc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
#ifdef LMMS_HAVE_LV2

#include <cmath>
#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
#include <lv2/lv2plug.in/ns/ext/resize-port/resize-port.h>
#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
#include <lv2/midi/midi.h>
#include <lv2/atom/atom.h>
#include <lv2/resize-port/resize-port.h>
#include <lv2/worker/worker.h>
#include <QDebug>
#include <QDomDocument>
#include <QtGlobal>
Expand Down
8 changes: 4 additions & 4 deletions src/core/lv2/Lv2UridCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

#ifdef LMMS_HAVE_LV2

#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
#include <lv2/lv2plug.in/ns/ext/buf-size/buf-size.h>
#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
#include <lv2/lv2plug.in/ns/ext/parameters/parameters.h>
#include <lv2/atom/atom.h>
#include <lv2/buf-size/buf-size.h>
#include <lv2/midi/midi.h>
#include <lv2/parameters/parameters.h>
#include <QtGlobal>

#include "Lv2UridMap.h"
Expand Down
2 changes: 1 addition & 1 deletion src/gui/Lv2ViewBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <QHBoxLayout>
#include <QLabel>
#include <lilv/lilv.h>
#include <lv2/lv2plug.in/ns/ext/port-props/port-props.h>
#include <lv2/port-props/port-props.h>

#include "AudioEngine.h"
#include "Controls.h"
Expand Down
Loading