diff options
author | wm4 <wm4@nowhere> | 2014-05-02 01:25:58 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-05-02 01:25:58 +0200 |
commit | beaa7c71531f978fa0e51283781534f372404496 (patch) | |
tree | 16f1875e90a6055aad029c6d0e647bb822c2e296 | |
parent | eb9d2039460e413fe2f4f191ad0ddafde3be27df (diff) | |
download | mpv-beaa7c71531f978fa0e51283781534f372404496.tar.bz2 mpv-beaa7c71531f978fa0e51283781534f372404496.tar.xz |
lua: remove "lua/" prefix from script names
This affects the return value of mp.script_name, the "client name"
(what's returned by mpv_client_name()) and all associated features, as
well as the mpv terminal output module prefix when scripts print
something.
As discussed in #748.
-rw-r--r-- | DOCS/man/en/lua.rst | 10 | ||||
-rw-r--r-- | player/lua.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/DOCS/man/en/lua.rst b/DOCS/man/en/lua.rst index 89f914201b..cf0b685906 100644 --- a/DOCS/man/en/lua.rst +++ b/DOCS/man/en/lua.rst @@ -203,7 +203,7 @@ The ``mp`` module is preloaded, although it can be loaded manually with :: - y script_message_to lua/fooscript something + y script_message_to fooscript something ``mp.add_forced_key_binding(...)`` This works almost the same as ``mp.add_key_binding``, but registers the @@ -305,13 +305,13 @@ The ``mp`` module is preloaded, although it can be loaded manually with ``mp.get_script_name()`` Return the name of the current script. The name is usually made of the - filename of the script, with directory and file extension removed, and - prefixed with ``lua/``. If there are several script which would have the - same name, it's made unique by appending a number. + filename of the script, with directory and file extension removed. If + there are several script which would have the same name, it's made unique + by appending a number. .. admonition:: Example - The script ``/path/to/fooscript.lua`` becomes ``lua/fooscript``. + The script ``/path/to/fooscript.lua`` becomes ``fooscript``. ``mp.osd_message(text [,duration])`` Show an OSD message on the screen. ``duration`` is in seconds, and is diff --git a/player/lua.c b/player/lua.c index 4ba4198aeb..0c8c415630 100644 --- a/player/lua.c +++ b/player/lua.c @@ -158,7 +158,7 @@ static char *script_name_from_filename(void *talloc_ctx, const char *fname) !(c >= '0' && c <= '9')) name[n] = '_'; } - return talloc_asprintf(talloc_ctx, "lua/%s", name); + return talloc_asprintf(talloc_ctx, "%s", name); } static int load_file(struct script_ctx *ctx, const char *fname) |