[Scummvm-cvs-logs] SF.net SVN: scummvm: [32826] scummvm/trunk/backends/platform
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Jun 28 17:13:55 CEST 2008
Revision: 32826
http://scummvm.svn.sourceforge.net/scummvm/?rev=32826&view=rev
Author: fingolfin
Date: 2008-06-28 08:13:54 -0700 (Sat, 28 Jun 2008)
Log Message:
-----------
Removed obsolete ::clearSoundCallback() code
Modified Paths:
--------------
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
scummvm/trunk/backends/platform/gp2x/gp2x-common.h
scummvm/trunk/backends/platform/gp2x/gp2x.cpp
scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
scummvm/trunk/backends/platform/iphone/osys_iphone.h
scummvm/trunk/backends/platform/null/null.cpp
scummvm/trunk/backends/platform/ps2/systemps2.cpp
scummvm/trunk/backends/platform/psp/osys_psp.cpp
scummvm/trunk/backends/platform/psp/osys_psp.h
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2008-06-28 15:00:27 UTC (rev 32825)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2008-06-28 15:13:54 UTC (rev 32826)
@@ -433,13 +433,7 @@
void OSystem_DS::deleteMutex(MutexRef mutex) {
}
-void OSystem_DS::clearSoundCallback() {
-// consolePrintf("Clearing sound callback");
-// DS::setSoundProc(NULL, NULL);
-}
-
-int OSystem_DS::getOutputSampleRate() const
-{
+int OSystem_DS::getOutputSampleRate() const {
return DS::getSoundFrequency();
}
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2008-06-28 15:00:27 UTC (rev 32825)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2008-06-28 15:13:54 UTC (rev 32826)
@@ -114,7 +114,6 @@
virtual void unlockMutex(MutexRef mutex);
virtual void deleteMutex(MutexRef mutex);
- virtual void clearSoundCallback();
virtual int getOutputSampleRate() const;
virtual bool openCD(int drive);
Modified: scummvm/trunk/backends/platform/gp2x/gp2x-common.h
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2008-06-28 15:00:27 UTC (rev 32825)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2008-06-28 15:13:54 UTC (rev 32826)
@@ -132,8 +132,6 @@
virtual bool setSoundCallback(SoundProc proc, void *param); // overloaded by CE backend
virtual Audio::Mixer *getMixer();
- void clearSoundCallback();
-
// Poll CD status
// Returns true if cd audio is playing
bool pollCD();
Modified: scummvm/trunk/backends/platform/gp2x/gp2x.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x.cpp 2008-06-28 15:00:27 UTC (rev 32825)
+++ scummvm/trunk/backends/platform/gp2x/gp2x.cpp 2008-06-28 15:13:54 UTC (rev 32826)
@@ -478,10 +478,6 @@
return true;
}
-void OSystem_GP2X::clearSoundCallback() {
- SDL_CloseAudio();
-}
-
int OSystem_GP2X::getOutputSampleRate() const {
return _samplesPerSec;
}
Modified: scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_iphone.cpp 2008-06-28 15:00:27 UTC (rev 32825)
+++ scummvm/trunk/backends/platform/iphone/osys_iphone.cpp 2008-06-28 15:13:54 UTC (rev 32826)
@@ -1128,10 +1128,6 @@
return true;
}
-void OSystem_IPHONE::clearSoundCallback() {
- debug("clearSoundCallback()\n");
-}
-
int OSystem_IPHONE::getOutputSampleRate() const {
return AUDIO_SAMPLE_RATE;
}
Modified: scummvm/trunk/backends/platform/iphone/osys_iphone.h
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_iphone.h 2008-06-28 15:00:27 UTC (rev 32825)
+++ scummvm/trunk/backends/platform/iphone/osys_iphone.h 2008-06-28 15:13:54 UTC (rev 32826)
@@ -153,7 +153,6 @@
virtual void deleteMutex(MutexRef mutex);
virtual bool setSoundCallback(SoundProc proc, void *param);
- virtual void clearSoundCallback();
virtual int getOutputSampleRate() const;
virtual void setTimerCallback(TimerProc callback, int interval);
Modified: scummvm/trunk/backends/platform/null/null.cpp
===================================================================
--- scummvm/trunk/backends/platform/null/null.cpp 2008-06-28 15:00:27 UTC (rev 32825)
+++ scummvm/trunk/backends/platform/null/null.cpp 2008-06-28 15:13:54 UTC (rev 32826)
@@ -283,9 +283,6 @@
return true;
}
-void OSystem_NULL::clearSoundCallback() {
-}
-
int OSystem_NULL::getOutputSampleRate() const {
return 22050;
}
Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp 2008-06-28 15:00:27 UTC (rev 32825)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp 2008-06-28 15:13:54 UTC (rev 32826)
@@ -727,7 +727,6 @@
driveStandby();
fio.umount("pfs0:");
}
- //clearSoundCallback();
//setTimerCallback(NULL, 0);
_screen->wantAnim(false);
_systemQuit = true;
Modified: scummvm/trunk/backends/platform/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.cpp 2008-06-28 15:00:27 UTC (rev 32825)
+++ scummvm/trunk/backends/platform/psp/osys_psp.cpp 2008-06-28 15:13:54 UTC (rev 32826)
@@ -626,16 +626,12 @@
return true;
}
-void OSystem_PSP::clearSoundCallback() {
- SDL_CloseAudio();
-}
-
int OSystem_PSP::getOutputSampleRate() const {
return _samplesPerSec;
}
void OSystem_PSP::quit() {
- clearSoundCallback();
+ SDL_CloseAudio();
SDL_Quit();
sceGuTerm();
sceKernelExitGame();
Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h 2008-06-28 15:00:27 UTC (rev 32825)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h 2008-06-28 15:13:54 UTC (rev 32826)
@@ -131,7 +131,6 @@
typedef void (*SoundProc)(void *param, byte *buf, int len);
virtual bool setSoundCallback(SoundProc proc, void *param);
- virtual void clearSoundCallback();
virtual int getOutputSampleRate() const;
Common::SaveFileManager *getSavefileManager() { return _savefile; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list