Temporarily disabled conversion API.
This commit is contained in:
parent
0d4adb98cb
commit
507eb80707
4 changed files with 7 additions and 5 deletions
|
@ -94,7 +94,7 @@ void statusMonitor(void * np){
|
||||||
tthread::lock_guard<tthread::mutex> guard(Controller::configMutex);
|
tthread::lock_guard<tthread::mutex> guard(Controller::configMutex);
|
||||||
Controller::CheckProtocols(Controller::Storage["config"]["protocols"], Controller::capabilities);
|
Controller::CheckProtocols(Controller::Storage["config"]["protocols"], Controller::capabilities);
|
||||||
Controller::CheckAllStreams(Controller::Storage["streams"]);
|
Controller::CheckAllStreams(Controller::Storage["streams"]);
|
||||||
Controller::myConverter.updateStatus();
|
//Controller::myConverter.updateStatus();
|
||||||
}
|
}
|
||||||
Util::wait(5000);//wait at least 5 seconds
|
Util::wait(5000);//wait at least 5 seconds
|
||||||
}
|
}
|
||||||
|
|
|
@ -193,6 +193,8 @@ int Controller::handleAPIConnection(Socket::Connection & conn){
|
||||||
Controller::checkCapable(capabilities);
|
Controller::checkCapable(capabilities);
|
||||||
Response["capabilities"] = capabilities;
|
Response["capabilities"] = capabilities;
|
||||||
}
|
}
|
||||||
|
/// \todo Re-enable conversion API at some point.
|
||||||
|
/*
|
||||||
if (Request.isMember("conversion")){
|
if (Request.isMember("conversion")){
|
||||||
if (Request["conversion"].isMember("encoders")){
|
if (Request["conversion"].isMember("encoders")){
|
||||||
Response["conversion"]["encoders"] = myConverter.getEncoders();
|
Response["conversion"]["encoders"] = myConverter.getEncoders();
|
||||||
|
@ -217,6 +219,7 @@ int Controller::handleAPIConnection(Socket::Connection & conn){
|
||||||
Response["conversion"]["status"] = myConverter.getStatus();
|
Response["conversion"]["status"] = myConverter.getStatus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
///
|
///
|
||||||
/// \api
|
/// \api
|
||||||
/// `"save"` requests are always empty:
|
/// `"save"` requests are always empty:
|
||||||
|
|
|
@ -9,10 +9,9 @@
|
||||||
///\brief Holds everything unique to the controller.
|
///\brief Holds everything unique to the controller.
|
||||||
namespace Controller {
|
namespace Controller {
|
||||||
|
|
||||||
///Create a converter class and automatically load in all encoders.
|
|
||||||
Converter::Converter myConverter;
|
|
||||||
|
|
||||||
JSON::Value capabilities;
|
JSON::Value capabilities;
|
||||||
|
//Converter::Converter * myConverter = 0;
|
||||||
|
|
||||||
|
|
||||||
///Aquire list of available protocols, storing in global 'capabilities' JSON::Value.
|
///Aquire list of available protocols, storing in global 'capabilities' JSON::Value.
|
||||||
void checkAvailProtocols(){
|
void checkAvailProtocols(){
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
namespace Controller {
|
namespace Controller {
|
||||||
extern JSON::Value capabilities; ///< Global storage of capabilities
|
extern JSON::Value capabilities; ///< Global storage of capabilities
|
||||||
extern Converter::Converter myConverter;
|
//extern Converter::Converter * myConverter;
|
||||||
void checkCapable(JSON::Value & capa);
|
void checkCapable(JSON::Value & capa);
|
||||||
void checkAvailProtocols();
|
void checkAvailProtocols();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue