Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

MVE: Migrate to SDL2 functions

Browse Source 
Replaced SDL 1.2 legacy calls to SDL2 equivalents.
Changed spec.size to fixed value 4096 as values obtained from file can produce sound stuttering.
This commit is contained in:
Azamat H. Hackimov 2024-05-08 16:18:42 +03:00
parent 96c240a4c0
commit 8d56e1c1ff
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmve/mveplay.cpp
View File

@ -15,7 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
// TODO
#define AUDIO #define AUDIO
#include <cstring> #include <cstring>
@ -65,6 +64,8 @@ static int g_frameUpdated = 0;
static ISoundDevice *snd_ds = nullptr; static ISoundDevice *snd_ds = nullptr;
static SDL_AudioDeviceID device = 0;
static short get_short(const unsigned char *data) { static short get_short(const unsigned char *data) {
return D3::convert_le<int16_t>(data[0] | (data[1] << 8)); return D3::convert_le<int16_t>(data[0] | (data[1] << 8));
} }
@ -328,10 +329,11 @@ static int create_audiobuf_handler(unsigned char major, unsigned char minor, uns
.freq = sample_rate, .freq = sample_rate,
.format = (unsigned short)format, .format = (unsigned short)format,
.channels = (unsigned char)(stereo ? 2 : 1), .channels = (unsigned char)(stereo ? 2 : 1),
.size = (unsigned int)desired_buffer, .size = 4096,
.callback = mve_audio_callback, .callback = mve_audio_callback,
}; };
if (SDL_OpenAudio(&spec, nullptr) == 0) { device = SDL_OpenAudioDevice(nullptr, 0, &spec, nullptr, SDL_AUDIO_ALLOW_ANY_CHANGE);
if (device != 0) {
fprintf(stderr, " success\n"); fprintf(stderr, " success\n");
mve_audio_canplay = 1; mve_audio_canplay = 1;
} else { } else {
@ -351,7 +353,7 @@ static int create_audiobuf_handler(unsigned char major, unsigned char minor, uns
static int play_audio_handler(unsigned char major, unsigned char minor, unsigned char *data, int len, void *context) { static int play_audio_handler(unsigned char major, unsigned char minor, unsigned char *data, int len, void *context) {
#ifdef AUDIO #ifdef AUDIO
if (mve_audio_canplay && !mve_audio_playing && mve_audio_bufhead != mve_audio_buftail) { if (mve_audio_canplay && !mve_audio_playing && mve_audio_bufhead != mve_audio_buftail) {
SDL_PauseAudio(0); SDL_PauseAudioDevice(device, 0);
mve_audio_playing = 1; mve_audio_playing = 1;
} }
#endif #endif
@ -644,7 +646,7 @@ void MVE_rmEndMovie(MVESTREAM *mve) {
#ifdef AUDIO #ifdef AUDIO
if (mve_audio_canplay) { if (mve_audio_canplay) {
// only close audio if we opened it // only close audio if we opened it
SDL_CloseAudio(); SDL_CloseAudioDevice(device);
mve_audio_canplay = 0; mve_audio_canplay = 0;
} }
for (int i = 0; i < TOTAL_AUDIO_BUFFERS; i++) for (int i = 0; i < TOTAL_AUDIO_BUFFERS; i++)