aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAlexander Tkachev2016-05-11 20:24:53 +0600
committerAlexander Tkachev2016-08-24 16:05:07 +0600
commitca2eeb221455e54505aaef7039cfc0b01b807179 (patch)
tree9e73268cc9a8a5a1ad805b4107d06e2e0b08cc29 /common
parent7446ffd73bd184610d550a354a8e252b0b7f334d (diff)
downloadscummvm-rg350-ca2eeb221455e54505aaef7039cfc0b01b807179.tar.gz
scummvm-rg350-ca2eeb221455e54505aaef7039cfc0b01b807179.tar.bz2
scummvm-rg350-ca2eeb221455e54505aaef7039cfc0b01b807179.zip
CLOUD: Add Cloud::Manager and Cloud::Storage
This commit introduces Common::CloudManager, which can be accessed from OSystem. The backend for this manager is Cloud::Manager (defined in backends/cloud/manager.h). It should load all users storages from configs and provide access to current Storage instance. For now it just creates a new one. Cloud::Storage (backends/cloud/storage.h) provides an API to interact with cloud storage, for example, create new directory or sync files. Right now it's not ready and has only two dummy methods: listDirectory() and syncSaves(). There is Cloud::Dropbox::DropboxStorage backend (backends/cloud/dropbox/dropboxstorage.h) for Cloud::Storage. Right now it implements both listDirectory() and syncSaves() with starting timer task and handling it by printing out some JSON examples.
Diffstat (limited to 'common')
-rw-r--r--common/cloudmanager.h53
-rw-r--r--common/module.mk4
-rw-r--r--common/system.h14
3 files changed, 63 insertions, 8 deletions
diff --git a/common/cloudmanager.h b/common/cloudmanager.h
new file mode 100644
index 0000000000..6b5768280a
--- /dev/null
+++ b/common/cloudmanager.h
@@ -0,0 +1,53 @@
+/* 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.
+*
+*/
+
+#ifndef COMMON_CLOUDMANAGER_H
+#define COMMON_CLOUDMANAGER_H
+
+#include "backends/cloud/storage.h"
+
+namespace Common {
+
+class CloudManager {
+public:
+ CloudManager() {};
+ virtual ~CloudManager() {};
+
+ /**
+ * Returns active Storage, which could be used to interact
+ * with cloud storage.
+ *
+ * @return active Cloud::Storage or null, if there is no active Storage.
+ */
+
+ virtual Cloud::Storage* getCurrentStorage() = 0;
+
+ /**
+ * Starts saves syncing process in currently active storage if there is any.
+ */
+
+ virtual void syncSaves() = 0;
+};
+
+} //end of namespace Common
+
+#endif
diff --git a/common/module.mk b/common/module.mk
index 54aa16f557..29def4b8aa 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -62,5 +62,9 @@ MODULE_OBJS += \
updates.o
endif
+#TODO define USE_CLOUD
+#ifdef USE_CLOUD
+#endif
+
# Include common rules
include $(srcdir)/rules.mk
diff --git a/common/system.h b/common/system.h
index 1af45fb1fc..b1c74cbc5b 100644
--- a/common/system.h
+++ b/common/system.h
@@ -56,13 +56,11 @@ class HardwareInputSet;
class Keymap;
class KeymapperDefaultBindings;
#endif
-}
-
//TODO: define USE_CLOUD
-//TODO: probably move to common and name CloudManager
//#if defined(USE_CLOUD)
-class CloudThread;
+class CloudManager;
//#endif
+}
class AudioCDManager;
class FilesystemFactory;
@@ -191,7 +189,7 @@ protected:
*
* @note _cloudThread is deleted by the OSystem destructor.
*/
- CloudThread *_cloudThread;
+ Common::CloudManager *_cloudThread;
//#endif
/**
@@ -1135,12 +1133,12 @@ public:
//TODO: define USE_CLOUD
//#if defined(USE_CLOUD)
/**
- * Returns the CloudThread, used to sync save games and
+ * Returns the CloudManager, used to sync save games and
* upload/download files from user's cloud storage.
*
- * @return the CloudThread for the current architecture
+ * @return the CloudManager for the current architecture
*/
- virtual CloudThread *getCloudThread() {
+ virtual Common::CloudManager *getCloudManager() {
return _cloudThread;
}
//#endif