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
Use appid between homescreen-service and apps
[src/libhomescreen.git]
/
include
/
libhomescreen.hpp
diff --git
a/include/libhomescreen.hpp
b/include/libhomescreen.hpp
index
5720368
..
ea35d1e
100644
(file)
--- a/
include/libhomescreen.hpp
+++ b/
include/libhomescreen.hpp
@@
-24,7
+24,6
@@
#include <systemd/sd-event.h>
extern "C"
{
#include <systemd/sd-event.h>
extern "C"
{
-#include <afb/afb-binding.h>
#include <afb/afb-wsj1.h>
#include <afb/afb-ws-client.h>
}
#include <afb/afb-wsj1.h>
#include <afb/afb-ws-client.h>
}
@@
-38,11
+37,12
@@
public:
LibHomeScreen(const LibHomeScreen &) = delete;
LibHomeScreen &operator=(const LibHomeScreen &) = delete;
LibHomeScreen(const LibHomeScreen &) = delete;
LibHomeScreen &operator=(const LibHomeScreen &) = delete;
- using handler_func = std::function<void(
const char
*)>;
+ using handler_func = std::function<void(
json_object
*)>;
enum EventType {
Event_TapShortcut = 1,
enum EventType {
Event_TapShortcut = 1,
- Event_OnScreenMessage
+ Event_OnScreenMessage,
+ Event_OnScreenReply
};
static const std::vector<std::string> api_list;
};
static const std::vector<std::string> api_list;
@@
-51,8
+51,9
@@
public:
/* Method */
int init(const int port, const std::string& token);
/* Method */
int init(const int port, const std::string& token);
- int tapShortcut(const char* application_
name
);
+ int tapShortcut(const char* application_
id
);
int onScreenMessage(const char* display_message);
int onScreenMessage(const char* display_message);
+ int onScreenReply(const char* reply_message);
void set_event_handler(enum EventType et, handler_func f);
void set_event_handler(enum EventType et, handler_func f);
@@
-76,6
+77,7
@@
private:
struct afb_wsj1* sp_websock;
struct afb_wsj1_itf minterface;
sd_event* mploop;
struct afb_wsj1* sp_websock;
struct afb_wsj1_itf minterface;
sd_event* mploop;
+ std::string mapp_id;
std::string muri;
int mport = 2000;
std::string muri;
int mport = 2000;