Mercurial > hg > dmlib
diff src/dmres.h @ 2446:8193f62a541d
Remove some useless complexity from resource system .. could remove more.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 10 Mar 2020 00:20:05 +0200 |
parents | fa089a430121 |
children | 9807ae37ad69 |
line wrap: on
line diff
--- a/src/dmres.h Mon Mar 09 22:37:00 2020 +0200 +++ b/src/dmres.h Tue Mar 10 00:20:05 2020 +0200 @@ -22,12 +22,6 @@ */ enum { - DMPRUNE_ATIME = 0x0001, - DMPRUNE_MTIME = 0x0002, -}; - -enum -{ DRF_USE_PACK = 0x0001, DRF_USE_STDIO = 0x0002, DRF_PRELOAD_RAW = 0x0004, @@ -38,7 +32,6 @@ { DMF_PERSIST = 0x0001, // Persist loaded RAW resource DMF_COMPRESSED = 0x0002, // Resource is compressed in PACK file, otherwise raw - DMF_TEMPORARY = 0x0004, DMF_PACK_MASK = 0x00ff, // Mask for flags that may be specified in PACK DMF_UNALLOCATED = 0x1000, // The raw data is not allocated, so do not free it @@ -57,8 +50,6 @@ typedef struct DMResource { // Timestamps (in seconds from time()) - int mtime, // When resource was loaded - atime; // Last accessed (dmResourceRef()/unref) int refcount; // Reference count int flags; // Resource flags (DMF_*) @@ -116,6 +107,10 @@ { char *name; + int (*fopen)(DMResource *); + void (*fclose)(DMResource *); + int (*preload)(DMResource *); + int (*freset)(DMResource *); int (*ferror)(DMResource *); int (*fseek)(DMResource *, const off_t, const int); @@ -127,9 +122,6 @@ size_t (*fread)(void *, const size_t, const size_t, DMResource *); size_t (*fwrite)(const void *, const size_t, const size_t, DMResource *); - int (*fopen)(DMResource *); - void (*fclose)(DMResource *); - int (*preload)(DMResource *); } DMResourceOps; @@ -138,7 +130,6 @@ int dmResourcesInit(DMResourceLib **lib, const char *filename, const char *path, const int flags, int (*classifier)(DMResource *)); int dmResourcesClose(DMResourceLib *lib); -void dmResourcesPrune(DMResourceLib *lib, const int agems, int const flags); int dmResourcesPreload(DMResourceLib *lib, BOOL start, int *loaded, int *total); DMResource * dmResourceNew(DMResourceLib *lib, const char *filename, const size_t size, const int flags); @@ -146,6 +137,7 @@ void dmResourceInsert(DMResourceLib *lib, DMResource * node); void dmResourceDelete(DMResourceLib *lib, DMResource * node); DMResource * dmResourceFind(DMResourceLib *lib, const char *filename); + int dmResourceRef(DMResource *); int dmResourceUnref(DMResource *);