diff options
Diffstat (limited to 'TOOLS')
| -rw-r--r-- | TOOLS/lua/observe-all.lua | 10 | ||||
| -rw-r--r-- | TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf | 2 | ||||
| -rwxr-xr-x | TOOLS/stats-conv.py | 11 | ||||
| -rwxr-xr-x | TOOLS/travis-rebuild-website | 29 | ||||
| -rwxr-xr-x | TOOLS/zsh.pl | 6 |
5 files changed, 49 insertions, 9 deletions
diff --git a/TOOLS/lua/observe-all.lua b/TOOLS/lua/observe-all.lua index be9f7270e4..0037439d5b 100644 --- a/TOOLS/lua/observe-all.lua +++ b/TOOLS/lua/observe-all.lua @@ -6,9 +6,17 @@ local utils = require("mp.utils") -for i,name in ipairs(mp.get_property_native("property-list")) do +function observe(name) mp.observe_property(name, "native", function(name, val) print("property '" .. name .. "' changed to '" .. utils.to_string(val) .. "'") end) end + +for i,name in ipairs(mp.get_property_native("property-list")) do + observe(name) +end + +for i,name in ipairs(mp.get_property_native("options")) do + observe("options/" .. name) +end diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf index d23926be9b..bdffa7a951 100644 --- a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf +++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf @@ -1 +1 @@ -profile=pseudo-gui +player-operation-mode=pseudo-gui diff --git a/TOOLS/stats-conv.py b/TOOLS/stats-conv.py index 120f69195a..5fc092e3c7 100755 --- a/TOOLS/stats-conv.py +++ b/TOOLS/stats-conv.py @@ -151,15 +151,16 @@ for cur in ax: cur.addLegend(offset = (-1, 1)) for e in G.sevents: cur = ax[1 if e.type == "value" else 0] + if not cur in G.curveno: + G.curveno[cur] = 0 args = {'name': e.name,'antialias':True} + color = mkColor(colors[G.curveno[cur] % len(colors)]) if e.type == "event-signal": args['symbol'] = e.marker - args['pen'] = None + args['symbolBrush'] = pg.mkBrush(color, width=0) else: - if not cur in G.curveno: - G.curveno[cur] = 0 - args['pen'] = pg.mkPen(mkColor(colors[G.curveno[cur] % len(colors)]), width=0) - G.curveno[cur] += 1 + args['pen'] = pg.mkPen(color, width=0) + G.curveno[cur] += 1 n = cur.plot([x for x,y in e.vals], [y for x,y in e.vals], **args) QtGui.QApplication.instance().exec_() diff --git a/TOOLS/travis-rebuild-website b/TOOLS/travis-rebuild-website new file mode 100755 index 0000000000..02bf2c2564 --- /dev/null +++ b/TOOLS/travis-rebuild-website @@ -0,0 +1,29 @@ +#!/bin/sh + +if [ "x$LIBAV" != "xffmpeg-git" ] || [ "x$TRAVIS_OS_NAME" != "xlinux" ]; then + # trigger build only on one of the matrix nodes + exit; +fi + +if [ "x$TRAVIS_BRANCH" != "xmaster" ]; then + # only rebuild website with pushes to master + exit; +fi + +TRAVIS_COMMIT_RANGE=${TRAVIS_COMMIT_RANGE:-HEAD^..} +if git diff --quiet --name-only --exit-code "$TRAVIS_COMMIT_RANGE" DOCS/; then + exit; +fi + +body='{ +"request": { + "branch":"master" +}}' + +curl -s -X POST \ +-H "Content-Type: application/json" \ +-H "Accept: application/json" \ +-H "Travis-API-Version: 3" \ +-H "Authorization: token $WEBSITE_TRAVIS_TOKEN" \ +-d "$body" \ +https://api.travis-ci.org/repo/mpv-player%2Fmpv.io/requests diff --git a/TOOLS/zsh.pl b/TOOLS/zsh.pl index 306e9765b7..f4491e3971 100755 --- a/TOOLS/zsh.pl +++ b/TOOLS/zsh.pl @@ -4,11 +4,14 @@ use strict; use warnings; +use warnings FATAL => 'uninitialized'; my $mpv = $ARGV[0] || 'mpv'; my @opts = parse_main_opts('--list-options', '^ (\-\-[^\s\*]*)\*?\s*(.*)'); +die "Couldn't find any options" unless (@opts); + my @ao = parse_opts('--ao=help', '^ ([^\s\:]*)\s*: (.*)'); my @vo = parse_opts('--vo=help', '^ ([^\s\:]*)\s*: (.*)'); @@ -141,8 +144,7 @@ $runtime_completions local expl _tags files urls while _tags; do - _requested files expl 'media file' _files -g \\ - "*.(#i)(asf|asx|avi|f4v|flac|flv|m1v|m2p|m2v|m4v|mjpg|mka|mkv|mov|mp3|mp4|mpe|mpeg|mpg|ogg|ogm|ogv|opus|qt|rm|ts|vob|wav|webm|wma|wmv|wv)(-.)" && rc=0 + _requested files expl 'media file' _files && rc=0 if _requested urls; then while _next_label urls expl URL; do _urls "\$expl[@]" && rc=0 |