Merge pull request cebix#241 from rakslice/remove_mixaudio_volume

bin/cue: removed unused MixAudio volume param
rakslice · Jan 8, 2025 · 3498324 · 3498324
2 parents 51e3a90 + 3eff56b
commit 3498324
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/BasiliskII/src/SDL/audio_sdl.cpp b/BasiliskII/src/SDL/audio_sdl.cpp
@@ -269,7 +269,7 @@ static void stream_func(void *arg, uint8 *stream, int stream_len)
 	}
 
 #if defined(BINCUE)
-	MixAudio_bincue(stream, stream_len, get_audio_volume());
+	MixAudio_bincue(stream, stream_len);
 #endif
 
 }

diff --git a/BasiliskII/src/SDL/audio_sdl3.cpp b/BasiliskII/src/SDL/audio_sdl3.cpp
@@ -401,7 +401,7 @@ static void SDLCALL stream_func(void *, SDL_AudioStream *stream, int stream_len,
 	//int r = SDL_GetAudioStreamFormat(stream, NULL, &audio_spec);// little endianが帰ってくる
 	SDL_MixAudio(dst, src, audio_spec.format, stream_len, get_audio_volume());
 #if defined(BINCUE)
-	MixAudio_bincue(dst, stream_len, get_audio_volume());
+	MixAudio_bincue(dst, stream_len);
 #endif
 	SDL_PutAudioStreamData(stream, dst, stream_len);
 }

diff --git a/BasiliskII/src/bincue.cpp b/BasiliskII/src/bincue.cpp
@@ -991,7 +991,7 @@ bool HaveAudioToMix_bincue() {
 	return currently_playing != NULL;
 }
 
-void MixAudio_bincue(uint8 *stream, int stream_len, int volume)
+void MixAudio_bincue(uint8 *stream, int stream_len)
 {
 	if (currently_playing) {
 

diff --git a/BasiliskII/src/include/bincue.h b/BasiliskII/src/include/bincue.h
@@ -41,7 +41,7 @@ extern void CDGetVol_bincue(void *, uint8 *, uint8 *);
 #ifdef USE_SDL_AUDIO
 extern void OpenAudio_bincue(int, int, int, uint8, int);
 extern bool HaveAudioToMix_bincue(void);
-extern void MixAudio_bincue(uint8 *, int, int);
+extern void MixAudio_bincue(uint8 *, int);
 extern void CloseAudio_bincue(void);
 #endif
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     #if defined(BINCUE)
-    	MixAudio_bincue(stream, stream_len, get_audio_volume());
+    	MixAudio_bincue(stream, stream_len);
     #endif
     }
@@ Expand Down @@