mazmazz
|
c64686d8c6
|
I_GetMusicLoopPoint and I_SetMusicLoopPoint for Lua
* Fix S_GetMusicLength for player compatibility
|
2018-08-18 20:20:18 -04:00 |
|
mazmazz
|
9d835614a9
|
I_GetMusicLoopPoint and I_SetMusicLoopPoint for other targets
|
2018-08-18 20:19:54 -04:00 |
|
mazmazz
|
1629a8cfd0
|
I_GetMusicLoopPoint and I_SetMusicLoopPoint implementation
* Stub pause for MIDI
* Fix MP3 tag wide char search
* Reset songpaused bool where appropriate
|
2018-08-18 20:19:44 -04:00 |
|
mazmazz
|
24270b4998
|
Lua merge fixes
|
2018-08-18 18:57:53 -04:00 |
|
mazmazz
|
e68187edfe
|
Remove I_MIDIPlaying from Lua
|
2018-08-18 17:46:14 -04:00 |
|
mazmazz
|
4659bc241a
|
Remove I_MIDIPlaying from other targets
|
2018-08-18 17:46:06 -04:00 |
|
mazmazz
|
22b2ef44b9
|
Remove I_MIDIPlaying
|
2018-08-18 17:45:57 -04:00 |
|
mazmazz
|
ec2b368c6d
|
Lua for MusicType
|
2018-08-18 17:18:22 -04:00 |
|
mazmazz
|
14336ea1ae
|
Other interfaces for I_MusicType
|
2018-08-18 17:18:13 -04:00 |
|
mazmazz
|
c9c1b24ad6
|
S_MusicType implementation; MOD support for Get/SetMusicPosition and MusicLength
* Misc MOD fixes
|
2018-08-18 17:17:53 -04:00 |
|
mazmazz
|
7080c93576
|
Added GME for GetMusicLength, SetMusicPosition, GetMusicPosition
* Misc fixes
|
2018-08-18 16:21:28 -04:00 |
|
mazmazz
|
8db0d04cb8
|
Support wide chars when searching for music tags (MP3)
|
2018-08-18 15:26:31 -04:00 |
|
mazmazz
|
2319a2ba53
|
Lua for I_GetMusicLength
|
2018-08-18 14:18:58 -04:00 |
|
mazmazz
|
7328f47b53
|
I_GetMusicLength declarations for other interfaces
|
2018-08-18 14:18:49 -04:00 |
|
mazmazz
|
e7a4f6d78f
|
I_GetMusicLength implementation
|
2018-08-18 14:18:29 -04:00 |
|
mazmazz
|
0c7e4a05aa
|
HAVE_LUA_MUSICPLUS for testing
|
2018-08-18 09:33:37 -04:00 |
|
mazmazz
|
49c392334e
|
Hide MusicPlus lua behind an #ifdef HAVE_LUA_MUSICPLUS
# Conflicts:
# src/lua_hook.h
# src/lua_hooklib.c
# src/p_user.c
|
2018-08-15 03:37:11 -04:00 |
|
mazmazz
|
da5fd51feb
|
Fix merge errors
|
2018-08-15 02:42:50 -04:00 |
|
mazmazz
|
c912fab1da
|
Lua: Make P_RestoreMusic follow the non-local player nil output convention
|
2018-08-15 02:29:26 -04:00 |
|
mazmazz
|
456652021e
|
Lua: Fix music functions not returning proper values
# Conflicts:
# src/lua_baselib.c
|
2018-08-15 02:29:04 -04:00 |
|
mazmazz
|
2e3837e656
|
Lua: Make S_SpeedMusic and S_ChangeMusic return nil for invalid players
|
2018-08-15 02:23:18 -04:00 |
|
mazmazz
|
8e087a04b4
|
Music lua: Return nil for invalid players and non-nil for valid players
# Conflicts:
# src/lua_baselib.c
|
2018-08-15 02:22:52 -04:00 |
|
mazmazz
|
9b50322924
|
Make S_StopMusic return nil for invalid player, true otherwise
|
2018-08-15 02:21:18 -04:00 |
|
mazmazz
|
21ec9d49fe
|
Lua S_GetMusicPosition: Remove erroneous position input line
# Conflicts:
# src/lua_baselib.c
|
2018-08-15 02:20:56 -04:00 |
|
mazmazz
|
5b504509c0
|
Lua: Make S_GetMusicPosition and S_SetMusicPosition return nil when non-local player is passed
|
2018-08-15 02:19:12 -04:00 |
|
mazmazz
|
2c4af751d2
|
Lua: Added player_t input to S_DigitalPlaying, S_MidiPlaying, S_MusicPlaying, S_MusicPaused, S_MusicName
|
2018-08-15 02:19:06 -04:00 |
|
mazmazz
|
8d1b4ec54e
|
Add player parameter to S_GetMusicPosition lua
# Conflicts:
# src/lua_baselib.c
|
2018-08-15 02:18:46 -04:00 |
|
mazmazz
|
b24efc7439
|
Fix #6 #7 SDL looping and counter bugs when looping=false
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 02:15:05 -04:00 |
|
mazmazz
|
afa71ec7cd
|
SDL: Fix looping bug when looping=false; reset bytes counter when non-looping
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 02:11:17 -04:00 |
|
mazmazz
|
074f43f377
|
Undoing malloc for S_MusicName, pass music_name instead.
I don't think there's a reason for copying to a new var.
|
2018-08-15 02:11:01 -04:00 |
|
mazmazz
|
5e3e23c779
|
Add S_DigitalPlaying
|
2018-08-15 02:10:53 -04:00 |
|
mazmazz
|
5197f69c6f
|
Refactor to SetMusicPosition, GetMusicPosition
# Conflicts:
# src/lua_baselib.c
# src/nds/i_sound.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
|
2018-08-15 02:10:46 -04:00 |
|
mazmazz
|
45581b263b
|
S_MusicName copy music_name to new buffer (is this ok?)
|
2018-08-15 02:07:51 -04:00 |
|
mazmazz
|
3da9a9c4d0
|
Support mflags and looping in MusicChange hook
# Conflicts:
# src/lua_hook.h
|
2018-08-15 02:07:33 -04:00 |
|
mazmazz
|
183f94091b
|
Implemented MusicChange lua hook
# Conflicts:
# src/lua_hook.h
# src/lua_hooklib.c
|
2018-08-15 02:06:43 -04:00 |
|
mazmazz
|
7eabad83a1
|
Another loop fix to resolve music_bytes not resetting on non-looppoint tracks
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 02:03:04 -04:00 |
|
mazmazz
|
58727a3bba
|
SDL mixer: Fix no looping bug when changing song position
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 02:02:33 -04:00 |
|
mazmazz
|
ca3ceb30b9
|
S_MusicName, S_MusicExists, S_PauseMusic lua, S_ResumeMusic lua
# Conflicts:
# src/lua_baselib.c
|
2018-08-15 02:01:34 -04:00 |
|
mazmazz
|
10f989f906
|
Implement I_MIDIPlaying, I_MusicPlaying, I_MusicPaused in other targets
# Conflicts:
# src/nds/i_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
|
2018-08-15 01:59:01 -04:00 |
|
mazmazz
|
6841f90562
|
Use Mix_PausedMusic instead of our own music_paused flag in SDL2/SDL1.2 I_MusicPaused
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 01:55:49 -04:00 |
|
mazmazz
|
de4d4e87e1
|
Implement I_MusicPaused in SDL2, SDL1.2, and FMOD; console and lua commands
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 01:55:03 -04:00 |
|
mazmazz
|
0f5a7e43a1
|
Fix SDL music counter pause issue
|
2018-08-15 01:54:17 -04:00 |
|
mazmazz
|
01eeefded7
|
Remove MUSICPOS command, can be done in lua
|
2018-08-15 01:53:59 -04:00 |
|
mazmazz
|
53c176e922
|
Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 01:53:45 -04:00 |
|
mazmazz
|
9604fe2e22
|
MUSICPOS console command
|
2018-08-15 01:52:35 -04:00 |
|
mazmazz
|
e2c40e63cf
|
Lua PositionMusic switch to UINT32
|
2018-08-15 01:52:20 -04:00 |
|
mazmazz
|
ffa2bfcd22
|
Lua PositionMusic/GetPositionMusic and console TUNES position
|
2018-08-15 01:50:19 -04:00 |
|
mazmazz
|
ed83e09616
|
Lua funcs MidiPlaying/MusicPlaying
|
2018-08-15 01:44:11 -04:00 |
|
mazmazz
|
44c3928d82
|
Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying
# Conflicts:
# src/sdl12/mixer_sound.c
|
2018-08-15 01:43:51 -04:00 |
|
mazmazz
|
d23d77754e
|
Fix SDL music position getting; dummy out position methods for MIDI
# Conflicts:
# src/sdl/mixer_sound.c
# src/sdl12/mixer_sound.c
|
2018-08-15 01:42:15 -04:00 |
|