X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.cc;h=4d88a709e69bb39a71e739a574823e254ff2f0ac;hp=7b31ae4f83283ccbf65a91fe32e9e999f65ea626;hb=61e441a6b4b7c4b2b14b12a1a2545a04155c719b;hpb=e0c0a3b5e7337cde55e520801d2e59e03dc97d9c

diff --git a/src/Main.cc b/src/Main.cc
index 7b31ae4..4d88a70 100644
--- a/src/Main.cc
+++ b/src/Main.cc
@@ -40,8 +40,6 @@ Main::Main(Mf::Settings& settings, Mf::Video& video) :
 	mNewContextDispatch = dispatch.addTarget("video.newcontext",
 											 boost::bind(&Main::setupGL));
 	setupGL();
-
-	addChild(TitleLayer::alloc());
 }
 
 
@@ -49,9 +47,10 @@ void Main::update(Mf::Scalar t, Mf::Scalar dt)
 {
 	if (children().size() == 0)
 	{
-		Mf::logWarning("main view has no children");
-		stop();
-		return;
+		//Mf::logWarning("main view has no children");
+		//stop();
+		//return;
+		addChild(TitleLayer::alloc());
 	}
 
 	Mf::View::update(t, dt);
@@ -128,7 +127,8 @@ std::string Main::getConfigPath()
 	// 3. $HOME/.yoinkrc
 	// 4. YOINKRC (environment)
 
-	std::string path = Mf::Resource::getPath("yoinkrc");
+	std::string path("yoinkrc");
+	Mf::Resource::getPath(path);
 
 #if !defined(_WIN32)
 	path += ":/etc/yoinkrc";
@@ -221,11 +221,18 @@ void Main::printInfo(int argc, char* argv[])
 	}
 
 	std::cout << "   Executable: " << argv[0] << std::endl
+#ifdef YOINK_GITHEAD
+			  << "       Commit: "YOINK_GITHEAD << std::endl
+#endif
 			  << "      Version: "VERSION << std::endl
 			  << "        Built: " << COMPILE_TIME << std::endl
 			  << "     Compiler: "COMPILER_STRING << std::endl
 			  << "       Assets: " << assets << std::endl
 			  << "Build options: "
+#ifndef HAVE_CLOCK_GETTIME
+			  << "-"
+#endif
+			  << "clock_gettime "
 #ifdef NDEBUG
 			  << "-"
 #endif
@@ -269,8 +276,90 @@ void goodbye()
 }
 
 
+#include <Moof/Socket.hh>
+
 int main(int argc, char* argv[])
 {
+	Mf::ResolverTask task("4950", "compy", SOCK_DGRAM);
+	task.run();
+
+	int i = task.wait();
+	Mf::logWarning << "task ended with code: " << i << std::endl;
+
+	std::vector<Mf::SocketAddress>::const_iterator it;
+	for (it = task.addresses().begin(); it != task.addresses().end(); ++it)
+	{
+		Mf::SocketAddress addr = *it;
+
+		Mf::logInfo << "address: " << addr.name() << ":" << addr.port() 
+					<< " (" << addr.type() << ")" << std::endl;
+	}
+
+
+	Mf::Packet packet(1000000);
+
+	packet << 5.1234f;
+	Mf::logInfo << "packet size: " << packet.size() << std::endl;
+
+	float meh3;
+	packet >> meh3;
+	Mf::logInfo << "float: " << meh3 << std::endl;
+	Mf::logInfo << "packet size: " << packet.size() << std::endl;
+
+
+	packet << uint16_t(45);
+	Mf::logInfo << "packet size: " << packet.size() << std::endl;
+	packet << uint64_t(1234567812345679ULL);
+	Mf::logInfo << "packet size: " << packet.size() << std::endl;
+
+	packet << true << false << false << true << false << true << true;
+	Mf::logInfo << "packet size: " << packet.size() << std::endl;
+
+	std::vector<short> hi;
+	hi.push_back(34);
+	hi.push_back(-12345);
+	hi.push_back(7734);
+
+	for (int a = 0; a < 15900; a++)
+	{
+		hi.push_back(a);
+	}
+
+	packet << hi;
+	Mf::logInfo << "packet size: " << packet.size() << std::endl;
+
+	packet << "hello world";
+	Mf::logInfo << "packet size: " << packet.size() << std::endl;
+
+	packet << false << false << false << true << false;
+	Mf::logInfo << "packet size: " << packet.size() << std::endl;
+
+
+	Mf::SocketAddress addr = Mf::SocketAddress::broadcast("4950");
+	//Mf::logInfo << "local addr: " << addr.name() << std::endl;
+
+	//for (it = task.addresses().begin(); it != task.addresses().end(); ++it)
+	//{
+		int bcast = 0;
+
+		//Mf::SocketAddress addr = *it;
+		Mf::Socket sock(addr);
+
+		sock.get(SO_BROADCAST, bcast);
+		Mf::logInfo << "bcast: " << bcast << std::endl;
+
+		sock.set(SO_BROADCAST, 1);
+
+		sock.get(SO_BROADCAST, bcast);
+		Mf::logInfo << "bcast: " << bcast << std::endl;
+
+		sock.write(packet);
+	//}
+
+
+	return 0;
+
+
 	if (argc > 1)
 	{
 		std::string arg(argv[1]);