diff options
author | Cœur <coeur@gmx.fr> | 2022-04-25 19:27:18 +0800 |
---|---|---|
committer | Leo Izen <leo.izen@gmail.com> | 2022-04-25 09:07:18 -0400 |
commit | bb5b4b1ba61b67da40c85c34376aced9383fc366 (patch) | |
tree | b917b0ad45f31c1187c47424de4159cc28aa730f /player | |
parent | 6407095871b8f177996a6ec3ee9a8c4f06bd63ee (diff) | |
download | mpv-bb5b4b1ba61b67da40c85c34376aced9383fc366.tar.bz2 mpv-bb5b4b1ba61b67da40c85c34376aced9383fc366.tar.xz |
various: fix typos
Diffstat (limited to 'player')
-rw-r--r-- | player/client.c | 2 | ||||
-rw-r--r-- | player/lua.c | 8 | ||||
-rw-r--r-- | player/lua/console.lua | 2 | ||||
-rw-r--r-- | player/lua/osc.lua | 4 | ||||
-rw-r--r-- | player/lua/stats.lua | 4 | ||||
-rw-r--r-- | player/osd.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/player/client.c b/player/client.c index 8d25513259..dd81cdf973 100644 --- a/player/client.c +++ b/player/client.c @@ -106,7 +106,7 @@ struct observe_property { }; struct mpv_handle { - // -- immmutable + // -- immutable char name[MAX_CLIENT_NAME]; struct mp_log *log; struct MPContext *mpctx; diff --git a/player/lua.c b/player/lua.c index a2d4d766d8..665c589802 100644 --- a/player/lua.c +++ b/player/lua.c @@ -128,17 +128,17 @@ static void mp_lua_optarg(lua_State *L, int arg) // autofree lua C function: same as lua_CFunction but with these differences: // - It accepts an additional void* argument - a pre-initialized talloc context // which it can use, and which is freed with its children once the function -// completes - regardless if a lua error occured or not. If a lua error did +// completes - regardless if a lua error occurred or not. If a lua error did // occur then it's re-thrown after the ctx is freed. // The stack/arguments/upvalues/return are the same as with lua_CFunction. // - It's inserted into the lua VM using af_pushc{function,closure} instead of // lua_pushc{function,closure}, which takes care of wrapping it with the -// automatic talloc alocation + lua-error-handling + talloc release. +// automatic talloc allocation + lua-error-handling + talloc release. // This requires using AF_ENTRY instead of FN_ENTRY at struct fn_entry. // - The autofree overhead per call is roughly two additional plain lua calls. // Typically that's up to 20% slower than plain new+free without "auto", // and at most about twice slower - compared to bare new+free lua_CFunction. -// - The overhead of af_push* is one aditional lua-c-closure with two upvalues. +// - The overhead of af_push* is one additional lua-c-closure with two upvalues. typedef int (*af_CFunction)(lua_State *L, void *ctx); static void af_pushcclosure(lua_State *L, af_CFunction fn, int n); @@ -249,7 +249,7 @@ static void load_file(lua_State *L, const char *fname) struct script_ctx *ctx = get_ctx(L); MP_DBG(ctx, "loading file %s\n", fname); void *tmp = talloc_new(ctx); - // according to Lua manaual chunkname should be '@' plus the filename + // according to Lua manual chunkname should be '@' plus the filename char *dispname = talloc_asprintf(tmp, "@%s", fname); struct bstr s = stream_read_file(fname, tmp, ctx->mpctx->global, 100000000); if (!s.start) diff --git a/player/lua/console.lua b/player/lua/console.lua index 36c0c95426..6401e26850 100644 --- a/player/lua/console.lua +++ b/player/lua/console.lua @@ -251,7 +251,7 @@ function next_utf8(str, pos) return pos end --- As above, but finds the previous UTF-8 charcter in 'str' before 'pos' +-- As above, but finds the previous UTF-8 character in 'str' before 'pos' function prev_utf8(str, pos) if pos <= 1 then return pos end repeat diff --git a/player/lua/osc.lua b/player/lua/osc.lua index 5259b5873e..cacc067c05 100644 --- a/player/lua/osc.lua +++ b/player/lua/osc.lua @@ -34,7 +34,7 @@ local user_opts = { seekbarstyle = "bar", -- bar, diamond or knob seekbarhandlesize = 0.6, -- size ratio of the diamond and knob handle seekrangestyle = "inverted",-- bar, line, slider, inverted or none - seekrangeseparate = true, -- wether the seekranges overlay on the bar-style seekbar + seekrangeseparate = true, -- whether the seekranges overlay on the bar-style seekbar seekrangealpha = 200, -- transparency of seekranges seekbarkeyframes = true, -- use keyframes when dragging the seekbar title = "${media-title}", -- string compatible with property-expansion @@ -2834,7 +2834,7 @@ function visibility_mode(mode, no_osd) end -- Reset the input state on a mode change. The input state will be - -- recalcuated on the next render cycle, except in 'never' mode where it + -- recalculated on the next render cycle, except in 'never' mode where it -- will just stay disabled. mp.disable_key_bindings("input") mp.disable_key_bindings("window-controls") diff --git a/player/lua/stats.lua b/player/lua/stats.lua index c823541ffc..6c2a0afa25 100644 --- a/player/lua/stats.lua +++ b/player/lua/stats.lua @@ -145,8 +145,8 @@ local function no_ASS(t) -- mp.set_osd_ass doesn't support ass-escape. roll our own. -- similar to mpv's sub/osd_libass.c:mangle_ass(...), excluding -- space after newlines because no_ASS is not used with multi-line. - -- space at the begining is replaced with "\\h" because it matters - -- at the begining of a line, and we can't know where our output + -- space at the beginning is replaced with "\\h" because it matters + -- at the beginning of a line, and we can't know where our output -- ends up. no issue if it ends up at the middle of a line. return tostring(t) :gsub("\\", ESC_BACKSLASH) diff --git a/player/osd.c b/player/osd.c index 5bf7fa699b..a9f722f70d 100644 --- a/player/osd.c +++ b/player/osd.c @@ -460,7 +460,7 @@ static void sadd_osd_status(char **buffer, struct MPContext *mpctx, int level) } } -// OSD messages initated by seeking commands are added lazily with this +// OSD messages initiated by seeking commands are added lazily with this // function, because multiple successive seek commands can be coalesced. static void add_seek_osd_messages(struct MPContext *mpctx) { |