X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnetvis.h;h=47f5de5bd31e7b05ea80248fe1ae32f32ffa5669;hb=6ffe2b950143c5474659cbca2bbcdf58d6b8322c;hp=50170386c9ece06ab538295541e5937a58b3f9b1;hpb=f3939c5da4add9af55a26293c99f0f013052cc25;p=netvis.git

diff --git a/source/netvis.h b/source/netvis.h
index 5017038..47f5de5 100644
--- a/source/netvis.h
+++ b/source/netvis.h
@@ -15,7 +15,7 @@ Distributed unter the GPL
 #include <msp/debug/profiler.h>
 #include <msp/gbase/display.h>
 #include <msp/gbase/glcontext.h>
-#include <msp/gbase/window.h>
+#include <msp/gbase/simplewindow.h>
 #include <msp/gl/color.h>
 #include <msp/gl/font.h>
 #include <msp/time/timestamp.h>
@@ -29,31 +29,33 @@ class NetVis: public Msp::Application
 private:
 	std::string iface;
 	pcap_t *pcap;
-	std::list<Packet *> packets;
+	Resolver *resolver;
+	unsigned localnet;
+	unsigned localnet_mask;
+
+	Msp::Graphics::SimpleGLWindow *wnd;
+	Msp::GL::Font *font;
+
 	unsigned max_hosts;
 	unsigned max_visible_hosts;
 	std::map<unsigned, Host *> hosts;
 	std::map<unsigned, Host *> disabled_hosts;
-	Msp::Graphics::Display *dpy;
-	Msp::Graphics::Window *wnd;
-	Msp::Graphics::GLContext *glc;
-	Msp::Time::TimeStamp tick_t;
+	std::list<Packet *> packets;
 	std::map<unsigned, Msp::GL::Color> port_colors;
-	Msp::GL::Font *font;
-	Msp::GL::Texture2D *font_tex;
-	Msp::Debug::Profiler profiler;
 	bool draw_labels;
 	bool blend;
-	Resolver *resolver;
-	unsigned localnet;
-	unsigned localnet_mask;
+
+	Msp::Time::TimeStamp tick_t;
 	Msp::Time::TimeStamp fps_t;
 	unsigned frames;
 	float fps;
 
+	Msp::Debug::Profiler profiler;
+
 public:
 	NetVis(int, char **);
-	int main();
+	~NetVis();
+
 	const Msp::GL::Font &get_font() const { return *font; }
 	const std::map<unsigned, Host *> &get_hosts() const { return hosts; }
 private: