X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=b6cce36f42e30cd5672d7e5cc9934cc2d659ca8f;hp=4fe2140be607effea9d5c0a17c1eec8f41011b59;hb=7196e1a81b02d147dd43011a0762fd04397acdc6;hpb=7e611b37e41f0ec7ec6d3173b7e88ed5b9b3a276

diff --git a/afs.c b/afs.c
index 4fe2140b..b6cce36f 100644
--- a/afs.c
+++ b/afs.c
@@ -366,8 +366,8 @@ int for_each_matching_row(struct pattern_match_data *pmd)
  */
 int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 {
-	const char *str1 = (const char *)obj1->data;
-	const char *str2 = (const char *)obj2->data;
+	const char *str1 = obj1->data;
+	const char *str2 = obj2->data;
 	return strncmp(str1, str2, PARA_MIN(obj1->size, obj2->size));
 }
 
@@ -418,13 +418,13 @@ static int pass_afd(int fd, char *buf, size_t size)
  */
 static int open_next_audio_file(void)
 {
-	struct audio_file_data afd;
-	int ret, shmid;
+	int ret, shmid, fd;
 	char buf[8];
 
-	ret = open_and_update_audio_file(&afd);
+	ret = open_and_update_audio_file(&fd);
 	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
+			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		goto no_admissible_files;
 	}
 	shmid = ret;
@@ -434,8 +434,8 @@ static int open_next_audio_file(void)
 	}
 	*(uint32_t *)buf = NEXT_AUDIO_FILE;
 	*(uint32_t *)(buf + 4) = (uint32_t)shmid;
-	ret = pass_afd(afd.fd, buf, 8);
-	close(afd.fd);
+	ret = pass_afd(fd, buf, 8);
+	close(fd);
 	if (ret >= 0)
 		return ret;
 destroy:
@@ -589,8 +589,9 @@ static int com_select_callback(struct afs_callback_arg *aca)
 	para_printf(&aca->pbout, "activating dummy mood\n");
 	activate_mood_or_playlist(NULL, &num_admissible, NULL);
 out:
-	para_printf(&aca->pbout, "activated %s (%d admissible files)\n",
-		current_mop? current_mop : "dummy mood", num_admissible);
+	para_printf(&aca->pbout, "activated %s (%d admissible file%s)\n",
+		current_mop? current_mop : "dummy mood", num_admissible,
+			num_admissible == 1? "" : "s");
 free_lpr:
 	lls_free_parse_result(aca->lpr, cmd);
 	return ret;
@@ -1042,7 +1043,8 @@ static int com_init_callback(struct afs_callback_arg *aca)
 	}
 	ret = open_afs_tables();
 	if (ret < 0)
-		para_printf(&aca->pbout, "cannot open afs tables\n");
+		para_printf(&aca->pbout, "cannot open afs tables: %s\n",
+			para_strerror(-ret));
 out:
 	return ret;
 }