Replaced the old MiavConfig class with the new Configuration class in all the the appropriate places.

Crippled the MulticastConfiguration class. This  must be rewritten to use the new configuration interface.

1 files changed, 9 insertions, 4 deletions

diff --git a/server/mov_encoder_thread.cc b/server/mov_encoder_thread.cc
index 63bc3c6..24f3a42 100644
--- a/server/mov_encoder_thread.cc
+++ b/server/mov_encoder_thread.cc
@@ -24,10 +24,10 @@
  *    along with MIaV; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#include <config.h>
 #include "mov_encoder_thread.h"
+
 #include <errno.h>
-#include "miav_config.h"
+#include "configuration.h"
 #include "info.h"
 
 MovEncoderThread::MovEncoderThread(const char *clientip, const char *cpr)
@@ -50,11 +50,16 @@ MovEncoderThread::MovEncoderThread(const char *clientip, const char *cpr)
 
   block = new FrameVector();
 
-  num_frames_in_block = MIaV::config->readString("frame_sequence")->length();
+  std::string blockstring;
+  if(MIaV::config->get("frame_sequence", &blockstring))
+    MIaV::info->error("Could not read the symbol [frame_sequence] from the conf file!");
+
+  num_frames_in_block = blockstring.length();
 
   MIaV::info->info("Frame sequence length %d", num_frames_in_block);
 
-  threads = MIaV::config->readInt("encoding_threads");
+  if(MIaV::config->get("encoding_threads", &threads))
+    MIaV::info->error("Could not read the symbol [encoding_threads] from the conf file!");
   
   movencodersrunning = true;