Replace status item DBINFO2 by ATTRIBUTES.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index ed9d2584c4953b5322fabdf25adb01cfd379cba0..f81c48569d23a83c6e863f7b23e1d72e7f137926 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -595,30 +595,6 @@ int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi)
        return 1;
 }
 
-#if 0
-/**
- * Get the chunk table of an audio file, given a row of the audio file table.
- *
- * \param row Pointer to a row of the audio file table.
- * \param afhi Result pointer.
- *
- * \return The return value of the underlying call to osl_open_disk_object().
- *
- * \sa get_afhi_of_row().
- */
-static int get_chunk_table_of_row(const struct osl_row *row, struct audio_format_info *afhi)
-{
-       struct osl_object obj;
-       int ret = osl_open_disk_object(audio_file_table, row, AFTCOL_CHUNKS,
-               &obj);
-       if (ret < 0)
-               return ret;
-       ret = load_chunk_info(&obj, afhi);
-       osl_close_disk_object(&obj);
-       return ret;
-}
-#endif
-
 /* returns shmid on success */
 static int save_afd(struct audio_file_data *afd)
 {
@@ -690,6 +666,7 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
        int ret = get_hash_of_row(aft_row, &aft_hash);
        struct afsi_change_event_data aced;
        struct osl_object map, chunk_table_obj;
+       char *tmp;
 
        if (ret < 0)
                return ret;
@@ -728,7 +705,12 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
        ret = load_chunk_info(&chunk_table_obj, &afd->afhi);
        if (ret < 0)
                goto err;
-
+       ret = get_attribute_text(&afd->afsi.attributes, " ", &tmp);
+       if (ret < 0)
+               goto err;
+       tmp[sizeof(afd->attributes_string) - 1] = '\0';
+       strcpy(afd->attributes_string, tmp); /* OK */
+       free(tmp);
        aced.aft_row = aft_row;
        aced.old_afsi = &afd->afsi;
        afs_event(AFSI_CHANGE, NULL, &aced);