diff options
| -rw-r--r-- | m4/_xine.m4 | 2 | ||||
| -rw-r--r-- | src/dxr3/dxr3_video_out.c | 4 | ||||
| -rw-r--r-- | src/dxr3/dxr3_video_out.h | 4 | ||||
| -rw-r--r-- | src/dxr3/dxr3_vo_core.c | 15 | ||||
| -rw-r--r-- | src/libspudec/spu.c | 8 |
5 files changed, 21 insertions, 12 deletions
diff --git a/m4/_xine.m4 b/m4/_xine.m4 index f6d9d0957..ee7130e0b 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -90,7 +90,7 @@ AC_DEFUN([AC_CHECK_DXR3], [ --disable-dxr3 Do not build the DXR3/HW+ plugins],, enable_dxr3=yes) if test x"$enable_dxr3" = xyes; then - AC_CHECK_HEADER($linux_path/include/linux/em8300.h, + AC_CHECK_HEADER(/usr/include/linux/em8300.h, have_dxr3=yes, [have_dxr3=no AC_MSG_RESULT([*** DXR3 support disabled due to missing em8300.h ***])]) diff --git a/src/dxr3/dxr3_video_out.c b/src/dxr3/dxr3_video_out.c index e1197d6e2..02d2f053f 100644 --- a/src/dxr3/dxr3_video_out.c +++ b/src/dxr3/dxr3_video_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_video_out.c,v 1.5 2002/01/09 22:33:04 jcdutton Exp $ + * $Id: dxr3_video_out.c,v 1.6 2002/02/25 23:44:05 jcdutton Exp $ * * mpeg1 encoding video out plugin for the dxr3. * @@ -636,7 +636,7 @@ printf("dxr3_video_out:init_plugin\n"); } static vo_info_t vo_info_dxr3 = { - 3, /* api version */ + 4, /* api version */ "dxr3", "xine video output plugin for dxr3 cards", VISUAL_TYPE_X11, diff --git a/src/dxr3/dxr3_video_out.h b/src/dxr3/dxr3_video_out.h index d3fa1c6b5..0b79c736d 100644 --- a/src/dxr3/dxr3_video_out.h +++ b/src/dxr3/dxr3_video_out.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_video_out.h,v 1.12 2001/12/23 02:36:55 hrm Exp $ + * $Id: dxr3_video_out.h,v 1.13 2002/02/25 23:44:05 jcdutton Exp $ * */ @@ -130,7 +130,7 @@ typedef struct dxr3_driver_s { char *user_data; - void (*request_dest_size) (char *userdata, int video_width, + void (*frame_output_cb) (char *userdata, int video_width, int video_height, int *dest_x, int *dest_y, int *dest_height, int *dest_width); } dxr3_driver_t; diff --git a/src/dxr3/dxr3_vo_core.c b/src/dxr3/dxr3_vo_core.c index fc0fd5a89..029175424 100644 --- a/src/dxr3/dxr3_vo_core.c +++ b/src/dxr3/dxr3_vo_core.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_vo_core.c,v 1.14 2002/01/10 21:30:10 jcdutton Exp $ + * $Id: dxr3_vo_core.c,v 1.15 2002/02/25 23:44:05 jcdutton Exp $ * ************************************************************************* * core functions common to both Standard and RT-Encoding vo plugins * @@ -245,8 +245,7 @@ int dxr3_get_property (vo_driver_t *this_gen, int property) case VO_PROP_COLORKEY: val = this->overlay.colorkey; break; - case VO_PROP_ZOOM_X: - case VO_PROP_ZOOM_Y: + case VO_PROP_ZOOM_FACTOR: case VO_PROP_TVMODE: break; @@ -306,7 +305,7 @@ int dxr3_set_property (vo_driver_t *this_gen, if (this->overlay_enabled && !fullscreen){ int foo; - this->request_dest_size(this->user_data, this->width, + this->frame_output_cb(this->user_data, this->width, this->width/this->desired_ratio, &foo, &foo, &foo, &foo); } break; @@ -314,7 +313,7 @@ int dxr3_set_property (vo_driver_t *this_gen, fprintf(stderr, "dxr3_vo: VO_PROP_COLORKEY not implemented!"); this->overlay.colorkey = val; break; - case VO_PROP_ZOOM_X: + case VO_PROP_ZOOM_FACTOR: /* FIXME: Was ZOOM_X */ if(!this->overlay_enabled){ /* TV-out only */ if(value==1){ fprintf(stderr, "dxr3_vo: enabling 16:9 zoom\n"); @@ -403,6 +402,8 @@ int dxr3_gui_data_exchange (vo_driver_t *this_gen, if (!this->overlay_enabled && !this->tv_switchable) return 0; switch (data_type) { +/************************************************************************* + * FIXME: Removed due to changes in XV by Guenter, but don't know what to replace it with case GUI_DATA_EX_DEST_POS_SIZE_CHANGED:{ x11_rectangle_t *area = (x11_rectangle_t*) data; dxr3_overlay_adapt_area(this, area->x, area->y, area->w, area->h); @@ -413,6 +414,7 @@ int dxr3_gui_data_exchange (vo_driver_t *this_gen, dxr3_overlay_set_mode(&this->overlay,EM8300_OVERLAY_MODE_OVERLAY); } break; +*************************************************************************/ case GUI_DATA_EX_EXPOSE_EVENT:{ XLockDisplay(this->display); XFillRectangle(this->display, this->win, @@ -498,7 +500,8 @@ void gather_screen_vars(dxr3_driver_t *this, x11_visual_t *vis) } this->overlay.screen_depth = DisplayPlanes(this->display, scrn); - this->request_dest_size = (void *)vis->request_dest_size; + this->frame_output_cb = (void *)vis->frame_output_cb; +/* request_dest_size; */ printf("xres %d yres %d depth %d\n", this->overlay.screen_xres, this->overlay.screen_yres, this->overlay.screen_depth); } diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c index 59b1f0cd4..382eb7ab9 100644 --- a/src/libspudec/spu.c +++ b/src/libspudec/spu.c @@ -35,7 +35,7 @@ * along with this program; see the file COPYING. If not, write to * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: spu.c,v 1.29 2002/01/05 21:29:37 jcdutton Exp $ + * $Id: spu.c,v 1.30 2002/02/25 23:44:06 jcdutton Exp $ * */ @@ -270,6 +270,12 @@ void spu_do_commands(spu_state_t *state, spu_seq_t* seq, vo_overlay_t *ovl) buf += 5; break; + case CMD_SPU_WIPE: +#ifdef LOG_DEBUG + printf ("spu: \tSPU_WIPE not implemented yet\n"); +#endif + break; + case CMD_SPU_FORCE_DISPLAY: #ifdef LOG_DEBUG printf ("spu: \tForce Display/Menu\n"); |