X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=1679a5495131117f440a5ee610f677ff14cc5612;hp=63a40d790f602c81d6f28e71e02b6d46d907cd5d;hb=fe3d9cd155b5eac8706015854c343440823e12da;hpb=80541d0f045e1ed57332800eff9832e0a5b72ddf

diff --git a/aft.c b/aft.c
index 63a40d79..1679a549 100644
--- a/aft.c
+++ b/aft.c
@@ -542,10 +542,12 @@ int get_audio_file_path_of_row(const struct osl_row *row, char **path)
 	struct osl_object path_obj;
 	int ret = osl(osl_get_object(audio_file_table, row, AFTCOL_PATH,
 		&path_obj));
+
 	if (ret < 0)
-		return ret;
-	*path = path_obj.data;
-	return 1;
+		*path = NULL;
+	else
+		*path = path_obj.data;
+	return ret;
 }
 
 /**
@@ -754,11 +756,11 @@ static int write_attribute_items(struct para_buffer *b,
 	char *att_text;
 	int ret;
 
-	WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_BITMAP, "%s\n", att_bitmap);
+	WRITE_STATUS_ITEM(b, SI_attributes_bitmap, "%s\n", att_bitmap);
 	ret = get_attribute_text(&afsi->attributes, " ", &att_text);
 	if (ret < 0)
 		return ret;
-	WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_TXT, "%s\n", att_text);
+	WRITE_STATUS_ITEM(b, SI_attributes_txt, "%s\n", att_text);
 	free(att_text);
 	return ret;
 }
@@ -767,9 +769,9 @@ static void write_lyrics_items(struct para_buffer *b, struct afs_info *afsi)
 {
 	char *lyrics_name;
 
-	WRITE_STATUS_ITEM(b, SI_LYRICS_ID, "%u\n", afsi->lyrics_id);
+	WRITE_STATUS_ITEM(b, SI_lyrics_id, "%u\n", afsi->lyrics_id);
 	lyr_get_name_by_id(afsi->lyrics_id, &lyrics_name);
-	WRITE_STATUS_ITEM(b, SI_LYRICS_NAME, "%s\n", lyrics_name?
+	WRITE_STATUS_ITEM(b, SI_lyrics_name, "%s\n", lyrics_name?
 		lyrics_name : "(none)");
 }
 
@@ -777,9 +779,9 @@ static void write_image_items(struct para_buffer *b, struct afs_info *afsi)
 {
 	char *image_name;
 
-	WRITE_STATUS_ITEM(b, SI_IMAGE_ID, "%u\n", afsi->image_id);
+	WRITE_STATUS_ITEM(b, SI_image_id, "%u\n", afsi->image_id);
 	img_get_name_by_id(afsi->image_id, &image_name);
-	WRITE_STATUS_ITEM(b, SI_IMAGE_NAME, "%s\n", image_name?
+	WRITE_STATUS_ITEM(b, SI_image_name, "%s\n", image_name?
 		image_name : "(none)");
 }
 
@@ -789,14 +791,14 @@ static void write_filename_items(struct para_buffer *b, const char *path,
 	char *val;
 
 	if (basename) {
-		WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", path);
+		WRITE_STATUS_ITEM(b, SI_basename, "%s\n", path);
 		return;
 	}
-	WRITE_STATUS_ITEM(b, SI_PATH, "%s\n", path);
+	WRITE_STATUS_ITEM(b, SI_path, "%s\n", path);
 	val = para_basename(path);
-	WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", val? val : "");
+	WRITE_STATUS_ITEM(b, SI_basename, "%s\n", val? val : "");
 	val = para_dirname(path);
-	WRITE_STATUS_ITEM(b, SI_DIRECTORY, "%s\n", val? val : "");
+	WRITE_STATUS_ITEM(b, SI_directory, "%s\n", val? val : "");
 	free(val);
 }
 
@@ -913,36 +915,36 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	}
 	write_filename_items(b, d->path, lls_opt_given(r_b));
 	if (lls_opt_given(r_a))
-		WRITE_STATUS_ITEM(b, SI_SCORE, "%li\n", d->score);
+		WRITE_STATUS_ITEM(b, SI_score, "%li\n", d->score);
 	ret = write_attribute_items(b, att_buf, afsi);
 	if (ret < 0)
 		goto out;
 	write_image_items(b, afsi);
 	write_lyrics_items(b, afsi);
 	hash_to_asc(d->hash, asc_hash);
-	WRITE_STATUS_ITEM(b, SI_HASH, "%s\n", asc_hash);
-	WRITE_STATUS_ITEM(b, SI_BITRATE, "%dkbit/s\n", afhi->bitrate);
-	WRITE_STATUS_ITEM(b, SI_FORMAT, "%s\n",
+	WRITE_STATUS_ITEM(b, SI_hash, "%s\n", asc_hash);
+	WRITE_STATUS_ITEM(b, SI_bitrate, "%dkbit/s\n", afhi->bitrate);
+	WRITE_STATUS_ITEM(b, SI_format, "%s\n",
 		audio_format_name(afsi->audio_format_id));
-	WRITE_STATUS_ITEM(b, SI_FREQUENCY, "%dHz\n", afhi->frequency);
-	WRITE_STATUS_ITEM(b, SI_CHANNELS, "%d\n", afhi->channels);
-	WRITE_STATUS_ITEM(b, SI_DURATION, "%s\n", duration_buf);
-	WRITE_STATUS_ITEM(b, SI_SECONDS_TOTAL, "%" PRIu32 "\n",
+	WRITE_STATUS_ITEM(b, SI_frequency, "%dHz\n", afhi->frequency);
+	WRITE_STATUS_ITEM(b, SI_channels, "%d\n", afhi->channels);
+	WRITE_STATUS_ITEM(b, SI_duration, "%s\n", duration_buf);
+	WRITE_STATUS_ITEM(b, SI_seconds_total, "%" PRIu32 "\n",
 		afhi->seconds_total);
-	WRITE_STATUS_ITEM(b, SI_LAST_PLAYED, "%s\n", last_played_time);
-	WRITE_STATUS_ITEM(b, SI_NUM_PLAYED, "%u\n", afsi->num_played);
-	WRITE_STATUS_ITEM(b, SI_AMPLIFICATION, "%u\n", afsi->amp);
-	WRITE_STATUS_ITEM(b, SI_CHUNK_TIME, "%lu\n", tv2ms(&afhi->chunk_tv));
-	WRITE_STATUS_ITEM(b, SI_NUM_CHUNKS, "%" PRIu32 "\n",
+	WRITE_STATUS_ITEM(b, SI_last_played, "%s\n", last_played_time);
+	WRITE_STATUS_ITEM(b, SI_num_played, "%u\n", afsi->num_played);
+	WRITE_STATUS_ITEM(b, SI_amplification, "%u\n", afsi->amp);
+	WRITE_STATUS_ITEM(b, SI_chunk_time, "%lu\n", tv2ms(&afhi->chunk_tv));
+	WRITE_STATUS_ITEM(b, SI_num_chunks, "%" PRIu32 "\n",
 		afhi->chunks_total);
-	WRITE_STATUS_ITEM(b, SI_MAX_CHUNK_SIZE, "%" PRIu32 "\n",
+	WRITE_STATUS_ITEM(b, SI_max_chunk_size, "%" PRIu32 "\n",
 		afhi->max_chunk_size);
-	WRITE_STATUS_ITEM(b, SI_TECHINFO, "%s\n", afhi->techinfo);
-	WRITE_STATUS_ITEM(b, SI_ARTIST, "%s\n", afhi->tags.artist);
-	WRITE_STATUS_ITEM(b, SI_TITLE, "%s\n", afhi->tags.title);
-	WRITE_STATUS_ITEM(b, SI_YEAR, "%s\n", afhi->tags.year);
-	WRITE_STATUS_ITEM(b, SI_ALBUM, "%s\n", afhi->tags.album);
-	WRITE_STATUS_ITEM(b, SI_COMMENT, "%s\n", afhi->tags.comment);
+	WRITE_STATUS_ITEM(b, SI_techinfo, "%s\n", afhi->techinfo);
+	WRITE_STATUS_ITEM(b, SI_artist, "%s\n", afhi->tags.artist);
+	WRITE_STATUS_ITEM(b, SI_title, "%s\n", afhi->tags.title);
+	WRITE_STATUS_ITEM(b, SI_year, "%s\n", afhi->tags.year);
+	WRITE_STATUS_ITEM(b, SI_album, "%s\n", afhi->tags.album);
+	WRITE_STATUS_ITEM(b, SI_comment, "%s\n", afhi->tags.comment);
 	if (opts->mode == LS_MODE_MBOX) {
 		struct osl_object lyrics_def;
 		lyr_get_def_by_id(afsi->lyrics_id, &lyrics_def);
@@ -976,8 +978,8 @@ static void make_inode_status_items(struct para_buffer *pb)
 	ret = strftime(mtime_str, 29, "%b %d %Y", &mtime_tm);
 	assert(ret > 0); /* number of bytes placed in mtime_str */
 out:
