diff --git a/src/controller/controller.cpp b/src/controller/controller.cpp index 4cad5f9e..bd462b05 100644 --- a/src/controller/controller.cpp +++ b/src/controller/controller.cpp @@ -94,7 +94,7 @@ void statusMonitor(void * np){ tthread::lock_guard guard(Controller::configMutex); Controller::CheckProtocols(Controller::Storage["config"]["protocols"], Controller::capabilities); Controller::CheckAllStreams(Controller::Storage["streams"]); - Controller::myConverter.updateStatus(); + //Controller::myConverter.updateStatus(); } Util::wait(5000);//wait at least 5 seconds } diff --git a/src/controller/controller_api.cpp b/src/controller/controller_api.cpp index dda2959d..e5ac7e1a 100644 --- a/src/controller/controller_api.cpp +++ b/src/controller/controller_api.cpp @@ -193,6 +193,8 @@ int Controller::handleAPIConnection(Socket::Connection & conn){ Controller::checkCapable(capabilities); Response["capabilities"] = capabilities; } + /// \todo Re-enable conversion API at some point. + /* if (Request.isMember("conversion")){ if (Request["conversion"].isMember("encoders")){ Response["conversion"]["encoders"] = myConverter.getEncoders(); @@ -217,6 +219,7 @@ int Controller::handleAPIConnection(Socket::Connection & conn){ Response["conversion"]["status"] = myConverter.getStatus(); } } + */ /// /// \api /// `"save"` requests are always empty: diff --git a/src/controller/controller_capabilities.cpp b/src/controller/controller_capabilities.cpp index 76798ad5..7cb974c9 100644 --- a/src/controller/controller_capabilities.cpp +++ b/src/controller/controller_capabilities.cpp @@ -9,10 +9,9 @@ ///\brief Holds everything unique to the controller. namespace Controller { - ///Create a converter class and automatically load in all encoders. - Converter::Converter myConverter; - JSON::Value capabilities; + //Converter::Converter * myConverter = 0; + ///Aquire list of available protocols, storing in global 'capabilities' JSON::Value. void checkAvailProtocols(){ diff --git a/src/controller/controller_capabilities.h b/src/controller/controller_capabilities.h index 5ff9c14d..2228f66d 100644 --- a/src/controller/controller_capabilities.h +++ b/src/controller/controller_capabilities.h @@ -3,7 +3,7 @@ namespace Controller { extern JSON::Value capabilities; ///< Global storage of capabilities - extern Converter::Converter myConverter; + //extern Converter::Converter * myConverter; void checkCapable(JSON::Value & capa); void checkAvailProtocols(); }