From dff0057f151cad670e40d4edade0bac1a8cbafb3 Mon Sep 17 00:00:00 2001 From: APTX Date: Fri, 24 Nov 2017 01:10:37 +0900 Subject: [PATCH] Remove qmake build system --- aniplayer3.pro | 7 -- backendplugins/backend_mpv/backend_mpv.pro | 35 -------- backendplugins/backend_null/backend_null.pro | 22 ----- backendplugins/backendbuildconfig.pri | 2 - backendplugins/backendplugins.pro | 15 ---- buildconfig.pri | 7 -- config.pri | 0 core/backendapi.pri | 2 - core/core.pri | 2 - core/core.pro | 52 ----------- core/include/aniplayer/backendpluginbase.h | 47 ---------- core/include/aniplayer/featurepluginbase.h | 34 -------- .../aniplayer/playerfeatureplugininterface.h | 13 --- .../include/aniplayer/playerplugininterface.h | 87 ------------------- core/include/aniplayer/uipluginbase.h | 23 ----- .../qtsingleapplication.pri | 6 -- .../qtsinglecoreapplication.pri | 10 --- .../feature_localmylist.pro | 24 ----- featureplugins/featurebuildconfig.pri | 2 - featureplugins/featureplugins.pro | 7 -- .../ui_desktop_qml_default.pro | 27 ------ uiplugins/uibuildconfig.pri | 2 - uiplugins/uiplugins.pro | 7 -- 23 files changed, 433 deletions(-) delete mode 100644 aniplayer3.pro delete mode 100644 backendplugins/backend_mpv/backend_mpv.pro delete mode 100644 backendplugins/backend_null/backend_null.pro delete mode 100644 backendplugins/backendbuildconfig.pri delete mode 100644 backendplugins/backendplugins.pro delete mode 100644 buildconfig.pri delete mode 100644 config.pri delete mode 100644 core/backendapi.pri delete mode 100644 core/core.pri delete mode 100644 core/core.pro delete mode 100644 core/include/aniplayer/backendpluginbase.h delete mode 100644 core/include/aniplayer/featurepluginbase.h delete mode 100644 core/include/aniplayer/playerfeatureplugininterface.h delete mode 100644 core/include/aniplayer/playerplugininterface.h delete mode 100644 core/include/aniplayer/uipluginbase.h delete mode 100644 core/qtsingleapplication/qtsingleapplication.pri delete mode 100644 core/qtsingleapplication/qtsinglecoreapplication.pri delete mode 100644 featureplugins/feature_localmylist/feature_localmylist.pro delete mode 100644 featureplugins/featurebuildconfig.pri delete mode 100644 featureplugins/featureplugins.pro delete mode 100644 uiplugins/ui_desktop_qml_default/ui_desktop_qml_default.pro delete mode 100644 uiplugins/uibuildconfig.pri delete mode 100644 uiplugins/uiplugins.pro diff --git a/aniplayer3.pro b/aniplayer3.pro deleted file mode 100644 index a4531eb..0000000 --- a/aniplayer3.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += \ - core \ - backendplugins \ - uiplugins \ - featureplugins diff --git a/backendplugins/backend_mpv/backend_mpv.pro b/backendplugins/backend_mpv/backend_mpv.pro deleted file mode 100644 index 3cda547..0000000 --- a/backendplugins/backend_mpv/backend_mpv.pro +++ /dev/null @@ -1,35 +0,0 @@ -TARGET = backend_mpv -TEMPLATE = lib - -include(../../core/backendapi.pri) -include(../backendbuildconfig.pri) - -DEFINES += BACKEND_MPV_LIBRARY QT_DEPRECATED_WARNINGS - -SOURCES += \ - backendmpv.cpp - -HEADERS += \ - backendmpv.h \ - backend_mpv_global.h - -DISTFILES += \ - backend_mpv.json - -unix { - LIBS += $$system(pkg-config --libs mpv) -} -!unix { - LIBS += -lmpv-1 -} - -unix { - target.path = $${PREFIX}/lib/aniplayer/backendplugins - INSTALLS += target -} - -win32:INSTALL_DESTINATION = aniplayer/backendplugins -unix:INSTALL_DESTINATION = lib/aniplayer/backendplugins - -target.path = $${PREFIX}/$${INSTALL_DESTINATION} -INSTALLS += target diff --git a/backendplugins/backend_null/backend_null.pro b/backendplugins/backend_null/backend_null.pro deleted file mode 100644 index 1948d17..0000000 --- a/backendplugins/backend_null/backend_null.pro +++ /dev/null @@ -1,22 +0,0 @@ -TARGET = backend_null -QT -= gui -TEMPLATE = lib - -include(../../core/backendapi.pri) -include(../backendbuildconfig.pri) - -DEFINES += BACKEND_NULL_LIBRARY QT_DEPRECATED_WARNINGS - -SOURCES += backendnull.cpp - -HEADERS += backendnull.h\ - backend_null_global.h - -DISTFILES += \ - backend_null.json - -win32:INSTALL_DESTINATION = aniplayer/backendplugins -unix:INSTALL_DESTINATION = lib/aniplayer/backendplugins - -target.path = $${PREFIX}/$${INSTALL_DESTINATION} -INSTALLS += target diff --git a/backendplugins/backendbuildconfig.pri b/backendplugins/backendbuildconfig.pri deleted file mode 100644 index 09a7862..0000000 --- a/backendplugins/backendbuildconfig.pri +++ /dev/null @@ -1,2 +0,0 @@ -include(../buildconfig.pri) -DESTDIR=../../build/backendplugins \ No newline at end of file diff --git a/backendplugins/backendplugins.pro b/backendplugins/backendplugins.pro deleted file mode 100644 index 5f3faf9..0000000 --- a/backendplugins/backendplugins.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = subdirs - -include(../config.pri) - -!no_backend_null { - SUBDIRS += backend_null -} - -backend_mpv { - SUBDIRS += backend_mpv -} - -backend_qtav { - SUBDIRS += backend_qtav -} \ No newline at end of file diff --git a/buildconfig.pri b/buildconfig.pri deleted file mode 100644 index 72bc845..0000000 --- a/buildconfig.pri +++ /dev/null @@ -1,7 +0,0 @@ -DESTDIR = ../build -CONFIG += c++14 -# Output Temporary files -OBJECTS_DIR = workfiles/obj -MOC_DIR = workfiles/moc -RCC_DIR = workfiles/rcc -include(config.pri) diff --git a/config.pri b/config.pri deleted file mode 100644 index e69de29..0000000 diff --git a/core/backendapi.pri b/core/backendapi.pri deleted file mode 100644 index 3b5ca33..0000000 --- a/core/backendapi.pri +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDEPATH += $$PWD/include -include(../buildconfig.pri) \ No newline at end of file diff --git a/core/core.pri b/core/core.pri deleted file mode 100644 index 159a17f..0000000 --- a/core/core.pri +++ /dev/null @@ -1,2 +0,0 @@ -INCLUDEPATH += $$PWD/include -include(../buildconfig.pri) diff --git a/core/core.pro b/core/core.pro deleted file mode 100644 index 4cfe5dc..0000000 --- a/core/core.pro +++ /dev/null @@ -1,52 +0,0 @@ -TARGET = aniplayer -TEMPLATE = app -QT += widgets qml quick - -DEFINES += BACKEND_MPV_LIBRARY QT_DEPRECATED_WARNINGS - -include(core.pri) - -SOURCES += main.cpp \ - player.cpp \ - pluginmanager.cpp \ - videoelement.cpp \ - instancemanager.cpp \ - settings.cpp \ - trackmodel.cpp \ - chaptermodel.cpp - -HEADERS += \ - player.h \ - include/aniplayer/backendpluginbase.h \ - include/aniplayer/playerplugininterface.h \ - include/aniplayer/featurepluginbase.h \ - include/aniplayer/uipluginbase.h \ - pluginmanager.h \ - videoelement.h \ - instancemanager.h \ - settings.h \ - trackmodel.h \ - chaptermodel.h \ - include/aniplayer/playerfeatureplugininterface.h - -include(qtsingleapplication/qtsingleapplication.pri) - -win32 { - CONFIG -= embed_manifest_exe - RC_FILE += aniplayer.rc -} - -win32 { - INSTALL_DESTINATION = aniplayer - HEADERS_DESTINATION = $$INSTALL_DESTINATION/include/aniplayer -} -unix { - INSTALL_DESTINATION = bin - HEADERS_DESTINATION = include/aniplayer -} - -target.path = $${PREFIX}/$${INSTALL_DESTINATION} -api_headers.files = $$find(HEADERS, "^include/") -api_headers.path = $${PREFIX}/$${HEADERS_DESTINATION} - -INSTALLS += target api_headers diff --git a/core/include/aniplayer/backendpluginbase.h b/core/include/aniplayer/backendpluginbase.h deleted file mode 100644 index 56d6728..0000000 --- a/core/include/aniplayer/backendpluginbase.h +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef BACKENDPLUGINBASE_H -#define BACKENDPLUGINBASE_H - -#include "playerplugininterface.h" - -class QUrl; - -class BackendInstance { -public: - using TrackIndex = int; - // In seconds - using TimeStamp = double; - // Volume valid range is 0.0-1.0 - using Volume = double; - virtual ~BackendInstance() = default; - - virtual VideoRendererBase *createRenderer(VideoUpdateInterface *) = 0; - - virtual bool open(const QUrl &resource) = 0; - - virtual void play() = 0; - virtual void pause() = 0; - virtual void stop() = 0; - - virtual void seek(TimeStamp) = 0; - - virtual void setVolume(Volume) = 0; - - virtual void setCurrentVideoStream(TrackIndex) = 0; - virtual void setCurrentAudioStream(TrackIndex) = 0; - virtual void setCurrentSubtitleStream(TrackIndex) = 0; -}; - -class BackendPluginBase { -public: - virtual ~BackendPluginBase() = default; - - virtual BackendInstance *createInstance(PlayerPluginInterface *) = 0; -}; - -#define ANIPLAYER_BACKEND_DPLUGIN_INTERFACE_IID \ - "org.aptx.aniplayer.BackendPluginInterface" - -#include -Q_DECLARE_INTERFACE(BackendPluginBase, ANIPLAYER_BACKEND_DPLUGIN_INTERFACE_IID) - -#endif // BACKENDPLUGINBASE_H diff --git a/core/include/aniplayer/featurepluginbase.h b/core/include/aniplayer/featurepluginbase.h deleted file mode 100644 index b20b3b3..0000000 --- a/core/include/aniplayer/featurepluginbase.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef FEATUREPLUGINBASE_H -#define FEATUREPLUGINBASE_H - -#include - -#include "aniplayer/playerfeatureplugininterface.h" - -class FeaturePluginInstance { -public: - virtual ~FeaturePluginInstance() = default; - - FeaturePluginInstance(QObject *player, - PlayerFeaturePlauginInterface *interface) - : m_player{player}, m_playerInterface{interface} {} - -protected: - QObject *m_player; - PlayerFeaturePlauginInterface *m_playerInterface; -}; - -class FeaturePluginBase { -public: - virtual ~FeaturePluginBase() = default; - - virtual FeaturePluginInstance * - createInstance(QObject *instance, PlayerFeaturePlauginInterface *) = 0; -}; - -#define ANIPLAYER_FEATURE_PLUGIN_INTERFACE_IID \ - "org.aptx.aniplayer.FeaturePluginInterface" - -Q_DECLARE_INTERFACE(FeaturePluginBase, ANIPLAYER_FEATURE_PLUGIN_INTERFACE_IID) - -#endif // FEATUREPLUGINBASE_H diff --git a/core/include/aniplayer/playerfeatureplugininterface.h b/core/include/aniplayer/playerfeatureplugininterface.h deleted file mode 100644 index 243a169..0000000 --- a/core/include/aniplayer/playerfeatureplugininterface.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef PLAYERFEATUREPLUGININTERFACE_H -#define PLAYERFEATUREPLUGININTERFACE_H - -#include - -class PlayerFeaturePlauginInterface { -public: - virtual ~PlayerFeaturePlauginInterface() = default; - - virtual void featureShowStatusMessage(const QString &message) = 0; -}; - -#endif // PLAYERFEATUREPLUGININTERFACE_H diff --git a/core/include/aniplayer/playerplugininterface.h b/core/include/aniplayer/playerplugininterface.h deleted file mode 100644 index 1f7b70a..0000000 --- a/core/include/aniplayer/playerplugininterface.h +++ /dev/null @@ -1,87 +0,0 @@ -#ifndef PLAYERPLUGININTERFACE_H -#define PLAYERPLUGININTERFACE_H - -#include -#include - -class QOpenGLFramebufferObject; - -class VideoUpdateInterface { -public: - virtual ~VideoUpdateInterface() = default; - - virtual void videoUpdated() = 0; -}; - -class PlayerPluginInterface { -public: - using TrackIndex = int; - using TimeStamp = double; - using Volume = double; - - enum class PlayState { Stopped, Paused, Playing }; - /* - * .-----. - * | | Error - * v | - * Stopped -'<--+<-------. - * | ^ | - * | Load | Error | - * v | | - * Paused<------+ | File End - * | ^ | - * | Play | Pause | - * v | | - * Playing------+--------' - */ - - virtual ~PlayerPluginInterface() = default; - - virtual void backendReadyToPlay() = 0; - - virtual void backendSourceChanged(QUrl source) = 0; - virtual void playStateChanged(PlayState) = 0; - virtual void playbackDurationChanged(TimeStamp) = 0; - virtual void playbackPositionChanged(TimeStamp) = 0; - virtual void playbackVolumeChanged(Volume) = 0; - virtual void playbackMaxVolumeChanged(Volume) = 0; - - struct Track { - QString title; - QString language; - int id; - }; - using TrackList = QList; - virtual void backendVideoTracksChanged(const TrackList &) = 0; - virtual void backendAudioTracksChanged(const TrackList &) = 0; - virtual void backendSubtitleTracksChanged(const TrackList &) = 0; - - virtual void backendCurrentVideoTrackChanged(TrackIndex) = 0; - virtual void backendCurrentAudioTrackChanged(TrackIndex) = 0; - virtual void backendCurrentSubtitleTrackChanged(TrackIndex) = 0; - - struct Chapter { - QString title; - TimeStamp startTime; - }; - using ChapterList = QList; - virtual void backendChaptersChanged(const ChapterList &chapters) = 0; -}; - -class PlayerRendererInterface { -public: - virtual ~PlayerRendererInterface() = default; - virtual void rendererSinkSet(VideoUpdateInterface *) = 0; - virtual void rendererReady() = 0; -}; - -class VideoRendererBase { -public: - VideoRendererBase() = default; - VideoRendererBase(const VideoRendererBase &) = delete; - VideoRendererBase &operator=(const VideoRendererBase &) = delete; - virtual ~VideoRendererBase() = default; - virtual void render(QOpenGLFramebufferObject *) = 0; -}; - -#endif // PLAYERPLUGININTERFACE_H diff --git a/core/include/aniplayer/uipluginbase.h b/core/include/aniplayer/uipluginbase.h deleted file mode 100644 index 04b0479..0000000 --- a/core/include/aniplayer/uipluginbase.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef UIPLUGINBASE_H -#define UIPLUGINBASE_H - -#include - -class UiInstance { -public: - virtual ~UiInstance() = default; -}; - -class UiPluginBase { -public: - virtual ~UiPluginBase() = default; - - virtual UiInstance *createUi(QObject *player, QObject *settings, - QObject *parent = nullptr) = 0; -}; - -#define ANIPLAYER_UI_PLUGIN_INTERFACE_IID "org.aptx.aniplayer.UiPluginInterface" - -Q_DECLARE_INTERFACE(UiPluginBase, ANIPLAYER_UI_PLUGIN_INTERFACE_IID) - -#endif // UIPLUGINBASE_H diff --git a/core/qtsingleapplication/qtsingleapplication.pri b/core/qtsingleapplication/qtsingleapplication.pri deleted file mode 100644 index 273ecb9..0000000 --- a/core/qtsingleapplication/qtsingleapplication.pri +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD -QT *= network - -SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp -HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h diff --git a/core/qtsingleapplication/qtsinglecoreapplication.pri b/core/qtsingleapplication/qtsinglecoreapplication.pri deleted file mode 100644 index d2d6cc3..0000000 --- a/core/qtsingleapplication/qtsinglecoreapplication.pri +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD -HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h -SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp - -QT *= network - -win32:contains(TEMPLATE, lib):contains(CONFIG, shared) { - DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport) -} diff --git a/featureplugins/feature_localmylist/feature_localmylist.pro b/featureplugins/feature_localmylist/feature_localmylist.pro deleted file mode 100644 index 8a7cedd..0000000 --- a/featureplugins/feature_localmylist/feature_localmylist.pro +++ /dev/null @@ -1,24 +0,0 @@ -TARGET = feature_localmylist -QT -= gui -QT += sql -TEMPLATE = lib - -include(../../core/core.pri) -include(../featurebuildconfig.pri) - -DEFINES += FEATURE_LOCALMYLIST_LIBRARY QT_DEPRECATED_WARNINGS - -SOURCES += featurelocalmylist.cpp - -HEADERS += featurelocalmylist.h\ - feature_localmylist_global.h - -DISTFILES += feature_localmylist.json - -LIBS += -llocalmylist - -win32:INSTALL_DESTINATION = aniplayer/featureplugins -unix:INSTALL_DESTINATION = lib/aniplayer/featureplugins - -target.path = $${PREFIX}/$${INSTALL_DESTINATION} -INSTALLS += target diff --git a/featureplugins/featurebuildconfig.pri b/featureplugins/featurebuildconfig.pri deleted file mode 100644 index 288e559..0000000 --- a/featureplugins/featurebuildconfig.pri +++ /dev/null @@ -1,2 +0,0 @@ -include(../buildconfig.pri) -DESTDIR=../../build/featureplugins \ No newline at end of file diff --git a/featureplugins/featureplugins.pro b/featureplugins/featureplugins.pro deleted file mode 100644 index acb012a..0000000 --- a/featureplugins/featureplugins.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = subdirs - -include(../config.pri) - -feature_plugin_localmylist { - SUBDIRS += feature_localmylist -} diff --git a/uiplugins/ui_desktop_qml_default/ui_desktop_qml_default.pro b/uiplugins/ui_desktop_qml_default/ui_desktop_qml_default.pro deleted file mode 100644 index 13337c2..0000000 --- a/uiplugins/ui_desktop_qml_default/ui_desktop_qml_default.pro +++ /dev/null @@ -1,27 +0,0 @@ -TARGET = ui_desktop_qml_default -QT += qml quick -TEMPLATE = lib - -include(../../core/core.pri) -include(../uibuildconfig.pri) - -DEFINES += UI_DESKTOP_QML_DEFAULT_LIBRARY QT_DEPRECATED_WARNINGS - -SOURCES += \ - uidesktopqmldefault.cpp \ - timeformatter.cpp - -HEADERS += \ - ui_desktop_qml_default_global.h \ - uidesktopqmldefault.h \ - timeformatter.h - -RESOURCES += qml.qrc - -DISTFILES += ui_desktop_qml_default.json - -win32:INSTALL_DESTINATION = aniplayer/uiplugins -unix:INSTALL_DESTINATION = lib/aniplayer/uiplugins - -target.path = $${PREFIX}/$${INSTALL_DESTINATION} -INSTALLS += target diff --git a/uiplugins/uibuildconfig.pri b/uiplugins/uibuildconfig.pri deleted file mode 100644 index 424939d..0000000 --- a/uiplugins/uibuildconfig.pri +++ /dev/null @@ -1,2 +0,0 @@ -include(../buildconfig.pri) -DESTDIR=../../build/uiplugins \ No newline at end of file diff --git a/uiplugins/uiplugins.pro b/uiplugins/uiplugins.pro deleted file mode 100644 index 2a46a74..0000000 --- a/uiplugins/uiplugins.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = subdirs - -include(../config.pri) - -!no_ui_desktop_qml_default { - SUBDIRS += ui_desktop_qml_default -} -- 2.52.0