From 347b1d8ed3a4f780f3a5c0d57a04eab05ca517a2 Mon Sep 17 00:00:00 2001 From: deva Date: Wed, 16 Aug 2006 23:49:23 +0000 Subject: 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. --- server/multicast_configuration.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'server/multicast_configuration.h') diff --git a/server/multicast_configuration.h b/server/multicast_configuration.h index 9ff320a..a7aa884 100644 --- a/server/multicast_configuration.h +++ b/server/multicast_configuration.h @@ -24,11 +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" #ifndef __MIAV_MULTICAST_CONFIGURATION_H__ #define __MIAV_MULTICAST_CONFIGURATION_H__ -#include "miav_config.h" +//#include "miav_config.h" #include #include @@ -41,16 +40,22 @@ typedef struct { bool with_audio; } mcastconf_t; -class MulticastConfiguration : private MiavConfig { +class MulticastConfiguration { public: - MulticastConfiguration(char *file); - ~MulticastConfiguration(); + MulticastConfiguration(char *file){} + ~MulticastConfiguration(){} - mcastconf_t &getConf(char *client); + mcastconf_t &getConf(char *client){ + a.client = "192.168.0.10"; + return a; + } private: + mcastconf_t a;//hack + std::vector confs; mcastconf_t global_conf; }; + #endif/*__MIAV_MULTICAST_CONFIGURATION_H__*/ -- cgit v1.2.3