diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/input_dvd.c | 21 | ||||
| -rw-r--r-- | src/video_out/video_out_sdl.c | 20 |
2 files changed, 33 insertions, 8 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 492afcfaa..0b890ab3f 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,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: input_dvd.c,v 1.160 2003/05/06 14:02:25 tchamp Exp $ + * $Id: input_dvd.c,v 1.161 2003/05/07 17:54:18 tchamp Exp $ * */ @@ -143,7 +143,11 @@ # ifndef _MSC_VER # define trace_print(s, ...) /* Nothing */ # else -# define trace_print printf +# ifdef INPUT_DEBUG_TRACE +# define trace_print printf +# else +# define trace_print() /* Nothing */ +# endif /* INPUT_DEBUG_TRACE */ # endif /* _MSC_VER */ #endif @@ -1244,14 +1248,16 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { intended_dvd_device = locator; intended_dvd_device[last_slash] = '\0'; locator += last_slash; + +#ifdef _MSC_VER + locator++; +#endif + }else{ intended_dvd_device=class->dvd_device; } -#ifdef _MSC_VER - if (*locator == '/') - locator++; -#else +#ifndef _MSC_VER locator++; #endif @@ -1621,6 +1627,9 @@ static void *init_class (xine_t *xine, void *data) { /* * $Log: input_dvd.c,v $ + * Revision 1.161 2003/05/07 17:54:18 tchamp + * DVD play sort of works on Win32. Also added a couple more plugings to the Win32 build. + * * Revision 1.160 2003/05/06 14:02:25 tchamp * This is some general Win32 cleanup and getting ready for DVD support. * diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 9ede5d8e0..511bb0aed 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.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_sdl.c,v 1.22 2003/02/13 19:04:52 heikos Exp $ + * $Id: video_out_sdl.c,v 1.23 2003/05/07 17:54:18 tchamp Exp $ * * video_out_sdl.c, Simple DirectMedia Layer * @@ -208,6 +208,12 @@ static void sdl_update_frame_format (vo_driver_t *this_gen, if (frame->overlay == NULL) return; + /* + * This needs to be done becuase I have found that + * pixels isn't setup until this is called. + */ + SDL_LockYUVOverlay (frame->overlay); + frame->vo_frame.pitches[0] = frame->overlay->pitches[0]; frame->vo_frame.pitches[1] = frame->overlay->pitches[2]; frame->vo_frame.pitches[2] = frame->overlay->pitches[1]; @@ -219,9 +225,12 @@ static void sdl_update_frame_format (vo_driver_t *this_gen, frame->height = height; frame->format = format; } + else { + + SDL_LockYUVOverlay (frame->overlay); + } frame->ratio_code = ratio_code; - SDL_LockYUVOverlay (frame->overlay); } @@ -590,3 +599,10 @@ plugin_info_t xine_plugin_info[] = { { PLUGIN_NONE, 0, "" , 0 , NULL, NULL} }; +#ifdef _MSC_VER +/* This probably really isn't needed! */ +vo_info_t * get_video_out_plugin_info() +{ + return &vo_info_sdl; +} +#endif
\ No newline at end of file |