Fixes to VOD playback, included libs in prj

alamminsalo · Mar 13, 2016 · 0ffdc30 · 0ffdc30
1 parent db0656f
commit 0ffdc30
Show file tree

Hide file tree

Showing 17 changed files with 2,598 additions and 25 deletions.
diff --git a/distfiles/qt.conf b/distfiles/qt.conf
@@ -0,0 +1,3 @@
+
+[Platforms]
+WindowsArguments = dpiawareness=2
diff --git a/libs/libeay32.dll b/libs/libeay32.dll
diff --git a/libs/libmpv.dll.a b/libs/libmpv.dll.a
diff --git a/libs/libssl32.dll b/libs/libssl32.dll
diff --git a/libs/mpv-1.dll b/libs/mpv-1.dll
diff --git a/libs/ssleay32.dll b/libs/ssleay32.dll
diff --git a/orion.pro b/orion.pro
@@ -7,7 +7,7 @@
 #
 #-------------------------------------------------
 
-QT     += opengl qml quick network
+QT     += gui opengl qml quick network
 
 TARGET = orion
 
@@ -57,7 +57,10 @@ HEADERS  += src/model/channel.h \
     src/model/vodmanager.h \
     src/network/vodsearchoperation.h \
     src/network/urls.h \
-    src/network/vodstreamextractoperation.h
+    src/network/vodstreamextractoperation.h \
+    src/player/mpv/client.h \
+    src/player/mpv/opengl_cb.h \
+    src/player/mpv/qthelper.hpp
 
 QMAKE_CXXFLAGS += -std=c++11 -Wall -O2
 
@@ -75,15 +78,48 @@ unix: {
 
         QMAKE_EXTRA_TARGETS += first copydata
     }
+
+    #QMAKE_POST_LINK += $quote($(COPY) $PWD/distfiles * $OUT_PWD
 }
 
 RESOURCES += \
     src/qml/qml.qrc
 
+# Copies the given files to the destination directory
+defineTest(copyToDestdir) {
+    files = $$1
+
+    for(FILE, files) {
+        DDIR = $$DESTDIR
+
+        # Replace slashes in paths with backslashes for Windows
+        win32:FILE ~= s,/,\\,g
+        win32:DDIR ~= s,/,\\,g
+
+        QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
+    }
+
+    export(QMAKE_POST_LINK)
+}
+
 win32: {
-    LIBS += -LC:/libmpv/32 -lmpv.dll
-    INCLUDEPATH += C:/libmpv/include
+    LIBS += -L$${PWD}/libs/ -lmpv.dll
     RC_ICONS = distfiles/orion.ico
+
+    EXTRA_BINFILES = $$PWD/libs/mpv-1.dll \
+                    $$PWD/distfiles/qt.conf \
+                    $$PWD/libs/libssl32.dll \
+                    $$PWD/libs/ssleay32.dll \
+                    $$PWD/libs/libeay32.dll
+
+    EXTRA_BINFILES_WIN = $${EXTRA_BINFILES}
+    EXTRA_BINFILES_WIN ~= s,/,\\,g
+    DESTDIR_WIN = $$OUT_PWD/release
+    DESTDIR_WIN ~= s,/,\\,g
+    for(FILE,EXTRA_BINFILES_WIN){
+                QMAKE_POST_LINK +=$$quote(cmd /c copy /y $${FILE} $${DESTDIR_WIN}$$escape_expand(\n\t))
+    }
+
 }
 
 #CONFIG(release): DEFINES += QT_NO_DEBUG_OUTPUT
diff --git a/orion.pro.user b/orion.pro.user
diff --git a/src/customapp.cpp b/src/customapp.cpp
@@ -13,4 +13,6 @@ bool CustomApp::event(QEvent *e)
     } else {
        QApplication::event(e);
     }
+
+    return true;
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -22,6 +22,9 @@
 
 int main(int argc, char *argv[])
 {
+    //Force using "auto" value for QT_DEVICE_PIXEL_RATIO env var
+    qputenv("QT_DEVICE_PIXEL_RATIO",QByteArray("auto"));
+
     CustomApp app(argc, argv);
 
     //Single application solution
@@ -39,7 +42,6 @@ int main(int argc, char *argv[])
     tray->setIcon(appIcon);
 
     QObject::connect(tray, SIGNAL(closeEventTriggered()), &app, SLOT(quit()));
-    //QObject::connect()
 
     ChannelManager *cman = new ChannelManager();
     cman->checkResources();
@@ -57,6 +59,9 @@ int main(int argc, char *argv[])
 
 #endif
 
+    //dpiMultiplier /= QGuiApplication::primaryScreen()->devicePixelRatio();
+
+    qDebug() << "Pixel ratio " << QGuiApplication::primaryScreen()->devicePixelRatio();
     qDebug() <<"DPI mult: "<< dpiMultiplier;
 
     //Invokable network operations for player