summaryrefslogtreecommitdiff
path: root/audio/liveice/patches/patch-ae
blob: 0b8bd679ffbf51efd58842eb899c5d5fa74d53b8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
$NetBSD: patch-ae,v 1.2 2001/05/05 10:05:34 wiz Exp $

--- setup.c.orig	Wed May 24 15:50:02 2000
+++ setup.c
@@ -38,7 +38,13 @@
 char default_mountpoint[]       = "liveice";
 char default_description[]      = "LiveIce";
 char default_pipe_directory[]   = ".liveice_temp_files";
+#ifdef __NetBSD__
+char default_sound_input_file[] = "/dev/audio";
+char default_netbsd_audio_file[] = "/dev/audio";
+char default_netbsd_audioctl_file[] = "/dev/audioctl";
+#else
 char default_sound_input_file[] = "/dev/dsp";
+#endif
 
 /* default encoder commands */
 char AJ_encoder_command[]       = "encoder";
@@ -46,7 +52,7 @@
 char MP3ENC_encoder_command[]   = "mp3enc";
 char SCREAMER_encoder_command[] = "lamer";
 char XING_encoder_command[]     = "xingmp3enc";
-char LAME3_encoder_command[]    = "lame3";
+char LAME3_encoder_command[]    = "lame";
 char GOGO_encoder_command[]    = "gogo";
 
 static int in_stream_set;
@@ -244,6 +250,13 @@
 	g_conf.sound_input_file=malloc(strlen(default_sound_input_file)+2);
 	strcpy(g_conf.sound_input_file,default_sound_input_file);
 
+#ifdef __NetBSD__
+	g_conf.netbsd_audio_file=malloc(strlen(default_netbsd_audio_file)+2);
+	strcpy(g_conf.netbsd_audio_file,default_netbsd_audio_file);
+
+	g_conf.netbsd_audioctl_file=malloc(strlen(default_netbsd_audioctl_file)+2);
+	strcpy(g_conf.netbsd_audioctl_file,default_netbsd_audioctl_file);
+#endif
 
 	g_conf.icy_public=1;
 	g_conf.bitrate=BITRATE;
@@ -407,6 +420,12 @@
 	         string_copy(&(g_conf.update_script),line);	  
 	 } else if(!strcmp(cmd,"URL")) {
 		 string_copy(&(g_conf.icy_url),line);
+#ifdef __NetBSD__
+	 } else if(!strcmp(cmd,"NETBSD_AUDIO_FILE")) {
+		 string_copy(&(g_conf.netbsd_audio_file),line); 
+	 } else if(!strcmp(cmd,"NETBSD_AUDIOCTL_FILE")) {
+		 string_copy(&(g_conf.netbsd_audioctl_file),line); 
+#endif
 	 } else if(!strcmp(cmd,"MIXER_CMD")) {
 	 	string_copy(&g_conf.mixer_cmd,line);
 		g_conf.mixer=COMMAND_MODE;