From 8196872e3b240ef93fc17dd3c05a7d97a8015d88 Mon Sep 17 00:00:00 2001 From: deva Date: Fri, 25 Aug 2006 21:20:07 +0000 Subject: Rearranged the network and socket code. Added status messages sent over the network using udp packets. --- client/networksender.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'client/networksender.h') diff --git a/client/networksender.h b/client/networksender.h index 589004b..e752a18 100644 --- a/client/networksender.h +++ b/client/networksender.h @@ -35,13 +35,14 @@ #include -#include "status.h" - -#include "socket.h" +#include "tcp_socket.h" #include "network.h" #include +// How many steps to do avarage calculation over. +#define BUFFERSIZE 100 + class NetworkSender : public QThread { public: @@ -54,10 +55,10 @@ public: void run(); void stop(); - void getServerStatus(Status *status); + double getfps(); private: - Socket *socket; + TCPSocket *socket; Network *network; std::string ip; @@ -72,12 +73,14 @@ private: // Server stats QMutex statusmutex; - unsigned int server_diskspace; - unsigned int server_diskspace_max; - unsigned int server_load; - unsigned int server_load_max; - unsigned int server_ping_ms; - double server_fps; + double fps; + + // Timer stuff (to calc the fps) + long long interval; + unsigned int frametime[BUFFERSIZE]; + struct timeval time; + struct timeval oldtime; + void checkPoint(); }; #endif/*__MIAV_NETWORKSENDER_H__*/ -- cgit v1.2.3