X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist_selector.c;h=b925453ec203234a799bbd124c5c60019b71f9dc;hp=47fb2699d264bdd87dc6b4a2dde05388dd0ef423;hb=4c80bf4a2082c4922094f7e8ce75193edb6be80f;hpb=019a4caa2bf9232c7efd84ffe7424994de6358fb

diff --git a/playlist_selector.c b/playlist_selector.c
index 47fb2699..b925453e 100644
--- a/playlist_selector.c
+++ b/playlist_selector.c
@@ -65,7 +65,7 @@ static int com_ppl(int, int, char **);
 static int com_lpl(int, int, char **);
 extern struct misc_meta_data *mmd;
 
-/* array of commands that are supported by this database tool */
+/* array of supported commands */
 static struct server_command cmds[] = {
 {
 .name = "ppl",
@@ -105,7 +105,7 @@ static int send_playlist_to_server(const char *buf, size_t size)
 	int ret, shm_mutex = -1, shm_id = -1;
 	void *shm = NULL;
 
-	PARA_DEBUG_LOG("new playlist (%d bytes)\n", size);
+	PARA_DEBUG_LOG("new playlist (%zd bytes)\n", size);
 
 	ret = mutex_new();
 	if (ret < 0)
@@ -142,7 +142,7 @@ out:
 	return ret;
 }
 
-static int com_lpl(int fd, __unused int argc, __unused char *argv[])
+static int com_lpl(int fd, __a_unused int argc, __a_unused char *argv[])
 {
 	unsigned loaded = 0;
 	size_t bufsize = 4096; /* guess that's enough */
@@ -173,7 +173,7 @@ out:
 	return ret;
 }
 
-static int com_ppl(int fd, __unused int argc, __unused char *argv[])
+static int com_ppl(int fd, __a_unused int argc, __a_unused char *argv[])
 {
 	unsigned i;
 
@@ -192,12 +192,12 @@ static char **pls_get_audio_file_list(unsigned int num)
 	char **file_list;
 	unsigned i;
 
-	num = MIN(num, playlist_len);
+	num = PARA_MIN(num, playlist_len);
 	if (!num)
 		return NULL;
 	file_list = para_malloc((num + 1) * sizeof(char *));
 	for (i = 0; i < num; i++) {
-		unsigned j = (current_playlist_entry + i) % playlist_len;
+		unsigned j = (current_playlist_entry + i + 1) % playlist_len;
 		file_list[i] = para_strdup(playlist[j]);
 	}
 	file_list[i] = NULL;
@@ -231,7 +231,7 @@ static void pls_shutdown(void)
 	playlist_size = 0;
 }
 
-static void pls_post_select(__unused fd_set *rfds, __unused fd_set *wfds)
+static void pls_post_select(__a_unused fd_set *rfds, __a_unused fd_set *wfds)
 {
 	struct private_pls_data *ppd = self->private_data;
 	struct pls_client_data *pcd = ppd->client_data;
@@ -247,10 +247,12 @@ static void pls_post_select(__unused fd_set *rfds, __unused fd_set *wfds)
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 		goto out;
 	}
-	PARA_DEBUG_LOG("loading new playlist (%d bytes)\n", pcd->size);
+	PARA_DEBUG_LOG("loading new playlist (%zd bytes)\n", pcd->size);
 	ret = for_each_line((char *)shm, pcd->size, &playlist_add);
 	shm_detach(shm);
 	PARA_NOTICE_LOG("new playlist (%d entries)\n", playlist_len);
+	sprintf(mmd->selector_info, "dbinfo1:new playlist: %d files\n"
+		"dbinfo2:\ndbinfo3:\n", playlist_len);
 	pcd->retval = 1;
 	pcd->size = 0;
 	mutex_unlock(pcd->mutex);
@@ -258,16 +260,44 @@ out:
 	mutex_unlock(ppd->server_mutex);
 }
 
+static size_t string_offset(const char *str, size_t max)
+{
+	size_t l = strlen(str);
+
+	if (l <= max)
+		return 0;
+	return l - max;
+}
+
 void pls_update_audio_file(char *audio_file)
 {
 	unsigned i;
-
-	for (i = 0; i < playlist_len; i++) {
+	char *dir = para_dirname(audio_file),
+		*prev = playlist[current_playlist_entry % playlist_len];
+	size_t dir_off = string_offset(dir, 50),
+		prev_off = string_offset(prev, 70);
+
+	for (i = 1; i <= playlist_len; i++) {
+		char *next;
+		size_t next_off;
 		unsigned j = (current_playlist_entry + i) % playlist_len;
 		if (strcmp(playlist[j], audio_file))
 			continue;
-		current_playlist_entry = (j + 1) % playlist_len;
+		current_playlist_entry = j;
+		next = playlist[(j + 1) %playlist_len];
+		next_off = string_offset(next, 70);
+		snprintf(mmd->selector_info, MMD_INFO_SIZE,
+			"dbinfo1: %d files, current dir: %s%s\n"
+			"dbinfo2: prev: %s%s\n"
+			"dbinfo3: next: %s%s\n",
+			playlist_len,
+			dir_off? "... " : "", dir + dir_off,
+			prev_off? "... " : "", prev + prev_off,
+			next_off? "... " : "", next + next_off
+		);
+		break;
 	}
+	free(dir);
 }
 
 /**
@@ -275,7 +305,8 @@ void pls_update_audio_file(char *audio_file)
  *
  * Init all function pointers of \a db
  *
- * \sa struct audio_file_selector, misc_meta_data::dbinfo, mysql.c random_dbtool.c
+ * \sa struct audio_file_selector, misc_meta_data::selector_info, mysql.c
+ * random_selector.c.
  */
 int playlist_selector_init(struct audio_file_selector *db)
 {
@@ -317,7 +348,8 @@ int playlist_selector_init(struct audio_file_selector *db)
 		goto err_out;
 	ppd->client_data = shm;
 	ppd->client_data->size = 0;
-	sprintf(mmd->dbinfo, "playlist selector initialized");
+	sprintf(mmd->selector_info, "dbinfo1: Welcome to the playlist "
+		"selector\ndbinfo2: no playlist loaded\ndbinfo3:\n");
 	return 1;
 err_out:
 	if (ppd->client_data_shm_id >= 0)