Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor: Reimplemented LumpFile in C++
- Loading branch information
1 parent
86f59c9
commit b926b07
Showing
2 changed files
with
161 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,106 @@ | ||
| /**\file lumpfile.c | ||
| *\section License | ||
| * License: GPL | ||
| * Online License Link: http://www.gnu.org/licenses/gpl.html | ||
| /** | ||
| * @file lumpfile.cpp | ||
| * Lump (file) accessor abstraction for containers. @ingroup fs | ||
| * | ||
| *\author Copyright © 2003-2012 Jaakko Keränen <jaakko.keranen@iki.fi> | ||
| *\author Copyright © 2005-2012 Daniel Swanson <danij@dengine.net> | ||
| * @author Copyright © 2003-2012 Jaakko Keränen <jaakko.keranen@iki.fi> | ||
| * @author Copyright © 2005-2012 Daniel Swanson <danij@dengine.net> | ||
| * | ||
| * 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. | ||
| * @par License | ||
| * GPL: http://www.gnu.org/licenses/gpl.html | ||
| * | ||
| * 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 St, Fifth Floor, | ||
| * Boston, MA 02110-1301 USA | ||
| * <small>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 St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA</small> | ||
| */ | ||
|
|
||
| #include "de_base.h" | ||
| #include "de_console.h" | ||
| #include "de_filesys.h" | ||
|
|
||
| #include "lumpdirectory.h" | ||
| #include "lumpfile.h" | ||
|
|
||
| LumpFile* LumpFile_New(DFile* file, const char* path, const LumpInfo* info) | ||
| #include <de/Error> | ||
| #include <de/Log> | ||
| #include <de/memory.h> | ||
|
|
||
| de::LumpFile::LumpFile(DFile& file, char const* path, LumpInfo const& info) | ||
| { | ||
| AbstractFile_Init(reinterpret_cast<abstractfile_t*>(this), FT_LUMPFILE, path, &file, &info); | ||
| } | ||
|
|
||
| de::LumpFile::~LumpFile() | ||
| { | ||
| LumpFile* lump = (LumpFile*)malloc(sizeof *lump); | ||
| if(!lump) Con_Error("LumpFile::Construct: Failed on allocation of %lu bytes for new LumpFile.", | ||
| (unsigned long) sizeof *lump); | ||
| F_ReleaseFile(reinterpret_cast<abstractfile_t*>(this)); | ||
| AbstractFile_Destroy(reinterpret_cast<abstractfile_t*>(this)); | ||
| } | ||
|
|
||
| AbstractFile_Init((abstractfile_t*)lump, FT_LUMPFILE, path, file, info); | ||
| return lump; | ||
| LumpInfo const* de::LumpFile::lumpInfo(int /*lumpIdx*/) | ||
| { | ||
| // Lump files are special cases for this *is* the lump. | ||
| return AbstractFile_Info(reinterpret_cast<abstractfile_t*>(this)); | ||
| } | ||
|
|
||
| int de::LumpFile::lumpCount() | ||
| { | ||
| return 1; // Always. | ||
| } | ||
|
|
||
| /** | ||
| * C Wrapper API: | ||
| */ | ||
|
|
||
| #define TOINTERNAL(inst) \ | ||
| (inst) != 0? reinterpret_cast<de::LumpFile*>(inst) : NULL | ||
|
|
||
| #define TOINTERNAL_CONST(inst) \ | ||
| (inst) != 0? reinterpret_cast<de::LumpFile const*>(inst) : NULL | ||
|
|
||
| #define SELF(inst) \ | ||
| DENG2_ASSERT(inst); \ | ||
| de::LumpFile* self = TOINTERNAL(inst) | ||
|
|
||
| #define SELF_CONST(inst) \ | ||
| DENG2_ASSERT(inst); \ | ||
| de::LumpFile const* self = TOINTERNAL_CONST(inst) | ||
|
|
||
| LumpFile* LumpFile_New(DFile* file, char const* path, LumpInfo const* info) | ||
| { | ||
| if(!info) LegacyCore_FatalError("LumpFile_New: Received invalid LumpInfo (=NULL)."); | ||
| try | ||
| { | ||
| return reinterpret_cast<LumpFile*>(new de::LumpFile(*file, path, *info)); | ||
| } | ||
| catch(de::Error& er) | ||
| { | ||
| QString msg = QString("LumpFile_New: Failed to instantiate new LumpFile. ") + er.asText(); | ||
| LegacyCore_FatalError(msg.toUtf8().constData()); | ||
| exit(1); // Unreachable. | ||
| } | ||
| } | ||
|
|
||
| void LumpFile_Delete(LumpFile* lump) | ||
| { | ||
| assert(lump); | ||
| F_ReleaseFile((abstractfile_t*)lump); | ||
| AbstractFile_Destroy((abstractfile_t*)lump); | ||
| free(lump); | ||
| if(lump) | ||
| { | ||
| SELF(lump); | ||
| delete self; | ||
| } | ||
| } | ||
|
|
||
| const LumpInfo* LumpFile_LumpInfo(LumpFile* lump, int lumpIdx) | ||
| LumpInfo const* LumpFile_LumpInfo(LumpFile* lump, int lumpIdx) | ||
| { | ||
| assert(lump); | ||
| /// Lump files are special cases for this *is* the lump. | ||
| return AbstractFile_Info((abstractfile_t*)lump); | ||
| SELF(lump); | ||
| return self->lumpInfo(lumpIdx); | ||
| } | ||
|
|
||
| int LumpFile_LumpCount(LumpFile* lump) | ||
| { | ||
| return 1; // Always. | ||
| SELF(lump); | ||
| return self->lumpCount(); | ||
| } |