diff options
| -rw-r--r-- | Gui/wm/wsxdnd.c | 5 | ||||
| -rw-r--r-- | libvo/vo_dxr3.c | 17 |
2 files changed, 14 insertions, 8 deletions
diff --git a/Gui/wm/wsxdnd.c b/Gui/wm/wsxdnd.c index 92a37cca22..c971c48afb 100644 --- a/Gui/wm/wsxdnd.c +++ b/Gui/wm/wsxdnd.c @@ -5,6 +5,7 @@ #include "ws.h" #include "wsxdnd.h" +#include <stdio.h> #include <stdlib.h> #include <string.h> @@ -158,7 +159,9 @@ wsXDNDProcessClientMessage(wsTWindow* wnd, XClientMessageEvent *event) int offset = 0; Atom* ret_buff; Atom ret_type; - unsigned long ret_format,ret_items; + int ret_format; + unsigned long ret_items; + /* while there is data left...*/ while(ret_left){ XGetWindowProperty(wsDisplay,event->data.l[0],_XA_XdndTypeList, diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index c0dfed89ed..1f4cc3759f 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -199,12 +199,13 @@ uint32_t control(uint32_t request, void *data, ...) if (ioctl(fd_control, EM8300_IOCTL_GETBCS, &bcs) < 0) return VO_FALSE; if (!strcasecmp(data, "brightness")) - bcs.brightness = value; + bcs.brightness = (value+100)*5; else if (!strcasecmp(data, "contrast")) - bcs.contrast = value; + bcs.contrast = (value+100)*5; else if (!strcasecmp(data, "saturation")) - bcs.saturation = value; - + bcs.saturation = (value+100)*5; + else return VO_FALSE; + if (ioctl(fd_control, EM8300_IOCTL_SETBCS, &bcs) < 0) return VO_FALSE; return VO_TRUE; @@ -223,11 +224,13 @@ uint32_t control(uint32_t request, void *data, ...) return VO_FALSE; if (!strcasecmp(data, "brightness")) - *value = bcs.brightness; + *value = (bcs.brightness/5)-100; else if (!strcasecmp(data, "contrast")) - *value = bcs.contrast; + *value = (bcs.contrast/5)-100; else if (!strcasecmp(data, "saturation")) - *value = bcs.saturation; + *value = (bcs.saturation/5)-100; + else return VO_FALSE; + return VO_TRUE; } } |