Create the SkMultimedia library

Sky.pro

@@ -8,6 +8,10 @@ isEmpty(TOOLS) {
               src/SkMedia \
               src/SkBarcode \
 
+    greaterThan(QT_MAJOR_VERSION, 4) {
+        SUBDIRS += src/SkMultimedia
+    }
+
     # NOTE Qt5 Windows: The WebView module is only available for MSVC but currently unsupported.
     # contains(QT_MAJOR_VERSION, 4) {
     #     SUBDIRS += src/SkWeb

dist/changes/1.9.0.md

@@ -7,7 +7,9 @@
 
 ## Global
 
-- Create SkBarcode library.
+- Create the SkBarcode library.
+
+- Create the SkMultimedia library.
 
 - Create Sk.pri.
 

include/SkMultimedia/WFilterBarcode

@@ -0,0 +1 @@
+#include "../../src/SkMultimedia/src/media/WFilterBarcode.h"

include/SkMultimedia/WFilterBarcode.h

@@ -0,0 +1 @@
+#include "../../src/SkMultimedia/src/media/WFilterBarcode.h"

include/SkMultimedia/private/WFilterBarcode_p

@@ -0,0 +1 @@
+#include "../../../src/SkMultimedia/src/media/WFilterBarcode_p.h"

include/SkMultimedia/private/WFilterBarcode_p.h

@@ -0,0 +1 @@
+#include "../../../src/SkMultimedia/src/media/WFilterBarcode_p.h"

include/generate.sh

@@ -8,7 +8,8 @@ includeGenerator="../deploy/includeGenerator"
 "$includeGenerator" ../../src/SkGui/src                               SkGui
 "$includeGenerator" ../../src/SkGui/src/3rdparty/qtsingleapplication  SkGui
 "$includeGenerator" ../../src/SkMedia/src                             SkMedia
+"$includeGenerator" ../../src/SkBarcode/src                           SkBarcode
+"$includeGenerator" ../../src/SkMultimedia/src                        SkMultimedia
 "$includeGenerator" ../../src/SkWeb/src                               SkWeb
 "$includeGenerator" ../../src/SkTorrent/src                           SkTorrent
-"$includeGenerator" ../../src/SkBarcode/src                           SkBarcode
 "$includeGenerator" ../../src/SkBackend/src                           SkBackend

src/SkCore/src/global/Sk.h

@@ -48,18 +48,24 @@ class WPrivate;
 #   define SK_MEDIA_EXPORT Q_DECL_IMPORT
 #endif
 
-#if defined(SK_WEB_LIBRARY)
-#   define SK_WEB_EXPORT Q_DECL_EXPORT
-#else
-#   define SK_WEB_EXPORT Q_DECL_IMPORT
-#endif
-
 #if defined(SK_BARCODE_LIBRARY)
 #   define SK_BARCODE_EXPORT Q_DECL_EXPORT
 #else
 #   define SK_BARCODE_EXPORT Q_DECL_IMPORT
 #endif
 
+#if defined(SK_MULTIMEDIA_LIBRARY)
+#   define SK_MULTIMEDIA_EXPORT Q_DECL_EXPORT
+#else
+#   define SK_MULTIMEDIA_EXPORT Q_DECL_IMPORT
+#endif
+
+#if defined(SK_WEB_LIBRARY)
+#   define SK_WEB_EXPORT Q_DECL_EXPORT
+#else
+#   define SK_WEB_EXPORT Q_DECL_IMPORT
+#endif
+
 #if defined(SK_TORRENT_LIBRARY)
 #   define SK_TORRENT_EXPORT Q_DECL_EXPORT
 #else

src/SkMultimedia/SkMultimedia.pro

@@ -0,0 +1,79 @@
+SK = $$_PRO_FILE_PWD_/../..
+
+CONFIG(debug, debug|release) {
+    TARGET = SkMultimediaD
+} else {
+    TARGET = SkMultimedia
+}
+
+DESTDIR = $$SK/lib
+
+TEMPLATE = lib
+
+QT += qml
+
+win32:CONFIG += dll
+
+# C++17
+CONFIG += c++1z
+
+DEFINES += SK_MULTIMEDIA_LIBRARY
+
+unix:QMAKE_LFLAGS += "-Wl,-rpath,'\$$ORIGIN'"
+
+include(../Sk.pri)
+include(src/media/media.pri)
+
+INCLUDEPATH += $$SK/include/SkCore \
+               $$SK/include/SkCore/private \
+               $$SK/include/SkGui \
+               $$SK/include/SkGui/private \
+               $$SK/include/SkBarcode \
+               $$SK/include/SkBarcode/private \
+               $$SK/include
+
+android {
+    CONFIG(debug, debug|release) {
+
+        LIBS += -L$$SK/lib -lSkCoreD_$$ABI \
+                -L$$SK/lib -lSkGuiD_$$ABI \
+                -L$$SK/lib -lSkBarcodeD_$$ABI
+    } else {
+        LIBS += -L$$SK/lib -lSkCore_$$ABI \
+                -L$$SK/lib -lSkGui_$$ABI \
+                -L$$SK/lib -lSkBarcode_$$ABI
+    }
+} else {
+    CONFIG(debug, debug|release) {
+
+        LIBS += -L$$SK/lib -lSkCoreD \
+                -L$$SK/lib -lSkGuiD \
+                -L$$SK/lib -lSkBarcodeD
+    } else {
+        LIBS += -L$$SK/lib -lSkCore \
+                -L$$SK/lib -lSkGui \
+                -L$$SK/lib -lSkBarcode
+    }
+}
+
+macx {
+CONFIG(debug, debug|release) {
+    QMAKE_POST_LINK  = install_name_tool -change libSkCoreD.dylib \
+                       @loader_path/libSkCoreD.dylib $${DESTDIR}/lib$${TARGET}.dylib;
+
+    QMAKE_POST_LINK += install_name_tool -change libSkGuiD.dylib \
+                       @loader_path/libSkGuiD.dylib $${DESTDIR}/lib$${TARGET}.dylib;
+
+   QMAKE_POST_LINK += install_name_tool -change libSkBarcodeD.dylib \
+                      @loader_path/libSkBarcodeD.dylib $${DESTDIR}/lib$${TARGET}.dylib;
+} else {
+    QMAKE_POST_LINK  = install_name_tool -change libSkCore.dylib \
+                       @loader_path/libSkCore.dylib $${DESTDIR}/lib$${TARGET}.dylib;
+
+    QMAKE_POST_LINK += install_name_tool -change libSkGui.dylib \
+                       @loader_path/libSkGui.dylib $${DESTDIR}/lib$${TARGET}.dylib;
+
+    QMAKE_POST_LINK += install_name_tool -change libSkBarcode.dylib \
+                       @loader_path/libSkBarcode.dylib $${DESTDIR}/lib$${TARGET}.dylib;
+}
+}

src/SkMultimedia/src/media/WFilterBarcode.cpp

@@ -0,0 +1,47 @@
+//=================================================================================================
+/*
+    Copyright (C) 2015-2020 Sky kit authors. <http://omega.gg/Sky>
+
+    Author: Benjamin Arnaud. <http://bunjee.me> <[email protected]>
+
+    This file is part of SkMultimedia.
+
+    - GNU Lesser General Public License Usage:
+    This file may be used under the terms of the GNU Lesser General Public License version 3 as
+    published by the Free Software Foundation and appearing in the LICENSE.md file included in the
+    packaging of this file. Please review the following information to ensure the GNU Lesser
+    General Public License requirements will be met: https://www.gnu.org/licenses/lgpl.html.
+
+    - Private License Usage:
+    Sky kit licensees holding valid private licenses may use this file in accordance with the
+    private license agreement provided with the Software or, alternatively, in accordance with the
+    terms contained in written agreement between you and Sky kit authors. For further information
+    contact us at [email protected].
+*/
+//=================================================================================================
+
+#include "WFilterBarcode.h"
+
+#ifndef SK_NO_FILTERBARCODE
+
+//-------------------------------------------------------------------------------------------------
+// Private
+//-------------------------------------------------------------------------------------------------
+
+#include "WFilterBarcode_p.h"
+
+WFilterBarcodePrivate::WFilterBarcodePrivate(WFilterBarcode * p) : WPrivate(p) {}
+
+void WFilterBarcodePrivate::init() {}
+
+//-------------------------------------------------------------------------------------------------
+// Ctor / dtor
+//-------------------------------------------------------------------------------------------------
+
+/* explicit */ WFilterBarcode::WFilterBarcode(QObject * parent)
+    : QObject(parent), WPrivatable(new WFilterBarcodePrivate(this))
+{
+    Q_D(WFilterBarcode); d->init();
+}
+
+#endif // SK_NO_FILTERBARCODE

src/SkMultimedia/src/media/WFilterBarcode.h

@@ -0,0 +1,48 @@
+//=================================================================================================
+/*
+    Copyright (C) 2015-2020 Sky kit authors. <http://omega.gg/Sky>
+
+    Author: Benjamin Arnaud. <http://bunjee.me> <[email protected]>
+
+    This file is part of SkMultimedia.
+
+    - GNU Lesser General Public License Usage:
+    This file may be used under the terms of the GNU Lesser General Public License version 3 as
+    published by the Free Software Foundation and appearing in the LICENSE.md file included in the
+    packaging of this file. Please review the following information to ensure the GNU Lesser
+    General Public License requirements will be met: https://www.gnu.org/licenses/lgpl.html.
+
+    - Private License Usage:
+    Sky kit licensees holding valid private licenses may use this file in accordance with the
+    private license agreement provided with the Software or, alternatively, in accordance with the
+    terms contained in written agreement between you and Sky kit authors. For further information
+    contact us at [email protected].
+*/
+//=================================================================================================
+
+#ifndef WFILTERBARCODE_H
+#define WFILTERBARCODE_H
+
+// Qt includes
+#include <QObject>
+
+// Sk includes
+#include <Sk>
+
+#ifndef SK_NO_FILTERBARCODE
+
+class WFilterBarcodePrivate;
+
+class SK_MULTIMEDIA_EXPORT WFilterBarcode : public QObject, public WPrivatable
+{
+    Q_OBJECT
+
+public:
+    explicit WFilterBarcode(QObject * parent = NULL);
+
+private:
+    W_DECLARE_PRIVATE(WFilterBarcode)
+};
+
+#endif // SK_NO_FILTERBARCODE
+#endif // WFILTERBARCODE_H

src/SkMultimedia/src/media/WFilterBarcode_p.h

@@ -0,0 +1,53 @@
+//=================================================================================================
+/*
+    Copyright (C) 2015-2020 Sky kit authors. <http://omega.gg/Sky>
+
+    Author: Benjamin Arnaud. <http://bunjee.me> <[email protected]>
+
+    This file is part of SkMultimedia.
+
+    - GNU Lesser General Public License Usage:
+    This file may be used under the terms of the GNU Lesser General Public License version 3 as
+    published by the Free Software Foundation and appearing in the LICENSE.md file included in the
+    packaging of this file. Please review the following information to ensure the GNU Lesser
+    General Public License requirements will be met: https://www.gnu.org/licenses/lgpl.html.
+
+    - Private License Usage:
+    Sky kit licensees holding valid private licenses may use this file in accordance with the
+    private license agreement provided with the Software or, alternatively, in accordance with the
+    terms contained in written agreement between you and Sky kit authors. For further information
+    contact us at [email protected].
+*/
+//=================================================================================================
+
+#ifndef WFILTERBARCODE_P_H
+#define WFILTERBARCODE_P_H
+
+/*  W A R N I N G
+    -------------
+
+    This file is not part of the Sk API. It exists purely as an
+    implementation detail. This header file may change from version to
+    version without notice, or even be removed.
+
+    We mean it.
+*/
+
+// Private includes
+#include <private/Sk_p>
+
+#ifndef SK_NO_FILTERBARCODE
+
+class SK_MULTIMEDIA_EXPORT WFilterBarcodePrivate : public WPrivate
+{
+public:
+    WFilterBarcodePrivate(WFilterBarcode * p);
+
+    void init();
+
+protected:
+    W_DECLARE_PUBLIC(WFilterBarcode)
+};
+
+#endif // SK_NO_FILTERBARCODE
+#endif // WFILTERBARCODE_P_H

src/SkMultimedia/src/media/media.pri

@@ -0,0 +1,6 @@
+# Media module
+
+HEADERS += src/media/WFilterBarcode.h \
+           src/media/WFilterBarcode_p.h \
+
+SOURCES += src/media/WFilterBarcode.cpp \