Added ISO9660/Joliet DVD support

svn-id: r35930

4 files changed, 31 insertions, 4 deletions

diff --git a/backends/platform/wii/Makefile b/backends/platform/wii/Makefile
index 8ee7ad7d42..54a10acf97 100644
--- a/backends/platform/wii/Makefile
+++ b/backends/platform/wii/Makefile
@@ -100,7 +100,7 @@ TARGET  = scummvm-wii
 MACHDEP  = -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float \
 			-ffunction-sections -fdata-sections -fmodulo-sched
 LIBDIR   = $(DEVKITPRO)/libogc/lib/wii
-LIBS      = -lstdc++ -lfat -lwiiuse -lbte -logc -lm
+LIBS      = -lstdc++ -ldi -lfat -lwiiuse -lbte -logc -lm
 endif
 
 INCDIR   = $(srcdir) . $(srcdir)/engines/ $(DEVKITPRO)/libogc/include
diff --git a/backends/platform/wii/main.cpp b/backends/platform/wii/main.cpp
index 3b5ce3762f..3c53039ea2 100644
--- a/backends/platform/wii/main.cpp
+++ b/backends/platform/wii/main.cpp
@@ -27,12 +27,16 @@
 #include <ogc/machine/processor.h>
 #include <fat.h>
 
-#include "osystem.h"
+#ifndef GAMECUBE
+#include <di/di.h>
+#endif
 
 #ifdef DEBUG_WII_GDB
 #include <debug.h>
 #endif
 
+#include "osystem.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -79,6 +83,10 @@ void wii_memstats(void) {
 int main(int argc, char *argv[]) {
 	s32 res;
 
+#ifndef GAMECUBE
+	DI_Init();
+#endif
+
 	VIDEO_Init();
 	PAD_Init();
 	AUDIO_Init(NULL);
@@ -102,6 +110,11 @@ int main(int argc, char *argv[]) {
 	SYS_SetPowerCallback(power_cb);
 #endif
 
+#ifndef GAMECUBE
+	// initial async mount for the browser, see wii-fs.cpp
+	DI_Mount();
+#endif
+
 	if (!fatInitDefault()) {
 		printf("fatInitDefault failed\n");
 	} else {
@@ -136,6 +149,10 @@ int main(int argc, char *argv[]) {
 	fatUnmountDefault();
 #endif
 
+#ifndef GAMECUBE
+	DI_Close();
+#endif
+
 	if (power_btn_pressed) {
 		printf("shutting down\n");
 		SYS_ResetSystem(SYS_POWEROFF, 0, 0);
diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index 885a460bac..12fe5341cd 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -115,6 +115,9 @@ void OSystem_Wii::quit() {
 	deinitEvents();
 	deinitSfx();
 	deinitGfx();
+
+	// umount all async filesystems
+	WiiFilesystemFactory::asyncHandler(false, NULL);
 }
 
 bool OSystem_Wii::hasFeature(Feature f) {
@@ -212,3 +215,8 @@ void OSystem_Wii::getTimeAndDate(struct tm &t) const {
 	t = *localtime(&curTime);
 }
 
+void OSystem_Wii::engineInit() {
+	// umount not required filesystems for this game
+	WiiFilesystemFactory::asyncHandler(false, &ConfMan.get("path"));
+}
+
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index 807b825097..b5476a21d0 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -167,8 +167,10 @@ public:
 	virtual Common::SaveFileManager *getSavefileManager();
 	virtual Audio::Mixer *getMixer();
 	virtual Common::TimerManager *getTimerManager();
-	FilesystemFactory *getFilesystemFactory();
-	void getTimeAndDate(struct tm &t) const;
+	virtual FilesystemFactory *getFilesystemFactory();
+	virtual void getTimeAndDate(struct tm &t) const;
+
+	virtual void engineInit();
 };
 
 #endif