Code Review
/
src
/
libhomescreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Modify function argument from char to json
[src/libhomescreen.git]
/
src
/
libhomescreen.cpp
diff --git
a/src/libhomescreen.cpp
b/src/libhomescreen.cpp
index
42ab8b1
..
2f3ef44
100644
(file)
--- a/
src/libhomescreen.cpp
+++ b/
src/libhomescreen.cpp
@@
-441,25
+441,15
@@
void LibHomeScreen::on_event(void *closure, const char *event, struct afb_wsj1_m
if (strcasecmp(event_only, LibHomeScreen::event_list[0].c_str()) == 0) {
auto i = this->handlers.find(Event_TapShortcut);
if (strcasecmp(event_only, LibHomeScreen::event_list[0].c_str()) == 0) {
auto i = this->handlers.find(Event_TapShortcut);
-
- struct json_object *json_application_name = json_object_object_get(json_data, "application_name");
- const char* application_name = json_object_get_string(json_application_name);
-
if ( i != this->handlers.end() ) {
if ( i != this->handlers.end() ) {
- i->second(
application_name
);
+ i->second(
json_data
);
}
}
else if (strcasecmp(event_only, LibHomeScreen::event_list[1].c_str()) == 0) {
}
}
else if (strcasecmp(event_only, LibHomeScreen::event_list[1].c_str()) == 0) {
-
auto i = this->handlers.find(Event_OnScreenMessage);
auto i = this->handlers.find(Event_OnScreenMessage);
-
- struct json_object *json_display_message = json_object_object_get(json_data, "display_message");
- const char* display_message = json_object_get_string(json_display_message);
-
if ( i != this->handlers.end() ) {
if ( i != this->handlers.end() ) {
- i->second(
display_message
);
+ i->second(
json_data
);
}
}
-
}
json_object_put(ev_contents);
}
json_object_put(ev_contents);