Reorganized files in folders and modules.

.gitignore

@@ -11,3 +11,4 @@ YUView.pro.user
 /GeneratedFiles
 /x64
 /deploy
+.vscode

YUView.pro

@@ -1,151 +1,7 @@
-QT += gui opengl xml concurrent network charts
+TEMPLATE = subdirs
+SUBDIRS = YUViewLib YUViewApp
 
-TARGET = YUView
-TEMPLATE = app
-CONFIG += c++11
+YUViewApp.subdir = src/YUViewApp
+YUViewLib.subdir = src/YUViewLib
 
-# Please keep the project file lists sorted by name.
-
-SOURCES += $$files(source/*.cpp, true)
-HEADERS += $$files(source/*.h, true)
-HEADERS += $$files(decoder/libde265*.h, true)
-HEADERS += $$files(decoder/dav1d/*.h, true)
-FORMS += $$files(ui/*.ui, true)
-
-RESOURCES += \
-    images/images.qrc \
-    docs/resources.qrc
-
-INCLUDEPATH += \
-    decoder/libde265 \
-    decoder/dav1d \
-    source/
-
-OTHER_FILES += \
-    HACKING.md \
-    README.md \
-    docs/about.html \
-    docs/help.html
-
-unix:!mac {
-	isEmpty(PREFIX) {
-		PREFIX = /usr/local
-	}
-	isEmpty(BINDIR) {
-		BINDIR = bin
-	}
-
-        target.path = $$PREFIX/$$BINDIR/
-
-        metainfo.files = packaging/linux/de.rwth_aachen.ient.YUView.appdata.xml
-        metainfo.path = $$PREFIX/share/metainfo
-        desktop.files = packaging/linux/de.rwth_aachen.ient.YUView.desktop
-        desktop.path = $$PREFIX/share/applications
-        mime.files = packaging/linux/de.rwth_aachen.ient.YUView.xml
-        mime.path = $$PREFIX/share/mime/packages
-        icon32.files = packaging/linux/icons/32x32/de.rwth_aachen.ient.YUView.png
-        icon64.files = packaging/linux/icons/64x64/de.rwth_aachen.ient.YUView.png
-        icon128.files = packaging/linux/icons/128x128/de.rwth_aachen.ient.YUView.png
-        icon256.files = packaging/linux/icons/256x256/de.rwth_aachen.ient.YUView.png
-        icon512.files = packaging/linux/icons/512x512/de.rwth_aachen.ient.YUView.png
-        icon1024.files = packaging/linux/icons/1024x1024/de.rwth_aachen.ient.YUView.png
-        icon32.path = $$PREFIX/share/icons/hicolor/32x32/apps
-        icon64.path = $$PREFIX/share/icons/hicolor/64x64/apps
-        icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps
-        icon256.path = $$PREFIX/share/icons/hicolor/256x256/apps
-        icon512.path = $$PREFIX/share/icons/hicolor/512x512/apps
-        icon1024.path = $$PREFIX/share/icons/hicolor/1024x1024/apps
-
-        INSTALLS += target metainfo desktop mime icon32 icon64 icon128 icon256 icon512 icon1024
-}
-
-
-contains(QT_ARCH, x86_32|i386) {
-    warning("You are building for a 32 bit system. This is untested!")
-}
-
-macx {
-    CONFIG(debug, debug|release) {
-        DESTDIR = build/debug
-    } else {
-        DESTDIR = build/release
-    }
-    OBJECTS_DIR = $$DESTDIR/.obj
-    MOC_DIR = $$DESTDIR/.moc
-    RCC_DIR = $$DESTDIR/.qrc
-    UI_DIR = $$DESTDIR/.ui
-
-    QMAKE_MAC_SDK = macosx
-
-    ICON = images/YUView.icns
-    QMAKE_INFO_PLIST = Info.plist
-    SVNN   = $$system("git describe --tags")
-}
-
-linux {
-    CONFIG(debug, debug|release) {
-        DESTDIR = build/debug
-    } else {
-        DESTDIR = build/release
-    }
-    OBJECTS_DIR = $$DESTDIR/.obj
-    MOC_DIR = $$DESTDIR/.moc
-    RCC_DIR = $$DESTDIR/.qrc
-    UI_DIR = $$DESTDIR/.ui
-
-    SVNN   = $$system("git describe --tags")
-}
-win32-msvc* {
-    message("MSVC Compiler detected.")
-}
-win32-g++ {
-    message("MinGW Compiler detected.")
-    QMAKE_FLAGS_RELEASE += -O3 -Ofast -msse4.1 -mssse3 -msse3 -msse2 -msse -mfpmath=sse
-    QMAKE_CXXFLAGS_RELEASE += -O3 -Ofast -msse4.1 -mssse3 -msse3 -msse2 -msse -mfpmath=sse
-}
-win32 {
-	CONFIG(debug, debug|release) {
-        DESTDIR = build/debug
-    } else {
-        DESTDIR = build/release
-    }
-    OBJECTS_DIR = $$DESTDIR/.obj
-    MOC_DIR = $$DESTDIR/.moc
-    RCC_DIR = $$DESTDIR/.qrc
-    UI_DIR = $$DESTDIR/.ui
-
-    #QMAKE_LFLAGS_DEBUG    = /INCREMENTAL:NO
-    RC_FILE += images/WindowsAppIcon.rc
-
-    SVNN = $$system("git describe --tags")
-    DEFINES += NOMINMAX
-}
-
-LASTHASH = $$system("git rev-parse HEAD")
-isEmpty(LASTHASH) {
-LASTHASH = 0
-}
-
-win32-msvc* {
-    HASHSTRING = '\\"$${LASTHASH}\\"'
-    DEFINES += YUVIEW_HASH=$${HASHSTRING}
-}
-
-win32-g++ | linux | macx {
-    HASHSTRING = '\\"$${LASTHASH}\\"'
-    DEFINES += YUVIEW_HASH=\"$${HASHSTRING}\"
-}
-
-isEmpty(SVNN) {
- SVNN = 0
-}
-
-win32-msvc* {
-    VERSTR = '\\"$${SVNN}\\"'
-    DEFINES += YUVIEW_VERSION=$${VERSTR}
-}
-
-win32-g++ | linux | macx {
-    VERSTR = '\\"$${SVNN}\\"'
-    DEFINES += YUVIEW_VERSION=\"$${VERSTR}\"
-}
+YUViewYpp.depends = YUViewLib

src/YUViewApp/YUViewApp.pro

@@ -0,0 +1,88 @@
+QT += gui opengl xml concurrent network charts
+
+TARGET = YUView
+TEMPLATE = app
+CONFIG += c++11
+
+SOURCES += $$files(*.cpp, false)
+HEADERS += $$files(*.h, false)
+
+INCLUDEPATH += ../YUViewLib
+CONFIG(release, debug|release) {
+  LIBS += -L../YUViewLib/release -lYUViewLib
+}
+CONFIG(debug, debug|release) {
+  LIBS += -L../YUViewLib/debug -lYUViewLib
+}
+
+unix:!mac {
+	isEmpty(PREFIX) {
+		PREFIX = /usr/local
+	}
+	isEmpty(BINDIR) {
+		BINDIR = bin
+	}
+
+        target.path = $$PREFIX/$$BINDIR/
+
+        metainfo.files = packaging/linux/de.rwth_aachen.ient.YUView.appdata.xml
+        metainfo.path = $$PREFIX/share/metainfo
+        desktop.files = packaging/linux/de.rwth_aachen.ient.YUView.desktop
+        desktop.path = $$PREFIX/share/applications
+        mime.files = packaging/linux/de.rwth_aachen.ient.YUView.xml
+        mime.path = $$PREFIX/share/mime/packages
+        icon32.files = packaging/linux/icons/32x32/de.rwth_aachen.ient.YUView.png
+        icon64.files = packaging/linux/icons/64x64/de.rwth_aachen.ient.YUView.png
+        icon128.files = packaging/linux/icons/128x128/de.rwth_aachen.ient.YUView.png
+        icon256.files = packaging/linux/icons/256x256/de.rwth_aachen.ient.YUView.png
+        icon512.files = packaging/linux/icons/512x512/de.rwth_aachen.ient.YUView.png
+        icon1024.files = packaging/linux/icons/1024x1024/de.rwth_aachen.ient.YUView.png
+        icon32.path = $$PREFIX/share/icons/hicolor/32x32/apps
+        icon64.path = $$PREFIX/share/icons/hicolor/64x64/apps
+        icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps
+        icon256.path = $$PREFIX/share/icons/hicolor/256x256/apps
+        icon512.path = $$PREFIX/share/icons/hicolor/512x512/apps
+        icon1024.path = $$PREFIX/share/icons/hicolor/1024x1024/apps
+
+        INSTALLS += target metainfo desktop mime icon32 icon64 icon128 icon256 icon512 icon1024
+}
+
+contains(QT_ARCH, x86_32|i386) {
+    warning("You are building for a 32 bit system. This is untested and not supported.")
+}
+
+macx {
+    QMAKE_MAC_SDK = macosx
+
+    ICON = images/YUView.icns
+    QMAKE_INFO_PLIST = Info.plist
+    SVNN = $$system("git describe --tags")
+}
+
+linux {
+    SVNN = $$system("git describe --tags")
+}
+win32-msvc* {
+    message("MSVC Compiler detected.")
+}
+win32-g++ {
+    message("MinGW Compiler detected.")
+    QMAKE_FLAGS_RELEASE += -O3 -Ofast -msse4.1 -mssse3 -msse3 -msse2 -msse -mfpmath=sse
+    QMAKE_CXXFLAGS_RELEASE += -O3 -Ofast -msse4.1 -mssse3 -msse3 -msse2 -msse -mfpmath=sse
+}
+win32 {
+    RC_FILE += images/WindowsAppIcon.rc
+    SVNN = $$system("git describe --tags")
+    DEFINES += NOMINMAX
+}
+
+LASTHASH = $$system("git rev-parse HEAD")
+isEmpty(LASTHASH) {
+    LASTHASH = 0
+}
+
+isEmpty(SVNN) {
+    SVNN = 0
+}
+VERSTR = '\\"$${SVNN}\\"'
+DEFINES += YUVIEW_VERSION=$${VERSTR}

src/YUViewApp/yuviewapp.cpp

@@ -0,0 +1,52 @@
+/*  This file is part of YUView - The YUV player with advanced analytics toolset
+*   <https://github.com/IENT/YUView>
+*   Copyright (C) 2015  Institut für Nachrichtentechnik, RWTH Aachen University, GERMANY
+*
+*   This program is free software; you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation; either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   In addition, as a special exception, the copyright holders give
+*   permission to link the code of portions of this program with the
+*   OpenSSL library under certain conditions as described in each
+*   individual source file, and distribute linked combinations including
+*   the two.
+*   
+*   You must obey the GNU General Public License in all respects for all
+*   of the code used other than OpenSSL. If you modify file(s) with this
+*   exception, you may extend this exception to your version of the
+*   file(s), but you are not obligated to do so. If you do not wish to do
+*   so, delete this exception statement from your version. If you delete
+*   this exception statement from all source files in the program, then
+*   also delete it here.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <QCoreApplication>
+
+#include "common/typedef.h"
+#include "ui/YUViewApplication.h"
+
+int main(int argc, char *argv[])
+{
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+  QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
+  QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); // DPI support
+#endif
+  QCoreApplication::setAttribute(Qt::AA_SynthesizeMouseForUnhandledTouchEvents,false);
+  QCoreApplication::setAttribute(Qt::AA_SynthesizeTouchForUnhandledMouseEvents,false);
+
+  YUViewApplication app(argc, argv);
+
+  qRegisterMetaType<recacheIndicator>("recacheIndicator");
+
+  return app.returnCode;
+}

src/YUViewLib/YUViewLib.pro

@@ -0,0 +1,83 @@
+QT += gui opengl xml concurrent network charts
+
+TEMPLATE = lib
+CONFIG += staticlib
+CONFIG += c++11
+
+SOURCES += $$files(*.cpp, true)
+HEADERS += $$files(*.h, true)
+
+FORMS += $$files(ui/formfiles/*.ui, false)
+
+RESOURCES += \
+    images/images.qrc \
+    docs/resources.qrc
+
+unix:!mac {
+	isEmpty(PREFIX) {
+		PREFIX = /usr/local
+	}
+	isEmpty(BINDIR) {
+		BINDIR = bin
+	}
+
+        target.path = $$PREFIX/$$BINDIR/
+
+        metainfo.files = packaging/linux/de.rwth_aachen.ient.YUView.appdata.xml
+        metainfo.path = $$PREFIX/share/metainfo
+        desktop.files = packaging/linux/de.rwth_aachen.ient.YUView.desktop
+        desktop.path = $$PREFIX/share/applications
+        mime.files = packaging/linux/de.rwth_aachen.ient.YUView.xml
+        mime.path = $$PREFIX/share/mime/packages
+        icon32.files = packaging/linux/icons/32x32/de.rwth_aachen.ient.YUView.png
+        icon64.files = packaging/linux/icons/64x64/de.rwth_aachen.ient.YUView.png
+        icon128.files = packaging/linux/icons/128x128/de.rwth_aachen.ient.YUView.png
+        icon256.files = packaging/linux/icons/256x256/de.rwth_aachen.ient.YUView.png
+        icon512.files = packaging/linux/icons/512x512/de.rwth_aachen.ient.YUView.png
+        icon1024.files = packaging/linux/icons/1024x1024/de.rwth_aachen.ient.YUView.png
+        icon32.path = $$PREFIX/share/icons/hicolor/32x32/apps
+        icon64.path = $$PREFIX/share/icons/hicolor/64x64/apps
+        icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps
+        icon256.path = $$PREFIX/share/icons/hicolor/256x256/apps
+        icon512.path = $$PREFIX/share/icons/hicolor/512x512/apps
+        icon1024.path = $$PREFIX/share/icons/hicolor/1024x1024/apps
+
+        INSTALLS += target metainfo desktop mime icon32 icon64 icon128 icon256 icon512 icon1024
+}
+
+contains(QT_ARCH, x86_32|i386) {
+    warning("You are building for a 32 bit system. This is untested and not supported.")
+}
+
+macx {
+    QMAKE_MAC_SDK = macosx
+    QMAKE_INFO_PLIST = Info.plist
+    SVNN = $$system("git describe --tags")
+}
+
+linux {
+    SVNN = $$system("git describe --tags")
+}
+win32-msvc* {
+    message("MSVC Compiler detected.")
+}
+win32-g++ {
+    message("MinGW Compiler detected.")
+    QMAKE_FLAGS_RELEASE += -O3 -Ofast -msse4.1 -mssse3 -msse3 -msse2 -msse -mfpmath=sse
+    QMAKE_CXXFLAGS_RELEASE += -O3 -Ofast -msse4.1 -mssse3 -msse3 -msse2 -msse -mfpmath=sse
+}
+win32 {
+    SVNN = $$system("git describe --tags")
+    DEFINES += NOMINMAX
+}
+
+LASTHASH = $$system("git rev-parse HEAD")
+isEmpty(LASTHASH) {
+    LASTHASH = 0
+}
+
+isEmpty(SVNN) {
+    SVNN = 0
+}
+VERSTR = '\\"$${SVNN}\\"'
+DEFINES += YUVIEW_VERSION=$${VERSTR}