ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added an error function that prints an error and frees any resources. 

Removes some duplication of code.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@154 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2002-12-05 16:43:57 +00:00
parent 1dea24d7cc
commit bbc5ada9e6
2 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
stella/src/ui/sound/SoundALSA.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: SoundALSA.cxx,v 1.1 2002-12-01 02:12:26 stephena Exp $ // $Id: SoundALSA.cxx,v 1.2 2002-12-05 16:43:57 stephena Exp $
//============================================================================ //============================================================================
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
@ -45,15 +45,14 @@ SoundALSA::SoundALSA()
// Open the PCM device for writing // Open the PCM device for writing
if((err = snd_pcm_open(&myPcmHandle, pcmName, SND_PCM_STREAM_PLAYBACK, 0)) < 0) if((err = snd_pcm_open(&myPcmHandle, pcmName, SND_PCM_STREAM_PLAYBACK, 0)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
return; return;
} }
// Init hwparams with full configuration space // Init hwparams with full configuration space
if((err = snd_pcm_hw_params_any(myPcmHandle, hwparams)) < 0) if((err = snd_pcm_hw_params_any(myPcmHandle, hwparams)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
return; return;
} }
@ -61,24 +60,21 @@ SoundALSA::SoundALSA()
if((err = snd_pcm_hw_params_set_access(myPcmHandle, hwparams, if((err = snd_pcm_hw_params_set_access(myPcmHandle, hwparams,
SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) SND_PCM_ACCESS_RW_INTERLEAVED)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
return; return;
} }
// Set the audio data format // Set the audio data format
if((err = snd_pcm_hw_params_set_format(myPcmHandle, hwparams, SND_PCM_FORMAT_U8)) < 0) if((err = snd_pcm_hw_params_set_format(myPcmHandle, hwparams, SND_PCM_FORMAT_U8)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
return; return;
} }
// Set the number of audio channels to 1 (mono mode) // Set the number of audio channels to 1 (mono mode)
if((err = snd_pcm_hw_params_set_channels(myPcmHandle, hwparams, 1)) < 0) if((err = snd_pcm_hw_params_set_channels(myPcmHandle, hwparams, 1)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
return; return;
} }
@ -87,18 +83,14 @@ SoundALSA::SoundALSA()
mySampleRate = 31400; mySampleRate = 31400;
if((err = snd_pcm_hw_params_set_rate_near(myPcmHandle, hwparams, mySampleRate, 0)) < 0) if((err = snd_pcm_hw_params_set_rate_near(myPcmHandle, hwparams, mySampleRate, 0)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
mySampleRate = 0;
return; return;
} }
// Set number of fragments to 2 // Set number of fragments to 2
if((err = snd_pcm_hw_params_set_periods(myPcmHandle, hwparams, 2, 0)) < 0) if((err = snd_pcm_hw_params_set_periods(myPcmHandle, hwparams, 2, 0)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
mySampleRate = 0;
return; return;
} }
@ -107,18 +99,14 @@ SoundALSA::SoundALSA()
if((err = snd_pcm_hw_params_set_period_size(myPcmHandle, hwparams, if((err = snd_pcm_hw_params_set_period_size(myPcmHandle, hwparams,
myBufferSize, 0)) < 0) myBufferSize, 0)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
mySampleRate = 0;
return; return;
} }
// Apply HW parameter settings to PCM device // Apply HW parameter settings to PCM device
if((err = snd_pcm_hw_params(myPcmHandle, hwparams)) < 0) if((err = snd_pcm_hw_params(myPcmHandle, hwparams)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
mySampleRate = 0;
return; return;
} }
@ -138,48 +126,34 @@ SoundALSA::SoundALSA()
// Open the mixer device // Open the mixer device
if((err = snd_mixer_open(&myMixerHandle, 0)) < 0) if((err = snd_mixer_open(&myMixerHandle, 0)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
mySampleRate = 0;
return; return;
} }
// Attach the mixer to the default sound card // Attach the mixer to the default sound card
if((err = snd_mixer_attach(myMixerHandle, mixerCard)) < 0) if((err = snd_mixer_attach(myMixerHandle, mixerCard)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
snd_mixer_close(myMixerHandle);
mySampleRate = 0;
return; return;
} }
// Register the mixer with the sound system // Register the mixer with the sound system
if((err = snd_mixer_selem_register(myMixerHandle, NULL, NULL)) < 0) if((err = snd_mixer_selem_register(myMixerHandle, NULL, NULL)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
snd_mixer_close(myMixerHandle);
mySampleRate = 0;
return; return;
} }
if((err = snd_mixer_load(myMixerHandle)) < 0) if((err = snd_mixer_load(myMixerHandle)) < 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
snd_mixer_close(myMixerHandle);
mySampleRate = 0;
return; return;
} }
// Get the mixer element that will be used to control volume // Get the mixer element that will be used to control volume
if((myMixerElem = snd_mixer_find_selem(myMixerHandle, mixerID)) == 0) if((myMixerElem = snd_mixer_find_selem(myMixerHandle, mixerID)) == 0)
{ {
cerr << "SoundALSA: " << snd_strerror(err) << endl; alsaError(err);
snd_pcm_close(myPcmHandle);
snd_mixer_close(myMixerHandle);
mySampleRate = 0;
return; return;
} }
@ -306,3 +280,16 @@ void SoundALSA::updateSound(MediaSource& mediaSource)
} }
} }
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void SoundALSA::alsaError(Int32 error)
{
cerr << "SoundALSA: " << snd_strerror(error) << endl;
if(myMixerHandle)
snd_mixer_close(myMixerHandle);
if(myPcmHandle)
snd_pcm_close(myPcmHandle);
mySampleRate = 0;
}

10
stella/src/ui/sound/SoundALSA.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: SoundALSA.hxx,v 1.1 2002-12-01 02:12:26 stephena Exp $ // $Id: SoundALSA.hxx,v 1.2 2002-12-05 16:43:57 stephena Exp $
//============================================================================ //============================================================================
#ifndef SOUNDALSA_HXX #ifndef SOUNDALSA_HXX
@ -30,7 +30,7 @@
Advanced Linux Sound Architecture (ALSA) version 0.9.x API. Advanced Linux Sound Architecture (ALSA) version 0.9.x API.
@author Stephen Anthony @author Stephen Anthony
@version $Id: SoundALSA.hxx,v 1.1 2002-12-01 02:12:26 stephena Exp $ @version $Id: SoundALSA.hxx,v 1.2 2002-12-05 16:43:57 stephena Exp $
*/ */
class SoundALSA : public Sound class SoundALSA : public Sound
{ {
@ -81,6 +81,12 @@ class SoundALSA : public Sound
*/ */
void updateSound(MediaSource& mediaSource); void updateSound(MediaSource& mediaSource);
private:
/**
Prints the given error message, and frees any resources used.
*/
void alsaError(Int32 error);
private: private:
// Indicates if the sound device was successfully initialized // Indicates if the sound device was successfully initialized
bool myIsInitializedFlag; bool myIsInitializedFlag;