[Scummvm-cvs-logs] SF.net SVN: scummvm: [22370] scummvm/trunk/common
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat May 6 11:11:04 CEST 2006
Revision: 22370
Author: fingolfin
Date: 2006-05-06 11:10:38 -0700 (Sat, 06 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22370&view=rev
Log Message:
-----------
Added a default implementation of the OSystem CD API (which simply does nothing)
Modified Paths:
--------------
scummvm/trunk/backends/PalmOS/Src/be_base.h
scummvm/trunk/backends/gp32/gp32_osys.cpp
scummvm/trunk/backends/gp32/gp32_osys.h
scummvm/trunk/backends/null/null.cpp
scummvm/trunk/backends/ps2/systemps2.cpp
scummvm/trunk/backends/ps2/systemps2.h
scummvm/trunk/backends/psp/osys_psp.cpp
scummvm/trunk/backends/psp/osys_psp.h
scummvm/trunk/backends/x11/x11.cpp
scummvm/trunk/backends/x11/x11.h
scummvm/trunk/common/system.cpp
scummvm/trunk/common/system.h
Modified: scummvm/trunk/backends/PalmOS/Src/be_base.h
===================================================================
--- scummvm/trunk/backends/PalmOS/Src/be_base.h 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/backends/PalmOS/Src/be_base.h 2006-05-06 18:10:38 UTC (rev 22370)
@@ -235,12 +235,6 @@
virtual void clearSoundCallback() = 0;
int getOutputSampleRate() const { return _samplesPerSec; }
- bool openCD(int drive) { return false;};
- bool pollCD() { return false;};
- void playCD(int track, int num_loops, int start_frame, int duration) {};
- void stopCD() {};
- void updateCD() {};
-
void quit();
virtual void setWindowCaption(const char *caption) = 0;
Modified: scummvm/trunk/backends/gp32/gp32_osys.cpp
===================================================================
--- scummvm/trunk/backends/gp32/gp32_osys.cpp 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/backends/gp32/gp32_osys.cpp 2006-05-06 18:10:38 UTC (rev 22370)
@@ -712,28 +712,6 @@
return _samplesPerSec;
}
-bool OSystem_GP32::openCD(int drive) {
- NP("OSys::openCD()");
- return true;
-}
-
-bool OSystem_GP32::pollCD() {
- NP("OSys::pollCD()");
- return true;
-}
-
-void OSystem_GP32::playCD(int track, int num_loops, int start_frame, int duration) {
- NP("OSys::playCD()");
-}
-
-void OSystem_GP32::stopCD() {
- NP("OSys::stopCD()");
-}
-
-void OSystem_GP32::updateCD() {
- NP("OSys::updateCD()");
-}
-
void OSystem_GP32::quit() {
NP("OSys::quit()");
clearSoundCallback();
Modified: scummvm/trunk/backends/gp32/gp32_osys.h
===================================================================
--- scummvm/trunk/backends/gp32/gp32_osys.h 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/backends/gp32/gp32_osys.h 2006-05-06 18:10:38 UTC (rev 22370)
@@ -136,13 +136,6 @@
virtual void clearSoundCallback();
virtual int getOutputSampleRate() const;
- virtual bool openCD(int drive);
- virtual bool pollCD();
-
- virtual void playCD(int track, int num_loops, int start_frame, int duration);
- virtual void stopCD();
- virtual void updateCD();
-
virtual void quit();
virtual void setWindowCaption(const char *caption);
Modified: scummvm/trunk/backends/null/null.cpp
===================================================================
--- scummvm/trunk/backends/null/null.cpp 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/backends/null/null.cpp 2006-05-06 18:10:38 UTC (rev 22370)
@@ -295,28 +295,6 @@
return 22050;
}
-bool OSystem_NULL::openCD(int drive)
-{
- return false;
-}
-
-bool OSystem_NULL::pollCD()
-{
- return false;
-}
-
-void OSystem_NULL::playCD(int track, int num_loops, int start_frame, int duration)
-{
-}
-
-void OSystem_NULL::stopCD()
-{
-}
-
-void OSystem_NULL::updateCD()
-{
-}
-
void OSystem_NULL::quit()
{
}
Modified: scummvm/trunk/backends/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/ps2/systemps2.cpp 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/backends/ps2/systemps2.cpp 2006-05-06 18:10:38 UTC (rev 22370)
@@ -614,23 +614,6 @@
_screen->setMouseOverlay(buf, w, h, hotspot_x, hotspot_y, keycolor);
}
-bool OSystem_PS2::openCD(int drive) {
- return false;
-}
-
-bool OSystem_PS2::pollCD(void) {
- return false;
-}
-
-void OSystem_PS2::playCD(int track, int num_loops, int start_frame, int duration) {
-}
-
-void OSystem_PS2::stopCD(void) {
-}
-
-void OSystem_PS2::updateCD(void) {
-}
-
void OSystem_PS2::showOverlay(void) {
_screen->showOverlay();
}
Modified: scummvm/trunk/backends/ps2/systemps2.h
===================================================================
--- scummvm/trunk/backends/ps2/systemps2.h 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/backends/ps2/systemps2.h 2006-05-06 18:10:38 UTC (rev 22370)
@@ -76,12 +76,6 @@
virtual void clearSoundCallback();
virtual int getOutputSampleRate(void) const;
- virtual bool openCD(int drive);
- virtual bool pollCD();
- virtual void playCD(int track, int num_loops, int start_frame, int duration);
- virtual void stopCD();
- virtual void updateCD();
-
virtual MutexRef createMutex(void);
virtual void lockMutex(MutexRef mutex);
virtual void unlockMutex(MutexRef mutex);
Modified: scummvm/trunk/backends/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/psp/osys_psp.cpp 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/backends/psp/osys_psp.cpp 2006-05-06 18:10:38 UTC (rev 22370)
@@ -606,23 +606,6 @@
return _samplesPerSec;
}
-bool OSystem_PSP::openCD(int drive) {
- return false;
-}
-
-bool OSystem_PSP::pollCD() {
- return false;
-}
-
-void OSystem_PSP::playCD(int track, int num_loops, int start_frame, int duration) {
-}
-
-void OSystem_PSP::stopCD() {
-}
-
-void OSystem_PSP::updateCD() {
-}
-
void OSystem_PSP::quit() {
clearSoundCallback();
SDL_Quit();
Modified: scummvm/trunk/backends/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/psp/osys_psp.h 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/backends/psp/osys_psp.h 2006-05-06 18:10:38 UTC (rev 22370)
@@ -121,13 +121,6 @@
virtual void clearSoundCallback();
virtual int getOutputSampleRate() const;
- virtual bool openCD(int drive);
- virtual bool pollCD();
-
- virtual void playCD(int track, int num_loops, int start_frame, int duration);
- virtual void stopCD();
- virtual void updateCD();
-
virtual void quit();
virtual void setWindowCaption(const char *caption);
Modified: scummvm/trunk/backends/x11/x11.cpp
===================================================================
--- scummvm/trunk/backends/x11/x11.cpp 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/backends/x11/x11.cpp 2006-05-06 18:10:38 UTC (rev 22370)
@@ -743,23 +743,6 @@
return SAMPLES_PER_SEC;
}
-bool OSystem_X11::openCD(int drive) {
- return false;
-}
-
-bool OSystem_X11::pollCD() {
- return false;
-}
-
-void OSystem_X11::playCD(int track, int num_loops, int start_frame, int duration) {
-}
-
-void OSystem_X11::stopCD() {
-}
-
-void OSystem_X11::updateCD() {
-}
-
void OSystem_X11::delayMillis(uint msecs) {
usleep(msecs * 1000);
}
Modified: scummvm/trunk/backends/x11/x11.h
===================================================================
--- scummvm/trunk/backends/x11/x11.h 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/backends/x11/x11.h 2006-05-06 18:10:38 UTC (rev 22370)
@@ -98,22 +98,6 @@
// callback will be played using this rate.
int getOutputSampleRate() const;
- // Initialise the specified CD drive for audio playback.
- bool openCD(int drive);
-
- // Poll cdrom status
- // Returns true if cd audio is playing
- bool pollCD();
-
- // Play cdrom audio track
- void playCD(int track, int num_loops, int start_frame, int duration);
-
- // Stop cdrom audio track
- void stopCD();
-
- // Update cdrom audio status
- void updateCD();
-
// Quit
void quit();
Modified: scummvm/trunk/common/system.cpp
===================================================================
--- scummvm/trunk/common/system.cpp 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/common/system.cpp 2006-05-06 18:10:38 UTC (rev 22370)
@@ -64,3 +64,22 @@
Common::SaveFileManager *OSystem::getSavefileManager() {
return new Common::DefaultSaveFileManager();
}
+
+
+bool OSystem::openCD(int drive) {
+ return false;
+}
+
+bool OSystem::pollCD() {
+ return false;
+}
+
+void OSystem::playCD(int track, int num_loops, int start_frame, int duration) {
+}
+
+void OSystem::stopCD() {
+}
+
+void OSystem::updateCD() {
+}
+
Modified: scummvm/trunk/common/system.h
===================================================================
--- scummvm/trunk/common/system.h 2006-05-06 09:18:31 UTC (rev 22369)
+++ scummvm/trunk/common/system.h 2006-05-06 18:10:38 UTC (rev 22370)
@@ -859,6 +859,7 @@
/**
* @name Audio CD
* The methods in this group deal with Audio CD playback.
+ * The default implementation simply does nothing.
*/
//@{
@@ -866,13 +867,13 @@
* Initialise the specified CD drive for audio playback.
* @return true if the CD drive was inited succesfully
*/
- virtual bool openCD(int drive) = 0;
+ virtual bool openCD(int drive);
/**
* Poll CD status.
* @return true if CD audio is playing
*/
- virtual bool pollCD() = 0;
+ virtual bool pollCD();
/**
* Start audio CD playback.
@@ -881,17 +882,17 @@
* @param start_frame the frame at which playback should start (75 frames = 1 second).
* @param duration the number of frames to play.
*/
- virtual void playCD(int track, int num_loops, int start_frame, int duration) = 0;
+ virtual void playCD(int track, int num_loops, int start_frame, int duration);
/**
* Stop audio CD playback.
*/
- virtual void stopCD() = 0;
+ virtual void stopCD();
/**
* Update cdrom audio status.
*/
- virtual void updateCD() = 0;
+ virtual void updateCD();
//@}
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