diff --git a/docs/source/luadoc_data_paths.sh b/docs/source/luadoc_data_paths.sh index 164d372bc2..bd8c96508c 100755 --- a/docs/source/luadoc_data_paths.sh +++ b/docs/source/luadoc_data_paths.sh @@ -6,7 +6,6 @@ paths=( scripts/omw/mechanics/animationcontroller.lua scripts/omw/input/gamepadcontrols.lua scripts/omw/camera/camera.lua - scripts/omw/music/music.lua scripts/omw/mwui/init.lua scripts/omw/settings/player.lua scripts/omw/ui.lua diff --git a/docs/source/reference/lua-scripting/api.rst b/docs/source/reference/lua-scripting/api.rst index 907c912fc5..ef6637cf7d 100644 --- a/docs/source/reference/lua-scripting/api.rst +++ b/docs/source/reference/lua-scripting/api.rst @@ -41,7 +41,6 @@ Lua API reference interface_controls interface_gamepadcontrols interface_item_usage - interface_music interface_mwui interface_settings interface_skill_progression diff --git a/docs/source/reference/lua-scripting/interface_music.rst b/docs/source/reference/lua-scripting/interface_music.rst deleted file mode 100644 index 2c0b37088c..0000000000 --- a/docs/source/reference/lua-scripting/interface_music.rst +++ /dev/null @@ -1,8 +0,0 @@ -Interface Music -=============== - -.. include:: version.rst - -.. raw:: html - :file: generated_html/scripts_omw_music_music.html - diff --git a/docs/source/reference/lua-scripting/tables/interfaces.rst b/docs/source/reference/lua-scripting/tables/interfaces.rst index 936f692f2e..42a9cd70ba 100644 --- a/docs/source/reference/lua-scripting/tables/interfaces.rst +++ b/docs/source/reference/lua-scripting/tables/interfaces.rst @@ -39,9 +39,6 @@ * - :ref:`MWUI ` - by player scripts - Morrowind-style UI templates. - * - :ref:`Music ` - - by player scripts - - Provides access to music playlists. * - :ref:`UI ` - by player scripts - | High-level UI modes interface. Allows to override parts diff --git a/files/data/scripts/omw/music/music.lua b/files/data/scripts/omw/music/music.lua index f173e75ea2..2a6249a3c1 100755 --- a/files/data/scripts/omw/music/music.lua +++ b/files/data/scripts/omw/music/music.lua @@ -150,35 +150,6 @@ registerPlaylist({ id = "battle", priority = battlePriority, randomize = true }) registerPlaylist({ id = "explore", priority = explorePriority, randomize = true, active = true }) return { - --- - -- @module Music - -- @usage require('openmw.interfaces').Music - interfaceName = 'Music', - interface = { - --- Interface version - -- @field [parent=#Music] #number version - version = 0, - --- - -- Set state for playlist with given ID - -- @function [parent=#Music] setPlaylistActive - -- @param #string id Playlist ID - -- @param #boolean state Playlist is active - setPlaylistActive = setPlaylistActive, - --- - -- Register given playlist - -- @function [parent=#Music] registerPlaylist - -- @param #table playlist Playlist data. Can contain: - -- - -- * `id` - #string, playlist ID - -- * `priority` - #number, playlist priority (lower value means higher priority) - -- * `fadeOut` - #number, Time in seconds to fade out current track before starting this one. If nil, allow the engine to choose the value. - -- * `tracks` - #list<#string>, Paths of track files for playlist (if nil, use all tracks from 'music/{id}/' folder) - -- * `active` - #boolean, tells if playlist is active (default is false) - -- * `randomize` - #boolean, tells if playlist should shuffle its tracks during playback (default is false). When all tracks are played, they are randomized again. - -- * `playOne` - #boolean, tells if playlist should be automatically deactivated after one track is played (default is false) - -- * `cycleTracks` - #boolean, if true, tells to start playlist from beginning once all tracks are played, otherwise playlist becomes deactivated (default is true). - registerPlaylist = registerPlaylist - }, engineHandlers = { onFrame = onFrame }, diff --git a/files/lua_api/openmw/interfaces.lua b/files/lua_api/openmw/interfaces.lua index 5cd72797ac..5ed98bd8be 100644 --- a/files/lua_api/openmw/interfaces.lua +++ b/files/lua_api/openmw/interfaces.lua @@ -17,9 +17,6 @@ --- -- @field [parent=#interfaces] scripts.omw.mwui.init#scripts.omw.mwui.init MWUI ---- --- @field [parent=#interfaces] scripts.omw.music.music#scripts.omw.music.music Music - --- -- @field [parent=#interfaces] scripts.omw.settings.player#scripts.omw.settings.player Settings