chaos/VideoPlayer
1
0
Fork 0
Code Activity

Disable advanced arguments and remove icon names.

Browse source
This commit is contained in:
Kitteh 2018-10-20 19:07:15 +01:00
parent 6a8d20f7ab
commit de9bd47082
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
KittehPlayer.pro
View file

@ -36,4 +36,4 @@ INSTALLS += target
HEADERS += src/main.h src/mpvobject.h src/config.h HEADERS += src/main.h src/mpvobject.h src/config.h
DISTFILES += KittehPlayer.desktop KittehPlayer.png README.md LICENSE.txt DISTFILES += KittehPlayer.desktop KittehPlayer.png README.md LICENSE.txt

6
scripts/build-mpv.sh
View file

@ -8,7 +8,7 @@ export CFLAGS="-fPIC -Os"
export V=0 VERBOSE=0 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 git clone --depth 1 https://github.com/mpv-player/mpv-build mpv-build
cd mpv-build cd mpv-build
@ -22,7 +22,7 @@ export MPVDIR=`pwd`
#sudo make install #sudo make install
#cd $MPVDIR #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/FFmpeg/FFmpeg.git ffmpeg
git clone --depth 1 https://github.com/mpv-player/mpv.git mpv git clone --depth 1 https://github.com/mpv-player/mpv.git mpv
git clone --depth 1 https://github.com/libass/libass.git libass 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 "--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 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 sudo ./install
ccache -s ccache -s

23
src/qml/main.qml
View file

@ -138,13 +138,14 @@ Window {
function startPlayer() { function startPlayer() {
var args = Qt.application.arguments var args = Qt.application.arguments
var len = Qt.application.arguments.length var len = Qt.application.arguments.length
var argNo = 1 var argNo = 0
renderer.setOption("ytdl-format", "bestvideo[width<=" + Screen.width renderer.setOption("ytdl-format", "bestvideo[width<=" + Screen.width
+ "][height<=" + Screen.height + "]+bestaudio") + "][height<=" + Screen.height + "]+bestaudio")
if (len > 1) { if (len > 1) {
for (argNo = 1; argNo < len; argNo++) { for (argNo = 1; argNo < len; argNo++) {
var argument = args[argNo] var argument = args[argNo]
if (argument.startsWith("--")) { if (argument.indexOf("KittehPlayer") !== -1) { continue; }
/* if (argument.startsWith("--")) {
argument = argument.substr(2) argument = argument.substr(2)
if (argument.length > 0) { if (argument.length > 0) {
var splitArg = argument.split(/=(.+)/) var splitArg = argument.split(/=(.+)/)
@ -157,9 +158,9 @@ Window {
renderer.setOption(splitArg[0], splitArg[1]) renderer.setOption(splitArg[0], splitArg[1])
} }
} }
} else { } else { */
renderer.command(["loadfile", argument, "append-play"]) renderer.command(["loadfile", argument, "append-play"])
} //}
} }
} }
} }
@ -486,7 +487,7 @@ Window {
Button { Button {
id: playlistPrevButton id: playlistPrevButton
icon.name: "prev" //icon.name: "prev"
icon.source: "icons/prev.svg" icon.source: "icons/prev.svg"
icon.color: "white" icon.color: "white"
display: AbstractButton.IconOnly display: AbstractButton.IconOnly
@ -505,7 +506,7 @@ Window {
Button { Button {
id: playPauseButton id: playPauseButton
icon.name: "pause" //icon.name: "pause"
icon.source: "icons/pause.svg" icon.source: "icons/pause.svg"
icon.color: "white" icon.color: "white"
display: AbstractButton.IconOnly display: AbstractButton.IconOnly
@ -522,7 +523,7 @@ Window {
Button { Button {
id: playlistNextButton id: playlistNextButton
icon.name: "next" //icon.name: "next"
icon.source: "icons/next.svg" icon.source: "icons/next.svg"
icon.color: "white" icon.color: "white"
display: AbstractButton.IconOnly display: AbstractButton.IconOnly
@ -539,7 +540,7 @@ Window {
Button { Button {
id: volumeButton id: volumeButton
icon.name: "volume-up" //icon.name: "volume-up"
icon.source: "icons/volume-up.svg" icon.source: "icons/volume-up.svg"
icon.color: "white" icon.color: "white"
display: AbstractButton.IconOnly display: AbstractButton.IconOnly
@ -621,7 +622,7 @@ Window {
Button { Button {
id: subtitlesButton id: subtitlesButton
icon.name: "subtitles" //icon.name: "subtitles"
icon.source: "icons/subtitles.svg" icon.source: "icons/subtitles.svg"
icon.color: "white" icon.color: "white"
anchors.right: settingsButton.left anchors.right: settingsButton.left
@ -640,7 +641,7 @@ Window {
Button { Button {
id: settingsButton id: settingsButton
icon.name: "settings" //icon.name: "settings"
icon.source: "icons/settings.svg" icon.source: "icons/settings.svg"
icon.color: "white" icon.color: "white"
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
@ -658,7 +659,7 @@ Window {
Button { Button {
id: fullscreenButton id: fullscreenButton
icon.name: "fullscreen" //icon.name: "fullscreen"
icon.source: "icons/fullscreen.svg" icon.source: "icons/fullscreen.svg"
icon.color: "white" icon.color: "white"
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight Layout.alignment: Qt.AlignVCenter | Qt.AlignRight