X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=8c31906aaa73646a784bca083128b55f6ae44f5e;hp=e91d734fea7d70e74350cdcfdc3c4def9bce8a05;hb=b8ece14bf778401197598c72a7fd7bcd1400aad0;hpb=4a0c8e1fb760134609dcf2c06cd1b9b76953d606

diff --git a/aft.c b/aft.c
index e91d734f..8c31906a 100644
--- a/aft.c
+++ b/aft.c
@@ -107,6 +107,8 @@ struct ls_widths {
 	unsigned short num_played_width;
 	/** size of the amp field. */
 	unsigned short amp_width;
+	/** size of the audio format field. */
+	unsigned short audio_format_width;
 };
 
 /** Data passed from the ls command handler to its callback function. */
@@ -902,7 +904,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			"%*d "  /* image_id  */
 			"%*d "  /* lyrics_id */
 			"%*d "  /* bitrate */
-			"%s "   /* audio format */
+			"%*s "  /* audio format */
 			"%*d "  /* frequency */
 			"%d "   /* channels */
 			"%s "   /* duration */
@@ -914,6 +916,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			w->image_id_width, afsi->image_id,
 			w->lyrics_id_width, afsi->lyrics_id,
 			w->bitrate_width, afhi->bitrate,
+			w->audio_format_width,
 			audio_format_name(afsi->audio_format_id),
 			w->frequency_width, afhi->frequency,
 			afhi->channels,
@@ -1328,6 +1331,8 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
 	w->duration_width = PARA_MAX(w->duration_width, num_digits);
 	GET_NUM_DIGITS(d->afsi.amp, &num_digits);
 	w->amp_width = PARA_MAX(w->amp_width, num_digits);
+	num_digits = strlen(audio_format_name(d->afsi.audio_format_id));
+	w->audio_format_width = PARA_MAX(w->audio_format_width, num_digits);
 	if (options->flags & LS_FLAG_ADMISSIBLE_ONLY) {
 		GET_NUM_DIGITS(score, &num_digits);
 		num_digits++; /* add one for the sign (space or "-") */
@@ -2481,6 +2486,8 @@ static void afs_stat_callback(int fd, const struct osl_object *query)
  * up-to-date afs status items directly. Therefore the usual callback mechanism
  * is used to pass the status items from the afs process to the command handler
  * via a shared memory area and a pipe.
+ *
+ * \return The return value of the underyling call to \ref send_callback_request().
  */
 int send_afs_status(struct stream_cipher_context *scc, int parser_friendly)
 {