X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=103373493f8cdadc8a6c5a640041f7453ef1fc30;hp=a112abe766af318a876bef5fdb2c62c480e4fd63;hb=8b8a81f7faf8faec7a14ebfca4ce2e5c6ad3ac40;hpb=4f01c486bb70a27f614cdc9c07a2b8d653db7605 diff --git a/aft.c b/aft.c index a112abe7..10337349 100644 --- a/aft.c +++ b/aft.c @@ -238,7 +238,7 @@ enum audio_file_table_columns { * * \sa osl_compare_func, uint32_compare(). */ -int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2) +static int aft_hash_compare(const struct osl_object *obj1, const struct osl_object *obj2) { return hash_compare((HASH_TYPE *)obj1->data, (HASH_TYPE *)obj2->data); } @@ -475,7 +475,7 @@ int aft_get_row_of_path(const char *path, struct osl_row **row) * * \return Standard. */ -int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row) +static int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row) { const struct osl_object obj = {.data = hash, .size = HASH_SIZE}; return osl(osl_get_row(audio_file_table, AFTCOL_HASH, &obj, row)); @@ -503,7 +503,7 @@ int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj) * * \return Positive on success, negative on errors. */ -int get_afsi_object_of_path(const char *path, struct osl_object *obj) +static int get_afsi_object_of_path(const char *path, struct osl_object *obj) { struct osl_row *row; int ret = aft_get_row_of_path(path, &row); @@ -652,6 +652,18 @@ err: return ret; } +/** + * Extract a afd stored in a shared memory area. + * + * Attach the shared memory area given by \a shmid, load the audio file data + * stored therein and detach the area afterwards. Called by vss, after + * receiving a positive response to the request for the next audio file. + + + * \param shmid The identifier of the shared memory area containing the afd. + * \param afd Result pointer. + * + * \return Standard. + */ int load_afd(int shmid, struct audio_file_data *afd) { void *shm_afd; @@ -2435,7 +2447,7 @@ int com_cpsi(struct rc4_context *rc4c, int argc, char * const * const argv) return ret; } -void afs_stat_callback(int fd, const struct osl_object *query) +static void afs_stat_callback(int fd, const struct osl_object *query) { int *parser_friendly = query->data; char *buf = *parser_friendly? @@ -2610,6 +2622,11 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb, } } +/** + * Initialize the audio file table. + * + * \param t Pointer to the structure to be initialized. + */ void aft_init(struct afs_table *t) { t->open = aft_open;