From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 12 Apr 2013 21:04:50 +0000 (+0200)
Subject: Since we just broke upgrade compatibility, kill some older stuff in the state protos.
X-Git-Tag: 1.0.0~137
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=9ca9a70e1d0d675a99399de8a5f88fcf5009ef1d

Since we just broke upgrade compatibility, kill some older stuff in the state protos.
---

diff --git a/main.cpp b/main.cpp
index 64ee29f..03938c3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -305,13 +305,6 @@ int main(int argc, char **argv)
 				create_input(loaded_state.inputs(i))));
 		} 
 
-		// Convert the acceptor from older serialized formats.
-		if (loaded_state.has_server_sock() && loaded_state.has_port()) {
-			AcceptorProto *acceptor = loaded_state.add_acceptors();
-			acceptor->set_server_sock(loaded_state.server_sock());
-			acceptor->set_port(loaded_state.port());
-		}
-
 		// Deserialize the acceptors.
 		for (int i = 0; i < loaded_state.acceptors_size(); ++i) {
 			deserialized_acceptors.insert(make_pair(
diff --git a/state.proto b/state.proto
index cfad404..eb4660f 100644
--- a/state.proto
+++ b/state.proto
@@ -46,8 +46,4 @@ message CubemapStateProto {
 	repeated StreamProto streams = 2;
 	repeated InputProto inputs = 5;
 	repeated AcceptorProto acceptors = 8;
-
-	// Deprecated. Use Acceptor instead.
-	optional int32 server_sock = 3;
-	optional int32 port = 4;
 };