X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=ea0a9f9f310d55f3e4fc56377a3583937e1bd92d;hp=e73c668fb6d93b3a200eb841e4d4c34ce4b48e59;hb=bb073aafd9c921d59031c0677dab2b02a86647a1;hpb=a181da64ba896c709d61e775606a0b8ebfdd1dde

diff --git a/afs.c b/afs.c
index e73c668f..ea0a9f9f 100644
--- a/afs.c
+++ b/afs.c
@@ -455,7 +455,7 @@ static int pass_afd(int fd, char *buf, size_t size)
 }
 
 /**
- * Open the audio file with highest score.
+ * Pass the fd of the next audio file to the server process.
  *
  * This stores all information for streaming the "best" audio file in a shared
  * memory area. The id of that area and an open file descriptor for the next
@@ -467,27 +467,15 @@ static int pass_afd(int fd, char *buf, size_t size)
  */
 static int open_next_audio_file(void)
 {
-	struct osl_row *aft_row;
 	struct audio_file_data afd;
 	int ret, shmid;
 	char buf[8];
-	long score;
-again:
-	PARA_NOTICE_LOG("getting next audio file\n");
-	ret = score_get_best(&aft_row, &score);
+
+	ret = open_and_update_audio_file(&afd);
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		goto no_admissible_files;
 	}
-	ret = open_and_update_audio_file(aft_row, score, &afd);
-	if (ret < 0) {
-		ret = score_delete(aft_row);
-		if (ret < 0) {
-			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-			goto no_admissible_files;
-		}
-		goto again;
-	}
 	shmid = ret;
 	if (!write_ok(server_socket)) {
 		ret = -E_AFS_SOCKET;
@@ -1011,7 +999,13 @@ static void create_tables_callback(int fd, const struct osl_object *query)
 {
 	uint32_t table_mask = *(uint32_t *)query->data;
 	int i, ret;
-	struct para_buffer pb = {.buf = NULL};
+	struct para_buffer pb = {
+		.max_size = shm_get_shmmax(),
+		.private_data = &(struct afs_max_size_handler_data) {
+			.fd = fd,
+			.band = SBD_OUTPUT
+		}
+	};
 
 	close_afs_tables();
 	for (i = 0; i < NUM_AFS_TABLES; i++) {