develop.uap-core.de/git
/
uwplayer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add handler for motion/button events
[uwplayer.git]
/
application
/
player.c
diff --git
a/application/player.c
b/application/player.c
index
9e65410
..
6cdba87
100644
(file)
--- a/
application/player.c
+++ b/
application/player.c
@@
-110,6
+110,7
@@
static void* wait_for_process(void *data) {
player->isactive = FALSE;
player->status = status;
player->isactive = FALSE;
player->status = status;
+ SetPlayerWindow(0);
return NULL;
}
return NULL;
}
@@
-329,7
+330,6
@@
static void handle_json_rpc_msg(Player *player, JSONValue *v) {
}
//json_print(v, NULL, 0);
}
//json_print(v, NULL, 0);
- fflush(stdout);
}
static Boolean player_widget_set_size(XtPointer data) {
}
static Boolean player_widget_set_size(XtPointer data) {
@@
-411,6
+411,9
@@
static Boolean get_player_window(XtPointer data) {
if(nchild > 0) {
p->window = child[0];
XFree(child);
if(nchild > 0) {
p->window = child[0];
XFree(child);
+
+ SetPlayerWindow(p->window);
+ XSelectInput(XtDisplay(win->player_widget), p->window, PointerMotionMask);
}
return 0;
}
return 0;
@@
-420,14
+423,24
@@
static void handle_json_rpc_event(Player *p, JSONValue *v, JSONValue *event) {
if(!json_strcmp(event, "property-change")) {
JSONValue *name = json_obj_get(&v->value.object, "name");
JSONValue *data = json_obj_get(&v->value.object, "data");
if(!json_strcmp(event, "property-change")) {
JSONValue *name = json_obj_get(&v->value.object, "name");
JSONValue *data = json_obj_get(&v->value.object, "data");
- if(!json_strcmp(name, "eof-reached")) {
+ if(!json_strcmp(name, "playback-time")) {
+ if(data && data->type == JSON_NUMBER) {
+ p->playback_time = data->value.number.value;
+ //printf("playback-time: %f\n", p->playback_time);
+ }
+ } else if(!json_strcmp(name, "eof-reached")) {
if(data && data->type == JSON_LITERAL && data->value.literal.literal == JSON_TRUE) {
PlayerEOF(p);
}
if(data && data->type == JSON_LITERAL && data->value.literal.literal == JSON_TRUE) {
PlayerEOF(p);
}
+ } else if(!json_strcmp(name, "osd-height")) {
+ if(data->type == JSON_NUMBER) {
+ p->osd_height = data->value.number.value;
+ }
}
} else if(!p->isstarted && !json_strcmp(event, "playback-restart")) {
char *cmd = "{ \"command\": [\"observe_property\", 1, \"playback-time\"] }\n"
"{ \"command\": [\"observe_property\", 1, \"eof-reached\"] }\n"
}
} else if(!p->isstarted && !json_strcmp(event, "playback-restart")) {
char *cmd = "{ \"command\": [\"observe_property\", 1, \"playback-time\"] }\n"
"{ \"command\": [\"observe_property\", 1, \"eof-reached\"] }\n"
+ "{ \"command\": [\"observe_property\", 1, \"osd-height\"] }\n"
"{ \"command\": [\"get_property\", \"width\"], request_id=\"" REQ_ID_WIDTH "\" }\n"
"{ \"command\": [\"get_property\", \"height\"], request_id=\"" REQ_ID_HEIGHT "\" }\n"
"{ \"command\": [\"set_property\", \"keep-open\", true] }\n";
"{ \"command\": [\"get_property\", \"width\"], request_id=\"" REQ_ID_WIDTH "\" }\n"
"{ \"command\": [\"get_property\", \"height\"], request_id=\"" REQ_ID_HEIGHT "\" }\n"
"{ \"command\": [\"set_property\", \"keep-open\", true] }\n";
@@
-454,6
+467,7
@@
void PlayerDestroy(Player *p) {
kill(p->process, SIGTERM);
}
kill(p->process, SIGTERM);
}
+ SetPlayerWindow(0);
free(p);
}
free(p);
}