Get rid of the "table" member in struct table_info.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index e643e01a18b1121703ddac0445421cc6f910195b..4ff7ef198cf3f18de42836396b56bf221ff3cbc9 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -785,7 +785,8 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
                        "channels: %d\n"
                        "duration: %s\n"
                        "num_played: %d\n"
-                       "last_played: %s\n\n",
+                       "last_played: %s\n"
+                       "tag info: %s\n",
                        (opts->flags & LS_FLAG_FULL_PATH)?
                                "path" : "file", d->path,
                        have_score? "score: " : "", score_buf,
@@ -800,7 +801,8 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
                        afhi->channels,
                        duration_buf,
                        afsi->num_played,
-                       last_played_time
+                       last_played_time,
+                       afhi->info_string
                );
                free(att_line);
                free(lyrics_line);
@@ -1824,10 +1826,9 @@ int aft_init(struct table_info *ti, const char *db)
 
        audio_file_table_desc.dir = db;
        ti->desc = &audio_file_table_desc;
-       ret = osl_open_table(ti->desc, &ti->table);
+       ret = osl_open_table(ti->desc, &audio_file_table);
        if (ret >= 0) {
                unsigned num;
-               audio_file_table = ti->table;
                osl_get_num_rows(audio_file_table, &num);
                PARA_INFO_LOG("audio file table contains %d files\n", num);
                return ret;