Move core plugin API to its own direcotry

diff --git a/backendplugins/backend_mpv/backend_mpv.pro b/backendplugins/backend_mpv/backend_mpv.pro
index 75ffa62830ec2bc4f1133fed03ac020bf213bc98..abb75be43d16f3c2a8ad3211b3d9eb7c62e1a99a 100644 (file)
--- a/backendplugins/backend_mpv/backend_mpv.pro
+++ b/backendplugins/backend_mpv/backend_mpv.pro
@@ -1,7 +1,7 @@
 TARGET = backend_mpv
 TEMPLATE = lib
 
-include(../../core/core.pri)
+include(../../core/backendapi.pri)
 include(../backendbuildconfig.pri)
 
 DEFINES += BACKEND_MPV_LIBRARY QT_DEPRECATED_WARNINGS
@@ -13,6 +13,9 @@ HEADERS += \
     backendmpv.h \
     backend_mpv_global.h
 
+DISTFILES += \
+    backend_mpv.json
+
 unix {
     LIBS += $$system(pkg-config --libs mpv)
 }
@@ -25,5 +28,3 @@ unix {
     INSTALLS += target
 }
 
-DISTFILES += \
-    backend_mpv.json

diff --git a/backendplugins/backend_mpv/backendmpv.h b/backendplugins/backend_mpv/backendmpv.h
index 43271a3c3c5610bf4fa6c3c5eb19faeb44060fb5..bd1f6b19bac7926a9e18f9dc00380c216951e934 100644 (file)
--- a/backendplugins/backend_mpv/backendmpv.h
+++ b/backendplugins/backend_mpv/backendmpv.h
@@ -5,7 +5,7 @@
 #include <QtPlugin>
 
 #include "backend_mpv_global.h"
-#include "backendpluginbase.h"
+#include "aniplayer/backendpluginbase.h"
 
 struct mpv_handle;
 struct mpv_opengl_cb_context;

diff --git a/backendplugins/backend_null/backend_null.pro b/backendplugins/backend_null/backend_null.pro
index 1443ae943d3d65b7a99064b39f059ae3f799dba7..6de835bc34846b7b0996e04689bd19c59dec9108 100644 (file)
--- a/backendplugins/backend_null/backend_null.pro
+++ b/backendplugins/backend_null/backend_null.pro
@@ -2,7 +2,7 @@ TARGET = backend_null
 QT -= gui
 TEMPLATE = lib
 
-include(../../core/core.pri)
+include(../../core/backendapi.pri)
 include(../backendbuildconfig.pri)
 
 DEFINES += BACKEND_NULL_LIBRARY QT_DEPRECATED_WARNINGS
@@ -12,6 +12,9 @@ SOURCES += backendnull.cpp
 HEADERS += backendnull.h\
            backend_null_global.h
 
+DISTFILES += \
+    backend_null.json
+
 unix {
     target.path = $${PREFIX}/lib/aniplayer/backendplugins
     INSTALLS += target

diff --git a/backendplugins/backend_null/backendnull.h b/backendplugins/backend_null/backendnull.h
index b997636c5d7bc4d7436170792c7376b82f140551..f16cefbf5f9bb6a3ea705dddf83c454f3929b3f5 100644 (file)
--- a/backendplugins/backend_null/backendnull.h
+++ b/backendplugins/backend_null/backendnull.h
@@ -5,7 +5,7 @@
 #include <QtPlugin>
 
 #include "backend_null_global.h"
-#include "backendpluginbase.h"
+#include "aniplayer/backendpluginbase.h"
 
 class QTimer;
 

diff --git a/core/backendapi.pri b/core/backendapi.pri
new file mode 100644 (file)
index 0000000..2dba128
--- /dev/null
+++ b/core/backendapi.pri
@@ -0,0 +1,2 @@
+INCLUDEPATH += $$PWD/include\r
+include(../buildconfig.pri)
\ No newline at end of file

diff --git a/core/backendpluginbase.cpp b/core/backendpluginbase.cpp
deleted file mode 100644 (file)
index bdb08e1..0000000
--- a/core/backendpluginbase.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "backendpluginbase.h"
-

diff --git a/core/core.pri b/core/core.pri
index 1264d97b088305b7edfeebd94c22e6713306136e..159a17f9bbc6c95c10b0b0e8f3a3b64cdb6c679c 100644 (file)
--- a/core/core.pri
+++ b/core/core.pri
@@ -1,2 +1,2 @@
-INCLUDEPATH += $$PWD
+INCLUDEPATH += $$PWD/include
 include(../buildconfig.pri)

diff --git a/core/core.pro b/core/core.pro
index bc605b59bfc0af5ac9fe2c10d82fe28545a5a4c0..c69085c568ae6327f62a53fee052ef33e11b6297 100644 (file)
--- a/core/core.pro
+++ b/core/core.pro
@@ -20,10 +20,10 @@ QML_IMPORT_PATH =
 
 HEADERS += \
     player.h \
-    backendpluginbase.h \
+    include/aniplayer/backendpluginbase.h \
+    include/aniplayer/playerplugininterface.h \
     pluginmanager.h \
     videoelement.h \
-    playerplugininterface.h \
     timeformatter.h \
     instancemanager.h
 

diff --git a/core/backendpluginbase.h b/core/include/aniplayer/backendpluginbase.h
similarity index 100%
rename from core/backendpluginbase.h
rename to core/include/aniplayer/backendpluginbase.h

diff --git a/core/playerplugininterface.h b/core/include/aniplayer/playerplugininterface.h
similarity index 100%
rename from core/playerplugininterface.h
rename to core/include/aniplayer/playerplugininterface.h

diff --git a/core/player.h b/core/player.h
index 7eec1558e319b8ad7123a249a4ea3542b15ac08d..72898101c955c19448e839102728e649a56caabc 100644 (file)
--- a/core/player.h
+++ b/core/player.h
@@ -6,7 +6,7 @@
 #include <QQmlEngine>
 #include <QUrl>
 
-#include "backendpluginbase.h"
+#include "aniplayer/backendpluginbase.h"
 #include "pluginmanager.h"
 
 class Player : public QObject,

diff --git a/core/playerplugininterface.cpp b/core/playerplugininterface.cpp
deleted file mode 100644 (file)
index 106c287..0000000
--- a/core/playerplugininterface.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "playerplugininterface.h"

diff --git a/core/videoelement.h b/core/videoelement.h
index ca3d014da1b8a3ed655a77b77b478b9a30ad3738..1fb7d4ad78ee74a0daea8fd27381659d29f5fcba 100644 (file)
--- a/core/videoelement.h
+++ b/core/videoelement.h
@@ -4,7 +4,7 @@
 #include <QQuickFramebufferObject>
 
 #include "player.h"
-#include "playerplugininterface.h"
+#include "aniplayer/playerplugininterface.h"
 
 class VideoElement : public QQuickFramebufferObject,
                      public VideoUpdateInterface {