From 85f9eeb8f438d6d542c0c7b7446b31585cc9c23d Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Sat, 18 Dec 2010 02:20:39 +0300 Subject: [PATCH] Drop Open_Stream --- Source/GameInitDispose.cpp | 16 ++++++++-------- Source/openal_wrapper.cpp | 13 ------------- Source/openal_wrapper.h | 3 +-- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index 6c9cf0f..8158a49 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -902,7 +902,7 @@ void Game::InitGame() OPENAL_SetSFXMasterVolume((int)(volume*255)); - strm[stream_music3] = OPENAL_Stream_Open(ConvertFileName(":Data:Sounds:music3.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=0;} + strm[stream_music3] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:music3.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=0;} // OPENAL_Sample_SetMinMaxDistance(strm[stream_music3], 4.0f, 1000.0f); OPENAL_Stream_SetMode(strm[stream_music3], OPENAL_LOOP_NORMAL); @@ -916,42 +916,42 @@ void Game::InitGame() FadeLoadingScreen(20); if(ambientsound){ - strm[stream_wind] = OPENAL_Stream_Open(ConvertFileName(":Data:Sounds:wind.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;} + strm[stream_wind] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:wind.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;} // OPENAL_Sample_SetMinMaxDistance(strm[stream_wind], 4.0f, 1000.0f); OPENAL_Stream_SetMode(strm[stream_wind], OPENAL_LOOP_NORMAL); FadeLoadingScreen(30); - strm[stream_desertambient] = OPENAL_Stream_Open(ConvertFileName(":Data:Sounds:desertambient.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;} + strm[stream_desertambient] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:desertambient.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;} // OPENAL_Sample_SetMinMaxDistance(strm[stream_desertambient], 4.0f, 1000.0f); OPENAL_Stream_SetMode(strm[stream_desertambient], OPENAL_LOOP_NORMAL); } FadeLoadingScreen(40); - strm[stream_firesound] = OPENAL_Stream_Open(ConvertFileName(":Data:Sounds:fire.ogg"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;} + strm[stream_firesound] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:fire.ogg"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;} // OPENAL_Sample_SetMinMaxDistance(strm[stream_firesound], 8.0f, 2000.0f); OPENAL_Stream_SetMode(strm[stream_firesound], OPENAL_LOOP_NORMAL); FadeLoadingScreen(50); //if(musictoggle){ - strm[stream_music1grass] = OPENAL_Stream_Open(ConvertFileName(":Data:Sounds:music1grass.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=1;} + strm[stream_music1grass] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:music1grass.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=1;} // OPENAL_Sample_SetMinMaxDistance(strm[stream_music1grass], 4.0f, 1000.0f); OPENAL_Stream_SetMode(strm[stream_music1grass], OPENAL_LOOP_NORMAL); - strm[stream_music1snow] = OPENAL_Stream_Open(ConvertFileName(":Data:Sounds:music1snow.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=2;} + strm[stream_music1snow] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:music1snow.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=2;} // OPENAL_Sample_SetMinMaxDistance(strm[stream_music1snow], 4.0f, 1000.0f); OPENAL_Stream_SetMode(strm[stream_music1snow], OPENAL_LOOP_NORMAL); FadeLoadingScreen(60); - strm[stream_music1desert] = OPENAL_Stream_Open(ConvertFileName(":Data:Sounds:music1desert.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=3;} + strm[stream_music1desert] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:music1desert.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=3;} // OPENAL_Sample_SetMinMaxDistance(strm[stream_music1desert], 4.0f, 1000.0f); OPENAL_Stream_SetMode(strm[stream_music1desert], OPENAL_LOOP_NORMAL); FadeLoadingScreen(80); - strm[stream_music2] = OPENAL_Stream_Open(ConvertFileName(":Data:Sounds:music2.ogg"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=4;} + strm[stream_music2] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:music2.ogg"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=4;} // OPENAL_Sample_SetMinMaxDistance(strm[stream_music2], 4.0f, 1000.0f); OPENAL_Stream_SetMode(strm[stream_music2], OPENAL_LOOP_NORMAL); diff --git a/Source/openal_wrapper.cpp b/Source/openal_wrapper.cpp index e375717..4dddfd5 100644 --- a/Source/openal_wrapper.cpp +++ b/Source/openal_wrapper.cpp @@ -114,14 +114,6 @@ typedef struct OPENAL_SAMPLE int is2d; } OPENAL_SAMPLE; -typedef struct OPENAL_STREAM -{ - char *name; - ALuint bid; // buffer id. - int mode; - int is2d; -} OPENAL_STREAM; - static size_t num_channels = 0; static OPENAL_Channels *channels = NULL; static bool initialized = false; @@ -600,11 +592,6 @@ AL_API signed char OPENAL_StopSound(int channel) return true; } -AL_API OPENAL_STREAM *OPENAL_Stream_Open(const char *name_or_data, unsigned int mode, int offset, int length) -{ - return (OPENAL_STREAM *) OPENAL_Sample_Load(OPENAL_FREE, name_or_data, mode, offset, length); -} - AL_API void OPENAL_Stream_Close(OPENAL_STREAM *stream) { OPENAL_Sample_Free((OPENAL_SAMPLE *) stream); diff --git a/Source/openal_wrapper.h b/Source/openal_wrapper.h index a15a6de..99fad2c 100644 --- a/Source/openal_wrapper.h +++ b/Source/openal_wrapper.h @@ -44,7 +44,7 @@ typedef struct OPENAL_SAMPLE OPENAL_SAMPLE; -typedef struct OPENAL_STREAM OPENAL_STREAM; +typedef OPENAL_SAMPLE OPENAL_STREAM; typedef struct OPENAL_DSPUNIT OPENAL_DSPUNIT; enum OPENAL_OUTPUTTYPES @@ -86,7 +86,6 @@ AL_API signed char OPENAL_SetVolume(int channel, int vol); AL_API signed char OPENAL_SetPaused(int channel, signed char paused); AL_API void OPENAL_SetSFXMasterVolume(int volume); AL_API signed char OPENAL_StopSound(int channel); -AL_API OPENAL_STREAM *OPENAL_Stream_Open(const char *name_or_data, unsigned int mode, int offset, int length); AL_API void OPENAL_Stream_Close(OPENAL_STREAM *stream); AL_API OPENAL_SAMPLE *OPENAL_Stream_GetSample(OPENAL_STREAM *stream); AL_API int OPENAL_Stream_PlayEx(int channel, OPENAL_STREAM *stream, OPENAL_DSPUNIT *dsp, signed char startpaused); -- 2.39.5