Removed obsolete ::clearSoundCallback() code
svn-id: r32826
This commit is contained in:
parent
861cf07522
commit
3b1a60c3b2
10 changed files with 2 additions and 29 deletions
|
@ -433,13 +433,7 @@ void OSystem_DS::unlockMutex(MutexRef mutex) {
|
||||||
void OSystem_DS::deleteMutex(MutexRef mutex) {
|
void OSystem_DS::deleteMutex(MutexRef mutex) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void OSystem_DS::clearSoundCallback() {
|
int OSystem_DS::getOutputSampleRate() const {
|
||||||
// consolePrintf("Clearing sound callback");
|
|
||||||
// DS::setSoundProc(NULL, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
int OSystem_DS::getOutputSampleRate() const
|
|
||||||
{
|
|
||||||
return DS::getSoundFrequency();
|
return DS::getSoundFrequency();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -114,7 +114,6 @@ public:
|
||||||
virtual void unlockMutex(MutexRef mutex);
|
virtual void unlockMutex(MutexRef mutex);
|
||||||
virtual void deleteMutex(MutexRef mutex);
|
virtual void deleteMutex(MutexRef mutex);
|
||||||
|
|
||||||
virtual void clearSoundCallback();
|
|
||||||
virtual int getOutputSampleRate() const;
|
virtual int getOutputSampleRate() const;
|
||||||
|
|
||||||
virtual bool openCD(int drive);
|
virtual bool openCD(int drive);
|
||||||
|
|
|
@ -132,8 +132,6 @@ public:
|
||||||
virtual bool setSoundCallback(SoundProc proc, void *param); // overloaded by CE backend
|
virtual bool setSoundCallback(SoundProc proc, void *param); // overloaded by CE backend
|
||||||
virtual Audio::Mixer *getMixer();
|
virtual Audio::Mixer *getMixer();
|
||||||
|
|
||||||
void clearSoundCallback();
|
|
||||||
|
|
||||||
// Poll CD status
|
// Poll CD status
|
||||||
// Returns true if cd audio is playing
|
// Returns true if cd audio is playing
|
||||||
bool pollCD();
|
bool pollCD();
|
||||||
|
|
|
@ -478,10 +478,6 @@ bool OSystem_GP2X::setSoundCallback(SoundProc proc, void *param) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OSystem_GP2X::clearSoundCallback() {
|
|
||||||
SDL_CloseAudio();
|
|
||||||
}
|
|
||||||
|
|
||||||
int OSystem_GP2X::getOutputSampleRate() const {
|
int OSystem_GP2X::getOutputSampleRate() const {
|
||||||
return _samplesPerSec;
|
return _samplesPerSec;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1128,10 +1128,6 @@ bool OSystem_IPHONE::setSoundCallback(SoundProc proc, void *param) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OSystem_IPHONE::clearSoundCallback() {
|
|
||||||
debug("clearSoundCallback()\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
int OSystem_IPHONE::getOutputSampleRate() const {
|
int OSystem_IPHONE::getOutputSampleRate() const {
|
||||||
return AUDIO_SAMPLE_RATE;
|
return AUDIO_SAMPLE_RATE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,7 +153,6 @@ public:
|
||||||
virtual void deleteMutex(MutexRef mutex);
|
virtual void deleteMutex(MutexRef mutex);
|
||||||
|
|
||||||
virtual bool setSoundCallback(SoundProc proc, void *param);
|
virtual bool setSoundCallback(SoundProc proc, void *param);
|
||||||
virtual void clearSoundCallback();
|
|
||||||
virtual int getOutputSampleRate() const;
|
virtual int getOutputSampleRate() const;
|
||||||
virtual void setTimerCallback(TimerProc callback, int interval);
|
virtual void setTimerCallback(TimerProc callback, int interval);
|
||||||
|
|
||||||
|
|
|
@ -283,9 +283,6 @@ bool OSystem_NULL::setSoundCallback(SoundProc proc, void *param) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OSystem_NULL::clearSoundCallback() {
|
|
||||||
}
|
|
||||||
|
|
||||||
int OSystem_NULL::getOutputSampleRate() const {
|
int OSystem_NULL::getOutputSampleRate() const {
|
||||||
return 22050;
|
return 22050;
|
||||||
}
|
}
|
||||||
|
|
|
@ -727,7 +727,6 @@ void OSystem_PS2::quit(void) {
|
||||||
driveStandby();
|
driveStandby();
|
||||||
fio.umount("pfs0:");
|
fio.umount("pfs0:");
|
||||||
}
|
}
|
||||||
//clearSoundCallback();
|
|
||||||
//setTimerCallback(NULL, 0);
|
//setTimerCallback(NULL, 0);
|
||||||
_screen->wantAnim(false);
|
_screen->wantAnim(false);
|
||||||
_systemQuit = true;
|
_systemQuit = true;
|
||||||
|
|
|
@ -626,16 +626,12 @@ bool OSystem_PSP::setSoundCallback(SoundProc proc, void *param) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OSystem_PSP::clearSoundCallback() {
|
|
||||||
SDL_CloseAudio();
|
|
||||||
}
|
|
||||||
|
|
||||||
int OSystem_PSP::getOutputSampleRate() const {
|
int OSystem_PSP::getOutputSampleRate() const {
|
||||||
return _samplesPerSec;
|
return _samplesPerSec;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OSystem_PSP::quit() {
|
void OSystem_PSP::quit() {
|
||||||
clearSoundCallback();
|
SDL_CloseAudio();
|
||||||
SDL_Quit();
|
SDL_Quit();
|
||||||
sceGuTerm();
|
sceGuTerm();
|
||||||
sceKernelExitGame();
|
sceKernelExitGame();
|
||||||
|
|
|
@ -131,7 +131,6 @@ public:
|
||||||
|
|
||||||
typedef void (*SoundProc)(void *param, byte *buf, int len);
|
typedef void (*SoundProc)(void *param, byte *buf, int len);
|
||||||
virtual bool setSoundCallback(SoundProc proc, void *param);
|
virtual bool setSoundCallback(SoundProc proc, void *param);
|
||||||
virtual void clearSoundCallback();
|
|
||||||
virtual int getOutputSampleRate() const;
|
virtual int getOutputSampleRate() const;
|
||||||
|
|
||||||
Common::SaveFileManager *getSavefileManager() { return _savefile; }
|
Common::SaveFileManager *getSavefileManager() { return _savefile; }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue