--- upstream/acatcher.cxx	2015-02-17 23:01:45.601558147 -0800
+++ acatcher.cxx	2015-02-18 01:25:01.141974147 -0800
@@ -42,22 +42,22 @@
 const int MAX = 16;
 
 const char *names[] = {
-	"0",
-	"1",
-	"2",
-	"3",
-	"4",
-	"5",
-	"6",
-	"7",
-	"8",
-	"9",
-	"A",
-	"B",
-	"C",
-	"D",
-	"E",
-	"F",
+"[0] mon-century-ab",
+"[1] mon-century-cd",
+"[2] mon-lajolla",
+"[3] mon-carmel",
+"[4] mon-losangeles-a",
+"[5] mon-losangeles-b",
+"[6] mon-losangeles-c",
+"[7] mon-marina",
+"[8] mon-belair",
+"[9] mon-sanlorenzo-d",
+"[a] mon-sanlorenzo-e",
+"[b] mon-sanlorenzo-f",
+"[c] mon-plaza-bc",
+"[d] mon-plaza-d",
+"[e] mon-internationallballroom",
+"[f] mon-pacificballroom",
 };
 
 void cls()
@@ -118,6 +118,7 @@
 	}
 }; 
 
+char fnbuf[80];
 struct audio_sockin : public sockin {
 	int leftover;
 	int a_fd;
@@ -132,7 +133,8 @@
 		a_fd = -1;
 
 		if (f_saveaudio) {
-			a_fd = open(names[id], O_WRONLY | O_APPEND | O_CREAT, S_IRWXU | S_IROTH);
+      sprintf(fnbuf, "%s.raw", names[id]);
+			a_fd = open(fnbuf, O_WRONLY | O_APPEND | O_CREAT, S_IRWXU | S_IROTH);
 		}
 	}
 	
@@ -302,9 +304,9 @@
 	}
 
 	// catch signals
-	if (((int)signal(SIGINT,sigcatch) < 0) ||
-	    ((int)signal(SIGQUIT,sigcatch) < 0) ||
-	    ((int)signal(SIGTERM,sigcatch) < 0)) {
+	if (((void *)signal(SIGINT,sigcatch) < 0) ||
+	    ((void *)signal(SIGQUIT,sigcatch) < 0) ||
+	    ((void *)signal(SIGTERM,sigcatch) < 0)) {
 		cerr << "Couldn't set up signal catching.  huh?\n";
 		return(1);
 	}
