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

Jump to bottom

libdjinterop 0.22.1, support for Engine 4.0.1 #13709

Open
wants to merge 1 commit into
base: 2.4
Choose a base branch
from
Open

libdjinterop 0.22.1, support for Engine 4.0.1 #13709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2261,7 +2261,7 @@ option(ENGINEPRIME "Support for library export to Denon Engine Prime" ON)
if(ENGINEPRIME)
# libdjinterop does not currently have a stable ABI, so we fetch sources for a specific tag, build here, and link
# statically. This situation should be reviewed once libdjinterop hits version 1.x.
set(LIBDJINTEROP_VERSION 0.21.0)
set(LIBDJINTEROP_VERSION 0.22.1)
# Look whether an existing installation of libdjinterop matches the required version.
find_package(DjInterop ${LIBDJINTEROP_VERSION} EXACT CONFIG)
if(NOT DjInterop_FOUND)
Expand Down Expand Up @@ -2293,11 +2293,18 @@ if(ENGINEPRIME)
# For offline builds download the archive file from the URL and
# copy it into DOWNLOAD_DIR under DOWNLOAD_NAME prior to starting
# the configuration.
#
# If you want to test (locally) an experimental fork/branch of libdjinterop,
# you can comment out URL and URL_HASH and use GIT_REPOSITORY instead:
#
# GIT_REPOSITORY "https://github.com/abcd/your-fork-of-libdjinterop"
# GIT_TAG "origin/name-of-your-branch"
#
ExternalProject_Add(libdjinterop
URL
"https://github.com/xsco/libdjinterop/archive/refs/tags/${LIBDJINTEROP_VERSION}.tar.gz"
"https://launchpad.net/~xsco/+archive/ubuntu/djinterop/+sourcefiles/libdjinterop/${LIBDJINTEROP_VERSION}-0ubuntu1/libdjinterop_${LIBDJINTEROP_VERSION}.orig.tar.gz"
URL_HASH SHA256=160d4e09b25e859816a6b664058e7c6bc5cd889adeb188a9721c2b65d2133641
URL_HASH SHA256=e811158d42c3864f5b682bcf76e0af78278050439d82d14d592dd0a391da6b20
DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads"
DOWNLOAD_NAME "libdjinterop-${LIBDJINTEROP_VERSION}.tar.gz"
INSTALL_DIR ${DJINTEROP_INSTALL_DIR}
Expand Down
3 changes: 1 addition & 2 deletions src/library/export/engineprimeexportjob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "library/trackset/crate/crate.h"
#include "moc_engineprimeexportjob.cpp"
#include "track/track.h"
#include "util/optional.h"
#include "util/thread_affinity.h"
#include "waveform/waveformfactory.h"

Expand Down Expand Up @@ -184,7 +183,7 @@ void exportMetadata(

snapshot.track_number = pTrack->getTrackNumber().toInt();
if (snapshot.track_number == 0) {
snapshot.track_number = djinterop::stdx::nullopt;
snapshot.track_number = std::nullopt;
}

snapshot.duration = std::chrono::milliseconds{
Expand Down
Loading