X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=afs.c;h=295933ec545d7eb60673e8dd002257347730e686;hb=eb578d92fd87aeb86c0832689000dc772e689f92;hp=09d4212610e26f5be064d97097bdff4ed8879055;hpb=cd0abca282ec1cd29510f4cf8fefb04aa7e20ad7;p=paraslash.git

diff --git a/afs.c b/afs.c
index 09d42126..295933ec 100644
--- a/afs.c
+++ b/afs.c
@@ -164,7 +164,6 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	int ret, fd = -1, query_shmid, result_shmid;
 	void *query_shm, *result_shm;
 	char buf[sizeof(afs_socket_cookie) + sizeof(int)];
-	struct sockaddr_un unix_addr;
 	size_t query_shm_size = sizeof(*cq);
 
 	if (query)
@@ -189,16 +188,10 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	*(uint32_t *) buf = afs_socket_cookie;
 	*(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid;
 
-	ret = get_stream_socket(PF_UNIX);
+	ret = create_remote_socket(conf.afs_socket_arg);
 	if (ret < 0)
 		goto out;
 	fd = ret;
-	ret = init_unix_addr(&unix_addr, conf.afs_socket_arg);
-	if (ret < 0)
-		goto out;
-	ret = PARA_CONNECT(fd, &unix_addr);
-	if (ret < 0)
-		goto out;
 	ret = send_bin_buffer(fd, buf, sizeof(buf));
 	if (ret < 0)
 		goto out;
@@ -534,10 +527,10 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 		ret = change_current_mood(NULL); /* always successful */
 		mode = PLAY_MODE_MOOD;
 	} else {
-		if (!strncmp(arg, "p:", 2)) {
+		if (!strncmp(arg, "p/", 2)) {
 			ret = playlist_open(arg + 2);
 			mode = PLAY_MODE_PLAYLIST;
-		} else if (!strncmp(arg, "m:", 2)) {
+		} else if (!strncmp(arg, "m/", 2)) {
 			ret = change_current_mood(arg + 2);
 			mode = PLAY_MODE_MOOD;
 		} else