diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-04-16 01:27:44 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-04-16 01:27:44 +0100 |
| commit | 852a6e962084cd7c78b474b70c72361f153f63da (patch) | |
| tree | 411b7d5f12fe695e0d30ef74a90d7147ac808472 | |
| parent | Remove the only parts in keeping with NetFS (diff) | |
| download | mythfs-852a6e962084cd7c78b474b70c72361f153f63da.tar.bz2 mythfs-852a6e962084cd7c78b474b70c72361f153f63da.tar.xz mythfs-852a6e962084cd7c78b474b70c72361f153f63da.zip | |
NetFS 1.2 compatmythfs-0.2.2.1
| -rw-r--r-- | mythfs/service/recordingsVolume.cpp | 5 | ||||
| -rw-r--r-- | mythfs/service/recordingsVolume.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mythfs/service/recordingsVolume.cpp b/mythfs/service/recordingsVolume.cpp index c4ddbc2..f8ba489 100644 --- a/mythfs/service/recordingsVolume.cpp +++ b/mythfs/service/recordingsVolume.cpp @@ -8,7 +8,6 @@ #include "inodes/groupingByDateDirectory.h" #include "openDirectory.h" #include <sys/statvfs.h> -#include <typeConvert.h> namespace MythFS { RecordingsVolume::RecordingsVolume(DBPrx db) @@ -61,9 +60,7 @@ namespace MythFS { if (::statvfs(p.c_str(), &s) != 0) { throw NetFS::SystemError(errno); } - NetFS::VFS t; - t << s; - return t; + return converter.convert(s); } Ice::Int RecordingsVolume::access(const NetFS::ReqEnv &, const std::string &, Ice::Int, const Ice::Current&) diff --git a/mythfs/service/recordingsVolume.h b/mythfs/service/recordingsVolume.h index bb27b18..6887301 100644 --- a/mythfs/service/recordingsVolume.h +++ b/mythfs/service/recordingsVolume.h @@ -4,6 +4,7 @@ #include <volume.h> #include "inodes/staticDirectory.h" #include <myth-db.h> +#include <typeConverter.h> namespace MythFS { class RecordingsVolume : public ::NetFS::Volume, public StaticDirectory { @@ -38,6 +39,7 @@ namespace MythFS { virtual void disconnect(const Ice::Current&) override; private: + TypeConverter converter; Node::PointerType resolvePath(const std::string &); }; } |