chris/harbour-sailfin
chris/harbour-sailfin
1
0
Fork 0
mirror of https://github.com/HenkKalkwater/harbour-sailfin.git synced 2024-12-23 06:25:17 +00:00
Code Issues Releases Wiki Activity
harbour-sailfin/core/CMakeLists.txt

164 lines
5.3 KiB
CMake
Raw Normal View History

Updated build system to fix issues - Application could not be launched by the invoker because of some missing compiler flags (-rdynamic -pie) - Private libraries were not found due to incorrect rpath being set - Moved the qml list of files for sailfish from qtquick to sailfish (Stupid mistake I made because my editor doesn't really differentiate between different files with the same name in different folders)
2020-10-25 23:14:46 +00:00
project(jellyfin-qt VERSION 0.1.0)
Switched to a sane build system (CMake)
2020-10-25 18:58:02 +00:00
find_package(Qt5 5.6 COMPONENTS Multimedia Network Qml WebSockets REQUIRED)
Add MPRIS support Besides MPRIS support, this also adds support for hasPrevious() and hasNext() in several parts to determine whether the player/playlist/shuffler has a previous or next item.
2021-08-30 23:29:51 +00:00
if (FREEDESKTOP_INTEGRATION)
Add basic settings framework This settingsframework uses mlite5 on SailfishOS and other platforms with the mlite library present, because I believe DConf is neat. For platforms that do not have DConf and mlite present, it falls back to a quickly put together implementation that uses QSettings as a backend. Implementing an settings item is simply done by subclassing the Jellyfin::QObjectSettingsWrapper.
2021-09-02 13:34:32 +00:00
find_package(Qt5 5.6 COMPONENTS DBus REQUIRED)
endif()
if (USE_MLITE)
find_package(mlite5 REQUIRED)
Add MPRIS support Besides MPRIS support, this also adds support for hasPrevious() and hasNext() in several parts to determine whether the player/playlist/shuffler has a previous or next item.
2021-08-30 23:29:51 +00:00
endif()
Switched to a sane build system (CMake)
2020-10-25 18:58:02 +00:00
include(GNUInstallDirs)
Slight improvements to the OpenAPI generator
2021-02-20 23:26:18 +00:00
include(GeneratedSources.cmake)
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
set(JellyfinQt_SOURCES
WIP: HttpLoader seems to work, Model still borked
2021-03-28 02:00:00 +00:00
src/model/deviceprofile.cpp
Make model code compileable This disables some application level logic, but I'm going to rewrite that using Lager anyway.
2021-03-20 15:29:31 +00:00
src/model/item.cpp
core: Split PlaybackManager up into smaller parts The PlaybackManager was a giant class that handled UI bindings, fetching stream URLS, playback logic. It now has been split up into: - ViewModel::PlaybackManager, which handles UI interfacing and allowing to swap out the Model::Playback implementation on the fly. - Model::PlaybackManager, which is an interface for what a PlaybackManager must do, handling queues/playlists, and controlling a player. - Model::LocalPlaybackManager, which is an Model::PlaybackManager implementation for playing back Jellyfin media within the application. - Model::PlaybackReporter, which reports the current playback state to the Jellyfin server, for keeping track of played items. - Model::Player, which handles playing back media from an URL and the usual play/pause et cetera. In a future commit, this would allow for introducing a Model::RemoteJellyfinPlaybackManager, to control other Jellyfin instances.
2022-01-05 20:24:52 +00:00
src/model/player.cpp
src/model/playbackmanager.cpp
src/model/playbackreporter.cpp
WIP: Playlist support
2021-05-21 13:46:30 +00:00
src/model/playlist.cpp
WIP: Add playlists/queues and add support for Sailfish back
2021-07-31 13:06:17 +00:00
src/model/shuffle.cpp
Add UserLoader back + misc regression fixes
2021-08-17 22:04:27 +00:00
src/model/user.cpp
WIP: Add playlists/queues and add support for Sailfish back
2021-07-31 13:06:17 +00:00
Make model code compileable This disables some application level logic, but I'm going to rewrite that using Lager anyway.
2021-03-20 15:29:31 +00:00
src/support/jsonconv.cpp
WIP: extract loading logic from model Loading logic should be extracted from the model, to make loading the data from other sources, such as a local database for synchronised items, possible.
2021-03-05 14:34:10 +00:00
src/support/loader.cpp
WIP: Add playlists/queues and add support for Sailfish back
2021-07-31 13:06:17 +00:00
src/support/parseexception.cpp
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
src/viewmodel/item.cpp
WIP: Reimplementation of ListModels.
2021-03-26 20:27:35 +00:00
src/viewmodel/itemmodel.cpp
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
src/viewmodel/loader.cpp
Add track selection back
2021-08-22 23:46:57 +00:00
src/viewmodel/mediastream.cpp
WIP: Code cleanup, trying to debug Q_ENUM not visible from QML
2021-03-29 12:27:37 +00:00
src/viewmodel/modelstatus.cpp
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
src/viewmodel/playbackmanager.cpp
WIP: Playlist support
2021-05-21 13:46:30 +00:00
src/viewmodel/playlist.cpp
Add basic settings framework This settingsframework uses mlite5 on SailfishOS and other platforms with the mlite library present, because I believe DConf is neat. For platforms that do not have DConf and mlite present, it falls back to a quickly put together implementation that uses QSettings as a backend. Implementing an settings item is simply done by subclassing the Jellyfin::QObjectSettingsWrapper.
2021-09-02 13:34:32 +00:00
src/viewmodel/settings.cpp
Rewire more of Sailfish frontend into new backend This should encompass most simple things, besides some larger, trickier things, like the video streams and the now-broken userdata
2021-08-11 21:35:33 +00:00
src/viewmodel/userdata.cpp
Add UserLoader back + misc regression fixes
2021-08-17 22:04:27 +00:00
src/viewmodel/usermodel.cpp
src/viewmodel/user.cpp
Big C++ refractor - Removed "jellyfin" prefix from files, as they are already in a directory named Jellyfin - Split the former "jellyfinitem.{h,cpp}" into multiple files in the DTO directory, one for each class. The jellyfinitem files started to become enormous. - Use forward declarations in headers instead of including files wherever possible. - Updated copyright headers
2021-02-17 18:42:10 +00:00
src/apiclient.cpp
src/apimodel.cpp
src/credentialmanager.cpp
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
src/eventbus.cpp
Big C++ refractor - Removed "jellyfin" prefix from files, as they are already in a directory named Jellyfin - Split the former "jellyfinitem.{h,cpp}" into multiple files in the DTO directory, one for each class. The jellyfinitem files started to become enormous. - Use forward declarations in headers instead of including files wherever possible. - Updated copyright headers
2021-02-17 18:42:10 +00:00
src/jellyfin.cpp
src/jsonhelper.cpp
Add basic settings framework This settingsframework uses mlite5 on SailfishOS and other platforms with the mlite library present, because I believe DConf is neat. For platforms that do not have DConf and mlite present, it falls back to a quickly put together implementation that uses QSettings as a backend. Implementing an settings item is simply done by subclassing the Jellyfin::QObjectSettingsWrapper.
2021-09-02 13:34:32 +00:00
src/qobjectsettingswrapper.cpp
Big C++ refractor - Removed "jellyfin" prefix from files, as they are already in a directory named Jellyfin - Split the former "jellyfinitem.{h,cpp}" into multiple files in the DTO directory, one for each class. The jellyfinitem files started to become enormous. - Use forward declarations in headers instead of including files wherever possible. - Updated copyright headers
2021-02-17 18:42:10 +00:00
src/serverdiscoverymodel.cpp
src/websocket.cpp)
Switched to a sane build system (CMake)
2020-10-25 18:58:02 +00:00
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
list(APPEND JellyfinQt_SOURCES ${openapi_SOURCES})
Slight improvements to the OpenAPI generator
2021-02-20 23:26:18 +00:00
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
set(JellyfinQt_HEADERS
WIP: HttpLoader seems to work, Model still borked
2021-03-28 02:00:00 +00:00
include/JellyfinQt/model/deviceprofile.h
Make model code compileable This disables some application level logic, but I'm going to rewrite that using Lager anyway.
2021-03-20 15:29:31 +00:00
include/JellyfinQt/model/item.h
core: Split PlaybackManager up into smaller parts The PlaybackManager was a giant class that handled UI bindings, fetching stream URLS, playback logic. It now has been split up into: - ViewModel::PlaybackManager, which handles UI interfacing and allowing to swap out the Model::Playback implementation on the fly. - Model::PlaybackManager, which is an interface for what a PlaybackManager must do, handling queues/playlists, and controlling a player. - Model::LocalPlaybackManager, which is an Model::PlaybackManager implementation for playing back Jellyfin media within the application. - Model::PlaybackReporter, which reports the current playback state to the Jellyfin server, for keeping track of played items. - Model::Player, which handles playing back media from an URL and the usual play/pause et cetera. In a future commit, this would allow for introducing a Model::RemoteJellyfinPlaybackManager, to control other Jellyfin instances.
2022-01-05 20:24:52 +00:00
include/JellyfinQt/model/player.h
include/JellyfinQt/model/playbackmanager.h
include/JellyfinQt/model/playbackreporter.h
WIP: Playlist support
2021-05-21 13:46:30 +00:00
include/JellyfinQt/model/playlist.h
WIP: Add playlists/queues and add support for Sailfish back
2021-07-31 13:06:17 +00:00
include/JellyfinQt/model/shuffle.h
Add UserLoader back + misc regression fixes
2021-08-17 22:04:27 +00:00
include/JellyfinQt/model/user.h
Make model code compileable This disables some application level logic, but I'm going to rewrite that using Lager anyway.
2021-03-20 15:29:31 +00:00
include/JellyfinQt/support/jsonconv.h
WIP: Add playlists/queues and add support for Sailfish back
2021-07-31 13:06:17 +00:00
include/JellyfinQt/support/jsonconvimpl.h
WIP: extract loading logic from model Loading logic should be extracted from the model, to make loading the data from other sources, such as a local database for synchronised items, possible.
2021-03-05 14:34:10 +00:00
include/JellyfinQt/support/loader.h
WIP: Add playlists/queues and add support for Sailfish back
2021-07-31 13:06:17 +00:00
include/JellyfinQt/support/parseexception.h
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
include/JellyfinQt/viewmodel/item.h
WIP: Reimplementation of ListModels.
2021-03-26 20:27:35 +00:00
include/JellyfinQt/viewmodel/itemmodel.h
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
include/JellyfinQt/viewmodel/loader.h
Add track selection back
2021-08-22 23:46:57 +00:00
include/JellyfinQt/viewmodel/mediastream.h
WIP: Code cleanup, trying to debug Q_ENUM not visible from QML
2021-03-29 12:27:37 +00:00
include/JellyfinQt/viewmodel/modelstatus.h
WIP: Reimplementation of ListModels.
2021-03-26 20:27:35 +00:00
include/JellyfinQt/viewmodel/propertyhelper.h
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
include/JellyfinQt/viewmodel/playbackmanager.h
Add MPRIS support Besides MPRIS support, this also adds support for hasPrevious() and hasNext() in several parts to determine whether the player/playlist/shuffler has a previous or next item.
2021-08-30 23:29:51 +00:00
include/JellyfinQt/viewmodel/platformmediacontrol.h
WIP: Playlist support
2021-05-21 13:46:30 +00:00
include/JellyfinQt/viewmodel/playlist.h
Add basic settings framework This settingsframework uses mlite5 on SailfishOS and other platforms with the mlite library present, because I believe DConf is neat. For platforms that do not have DConf and mlite present, it falls back to a quickly put together implementation that uses QSettings as a backend. Implementing an settings item is simply done by subclassing the Jellyfin::QObjectSettingsWrapper.
2021-09-02 13:34:32 +00:00
include/JellyfinQt/viewmodel/settings.h
Rewire more of Sailfish frontend into new backend This should encompass most simple things, besides some larger, trickier things, like the video streams and the now-broken userdata
2021-08-11 21:35:33 +00:00
include/JellyfinQt/viewmodel/userdata.h
Add UserLoader back + misc regression fixes
2021-08-17 22:04:27 +00:00
include/JellyfinQt/viewmodel/usermodel.h
include/JellyfinQt/viewmodel/user.h
Move QObject-wrapping code into templates Previously, this pattern was copy-pasted in a few places. This is undesirable, so the code has been moved into templates. Fixes #30
2022-08-24 15:00:14 +00:00
include/JellyfinQt/viewmodel/utils.h
Big C++ refractor - Removed "jellyfin" prefix from files, as they are already in a directory named Jellyfin - Split the former "jellyfinitem.{h,cpp}" into multiple files in the DTO directory, one for each class. The jellyfinitem files started to become enormous. - Use forward declarations in headers instead of including files wherever possible. - Updated copyright headers
2021-02-17 18:42:10 +00:00
include/JellyfinQt/apiclient.h
include/JellyfinQt/apimodel.h
include/JellyfinQt/credentialmanager.h
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
include/JellyfinQt/eventbus.h
Big C++ refractor - Removed "jellyfin" prefix from files, as they are already in a directory named Jellyfin - Split the former "jellyfinitem.{h,cpp}" into multiple files in the DTO directory, one for each class. The jellyfinitem files started to become enormous. - Use forward declarations in headers instead of including files wherever possible. - Updated copyright headers
2021-02-17 18:42:10 +00:00
include/JellyfinQt/jellyfin.h
include/JellyfinQt/jsonhelper.h
Add basic settings framework This settingsframework uses mlite5 on SailfishOS and other platforms with the mlite library present, because I believe DConf is neat. For platforms that do not have DConf and mlite present, it falls back to a quickly put together implementation that uses QSettings as a backend. Implementing an settings item is simply done by subclassing the Jellyfin::QObjectSettingsWrapper.
2021-09-02 13:34:32 +00:00
include/JellyfinQt/qobjectsettingswrapper.h
Big C++ refractor - Removed "jellyfin" prefix from files, as they are already in a directory named Jellyfin - Split the former "jellyfinitem.{h,cpp}" into multiple files in the DTO directory, one for each class. The jellyfinitem files started to become enormous. - Use forward declarations in headers instead of including files wherever possible. - Updated copyright headers
2021-02-17 18:42:10 +00:00
include/JellyfinQt/serverdiscoverymodel.h
include/JellyfinQt/websocket.h)
Add MPRIS support Besides MPRIS support, this also adds support for hasPrevious() and hasNext() in several parts to determine whether the player/playlist/shuffler has a previous or next item.
2021-08-30 23:29:51 +00:00
if (FREEDESKTOP_INTEGRATION)
list(APPEND JellyfinQt_SOURCES
src/platform/freedesktop/mediaplayer2.cpp
src/platform/freedesktop/mediaplayer2player.cpp
src/viewmodel/platformmediacontrol_freedesktop.cpp)
list(APPEND JellyfinQt_HEADERS
include/JellyfinQt/platform/freedesktop/mediaplayer2.h
include/JellyfinQt/platform/freedesktop/mediaplayer2player.h)
else()
list(APPEND JellyfinQt_SOURCES
src/viewmodel/platformmediacontrol_stub.cpp)
endif()
Slight improvements to the OpenAPI generator
2021-02-20 23:26:18 +00:00
WIP: HttpLoader seems to work, Model still borked
2021-03-28 02:00:00 +00:00
list(APPEND JellyfinQt_HEADERS ${openapi_HEADERS})
Switched to a sane build system (CMake)
2020-10-25 18:58:02 +00:00
add_definitions(-DSAILFIN_VERSION=\"${SAILFIN_VERSION}\")
WIP: HttpLoader seems to work, Model still borked
2021-03-28 02:00:00 +00:00
Add (optional) firejail support
2021-02-17 01:28:37 +00:00
if (PLATFORM_SAILFISHOS)
add_definitions(-DPLATFORM_SAILFISHOS=1)
endif()
WIP: HttpLoader seems to work, Model still borked
2021-03-28 02:00:00 +00:00
Add basic settings framework This settingsframework uses mlite5 on SailfishOS and other platforms with the mlite library present, because I believe DConf is neat. For platforms that do not have DConf and mlite present, it falls back to a quickly put together implementation that uses QSettings as a backend. Implementing an settings item is simply done by subclassing the Jellyfin::QObjectSettingsWrapper.
2021-09-02 13:34:32 +00:00
Make libJellyfinQt a proper qml plugin
2021-09-04 20:23:54 +00:00
add_library(JellyfinQt ${JellyfinQt_SOURCES} ${JellyfinQt_HEADERS} qmldir JellyfinQt.qmltypes)
WIP: HttpLoader seems to work, Model still borked
2021-03-28 02:00:00 +00:00
WIP: autogenerate models based on OpenAPI
2021-02-21 04:02:05 +00:00
if(${CMAKE_VERSION} VERSION_GREATER "3.16.0")
Resolved remaining issues with ApiModel
2021-03-29 15:10:25 +00:00
if(BUILD_PRECOMPILED_HEADERS)
target_precompile_headers(JellyfinQt PRIVATE ${JellyfinQt_HEADERS})
endif()
WIP: autogenerate models based on OpenAPI
2021-02-21 04:02:05 +00:00
endif()
WIP: HttpLoader seems to work, Model still borked
2021-03-28 02:00:00 +00:00
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
target_include_directories(JellyfinQt PUBLIC "include")
target_link_libraries(JellyfinQt PUBLIC Qt5::Core Qt5::Multimedia Qt5::Network Qt5::Qml Qt5::WebSockets)
Add MPRIS support Besides MPRIS support, this also adds support for hasPrevious() and hasNext() in several parts to determine whether the player/playlist/shuffler has a previous or next item.
2021-08-30 23:29:51 +00:00
if (FREEDESKTOP_INTEGRATION)
target_link_libraries(JellyfinQt PUBLIC Qt5::DBus)
endif()
Add basic settings framework This settingsframework uses mlite5 on SailfishOS and other platforms with the mlite library present, because I believe DConf is neat. For platforms that do not have DConf and mlite present, it falls back to a quickly put together implementation that uses QSettings as a backend. Implementing an settings item is simply done by subclassing the Jellyfin::QObjectSettingsWrapper.
2021-09-02 13:34:32 +00:00
if (USE_MLITE)
add_definitions(-DUSE_MLITE)
target_link_libraries(JellyfinQt PUBLIC mlite5::mlite5)
endif()
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
set_target_properties(JellyfinQt PROPERTIES CXX_VISIBILITY_PRESET default)
install(TARGETS JellyfinQt
Switched to a sane build system (CMake)
2020-10-25 18:58:02 +00:00
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
Make libJellyfinQt a proper qml plugin
2021-09-04 20:23:54 +00:00
add_custom_target(qmltypes
COMMAND qmlplugindump -nonrelocatable nl.netsoj.chris.Jellyfin 1.0 > $$PWD/JellyfinQt.qmltypes)
add_custom_command(
TARGET JellyfinQt
POST_BUILD
COMMAND
${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_LIST_DIR}/qmldir
$<TARGET_FILE_DIR:JellyfinQt>/qmldir
)
add_custom_command(
TARGET JellyfinQt
POST_BUILD
COMMAND
${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_LIST_DIR}/JellyfinQt.qmltypes
$<TARGET_FILE_DIR:JellyfinQt>/JellyfinQt.qmltypes
)
set(QML_IMPORT_PATH $<TARGET_FILE_DIR:JellyfinQt> CACHE PATH "")
install(FILES $<TARGET_FILE_DIR:JellyfinQt>/qmldir DESTINATION ${CMAKE_INSTALL_LIBDIR})
WIP: logic rewrite WIP: adding loaders
2021-03-24 19:04:03 +00:00
export(TARGETS JellyfinQt FILE JellyfinQtConfig.cmake)
Copy permalink