-	WRITE_STATUS_ITEM(pb, SI_MTIME, "%s\n", mtime_str);
-	WRITE_STATUS_ITEM(pb, SI_FILE_SIZE, "%ld\n", statbuf.st_size / 1024);
+	WRITE_STATUS_ITEM(pb, SI_mtime, "%s\n", mtime_str);
+	WRITE_STATUS_ITEM(pb, SI_file_size, "%ld\n", statbuf.st_size / 1024);
 }
 
 static int make_status_items(void)
@@ -989,6 +991,8 @@ static int make_status_items(void)
 	time_t current_time;
 	int ret;
 
+	if (!status_item_ls_data.path) /* no audio file open */
+		return 0;
 	ret = lls_parse(ARRAY_SIZE(argv), argv, cmd, &opts.lpr, NULL);
 	assert(ret >= 0);
 	time(&current_time);
@@ -2567,6 +2571,16 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 			return ret;
 		make_status_items();
 		return 1;
+	}
+	case BLOB_RENAME:
+	case BLOB_REMOVE:
+	case BLOB_ADD: {
+		/*
+		 * These events are rare. We don't bother to check whether the
+		 * current status items are affected and simply recreate them
+		 * every time.
+		 */
+		make_status_items();
 	} default:
 		return 0;
 	}