mazmazz
3c2f7038d0
Added GME for GetMusicLength, SetMusicPosition, GetMusicPosition
...
* Misc fixes
2018-08-18 16:21:28 -04:00
mazmazz
f4a574aba2
Support wide chars when searching for music tags (MP3)
2018-08-18 15:26:31 -04:00
mazmazz
c6035f5956
I_GetMusicLength implementation
2018-08-18 14:18:29 -04:00
Monster Iestyn
364339e1ce
Merge branch 'sdl_mixer_fixes' into 'master'
...
SDL Mixer fixes
Closes #31
See merge request STJr/SRB2!260
2018-08-16 16:57:14 -04:00
mazmazz
8452ec5c7c
Checkpoint: Basic functions
2018-08-15 12:07:08 -04:00
mazmazz
0254f4f368
Fix merge errors
2018-08-15 02:42:50 -04:00
mazmazz
e0ab8c1ed0
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
11c6148d4b
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
47423a69ed
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
79531b9683
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
2e9dba352a
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
d39f804662
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
2483c11cc4
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
e4a6cb87d1
Fix SDL music counter pause issue
2018-08-15 01:54:17 -04:00
mazmazz
297a8d537a
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
d47d18998b
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
2cf364ab8b
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
mazmazz
aed388976c
SDL fix for I_SetSongPosition
...
# Conflicts:
# src/sdl12/mixer_sound.c
2018-08-15 01:40:54 -04:00
mazmazz
8981ef2cdc
Change get/set music position to UINT32 parameter, milliseconds
...
# Conflicts:
# src/d_netcmd.c
# 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 01:40:20 -04:00
mazmazz
a4f7b17389
Initial attempt for get/set song position
...
* Declared I_SetSongPosition, I_GetSongPosition
* Implemented S_PositionMusic and S_GetPositionMusic
* Exposed in console TUNES and lua
* Implemented set position in SDL, SDL12, WIN32
* Implemented get position in WIN32
# Conflicts:
# src/nds/i_sound.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-08-15 01:38:06 -04:00
Monster Iestyn
485d990949
Merge branch 'gme-lowvolume-fix' into 'master'
...
GME low volume fix
See merge request STJr/SRB2!248
2018-07-31 14:35:32 -04:00
Steel Titanium
c02ee9a502
Re-did this fix.
2018-07-28 01:58:25 -04:00
Monster Iestyn
6b1fa399dc
Use plain malloc instead of Z_Malloc to allocate sound buffers in mixer_sound.c's I_GetSfx.
...
This should prevent I_FreeSfx making a mess of things later, hopefully.
2018-07-14 18:15:59 +01:00
Steel Titanium
77362c45cc
Fix pausing on gme
2018-06-03 18:15:20 -04:00
Steel Titanium
e394f7992d
Removed CONS_Printf line. That wasn't meant to be commited.
2018-05-29 22:12:36 -04:00
Steel Titanium
0248fcecd4
Some small change
...
Really this is just to prevent the music end up being disorted at max
volume
2018-05-29 20:31:28 -04:00
Steel Titanium
0b6d6c3363
GME low volume fix
2018-05-24 16:24:09 -04:00
Monster Iestyn
a33bb70a0c
Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12
...
Also removed GP2X setup from sdl/MakeNIX.cfg, use sdl12 for that too
2017-09-16 20:26:04 +01:00
ilag11111
c977d17416
Prevent truncation when resampling sounds with non-multiples of 11250.
2016-09-11 09:41:18 -07:00
Alam Ed Arias
4d6a3e3398
FUNCMATH fun
2016-06-12 16:08:48 -04:00
Alam Ed Arias
f45feb77fc
MSVC: kill level 3 warnings
2016-05-22 00:44:12 -04:00
Inuyasha
e91cfa7110
Fixed frustrating MIDI stuff
...
Until we use something besides Native MIDI to play
back MIDI music, MIDI volume changing is disabled
since it causes way too much of a damn headache.
(It's not even our fault, it's fucking MS.)
2016-04-06 08:16:13 -07:00
Alam Ed Arias
2b12e5ff20
Merge branch 'next' into backport_unslot-music
2016-02-26 02:11:29 -05:00
Inuyasha
6dda71bef7
I guess this is becoming the "try to make SDL_mixer work" branch
...
Move InitSubSystem calls into proper places,
don't use AUDIO_S16LSB (bad according to SDL_mixer docs)
Add error checking
2016-02-22 23:08:35 -08:00
Inuyasha
8c17dac589
The concept of "music slots" doesn't exist anymore.
...
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.
(cherry picked from commit 025ca413a2
)
# Conflicts:
# src/p_user.c
2016-02-09 02:48:33 -08:00
Ronald Kinard
8eef7239b2
Change mixer panning to make sense
...
This makes positional audio in sdl work correctly (things to the left
play sounds in the left speaker)
2014-08-04 02:48:18 -05:00
Ronald Kinard
03fe3bdad2
Replace sdl with sdl2
...
SDL1.2 is dead, long live SDL
2014-07-26 02:06:00 -05:00
Alam Ed Arias
f03e591f64
change SDL into HAVE_SDL
2014-07-25 19:10:24 -04:00
ilag11111
b21d5c55c9
Uses fixed-point math to properly calculate the exact amount of space needed.
2014-04-25 13:17:05 -07:00
ilag11111
f7bbf8c6d0
Improved fix by changing the formula for how memory is allocated to arbitrary sample rate conversion.
2014-04-25 12:42:43 -07:00
ilag11111
60a115b0a7
Fix (Linux) 64-bit crash in CEZ3 (playback of sfx_litng3).
2014-04-25 00:37:13 -07:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00