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

diff --git a/main.cpp b/main.cpp
index 64ee29f55fb55b924eb0632935876b5a3cc56ef1..03938c358e669fc611c0e783eb95ce17669c726b 100644 (file)
--- 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 cfad404da66eca1cc4d77b8f476b5d9416ebff90..eb4660f0c6d787d12628483ed66c34a2739d2668 100644 (file)
--- 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;
 };