diff options
| author | Grigori Goronzy <greg@blackbox> | 2009-07-11 02:18:51 +0200 |
|---|---|---|
| committer | Grigori Goronzy <greg@blackbox> | 2009-07-11 02:22:18 +0200 |
| commit | 2c412cdab94a7bb27c5a1e04ab902295215de888 (patch) | |
| tree | c1372ebf5e6473b287e152a40c88587f3470d237 /libass/ass_cache.h | |
| parent | 613a22ab9b96453c10de6d75b43067652ad6d7db (diff) | |
| download | libass-2c412cdab94a7bb27c5a1e04ab902295215de888.tar.bz2 libass-2c412cdab94a7bb27c5a1e04ab902295215de888.tar.xz | |
Message callback funtionality
Introduce functionality for providing a message callback that is used
for passing messages to the controlling application instead of simply
printing them to standard output. The function pointer to the callback
is stored in the ass_library_t instance. ass_msg needs access to it, so
in many places the library instance needs to be passed around now.
The default behavior is the old one: messages of MSGL_INFO or lower
are printed to the standard output, prefixed with "[ass]".
Diffstat (limited to 'libass/ass_cache.h')
| -rw-r--r-- | libass/ass_cache.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libass/ass_cache.h b/libass/ass_cache.h index d8de97a..004a4b6 100644 --- a/libass/ass_cache.h +++ b/libass/ass_cache.h @@ -49,9 +49,11 @@ typedef struct hashmap_s { int hit_count; int miss_count; int count; + ass_library_t *library; } hashmap_t; -hashmap_t *hashmap_init(size_t key_size, size_t value_size, int nbuckets, +hashmap_t *hashmap_init(ass_library_t *library, size_t key_size, + size_t value_size, int nbuckets, hashmap_item_dtor_t item_dtor, hashmap_key_compare_t key_compare, hashmap_hash_t hash); @@ -59,7 +61,7 @@ void hashmap_done(hashmap_t *map); void *hashmap_insert(hashmap_t *map, void *key, void *value); void *hashmap_find(hashmap_t *map, void *key); -hashmap_t *ass_font_cache_init(void); +hashmap_t *ass_font_cache_init(ass_library_t *library); ass_font_t *ass_font_cache_find(hashmap_t *, ass_font_desc_t *desc); void *ass_font_cache_add(hashmap_t *, ass_font_t *font); void ass_font_cache_done(hashmap_t *); @@ -74,7 +76,7 @@ typedef struct bitmap_hash_val_s { bitmap_t *bm_s; } bitmap_hash_val_t; -hashmap_t *ass_bitmap_cache_init(void); +hashmap_t *ass_bitmap_cache_init(ass_library_t *library); void *cache_add_bitmap(hashmap_t *, bitmap_hash_key_t *key, bitmap_hash_val_t *val); bitmap_hash_val_t *cache_find_bitmap(hashmap_t *bitmap_cache, @@ -88,7 +90,7 @@ typedef struct composite_hash_val_s { unsigned char *b; } composite_hash_val_t; -hashmap_t *ass_composite_cache_init(void); +hashmap_t *ass_composite_cache_init(ass_library_t *library); void *cache_add_composite(hashmap_t *, composite_hash_key_t *key, composite_hash_val_t *val); composite_hash_val_t *cache_find_composite(hashmap_t *composite_cache, @@ -105,7 +107,7 @@ typedef struct glyph_hash_val_s { int asc, desc; // ascender/descender of a drawing } glyph_hash_val_t; -hashmap_t *ass_glyph_cache_init(void); +hashmap_t *ass_glyph_cache_init(ass_library_t *library); void *cache_add_glyph(hashmap_t *, glyph_hash_key_t *key, glyph_hash_val_t *val); glyph_hash_val_t *cache_find_glyph(hashmap_t *glyph_cache, |