actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

hush spurious warning

Browse Source
This commit is contained in:
Glenn Maynard
2004-01-03 02:49:19 +00:00
parent dc2eeebde4
commit 72b3e5fa44
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/ALSA9Helpers.cpp
+3 -1
View File
@@ -65,7 +65,7 @@ bool Alsa9Buf::SetHWParams()
err = dsnd_pcm_hw_params_set_rate_near(pcm, hwparams, &rate, 0); err = dsnd_pcm_hw_params_set_rate_near(pcm, hwparams, &rate, 0);
ALSA_CHECK("dsnd_pcm_hw_params_set_rate_near"); ALSA_CHECK("dsnd_pcm_hw_params_set_rate_near");
if( (int) rate != samplerate ) if( samplerate_set_explicitly && (int) rate != samplerate )
LOG->Warn("Alsa9Buf::SetHWParams: Couldn't get %ihz (got %ihz instead)", samplerate, rate); LOG->Warn("Alsa9Buf::SetHWParams: Couldn't get %ihz (got %ihz instead)", samplerate, rate);
snd_pcm_uframes_t buffersize = 1024*8; snd_pcm_uframes_t buffersize = 1024*8;
@@ -160,6 +160,7 @@ Alsa9Buf::Alsa9Buf( hw hardware, int channels_ )
samplerate = 44100; samplerate = 44100;
samplebits = 16; samplebits = 16;
last_cursor_pos = 0; last_cursor_pos = 0;
samplerate_set_explicitly = false;
/* Open the device. */ /* Open the device. */
int err; int err;
@@ -333,6 +334,7 @@ void Alsa9Buf::Stop()
void Alsa9Buf::SetSampleRate(int hz) void Alsa9Buf::SetSampleRate(int hz)
{ {
samplerate = hz; samplerate = hz;
samplerate_set_explicitly = true;
SetHWParams(); SetHWParams();
stepmania/src/arch/Sound/ALSA9Helpers.h
+1
View File
@@ -12,6 +12,7 @@ class Alsa9Buf
private: private:
int channels, samplerate, samplebits; int channels, samplerate, samplebits;
int buffersize, last_cursor_pos; int buffersize, last_cursor_pos;
bool samplerate_set_explicitly;
snd_pcm_sframes_t total_frames; snd_pcm_sframes_t total_frames;
snd_pcm_uframes_t xfer_align; snd_pcm_uframes_t xfer_align;