summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2014-07-30 20:41:50 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2014-07-30 20:41:50 (GMT)
commitb7a2d38bdcee3bf85a32dea7ac74b144d5ef40fa (patch)
treebade629bcca6b6a1417cb45be4349a3c27ea0feb /src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
parentafbd0c4463c6f28ec1cd6ea45a68fdbcfcfeae6c (diff)
downloaduscxml-b7a2d38bdcee3bf85a32dea7ac74b144d5ef40fa.zip
uscxml-b7a2d38bdcee3bf85a32dea7ac74b144d5ef40fa.tar.gz
uscxml-b7a2d38bdcee3bf85a32dea7ac74b144d5ef40fa.tar.bz2
See detailled log
- Forcing Data.Type for Data(String) constructor now, default used to be INTERPRETED. - setDataModel and addIOProcessor on interpreter now - fixed a bug with Data(bool) constructor - various smaller fixes
Diffstat (limited to 'src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp')
-rw-r--r--src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
index 9dfe94f..7b45f2c 100644
--- a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
+++ b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp
@@ -282,7 +282,7 @@ void MilesSessionInvoker::send(const SendRequest& req) {
void MilesSessionInvoker::processEventStart(const std::string& origin, const std::string& userid, const std::string& reflector, const std::string& session) {
Event ev;
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
//std::cout << req;
if(num_connected>0) {
num_connected++;
@@ -383,7 +383,7 @@ void MilesSessionInvoker::processEventStart(const std::string& origin, const std
void MilesSessionInvoker::processEventStop(const std::string& origin) {
Event ev;
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
if(num_connected==0) {
LOG(ERROR) << "not connected";
@@ -419,7 +419,7 @@ void MilesSessionInvoker::processEventStop(const std::string& origin) {
void MilesSessionInvoker::processEventParticipants(const std::string& origin) {
Event ev;
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
if(num_connected==0) {
LOG(ERROR) << "not connected";
ev.name = "participants.error";
@@ -440,7 +440,7 @@ void MilesSessionInvoker::processEventParticipants(const std::string& origin) {
void MilesSessionInvoker::processEventThumbnail(const std::string& origin, const std::string& userid) {
Event ev;
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
if(num_connected==0) {
LOG(ERROR) << "not connected";
ev.name = "thumbnail.error";
@@ -496,52 +496,52 @@ void MilesSessionInvoker::processEventThumbnail(const std::string& origin, const
void MilesSessionInvoker::processEventVideoOn(const std::string& origin, const std::string& userid) {
Event ev;
ev.name = "videoon.reply";
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
returnEvent(ev);
}
void MilesSessionInvoker::processEventVideoOff(const std::string& origin, const std::string& userid) {
Event ev;
ev.name = "videooff.reply";
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
returnEvent(ev);
}
void MilesSessionInvoker::processEventAudioOn(const std::string& origin, const std::string& userid) {
Event ev;
ev.name = "audioon.reply";
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
returnEvent(ev);
}
void MilesSessionInvoker::processEventAudioOff(const std::string& origin, const std::string& userid) {
Event ev;
ev.name = "audiooff.reply";
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
returnEvent(ev);
}
void MilesSessionInvoker::processEventSendVideo(const std::string& origin, size_t width, size_t height, size_t framerate, const std::string& compression) {
Event ev;
ev.name = "sendvideo.reply";
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
sendvideo_enabled = 1;
returnEvent(ev);
}
void MilesSessionInvoker::processEventSendVideoOff(const std::string& origin) {
Event ev;
ev.name = "sendvideooff.reply";
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
returnEvent(ev);
sendvideo_enabled = 0;
}
void MilesSessionInvoker::processEventSendAudio(const std::string& origin, const std::string& encoding) {
Event ev;
ev.name = "sendaudio.reply";
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
returnEvent(ev);
sendaudio_enabled = 1;
}
void MilesSessionInvoker::processEventSendAudioOff(const std::string& origin) {
Event ev;
ev.name = "sendaudiooff.reply";
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
returnEvent(ev);
sendaudio_enabled = 0;
}
@@ -552,7 +552,7 @@ void MilesSessionInvoker::processEventPostText(const std::string& origin, const
int n, length;
Event ev;
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
if(num_connected==0) {
LOG(ERROR) << "not connected";
ev.name = "posttext.error";
@@ -574,7 +574,7 @@ void MilesSessionInvoker::processEventPostText(const std::string& origin, const
void MilesSessionInvoker::processEventGetText(const std::string& origin) {
Event ev;
- ev.data.compound["origin"] = origin;
+ ev.data.compound["origin"] = Data(origin, Data::INTERPRETED);
if(num_connected==0) {
LOG(ERROR) << "not connected";
ev.name = "gettext.error";