X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=53fa5379dc906ccb173535ab06bbe9c770f4b25a;hp=c5e2c93ee51363a69f3178b77c4d79982b427f73;hb=57e4ba0b86355954ff7978eaf15de6bb50a380ce;hpb=218a175db8e7a43cad9073770ebdb24a7bdc64e8

diff --git a/afs.c b/afs.c
index c5e2c93e..53fa5379 100644
--- a/afs.c
+++ b/afs.c
@@ -195,7 +195,7 @@ static int dispatch_result(int result_shmid, callback_result_handler *handler,
  * copied.  It then notifies the afs process that the callback function \a f
  * should be executed by sending the shared memory identifier (shmid) to the
  * socket.
-
+ *
  * If the callback produces a result, it sends any number of shared memory
  * identifiers back via the socket. For each such identifier received, \a
  * result_handler is called. The contents of the sma identified by the received
@@ -236,8 +236,8 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	if (ret < 0)
 		goto out;
 
-	*(uint32_t *) buf = afs_socket_cookie;
-	*(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid;
+	*(uint32_t *)buf = afs_socket_cookie;
+	*(int *)(buf + sizeof(afs_socket_cookie)) = query_shmid;
 
 	ret = connect_local_socket(conf.afs_socket_arg);
 	if (ret < 0)
@@ -365,8 +365,11 @@ static int action_if_pattern_matches(struct osl_row *row, void *data)
 	name = (char *)name_obj.data;
 	if ((!name || !*name) && (pmd->pm_flags & PM_SKIP_EMPTY_NAME))
 		return 1;
-	if (!pmd->patterns.size && (pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING))
+	if (pmd->patterns.size == 0 &&
+			(pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING)) {
+		pmd->num_matches++;
 		return pmd->action(pmd->table, row, name, pmd->data);
+	}
 	for (p = pattern_txt; p < pattern_txt + pmd->patterns.size;
 			p += strlen(p) + 1) {
 		ret = fnmatch(p, name, pmd->fnmatch_flags);
@@ -455,7 +458,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 +470,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;
@@ -607,8 +598,9 @@ static void com_select_callback(int fd, const struct osl_object *query)
 			activate_mood_or_playlist(NULL, &num_admissible);
 		}
 	} else
-		ret2 = para_printf(&pb, "activated %s (%d admissible files)\n", current_mop?
-			current_mop : "dummy mood", num_admissible);
+		ret2 = para_printf(&pb, "activated %s (%d admissible files)\n",
+			current_mop?  current_mop : "dummy mood",
+			num_admissible);
 out:
 	if (ret2 >= 0 && pb.offset)
 		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
@@ -828,11 +820,6 @@ err:
 	return ret;
 }
 
-/*
- * On errors, negative value is written to fd.
- * On success: If query produced a result, the result_shmid is written to fd.
- * Otherwise, zero is written.
- */
 static int call_callback(int fd, int query_shmid)
 {
 	void *query_shm;
@@ -1010,7 +997,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++) {
@@ -1059,9 +1052,8 @@ int com_init(struct command_context *cc)
 				return -E_BAD_TABLE_NAME;
 		}
 	}
-	ret = send_callback_request(create_tables_callback, &query,
+	return send_callback_request(create_tables_callback, &query,
 		afs_cb_result_handler, cc);
-	return ret;
 }
 
 /**