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: rename lnx_sound to sdl_sound

Browse Source 
Now this is cross-platform playback.
This commit is contained in:
Azamat H. Hackimov 2024-07-07 04:28:57 +03:00
parent 4f0e0f87a5
commit c6eb9a8908
4 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmve/CMakeLists.txt
View File

@ -1,13 +1,7 @@
set(CPPS set(CPPS
# mveasm.cpp
# mvelibl.cpp
# platform.cpp
# lnxdsound.cpp
# d2x implementation
decoder8.cpp decoder8.cpp
decoder16.cpp decoder16.cpp
lnx_sound.cpp movie_sound.cpp
mve_audio.cpp mve_audio.cpp
mvelib.cpp mvelib.cpp
mveplay.cpp mveplay.cpp

2
libmve/lnx_sound.cpp → libmve/movie_sound.cpp
View File

@ -17,7 +17,7 @@
*/ */
#include <functional> #include <functional>
#include "lnx_sound.h" #include "movie_sound.h"
namespace D3 { namespace D3 {

6
libmve/lnx_sound.h → libmve/movie_sound.h
View File

@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBMVE_LNX_SOUND_H_ #ifndef LIBMVE_MOVIE_SOUND_H_
#define LIBMVE_LNX_SOUND_H_ #define LIBMVE_MOVIE_SOUND_H_
#include <SDL_audio.h> #include <SDL_audio.h>
@ -49,4 +49,4 @@ public:
} }
#endif // LIBMVE_LNX_SOUND_H_ #endif // LIBMVE_MOVIE_SOUND_H_

7
libmve/mveplay.cpp
View File

@ -30,7 +30,7 @@
#include "mve_audio.h" #include "mve_audio.h"
#ifdef AUDIO #ifdef AUDIO
#include "lnx_sound.h" #include "movie_sound.h"
#endif #endif
#define MVE_OPCODE_ENDOFSTREAM 0x00 // mcmd_end #define MVE_OPCODE_ENDOFSTREAM 0x00 // mcmd_end
@ -156,7 +156,6 @@ static void do_timer_wait() {
ts = timer_expire - tv; ts = timer_expire - tv;
//mprintf(0,"SLEEP for %llu us, buffer size is %d\n", ts, snd_ds->GetBuffer()->size());
timer_sleepmicroseconds(ts); timer_sleepmicroseconds(ts);
end: end:
@ -279,10 +278,6 @@ static int create_videobuf_handler(unsigned char major, unsigned char minor, uns
memset(g_vBackBuf1, 0, g_width * g_height * 4); memset(g_vBackBuf1, 0, g_width * g_height * 4);
#ifdef DEBUG
fprintf(stderr, "DEBUG: w,h=%d,%d count=%d, tc=%d\n", w, h, count, truecolor);
#endif
g_truecolor = truecolor; g_truecolor = truecolor;
return 1; return 1;