Split server/client config files.

6 files changed, 71 insertions, 53 deletions

diff --git a/configure.in b/configure.ac
index 2dd686d..9180756 100644
--- a/configure.in
+++ b/configure.ac
@@ -25,8 +25,8 @@ dnl Init pkg-config
 dnl ======================
 PKG_PROG_PKG_CONFIG(0.23)
 
-AC_ARG_WITH(gui,  [  --without-gui           build without GUI support])
-if test x$with_gui != xno && test -z "$GUI"; then
+AC_ARG_WITH(client,  [  --without-client        build without client support])
+if test x$with_client != xno && test -z "$CLIENT"; then
     dnl ======================
     dnl Check for Qt
     dnl ======================
@@ -62,7 +62,7 @@ if test x$with_gui != xno && test -z "$GUI"; then
     dnl ======================
     PKG_CHECK_MODULES(DV, libdv >= 1.0)
 else
-    AC_MSG_WARN([*** Building without GUI support!])
+    AC_MSG_WARN([*** Building without client support!])
 fi 
 
 AC_ARG_WITH(server,  [  --without-server        build without server support])
@@ -192,7 +192,7 @@ AC_SUBST(CPPFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL([WITH_GUI], [test "x$with_gui" = "xyes"])
+AM_CONDITIONAL([WITH_CLIENT], [test "x$with_client" = "xyes"])
 AM_CONDITIONAL([WITH_SERVER], [test "x$with_server" = "xyes"])
 
 AC_OUTPUT(
diff --git a/etc/Makefile.am b/etc/Makefile.am
index 1e4ee34..507c8e1 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,9 +1,19 @@
 EXTRA_DIST = \
 	miav.conf \
+	miavd.conf \
 	multicast.conf
 
 sysconfdir=${prefix}/etc/miav
 
-dist_sysconf_DATA = \
-	miav.conf \
-	multicast.conf
\ No newline at end of file
+dist_sysconf_DATA =
+
+if WITH_CLIENT
+dist_sysconf_DATA += \
+	miav.conf
+endif
+
+if WITH_SERVER
+dist_sysconf_DATA += \
+	miavd.conf \
+	multicast.conf
+endif
diff --git a/etc/miav.conf b/etc/miav.conf
index 40a8e18..4e05fc9 100644
--- a/etc/miav.conf
+++ b/etc/miav.conf
@@ -1,10 +1,9 @@
 ##############################
-## The MIaV configuration file
+## The MIaV client configuration file
 ##
 
 # Log files of the server and the client
 client_log_file	= "/tmp/miav_client.log"
-server_log_file	= "/tmp/miav_server.log"
 
 # Cpr Database configuration
 cpr_host	= "cpr.j.auh.dk"
@@ -26,44 +25,5 @@ pixel_height	= 768
 player_skip_frames = 1
 
 # How and where to connect to the miav server?
-server_addr	= "192.168.0.10"
+server_addr	= "127.0.0.1"
 server_port	= 18120
-
-# Run the server as the following user:
-server_user	= "miav"
-server_group	= "miav"
-
-# Where to store the files recieved by the server
-server_movie_root	= "/home/miav/miav_movie_files"
-server_image_root	= "/home/miav/miav_image_files"
-server_later            = "/home/miav/miav_movie_files/deathrow"
-server_trash            = "/home/miav/miav_movie_files/trash"
-
-# Defines the size of the multicasted upd packages (1500 is normal)
-udp_packet_size	= 1500
-
-# Video output controls. A sequence of I and P, where I is keyframes
-# which is fast to create, but uses a lot of discspace.
-# B uses changes since last frame, is more cpu intensive, but uses a
-# lot less diskspace than I frames
-frame_sequence	= "IPPPIPPIP"
-
-# quality in % - 100% is best quality
-video_quality	= 85
-
-# bitrate in kbytes pr. second (0 == vbr)
-video_bitrate	= 0
-
-# mp3 encoding quality settings
-mp3_quality	= 3
-mp3_bitrate	= 112
-
-# The number of threads started for parallel encoding on the server
-# (for multiprocessor systems)
-encoding_threads = 1
-
-# Codec is one of the following:
-# "mpeg1" For use with mpeg1 encoding.
-# "mpeg4" for use with mpeg4 encoding
-# default is "mpeg1"
-encoding_codec 	= "mpeg1"
diff --git a/etc/miavd.conf b/etc/miavd.conf
new file mode 100644
index 0000000..73bb8ba
--- /dev/null
+++ b/etc/miavd.conf
@@ -0,0 +1,48 @@
+##############################
+## The MIaV server configuration file
+##
+
+# Log files of the server and the client
+server_log_file	= "/tmp/miav_server.log"
+
+# Which port to listen on?
+server_port	= 18120
+
+# Run the server as the following user:
+server_user	= "miav"
+server_group	= "miav"
+
+# Where to store the files recieved by the server
+server_movie_root	= "/home/miav/miav_movie_files"
+server_image_root	= "/home/miav/miav_image_files"
+server_later            = "/home/miav/miav_movie_files/deathrow"
+server_trash            = "/home/miav/miav_movie_files/trash"
+
+# Defines the size of the multicasted upd packages (1500 is normal)
+udp_packet_size	= 1500
+
+# Video output controls. A sequence of I and P, where I is keyframes
+# which is fast to create, but uses a lot of discspace.
+# B uses changes since last frame, is more cpu intensive, but uses a
+# lot less diskspace than I frames
+frame_sequence	= "IPPPIPPIP"
+
+# quality in % - 100% is best quality
+video_quality	= 85
+
+# bitrate in kbytes pr. second (0 == vbr)
+video_bitrate	= 0
+
+# mp3 encoding quality settings
+mp3_quality	= 3
+mp3_bitrate	= 112
+
+# The number of threads started for parallel encoding on the server
+# (for multiprocessor systems)
+encoding_threads = 1
+
+# Codec is one of the following:
+# "mpeg1" For use with mpeg1 encoding.
+# "mpeg4" for use with mpeg4 encoding
+# default is "mpeg1"
+encoding_codec 	= "mpeg1"
diff --git a/src/Makefile.am b/src/Makefile.am
index 2f01eba..9e77f4f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS =
 
-if WITH_GUI
+if WITH_CLIENT
 bin_PROGRAMS += miav
 endif
 
@@ -144,7 +144,7 @@ EXTRA_DIST = \
 	miav.qrc
 
 miav_MOC =
-if WITH_GUI
+if WITH_CLIENT
 miav_MOC += $(shell  if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi )
 endif
 
diff --git a/src/miavd.cc b/src/miavd.cc
index 1658648..89e8990 100644
--- a/src/miavd.cc
+++ b/src/miavd.cc
@@ -51,7 +51,7 @@ static const char copyright_str[] =
 static const char usage_str[] =
 "Usage: %s [options]\n"
 "Options:\n"
-"  -c, --config file   Read configfile from 'file' (default "ETC"/miav.conf)\n"
+"  -c, --config file   Read configfile from 'file' (default "ETC"/miavd.conf)\n"
 "  -f, --foreground    Run in foreground mode (non-daemon mode)\n"
 "  -u, --user user     Run as 'user' (overrides the configfile)\n"
 "  -g, --group group   Run as 'group' (overrides the configfile)\n"
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
   const char *hugin_filter = "+all";
   const char *logfile = NULL;
   int c;
-  std::string configfile = ETC"/miav.conf";
+  std::string configfile = ETC"/miavd.conf";
   char *user = NULL;
   char *group = NULL;
   bool foreground = false;