From 99e3a59848797bb824c054f0a2e992ed50a1d528 Mon Sep 17 00:00:00 2001 From: Kitteh Date: Sun, 4 Nov 2018 21:20:11 +0000 Subject: [PATCH] [Multiple] Minor tweaks. --- CMakeLists.txt | 13 +++++++++++++ KittehPlayer.desktop | 4 +--- scripts/makeappimage.sh | 2 -- src/main.cpp | 2 ++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffdeabb..1294cdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,10 +23,23 @@ set(SOURCES src/MpvPlayerBackend.cpp ) +if(TESTING) +SET(CMAKE_C_COMPILER "/usr/bin/clang") +SET(CMAKE_CXX_COMPILER "/usr/bin/clang++") +SET(CMAKE_AR "/usr/bin/llvm-ar") +SET(CMAKE_LINKER "/usr/bin/llvm-link") +SET(CMAKE_NM "/usr/bin/llvm-nm") +SET(CMAKE_OBJDUMP "/usr/bin/llvm-objdump") +SET(CMAKE_RANLIB "/usr/bin/llvm-ranlib") + +endif(TESTING) + + if(DEVELOP) set(SOURCES ${SOURCES} runtimeqml/runtimeqml.cpp) add_definitions(-DQRC_SOURCE_PATH="${PROJECT_SOURCE_DIR}/src/qml") add_definitions(-DQT_QML_DEBUG) + endif(DEVELOP) add_executable(KittehPlayer ${SOURCES} ${qml_QRC}) diff --git a/KittehPlayer.desktop b/KittehPlayer.desktop index b2e492a..3b831f0 100644 --- a/KittehPlayer.desktop +++ b/KittehPlayer.desktop @@ -6,6 +6,4 @@ Icon=KittehPlayer Exec=KittehPlayer %U Terminal=false Categories=AudioVideo;Player; -MimeType=application/ogg;application/x-ogg;audio/ogg;audio/vorbis;audio/x-vorbis;audio/x-vorbis+ogg;video/ogg;video/x-ogm;video/x-ogm+ogg;video/x-theora+ogg;video/x-theora;audio/x-speex;audio/opus;application/x-flac;audio/flac;audio/x-flac;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;audio/x-pn-windows-acm;video/divx;video/msvideo;video/vnd.divx;video/avi;video/x-avi;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/vnd.rn-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;audio/x-realaudio;video/vnd.rn-realvideo;audio/mpeg;audio/mpg;audio/mp1;audio/mp2;audio/mp3;audio/x-mp1;audio/x-mp2;audio/x-mp3;audio/x-mpeg;audio/x-mpg;video/mp2t;video/mpeg;video/mpeg-system;video/x-mpeg;video/x-mpeg2;video/x-mpeg-system;application/mpeg4-iod;application/mpeg4-muxcodetable;application/x-extension-m4a;application/x-extension-mp4;audio/aac;audio/m4a;audio/mp4;audio/x-m4a;audio/x-aac;video/mp4;video/mp4v-es;video/x-m4v;application/x-quicktime-media-link;application/x-quicktimeplayer;video/quicktime;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/3gpp;audio/3gpp2;audio/AMR;audio/AMR-WB;video/3gp;video/3gpp;video/3gpp2;x-scheme-handler/mms;x-scheme-handler/mmsh;x-scheme-handler/rtsp;x-scheme-handler/rtp;x-scheme-handler/rtmp;x-scheme-handler/icy;x-scheme-handler/icyx;application/x-cd-image;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;application/ram;application/xspf+xml;audio/mpegurl;audio/x-mpegurl;audio/scpls;audio/x-scpls;text/google-video-pointer;text/x-google-video-pointer;video/vnd.mpegurl;application/vnd.apple.mpegurl;application/vnd.ms-asf;application/vnd.ms-wpl;application/sdp;audio/dv;video/dv;audio/x-aiff;audio/x-pn-aiff;video/x-anim;video/x-nsv;video/fli;video/flv;video/x-flc;video/x-fli;video/x-flv;audio/wav;audio/x-pn-au;audio/x-pn-wav;audio/x-wav;audio/x-adpcm;audio/ac3;audio/eac3;audio/vnd.dts;audio/vnd.dts.hd;audio/vnd.dolby.heaac.1;audio/vnd.dolby.heaac.2;audio/vnd.dolby.mlp;audio/basic;audio/midi;audio/x-ape;audio/x-gsm;audio/x-musepack;audio/x-tta;audio/x-wavpack;audio/x-shorten;application/x-shockwave-flash;application/x-flash-video;misc/ultravox;image/vnd.rn-realpix;audio/x-it;audio/x-mod;audio/x-s3m;audio/x-xm;application/mxf; -X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb -Keywords=Player;DVD;Audio;Video; + diff --git a/scripts/makeappimage.sh b/scripts/makeappimage.sh index 64e0f60..88c162a 100755 --- a/scripts/makeappimage.sh +++ b/scripts/makeappimage.sh @@ -32,8 +32,6 @@ cd .. cp /usr/bin/appimageupdatetool appdir/usr/bin -cp -f /usr/lib/*/libjack.so.0 appdir/usr/lib - sudo pip3 install pyinstaller || true sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O ytdl.zip || true unzip ytdl.zip || true diff --git a/src/main.cpp b/src/main.cpp index d7ddd62..34ad0dc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,6 +41,8 @@ int main( int argc, char *argv[] ) setenv("PATH", newpath.toUtf8().constData(), 1); QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + +QApplication::setAttribute(Qt::AA_NativeWindows); qmlRegisterType("player", 1, 0, "PlayerBackend"); std::setlocale(LC_NUMERIC, "C");