X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=de56ce8296fdf5d451c5a16b7cd08f2cddc47e1a;hp=325f768604ef192ef986e47ca0b603de92938cbb;hb=7f053695dcb0ab70745a457048e6fb0b83d75d47;hpb=c85690666e2ed2327e751b819970658d58479bfb

diff --git a/command.c b/command.c
index 325f7686..de56ce82 100644
--- a/command.c
+++ b/command.c
@@ -45,7 +45,6 @@ extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
 extern struct audio_file_selector selectors[];
 extern struct sender senders[];
-extern char *user_list;
 
 static void dummy(__a_unused int s)
 {}
@@ -78,8 +77,8 @@ static char *cmd_perms_itohuman(unsigned int perms)
 {
 	char *msg = para_malloc(5 * sizeof(char));
 
-	msg[0] = perms & DB_READ? 'a' : '-';
-	msg[1] = perms & DB_WRITE? 'A' : '-';
+	msg[0] = perms & AFS_READ? 'a' : '-';
+	msg[1] = perms & AFS_WRITE? 'A' : '-';
 	msg[2] = perms & VSS_READ? 'v' : '-';
 	msg[3] = perms & VSS_WRITE? 'V' : '-';
 	msg[4] = '\0';
@@ -114,14 +113,14 @@ static char *get_sb_string(struct misc_meta_data *nmmd)
 		return para_strdup("");
 	if (!base[0])
 		return base;
-	if (nmmd->chunks_total) {
-		secs = (long long) nmmd->seconds_total * nmmd->chunks_sent
-			/ nmmd->chunks_total;
-		rsecs = (long long) nmmd->seconds_total *
-			(nmmd->chunks_total - nmmd->chunks_sent)
-			/ nmmd->chunks_total;
+	if (nmmd->afi.chunks_total) {
+		secs = (long long) nmmd->afi.seconds_total * nmmd->chunks_sent
+			/ nmmd->afi.chunks_total;
+		rsecs = (long long) nmmd->afi.seconds_total *
+			(nmmd->afi.chunks_total - nmmd->chunks_sent)
+			/ nmmd->afi.chunks_total;
 		percent = 100 * ((nmmd->chunks_sent + 5) / 10)
-			/ ((nmmd->chunks_total + 5) / 10);
+			/ ((nmmd->afi.chunks_total + 5) / 10);
 	}
 	ret = make_message("%llu:%02llu [%llu:%02llu] (%llu%%) %s",
 		secs / 60, secs % 60,
@@ -158,7 +157,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 		"%s:%s\n"	"%s:%lu.%lu\n"	"%s:%lu.%lu\n",
 		status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
 		status_item_list[SI_MTIME], mtime,
-		status_item_list[SI_LENGTH], nmmd->seconds_total,
+		status_item_list[SI_LENGTH], nmmd->afi.seconds_total,
 		status_item_list[SI_NUM_PLAYED], nmmd->num_played,
 
 		status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
@@ -169,7 +168,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 		status_item_list[SI_OFFSET], offset,
 		status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
 		nmmd->selector_info,
-		nmmd->audio_file_info,
+		nmmd->afi.info_string,
 
 		status_item_list[SI_UPTIME], ut,
 		status_item_list[SI_STREAM_START],
@@ -649,20 +648,20 @@ int com_ff(__a_unused int fd, int argc, char **argv)
 		backwards = 1; /* jmp backwards */
 	mmd_lock();
 	ret = -E_NO_AUDIO_FILE;
-	if (!mmd->chunks_total || !mmd->seconds_total)
+	if (!mmd->afi.chunks_total || !mmd->afi.seconds_total)
 		goto out;
-	promille = (1000 * mmd->current_chunk) / mmd->chunks_total;
+	promille = (1000 * mmd->current_chunk) / mmd->afi.chunks_total;
 	if (backwards)
-		promille -= 1000 * i / mmd->seconds_total;
+		promille -= 1000 * i / mmd->afi.seconds_total;
 	else
-		promille += 1000 * i / mmd->seconds_total;
+		promille += 1000 * i / mmd->afi.seconds_total;
 	if (promille < 0)
 		promille = 0;
 	if (promille >  1000) {
 		mmd->new_vss_status_flags |= VSS_NEXT;
 		goto out;
 	}
-	mmd->repos_request = (mmd->chunks_total * promille) / 1000;
+	mmd->repos_request = (mmd->afi.chunks_total * promille) / 1000;
 	mmd->new_vss_status_flags |= VSS_REPOS;
 	mmd->new_vss_status_flags &= ~VSS_NEXT;
 	mmd->events++;
@@ -684,12 +683,12 @@ int com_jmp(__a_unused int fd, int argc, char **argv)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
 	ret = -E_NO_AUDIO_FILE;
-	if (!mmd->chunks_total)
+	if (!mmd->afi.chunks_total)
 		goto out;
 	if (i > 100)
 		i = 100;
 	PARA_INFO_LOG("jumping to %lu%%\n", i);
-	mmd->repos_request = (mmd->chunks_total * i + 50)/ 100;
+	mmd->repos_request = (mmd->afi.chunks_total * i + 50)/ 100;
 	PARA_INFO_LOG("sent: %lu,  offset before jmp: %lu\n",
 		mmd->chunks_sent, mmd->offset);
 	mmd->new_vss_status_flags |= VSS_REPOS;
@@ -919,7 +918,7 @@ out:
 	free(command);
 	free(argv);
 	mmd_lock();
-	if (cmd && (cmd->perms & DB_WRITE) && ret >= 0)
+	if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0)
 		mmd->events++;
 	mmd->active_connections--;
 	mmd_unlock();