diff --git a/KittehPlayer.pro b/KittehPlayer.pro index 9069468..766fb22 100644 --- a/KittehPlayer.pro +++ b/KittehPlayer.pro @@ -36,4 +36,4 @@ INSTALLS += target HEADERS += src/main.h src/mpvobject.h src/config.h -DISTFILES += KittehPlayer.desktop KittehPlayer.png README.md LICENSE.txt \ No newline at end of file +DISTFILES += KittehPlayer.desktop KittehPlayer.png README.md LICENSE.txt diff --git a/scripts/build-mpv.sh b/scripts/build-mpv.sh index 8e1f080..8cebc24 100755 --- a/scripts/build-mpv.sh +++ b/scripts/build-mpv.sh @@ -8,7 +8,7 @@ export CFLAGS="-fPIC -Os" export V=0 VERBOSE=0 -rm -rf mpv-build +#rm -rf mpv-build git clone --depth 1 https://github.com/mpv-player/mpv-build mpv-build cd mpv-build @@ -22,7 +22,7 @@ export MPVDIR=`pwd` #sudo make install #cd $MPVDIR -rm -rf ffmpeg mpv libass +#rm -rf ffmpeg mpv libass git clone --depth 1 https://github.com/FFmpeg/FFmpeg.git ffmpeg git clone --depth 1 https://github.com/mpv-player/mpv.git mpv git clone --depth 1 https://github.com/libass/libass.git libass @@ -32,7 +32,7 @@ echo "--disable-programs --disable-runtime-cpudetect --enable-small" >> ffmpeg_o echo "--enable-libmpv-shared --prefix=/usr" > mpv_options echo "--disable-caca --disable-wayland --disable-gl-wayland --disable-libarchive --disable-zlib --disable-tv --disable-debug-build --disable-manpage-build --disable-vapoursynth --disable-libsmbclient --disable-wayland" >> mpv_options -./rebuild -j`nproc` 2>&1 > build.log +./rebuild -j`nproc` sudo ./install ccache -s diff --git a/src/qml/main.qml b/src/qml/main.qml index 71a0dd5..2272452 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -138,13 +138,14 @@ Window { function startPlayer() { var args = Qt.application.arguments var len = Qt.application.arguments.length - var argNo = 1 + var argNo = 0 renderer.setOption("ytdl-format", "bestvideo[width<=" + Screen.width + "][height<=" + Screen.height + "]+bestaudio") if (len > 1) { for (argNo = 1; argNo < len; argNo++) { var argument = args[argNo] - if (argument.startsWith("--")) { + if (argument.indexOf("KittehPlayer") !== -1) { continue; } + /* if (argument.startsWith("--")) { argument = argument.substr(2) if (argument.length > 0) { var splitArg = argument.split(/=(.+)/) @@ -157,9 +158,9 @@ Window { renderer.setOption(splitArg[0], splitArg[1]) } } - } else { + } else { */ renderer.command(["loadfile", argument, "append-play"]) - } + //} } } } @@ -486,7 +487,7 @@ Window { Button { id: playlistPrevButton - icon.name: "prev" + //icon.name: "prev" icon.source: "icons/prev.svg" icon.color: "white" display: AbstractButton.IconOnly @@ -505,7 +506,7 @@ Window { Button { id: playPauseButton - icon.name: "pause" + //icon.name: "pause" icon.source: "icons/pause.svg" icon.color: "white" display: AbstractButton.IconOnly @@ -522,7 +523,7 @@ Window { Button { id: playlistNextButton - icon.name: "next" + //icon.name: "next" icon.source: "icons/next.svg" icon.color: "white" display: AbstractButton.IconOnly @@ -539,7 +540,7 @@ Window { Button { id: volumeButton - icon.name: "volume-up" + //icon.name: "volume-up" icon.source: "icons/volume-up.svg" icon.color: "white" display: AbstractButton.IconOnly @@ -621,7 +622,7 @@ Window { Button { id: subtitlesButton - icon.name: "subtitles" + //icon.name: "subtitles" icon.source: "icons/subtitles.svg" icon.color: "white" anchors.right: settingsButton.left @@ -640,7 +641,7 @@ Window { Button { id: settingsButton - icon.name: "settings" + //icon.name: "settings" icon.source: "icons/settings.svg" icon.color: "white" Layout.alignment: Qt.AlignVCenter | Qt.AlignRight @@ -658,7 +659,7 @@ Window { Button { id: fullscreenButton - icon.name: "fullscreen" + //icon.name: "fullscreen" icon.source: "icons/fullscreen.svg" icon.color: "white" Layout.alignment: Qt.AlignVCenter | Qt.AlignRight