$OpenBSD: patch-src_config_c,v 1.17 2021/06/15 06:54:44 landry Exp $

Index: src/config.c
--- src/config.c.orig
+++ src/config.c
@@ -560,7 +560,7 @@ static const char *default_video_device(void)
 #elif defined (WIN32)
 	return "dshow,nil";
 #else
-	return "v4l2,/dev/video0";
+	return "v4l2,/dev/video";
 #endif
 }
 
@@ -829,26 +829,26 @@ int config_write_template(const char *file, const stru
 	(void)re_fprintf(f, "module\t\t\t" "stdio" MOD_EXT "\n");
 #endif
 	(void)re_fprintf(f, "#module\t\t\t" "cons" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "evdev" MOD_EXT "\n");
+//	(void)re_fprintf(f, "#module\t\t\t" "evdev" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "httpd" MOD_EXT "\n");
 
 	(void)re_fprintf(f, "\n# Audio codec Modules (in order)\n");
-	(void)re_fprintf(f, "#module\t\t\t" "opus" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "amr" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "opus" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "amr" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "g7221" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "g722" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "g726" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "g722" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "g726" MOD_EXT "\n");
 	(void)re_fprintf(f, "module\t\t\t" "g711" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "gsm" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "l16" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "mpa" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "gsm" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "l16" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "mpa" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "codec2" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "ilbc" MOD_EXT "\n");
 
 	(void)re_fprintf(f, "\n# Audio filter Modules (in encoding order)\n");
 	(void)re_fprintf(f, "#module\t\t\t" "vumeter" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "sndfile" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "speex_pp" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "speex_pp" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "plc" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "webrtc_aec" MOD_EXT "\n");
 
@@ -880,16 +880,16 @@ int config_write_template(const char *file, const stru
 		(void)re_fprintf(f, "#module\t\t\t" "pulse" MOD_EXT "\n");
 	}
 #endif
-	(void)re_fprintf(f, "#module\t\t\t" "jack" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "portaudio" MOD_EXT "\n");
+//	(void)re_fprintf(f, "#module\t\t\t" "jack" MOD_EXT "\n");
+//	(void)re_fprintf(f, "#module\t\t\t" "portaudio" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "aubridge" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "aufile" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "ausine" MOD_EXT "\n");
 
 	(void)re_fprintf(f, "\n# Video codec Modules (in order)\n");
-	(void)re_fprintf(f, "#module\t\t\t" "avcodec" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "vp8" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "vp9" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "avcodec" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "vp8" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "vp9" MOD_EXT "\n");
 
 	(void)re_fprintf(f, "\n# Video filter Modules (in encoding order)\n");
 	(void)re_fprintf(f, "#module\t\t\t" "selfview" MOD_EXT "\n");
@@ -910,7 +910,7 @@ int config_write_template(const char *file, const stru
 	(void)re_fprintf(f, "#module\t\t\t" "v4l2" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "v4l2_codec" MOD_EXT "\n");
 #endif
-	(void)re_fprintf(f, "#module\t\t\t" "x11grab" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "x11grab" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "cairo" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "vidbridge" MOD_EXT "\n");
 
@@ -918,16 +918,16 @@ int config_write_template(const char *file, const stru
 #ifdef LINUX
 	(void)re_fprintf(f, "#module\t\t\t" "directfb" MOD_EXT "\n");
 #endif
-	(void)re_fprintf(f, "#module\t\t\t" "x11" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "x11" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "sdl" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "fakevideo" MOD_EXT "\n");
 
 
 	(void)re_fprintf(f, "\n# Audio/Video source modules\n");
 	(void)re_fprintf(f, "#module\t\t\t" "avformat" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "rst" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "gst" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "gst_video" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "rst" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "gst" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "gst_video" MOD_EXT "\n");
 
 	(void)re_fprintf(f, "\n# Compatibility modules\n");
 	(void)re_fprintf(f, "#module\t\t\t" "ebuacip" MOD_EXT "\n");
@@ -940,8 +940,8 @@ int config_write_template(const char *file, const stru
 	(void)re_fprintf(f, "#module\t\t\t" "pcp" MOD_EXT "\n");
 
 	(void)re_fprintf(f, "\n# Media encryption modules\n");
-	(void)re_fprintf(f, "#module\t\t\t" "srtp" MOD_EXT "\n");
-	(void)re_fprintf(f, "#module\t\t\t" "dtls_srtp" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "srtp" MOD_EXT "\n");
+	(void)re_fprintf(f, "module\t\t\t" "dtls_srtp" MOD_EXT "\n");
 	(void)re_fprintf(f, "#module\t\t\t" "zrtp" MOD_EXT "\n");
 	(void)re_fprintf(f, "\n");
 
@@ -958,6 +958,7 @@ int config_write_template(const char *file, const stru
 	(void)re_fprintf(f, "# Application Modules\n");
 	(void)re_fprintf(f, "\n");
 	(void)re_fprintf(f, "module_app\t\t" "auloop"MOD_EXT"\n");
+	(void)re_fprintf(f, "#module_app\t\t" "avahi"MOD_EXT"\n");
 	(void)re_fprintf(f, "#module_app\t\t" "b2bua"MOD_EXT"\n");
 	(void)re_fprintf(f, "module_app\t\t"  "contact"MOD_EXT"\n");
 	(void)re_fprintf(f, "module_app\t\t"  "debug_cmd"MOD_EXT"\n");
@@ -993,8 +994,8 @@ int config_write_template(const char *file, const stru
 	(void)re_fprintf(f, "ctrl_tcp_listen\t\t0.0.0.0:4444 # ctrl_tcp - "
 				"TCP interface JSON\n");
 
-	(void)re_fprintf(f, "\n");
-	(void)re_fprintf(f, "evdev_device\t\t/dev/input/event0\n");
+//	(void)re_fprintf(f, "\n");
+//	(void)re_fprintf(f, "evdev_device\t\t/dev/input/event0\n");
 
 	(void)re_fprintf(f, "\n# Opus codec parameters\n");
 	(void)re_fprintf(f, "opus_bitrate\t\t28000 # 6000-510000\n");
