diff options
| -rw-r--r-- | src/dxr3/dxr3_decoder.c | 4 | ||||
| -rw-r--r-- | src/dxr3/overlay.c | 18 | ||||
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 9 |
3 files changed, 17 insertions, 14 deletions
diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c index c5c6240af..dc0cb927a 100644 --- a/src/dxr3/dxr3_decoder.c +++ b/src/dxr3/dxr3_decoder.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_decoder.c,v 1.20 2001/10/24 13:42:58 mlampard Exp $ + * $Id: dxr3_decoder.c,v 1.21 2001/10/24 15:53:23 mlampard Exp $ * * dxr3 video and spu decoder plugin. Accepts the video and spu data * from XINE and sends it directly to the corresponding dxr3 devices. @@ -240,7 +240,7 @@ static void find_aspect(dxr3_decoder_t *this, uint8_t * buffer) if (old_h!=this->height || old_w!=this->width || old_a!=this->aspect) this->video_out->get_frame(this->video_out, this->width,this->height,this->aspect, - IMGFMT_YV12, 1, 6667); + IMGFMT_YV12, 1, 6667); /* dxr3_decoder = 6667 */ } } diff --git a/src/dxr3/overlay.c b/src/dxr3/overlay.c index a5def90ba..86109e618 100644 --- a/src/dxr3/overlay.c +++ b/src/dxr3/overlay.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: overlay.c,v 1.1 2001/07/26 16:03:10 ehasenle Exp $ + * $Id: overlay.c,v 1.2 2001/10/24 15:53:23 mlampard Exp $ * * Overlay support routines for video_out_dxr3 */ @@ -237,7 +237,7 @@ int dxr3_overlay_set_signalmode(dxr3_overlay_t *this,int mode) void dxr3_overlay_buggy_preinit(dxr3_overlay_t *this, int fd) { - int mode = 0; +/* int mode = 0; */ /* TODO: catch errors */ this->fd_control = fd; @@ -245,10 +245,14 @@ void dxr3_overlay_buggy_preinit(dxr3_overlay_t *this, int fd) dxr3_overlay_set_screen(this); dxr3_overlay_set_window(this, 1,1, 320,240); dxr3_overlay_set_mode(this, EM8300_OVERLAY_MODE_OVERLAY); - ioctl(this->fd_control, EM8300_IOCTL_SET_VIDEOMODE, &mode); - dxr3_overlay_set_screen(this); - dxr3_overlay_set_window(this, 1,1, 320,240); - dxr3_overlay_set_attributes(this); dxr3_overlay_set_keycolor(this); - dxr3_overlay_set_mode(this, EM8300_OVERLAY_MODE_OVERLAY); + +/* No longer required with em8300 ver 8.2+ ??? + * ioctl(this->fd_control, EM8300_IOCTL_SET_VIDEOMODE, &mode); + * dxr3_overlay_set_screen(this); + * dxr3_overlay_set_window(this, 1,1, 320,240); + * dxr3_overlay_set_attributes(this); + * dxr3_overlay_set_keycolor(this); + * dxr3_overlay_set_mode(this, EM8300_OVERLAY_MODE_OVERLAY); +*/ } diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index f8bb8cbf6..38560a7dd 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.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: video_out_dxr3.c,v 1.14 2001/10/24 13:42:58 mlampard Exp $ + * $Id: video_out_dxr3.c,v 1.15 2001/10/24 15:53:23 mlampard Exp $ * * Dummy video out plugin for the dxr3. Is responsible for setting * tv_mode, bcs values and the aspectratio. @@ -208,13 +208,13 @@ static void dxr3_update_frame_format (vo_driver_t *this_gen, this->video_width = width; this->video_height = height; this->video_aspect = ratio_code; - + if (ratio_code < 3 || ratio_code>4) aspect = ASPECT_FULL; else aspect = ASPECT_ANAMORPHIC; if(this->aspectratio!=aspect) - dxr3_set_property (this_gen, VO_PROP_ASPECT_RATIO, aspect); + dxr3_set_property ((vo_driver_t*)this, VO_PROP_ASPECT_RATIO, aspect); } else{ /* inform the user that we don't do non-mpeg streams and exit nicely */ @@ -222,7 +222,6 @@ static void dxr3_update_frame_format (vo_driver_t *this_gen, fprintf(stderr,"Please try xine with -VXv or -VShm for this stream. Exiting...\n"); exit(1); } - } static void dxr3_display_frame (vo_driver_t *this_gen, vo_frame_t *frame) @@ -473,7 +472,7 @@ static void gather_screen_vars(dxr3_driver_t *this, x11_visual_t *vis) } this->overlay.screen_depth = DisplayPlanes(this->display, scrn); - this->request_dest_size = vis->request_dest_size; + this->request_dest_size = (void *)vis->request_dest_size; printf("xres %d yres %d depth %d\n", this->overlay.screen_xres, this->overlay.screen_yres, this->overlay.screen_depth); } |