Fjernede miav_config entry.

Replaced the old MiavConfig class with the new Configuration class in all the the appropriate places.
Converted the conf file into LUA.

1 files changed, 26 insertions, 26 deletions

diff --git a/etc/miav.conf b/etc/miav.conf
index 55fefe8..d82fa18 100644
--- a/etc/miav.conf
+++ b/etc/miav.conf
@@ -1,70 +1,70 @@
-##############################
-## The MIaV configuration file
-##
+--------------------------------
+-- The MIaV configuration file
+--
 
-# Log files of the server and the client
+-- Log files of the server and the client
 client_log_file	= "/tmp/miav_client.log"
 server_log_file	= "/tmp/miav_server.log"
 
-# Cpr listen port
+-- Cpr listen port
 cprlisten_port = 18107
 
-# Cpr Database configuration
+-- Cpr Database configuration
 cpr_host	= "cpr.j.auh.dk"
 cpr_port	= 10301
 cpr_timeout	= 10000
 
-# Video source
+-- Video source
 video_width	= 720
 video_height	= 576
 
-# Size of the screen in inches
+-- Size of the screen in inches
 screensize	= 19.0
 pixel_width	= 1024
 pixel_height	= 768
 
-# Set to 1 if client is slow ( less than 1.5 ghz )
+-- Set to 1 if client is slow ( less than 1.5 ghz )
 player_skip_frames = 1
 
-# How and where to connect to the miav server?
+-- How and where to connect to the miav server?
 server_addr	= "192.168.0.10"
 server_port	= 18120
 
-# Run the server as the following user:
+-- Run the server as the following user:
 server_user	= "miav"
 server_group	= "miav"
 
-# Where to store the files recieved by the server
+-- 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)
+-- 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
+-- 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
+-- quality in % - 100% is best quality
 video_quality	= 85
 
-# bitrate in kbytes pr. second (0 == vbr)
+-- bitrate in kbytes pr. second (0 == vbr)
 video_bitrate	= 0
 
-# mp3 encoding quality settings
+-- mp3 encoding quality settings
 mp3_quality	= 3
 mp3_bitrate	= 112
 
-# The number of threads started for parallel encoding on the server
-# (for multiprocessor systems)
+-- 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"
+-- Codec is one of the following:
+-- "mpeg1" For use with mpeg1 encoding.
+-- "mpeg4" for use with mpeg4 encoding
+-- default is "mpeg1"
 encoding_codec 	= "mpeg1"