mSetCommands.insert(std::make_pair("..",sCommandPrototypeInfo("one step back in menu tree (back to root folder)",&CAmTelnetMenuHelper::oneStepBackCommand)));
mSetCommands.insert(std::make_pair("exit",sCommandPrototypeInfo("close telnet session",&CAmTelnetMenuHelper::exitCommand)));
mSetCommands.insert(std::make_pair("conn",sCommandPrototypeInfo("use 'conn sourceId sinkId' to connect a source and a sink",&CAmTelnetMenuHelper::setConnection)));
- mSetCommands.insert(std::make_pair("routing",sCommandPrototypeInfo("use 'routing sourceId sinkId' to get all\n\t possible routes between a sourceID and a sinkID",&CAmTelnetMenuHelper::setRoutingCommand)));
+ mSetCommands.insert(std::make_pair("routing",sCommandPrototypeInfo("use 'routing sourceId sinkId' to get all\n\t possible routes between a sourceID and a sinkID",&CAmTelnetMenuHelper::setRoutingCommand)));
+ mSetCommands.insert(std::make_pair("disc",sCommandPrototypeInfo("use 'disc connectionID' to disconnect \n\t this connection",&CAmTelnetMenuHelper::setDisconnectConnId)));
// Get commands
mGetCommands.insert(std::make_pair("help",sCommandPrototypeInfo(std::string("show all possible commands"),&CAmTelnetMenuHelper::helpCommand)));
break;
}
if(DEBUG_ON)std::cout << "new state: " << it->second << std::endl;
- //enterCmdQueue(CmdQueue,filedescriptor);
}
}
break;
}
sendTelnetLine(filedescriptor,line);
- //enterCmdQueue(CmdQueue,filedescriptor);
}
}
if( it != mCurrentMainStateMap.end())
{
it->second = eGetState;
- //enterCmdQueue(CmdQueue,filedescriptor);
}
}
if( it != mCurrentMainStateMap.end())
{
it->second = eSetState;
- //enterCmdQueue(CmdQueue,filedescriptor);
}
}
if( it != mCurrentMainStateMap.end())
{
it->second = eListState;
- //enterCmdQueue(CmdQueue,filedescriptor);
}
}
if( it != mCurrentMainStateMap.end())
{
it->second = eInfoState;
- //enterCmdQueue(CmdQueue,filedescriptor);
}
}
/****************************************************************************/
{
std::vector<am_Connection_s> listConnections;
- std::vector<am_Connection_s>::iterator it;
std::stringstream line;
mDatabasehandler->getListConnections(listConnections);
- line << "Current connections: " << listConnections.size();
+ line << "\tCurrent connections: " << listConnections.size() << std::endl;
sendTelnetLine(filedescriptor,line);
+ std::vector<am_Connection_s>::iterator it(listConnections.begin());
while(it != listConnections.end())
{
- line.clear();
+ line.str("");
line << "\tID: " << it->connectionID
<< "\tSrcID: " << it->sourceID
<< "\tSinkID: " << it->sinkID
<< "\tFormat: " << it->connectionFormat
- << "\tdelay: " << it->delay;
+ << "\tdelay: " << it->delay
+ << std::endl;
sendTelnetLine(filedescriptor,line);
it++;
/****************************************************************************/
{
std::vector<am_Source_s> listSources;
- std::vector<am_Source_s>::iterator it;
std::stringstream line;
mDatabasehandler->getListSources(listSources);
- line << "Current sources: " << listSources.size();
+ line << "\tCurrent sources: " << listSources.size();
sendTelnetLine(filedescriptor,line);
+ std::vector<am_Source_s>::iterator it(listSources.begin());
while(it != listSources.end())
{
- line.clear();
+ line.str("");
line << "\tID: " << it->sourceID
<< "\tDomainID: " << it->domainID
<< "\tName: " << it->name
<< "\tState: " << it->sourceState
- << "\tVolume: " << it->volume;
+ << "\tVolume: " << it->volume
+ << std::endl;
sendTelnetLine(filedescriptor,line);
it++;
/****************************************************************************/
{
std::vector<am_Sink_s> listSinks;
- std::vector<am_Sink_s>::iterator it;
std::stringstream line;
mDatabasehandler->getListSinks(listSinks);
- line << "Current sinks: " << listSinks.size();
+ line << "\tCurrent sinks: " << listSinks.size() << std::endl;
sendTelnetLine(filedescriptor,line);
+ std::vector<am_Sink_s>::iterator it(listSinks.begin());
while(it != listSinks.end())
{
- line.clear();
+ line.str("");
line << "\tID: " << it->sinkID
<< "\tDomainID: " << it->domainID
<< "\tName: " << it->name
<< "\tAvailable: " << it->available.availability
- << "\tVolume: " << it->volume;
+ << "\tVolume: " << it->volume
+ << std::endl;
sendTelnetLine(filedescriptor,line);
it++;
/****************************************************************************/
{
std::vector<am_Crossfader_s> listCrossfaders;
- std::vector<am_Crossfader_s>::iterator it;
std::stringstream line;
mDatabasehandler->getListCrossfaders(listCrossfaders);
- line << "Current crossfaders: " << listCrossfaders.size();
+ line << "\tCurrent crossfaders: " << listCrossfaders.size();
sendTelnetLine(filedescriptor,line);
+ std::vector<am_Crossfader_s>::iterator it(listCrossfaders.begin());
while(it != listCrossfaders.end())
{
- line.clear();
+ line.str("");
line << "\tID: " << it->crossfaderID
<< "\tName: " << it->name
- << "\tSourceID: " << it->sourceID;
+ << "\tSourceID: " << it->sourceID
+ << std::endl;
sendTelnetLine(filedescriptor,line);
it++;
/****************************************************************************/
{
std::vector<am_Gateway_s> listGateways;
- std::vector<am_Gateway_s>::iterator it;
std::stringstream line;
mDatabasehandler->getListGateways(listGateways);
- line << "Current gateways: " << listGateways.size();
+ line << "\tCurrent gateways: " << listGateways.size();
sendTelnetLine(filedescriptor,line);
+ std::vector<am_Gateway_s>::iterator it(listGateways.begin());
while(it != listGateways.end())
{
- line.clear();
+ line.str("");
line << "\tID: " << it->gatewayID
<< "\tName: " << it->name
<< "\tSourceID: " << it->sourceID
- << "\tSinkID: " << it->sinkID;
+ << "\tSinkID: " << it->sinkID
+ << std::endl;
sendTelnetLine(filedescriptor,line);
it++;
void CAmTelnetMenuHelper::getRoutingCommandExec(std::queue<std::string> & CmdQueue, int & filedescriptor)
/****************************************************************************/
{
- std::vector<am_Gateway_s> listGateways;
- std::vector<am_Gateway_s>::iterator it;
- std::stringstream line;
-
- /*
- mRouter->getRoute()
-
- line << "Current gateways: " << listGateways.size();
- sendTelnetLine(filedescriptor,line);
-
- while(it != listGateways.end())
- {
- line.clear();
- line << "\tID: " << it->gatewayID
- << "\tName: " << it->name
- << "\tSourceID: " << it->sourceID
- << "\tSinkID: " << it->sinkID;
-
- sendTelnetLine(filedescriptor,line);
- it++;
- }
- */
+ //TODO: fill with function
}
/****************************************************************************/
{
std::stringstream line;
- line << "Sender versions:" << std::endl
- << "Ctrl: " << mControlSender->getInterfaceVersion() << " | "
+ line << "\tSender versions:" << std::endl
+ << "\tCtrl: " << mControlSender->getInterfaceVersion() << " | "
<< "Cmd: " << mCommandSender->getInterfaceVersion() << " | "
- << "Routing: " << mRoutingSender->getInterfaceVersion();
+ << "Routing: " << mRoutingSender->getInterfaceVersion() << std::endl;
sendTelnetLine(filedescriptor,line);
}
{
std::stringstream line;
- line << "Receiver versions:" << std::endl
- << "Ctrl: " << mControlReceiver->getInterfaceVersion() << " | "
+ line << "\tReceiver versions:" << std::endl
+ << "\tCtrl: " << mControlReceiver->getInterfaceVersion() << " | "
<< "Cmd: " << mCommandReceiver->getInterfaceVersion() << " | "
- << "Routing: " << mRoutingReceiver->getInterfaceVersion();
+ << "Routing: " << mRoutingReceiver->getInterfaceVersion() << std::endl;
sendTelnetLine(filedescriptor,line);
mDatabasehandler->getListSystemProperties(listSystemProperties);
- line << "Systemproperties: ";
+ line << "\tSystemproperties: ";
sendTelnetLine(filedescriptor,line);
for(it = listSystemProperties.begin(); it < listSystemProperties.end(); it++ )
{
- line.clear();
- line << "Type: " << it->type << " Value: " << it->value;
+ line.str("");
+ line << "\tType: " << it->type << " Value: " << it->value << std::endl;
sendTelnetLine(filedescriptor,line);
}
}
{
reIter->connectionFormat;
reIter->domainID;
- output << ">(" << reIter->sourceID << ")->--[D:"<< reIter->domainID <<"F:"<< reIter->connectionFormat <<"]-->-(" << reIter->sinkID<< ")" << std::endl;
+ output << ">(" << reIter->sourceID << ")->--[D:"<< reIter->domainID <<"][F:"<< reIter->connectionFormat <<"]-->-(" << reIter->sinkID<< ")" << std::endl;
}
rlCnt++;
if(E_OK == rError)
{
- output << "ConnID: " << connID << "Src: " << sourceID << " ---> Sink: " << sinkID << std::endl;
+ output << "ConnID: " << connID << "\tSrc: " << sourceID << " ---> Sink: " << sinkID << std::endl;
sendTelnetLine(filedescriptor,output);
}
else
void CAmTelnetMenuHelper::setDisconnectConnId(std::queue<std::string> & CmdQueue, int & filedescriptor)
/****************************************************************************/
{
- instance->setConnectionExec(CmdQueue,filedescriptor);
+ instance->setDisconnectConnIdExec(CmdQueue,filedescriptor);
}
/****************************************************************************/
}
else
{
- sendError(filedescriptor,"Error connecting sourceID and sinkID");
+ sendError(filedescriptor,"Error disconnecting connectionID");
}
}
else
{
- sendError(filedescriptor,"Not enough arguments to disconnect a Main Connection, please enter 'connection ID' after command");
+ sendError(filedescriptor,"Not enough arguments to disconnect a Main Connection, please enter 'connectionID' after command");
return;
}
}