Merge branch 'master' into stable

1 files changed, 36 insertions, 0 deletions

diff --git a/Source/Core/DiscIO/Filesystem.cpp b/Source/Core/DiscIO/Filesystem.cpp
new file mode 100644
index 0000000000..c723569088
--- /dev/null
+++ b/Source/Core/DiscIO/Filesystem.cpp
@@ -0,0 +1,36 @@
+// Copyright 2008 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "DiscIO/Filesystem.h"
+#include "DiscIO/FileSystemGCWii.h"
+
+namespace DiscIO
+{
+
+IFileSystem::IFileSystem(const IVolume *_rVolume)
+	: m_rVolume(_rVolume)
+{}
+
+
+IFileSystem::~IFileSystem()
+{}
+
+
+IFileSystem* CreateFileSystem(const IVolume* _rVolume)
+{
+	IFileSystem* pFileSystem = new CFileSystemGCWii(_rVolume);
+
+	if (!pFileSystem)
+		return nullptr;
+
+	if (!pFileSystem->IsValid())
+	{
+		delete pFileSystem;
+		pFileSystem = nullptr;
+	}
+
+	return pFileSystem;
+}
+
+} // namespace