Revision: 49419
http://scummvm.svn.sourceforge.net/scummvm/?rev=49419&view=rev
Author: vgvgf
Date: 2010-06-04 01:51:32 +0000 (Fri, 04 Jun 2010)
Log Message:
-----------
Created DefaultAudioManager and DefaultMutexManager.
Deleted base subsystems, managers will be used instead.
Added Paths:
-----------
scummvm/branches/gsoc2010-opengl/backends/audio/
scummvm/branches/gsoc2010-opengl/backends/audio/default/
scummvm/branches/gsoc2010-opengl/backends/audio/default/default-audio.cpp
scummvm/branches/gsoc2010-opengl/backends/audio/default/default-audio.h
scummvm/branches/gsoc2010-opengl/backends/mutex/
scummvm/branches/gsoc2010-opengl/backends/mutex/default/
scummvm/branches/gsoc2010-opengl/backends/mutex/default/default-mutex.cpp
scummvm/branches/gsoc2010-opengl/backends/mutex/default/default-mutex.h
Removed Paths:
-------------
scummvm/branches/gsoc2010-opengl/backends/base-subsys-audio.h
scummvm/branches/gsoc2010-opengl/backends/base-subsys-events.h
scummvm/branches/gsoc2010-opengl/backends/base-subsys-file.h
scummvm/branches/gsoc2010-opengl/backends/base-subsys-graphics.h
scummvm/branches/gsoc2010-opengl/backends/base-subsys-mutex.h
scummvm/branches/gsoc2010-opengl/backends/base-subsys-timer.h
Added: scummvm/branches/gsoc2010-opengl/backends/audio/default/default-audio.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/audio/default/default-audio.cpp (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/audio/default/default-audio.cpp 2010-06-04 01:51:32 UTC (rev 49419)
@@ -0,0 +1,34 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "backends/audio/default/default-audio.h"
+
+bool DefaultAudioManager::hasAudioFeature(OSystem::Feature f) {
+ return false;
+}
+
+bool DefaultAudioManager::getAudioFeatureState(OSystem::Feature f) {
+ return false;
+}
Property changes on: scummvm/branches/gsoc2010-opengl/backends/audio/default/default-audio.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Added: scummvm/branches/gsoc2010-opengl/backends/audio/default/default-audio.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/audio/default/default-audio.h (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/audio/default/default-audio.h 2010-06-04 01:51:32 UTC (rev 49419)
@@ -0,0 +1,44 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef BACKENDS_AUDIO_DEFAULT_H
+#define BACKENDS_AUDIO_DEFAULT_H
+
+#include "common/system.h"
+#include "common/noncopyable.h"
+#include "sound/mixer_intern.h"
+
+class DefaultAudioManager : Audio::MixerImpl, Common::NonCopyable {
+public:
+ DefaultAudioManager(OSystem *system, uint sampleRate) : Audio::MixerImpl(system, sampleRate) {}
+ ~DefaultAudioManager() {}
+
+ bool hasAudioFeature(OSystem::Feature f);
+ void setAudioFeatureState(OSystem::Feature f, bool enable) {}
+ bool getAudioFeatureState(OSystem::Feature f);
+};
+
+
+#endif
Property changes on: scummvm/branches/gsoc2010-opengl/backends/audio/default/default-audio.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Deleted: scummvm/branches/gsoc2010-opengl/backends/base-subsys-audio.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/base-subsys-audio.h 2010-06-03 23:37:05 UTC (rev 49418)
+++ scummvm/branches/gsoc2010-opengl/backends/base-subsys-audio.h 2010-06-04 01:51:32 UTC (rev 49419)
@@ -1,38 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BACKENDS_BASE_SUBSYS_AUDIO_H
-#define BACKENDS_BASE_SUBSYS_AUDIO_H
-
-#include "common/system.h"
-
-class BaseSubSys_Audio : public virtual OSystem {
-public:
- virtual void audioInit() = 0;
- virtual void audioDone() = 0;
-};
-
-
-#endif
Deleted: scummvm/branches/gsoc2010-opengl/backends/base-subsys-events.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/base-subsys-events.h 2010-06-03 23:37:05 UTC (rev 49418)
+++ scummvm/branches/gsoc2010-opengl/backends/base-subsys-events.h 2010-06-04 01:51:32 UTC (rev 49419)
@@ -1,38 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BACKENDS_BASE_SUBSYS_EVENTS_H
-#define BACKENDS_BASE_SUBSYS_EVENTS_H
-
-#include "common/system.h"
-
-class BaseSubSys_Events : public virtual OSystem {
-public:
- virtual void eventsInit() = 0;
- virtual void eventsDone() = 0;
-};
-
-
-#endif
Deleted: scummvm/branches/gsoc2010-opengl/backends/base-subsys-file.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/base-subsys-file.h 2010-06-03 23:37:05 UTC (rev 49418)
+++ scummvm/branches/gsoc2010-opengl/backends/base-subsys-file.h 2010-06-04 01:51:32 UTC (rev 49419)
@@ -1,38 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BACKENDS_BASE_SUBSYS_FILE_H
-#define BACKENDS_BASE_SUBSYS_FILE_H
-
-#include "common/system.h"
-
-class BaseSubSys_File : public virtual OSystem {
-public:
- virtual void fileInit() = 0;
- virtual void fileDone() = 0;
-};
-
-
-#endif
Deleted: scummvm/branches/gsoc2010-opengl/backends/base-subsys-graphics.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/base-subsys-graphics.h 2010-06-03 23:37:05 UTC (rev 49418)
+++ scummvm/branches/gsoc2010-opengl/backends/base-subsys-graphics.h 2010-06-04 01:51:32 UTC (rev 49419)
@@ -1,38 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BACKENDS_BASE_SUBSYS_GRAPHICS_H
-#define BACKENDS_BASE_SUBSYS_GRAPHICS_H
-
-#include "common/system.h"
-
-class BaseSubSys_Graphics : public virtual OSystem {
-public:
- virtual void graphicsInit() = 0;
- virtual void graphicsDone() = 0;
-};
-
-
-#endif
Deleted: scummvm/branches/gsoc2010-opengl/backends/base-subsys-mutex.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/base-subsys-mutex.h 2010-06-03 23:37:05 UTC (rev 49418)
+++ scummvm/branches/gsoc2010-opengl/backends/base-subsys-mutex.h 2010-06-04 01:51:32 UTC (rev 49419)
@@ -1,38 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BACKENDS_BASE_SUBSYS_MUTEX_H
-#define BACKENDS_BASE_SUBSYS_MUTEX_H
-
-#include "common/system.h"
-
-class BaseSubSys_Mutex : public virtual OSystem {
-public:
- virtual void mutexInit() = 0;
- virtual void mutexDone() = 0;
-};
-
-
-#endif
Deleted: scummvm/branches/gsoc2010-opengl/backends/base-subsys-timer.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/base-subsys-timer.h 2010-06-03 23:37:05 UTC (rev 49418)
+++ scummvm/branches/gsoc2010-opengl/backends/base-subsys-timer.h 2010-06-04 01:51:32 UTC (rev 49419)
@@ -1,38 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BACKENDS_BASE_SUBSYS_TIMER_H
-#define BACKENDS_BASE_SUBSYS_TIMER_H
-
-#include "common/system.h"
-
-class BaseSubSys_Timer : public virtual OSystem {
-public:
- virtual void timerInit() = 0;
- virtual void timerDone() = 0;
-};
-
-
-#endif
Added: scummvm/branches/gsoc2010-opengl/backends/mutex/default/default-mutex.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/mutex/default/default-mutex.cpp (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/mutex/default/default-mutex.cpp 2010-06-04 01:51:32 UTC (rev 49419)
@@ -0,0 +1,38 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "backends/mutex/default/default-mutex.h"
+
+OSystem::MutexRef DefaultMutexManager::createMutex() {
+ return OSystem::MutexRef();
+}
+
+bool DefaultMutexManager::hasMutexFeature(OSystem::Feature f) {
+ return false;
+}
+
+bool DefaultMutexManager::getMutexFeatureState(OSystem::Feature f) {
+ return false;
+}
Property changes on: scummvm/branches/gsoc2010-opengl/backends/mutex/default/default-mutex.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Added: scummvm/branches/gsoc2010-opengl/backends/mutex/default/default-mutex.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/mutex/default/default-mutex.h (rev 0)
+++ scummvm/branches/gsoc2010-opengl/backends/mutex/default/default-mutex.h 2010-06-04 01:51:32 UTC (rev 49419)
@@ -0,0 +1,48 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef BACKENDS_MUTEX_DEFAULT_H
+#define BACKENDS_MUTEX_DEFAULT_H
+
+#include "common/system.h"
+#include "common/noncopyable.h"
+
+class DefaultMutexManager : Common::NonCopyable {
+public:
+ DefaultMutexManager() {}
+ ~DefaultMutexManager() {}
+
+ bool hasMutexFeature(OSystem::Feature f);
+ void setMutexFeatureState(OSystem::Feature f, bool enable) {}
+ bool getMutexFeatureState(OSystem::Feature f);
+
+ OSystem::MutexRef createMutex();
+ void lockMutex(OSystem::MutexRef mutex) {}
+ void unlockMutex(OSystem::MutexRef mutex) {}
+ void deleteMutex(OSystem::MutexRef mutex);
+};
+
+
+#endif
Property changes on: scummvm/branches/gsoc2010-opengl/backends/mutex/default/default-mutex.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.