Fix autovideo setup and fix video command description and output.

This commit is contained in:
Guillaume BIENKOWSKI 2014-01-02 14:26:48 +01:00
parent a4f8078058
commit 57fe1b184e
2 changed files with 7 additions and 7 deletions

View file

@ -6,19 +6,19 @@ Video::Video() :
"Toggles camera on current call."
"If no call is specified, the current call is taken.")
{
addExample(new DaemonCommandExample("video on 1",
addExample(new DaemonCommandExample("video 1",
"Status: Ok\n\n"
"Camera activated."));
addExample(new DaemonCommandExample("video off 1",
addExample(new DaemonCommandExample("video 1",
"Status: Ok\n\n"
"Camera deactivated."));
addExample(new DaemonCommandExample("video on",
addExample(new DaemonCommandExample("video",
"Status: Error\n\n"
"Reason: No current call available."));
addExample(new DaemonCommandExample("video on 2",
addExample(new DaemonCommandExample("video 2",
"Status: Error\n\n"
"Reason: No call with such id."));
}
@ -60,8 +60,8 @@ void Video::exec(Daemon* app, const char* args)
return;
}
app->sendResponse(Response(activate?"Camera deactivated.":
"Camera activated", Response::Ok));
app->sendResponse(Response(activate?"Camera activated.":
"Camera deactivated", Response::Ok));
}

View file

@ -285,7 +285,7 @@ bool DaemonCommand::matches(const char *name) const {
}
Daemon::Daemon(const char *config_path, const char *factory_config_path, const char *log_file, const char *pipe_name, bool display_video, bool capture_video) :
mLSD(0), mLogFile(NULL), mCallIds(0), mProxyIds(0), mAudioStreamIds(0) {
mLSD(0), mLogFile(NULL), mAutoVideo(0), mCallIds(0), mProxyIds(0), mAudioStreamIds(0) {
ms_mutex_init(&mMutex, NULL);
mServerFd = -1;
mChildFd = -1;