summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Auras <yak54@gmx.net>2011-02-27 20:01:03 +0100
committerAndreas Auras <yak54@gmx.net>2011-02-27 20:01:03 +0100
commit99fc6ddb2c975b1ebf04c3e87fefb0a040b0896d (patch)
tree90b528831610324b6b5ae6c194ccf935bef5d9a7
parent63fd907b679a72231f3a31048e76cb3571d1abf3 (diff)
downloadxine-lib-atmolight-99fc6ddb2c975b1ebf04c3e87fefb0a040b0896d.tar.gz
xine-lib-atmolight-99fc6ddb2c975b1ebf04c3e87fefb0a040b0896d.tar.bz2
migrate to changed grab interface
Changed debian version to 0.8
-rw-r--r--HISTORY3
-rw-r--r--xine_post_atmo.c10
2 files changed, 10 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index fd7a499..ebd2918 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,6 @@
+--- Version 0.8
+Added support for df-xine-lib-extensions patch
+
--- Version 0.7
Added output delay filter which is configurable with new plugin parameter 'filter_delay'.
Added uniform average brightness calculation mode which is configurable with new plugin parameter 'uniform_brightness'.
diff --git a/xine_post_atmo.c b/xine_post_atmo.c
index b421d99..c8cd69c 100644
--- a/xine_post_atmo.c
+++ b/xine_post_atmo.c
@@ -790,7 +790,10 @@ static void *atmo_grab_loop (void *this_gen) {
/* allocate grab frame */
if (!frame) {
#ifdef HAVE_XINE_VO_GRAB_FRAME
- frame = video_port->new_grab_frame(video_port);
+ if (video_port->driver->new_grab_frame)
+ frame = video_port->driver->new_grab_frame(video_port->driver);
+ else
+ frame = video_port->new_grab_frame(video_port);
if (!frame) {
#else
if (xine_port_send_gui_data(video_port, XINE_GUI_SEND_ALLOC_GRAB_FRAME, &frame)) {
@@ -843,12 +846,13 @@ static void *atmo_grab_loop (void *this_gen) {
/* grab displayed video frame */
frame->timeout = GRAB_TIMEOUT;
- frame->continuous = 1;
frame->width = analyze_width;
frame->height = analyze_height;
#ifdef HAVE_XINE_VO_GRAB_FRAME
- if (!(rc = frame->grab_next_displayed_frame(frame))) {
+ frame->flags = VO_GRAB_FRAME_FLAGS_CONTINUOUS | VO_GRAB_FRAME_FLAGS_WAIT_NEXT;
+ if (!(rc = frame->grab(frame))) {
#else
+ frame->continuous = 1;
if (!(rc = xine_port_send_gui_data(video_port, XINE_GUI_SEND_GRAB_FRAME, frame))) {
#endif
if (frame->width == analyze_width && frame->height == analyze_height) {