Author: kraymer Date: Wed Nov 8 15:55:37 2006 New Revision: 20781 Modified: trunk/help/help_mp-en.h trunk/libvo/aspect.c trunk/libvo/vo_xv.c Log: MSGTRs for libvo/aspect.c and libvo/vo_xv.c Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h (original) +++ trunk/help/help_mp-en.h Wed Nov 8 15:55:37 2006 @@ -1683,6 +1683,10 @@ #define MSGTR_LIBVO_3DFX_DisplayInitialized "[VO_3DFX] Initialized: %p.\n" #define MSGTR_LIBVO_3DFX_UnknownSubdevice "[VO_3DFX] Unknown subdevice: %s.\n" +// libvo/aspect.c +#define MSGTR_LIBVO_ASPECT_NoSuitableNewResFound "[ASPECT] Warning: No suitable new res found!\n" +#define MSGTR_LIBVO_ASPECT_NoNewSizeFoundThatFitsIntoRes "[ASPECT] Error: No new size found that fits into res!\n" + // libvo/vo_dxr3.c #define MSGTR_LIBVO_DXR3_UnableToLoadNewSPUPalette "[VO_DXR3] Unable to load new SPU palette!\n" @@ -1898,6 +1902,19 @@ // libvo/vo_xv.c #define MSGTR_LIBVO_XV_DrawFrameCalled "[VO_XV] draw_frame() called!!!!!!\n" +#define MSGTR_LIBVO_XV_SharedMemoryNotSupported "[VO_XV] Shared memory not supported\nReverting to normal Xv.\n" +#define MSGTR_LIBVO_XV_XvNotSupportedByX11 "[VO_XV] Sorry, Xv not supported by this X11 version/driver\n[VO_XV] ******** Try with -vo x11 or -vo sdl *********\n" +#define MSGTR_LIBVO_XV_XvQueryAdaptorsFailed "[VO_XV] XvQueryAdaptors failed.\n" +#define MSGTR_LIBVO_XV_InvalidPortParameter "[VO_XV] Invalid port parameter, overriding with port 0.\n" +#define MSGTR_LIBVO_XV_CouldNotGrabPort "[VO_XV] Could not grab port %i.\n" +#define MSGTR_LIBVO_XV_CouldNotFindFreePort "[VO_XV] Could not find free Xvideo port - maybe another process is already\n"\ +"[VO_XV] using it. Close all video applications, and try again. If that does\n"\ +"[VO_XV] not help, see 'mplayer -vo help' for other (non-xv) video out drivers.\n" +#define MSGTR_LIBVO_XV_NoXvideoSupport "[VO_XV] It seems there is no Xvideo support for your video card available.\n"\ +"[VO_XV] Run 'xvinfo' to verify its Xv support and read\n"\ +"[VO_XV] DOCS/HTML/en/video.html#xv!\n"\ +"[VO_XV] See 'mplayer -vo help' for other (non-xv) video out drivers.\n"\ +"[VO_XV] Try -vo x11.\n" // stream/stream_radio.c Modified: trunk/libvo/aspect.c ============================================================================== --- trunk/libvo/aspect.c (original) +++ trunk/libvo/aspect.c Wed Nov 8 15:55:37 2006 @@ -3,6 +3,7 @@ #include "geometry.h" //#ifndef ASPECT_TEST #include "mp_msg.h" +#include "help_mp.h" //#endif //#define ASPECT_DEBUG @@ -103,9 +104,9 @@ *srcw = tmpw; }else{ #ifndef ASPECT_TEST - mp_msg(MSGT_VO,MSGL_WARN,"aspect: Warning: no suitable new res found!\n"); + mp_msg(MSGT_VO,MSGL_WARN,MSGTR_LIBVO_ASPECT_NoSuitableNewResFound); #else - mp_msg(MSGT_VO,MSGL_WARN,"error: no new size found that fits into res!\n"); + mp_msg(MSGT_VO,MSGL_WARN,MSGTR_LIBVO_ASPECT_NoNewSizeFoundThatFitsIntoRes); #endif } } Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c (original) +++ trunk/libvo/vo_xv.c Wed Nov 8 15:55:37 2006 @@ -180,7 +180,7 @@ if ((max_width != 0 && max_height != 0) && (image_width > max_width || image_height > max_height)) { - mp_msg( MSGT_VO, MSGL_ERR, "[xv] " MSGTR_VO_XV_ImagedimTooHigh, + mp_msg( MSGT_VO, MSGL_ERR, MSGTR_VO_XV_ImagedimTooHigh, image_width, image_height, max_width, max_height); return -1; } @@ -488,7 +488,7 @@ { Shmem_Flag = 0; mp_msg(MSGT_VO, MSGL_INFO, - "Shared memory not supported\nReverting to normal Xv\n"); + MSGTR_LIBVO_XV_SharedMemoryNotSupported); } if (Shmem_Flag) { @@ -844,9 +844,7 @@ if (Success != XvQueryExtension(mDisplay, &ver, &rel, &req, &ev, &err)) { mp_msg(MSGT_VO, MSGL_ERR, - "Sorry, Xv not supported by this X11 version/driver\n"); - mp_msg(MSGT_VO, MSGL_ERR, - "******** Try with -vo x11 or -vo sdl *********\n"); + MSGTR_LIBVO_XV_XvNotSupportedByX11); return -1; } @@ -855,7 +853,7 @@ XvQueryAdaptors(mDisplay, DefaultRootWindow(mDisplay), &adaptors, &ai)) { - mp_msg(MSGT_VO, MSGL_ERR, "Xv: XvQueryAdaptors failed\n"); + mp_msg(MSGT_VO, MSGL_ERR, MSGTR_LIBVO_XV_XvQueryAdaptorsFailed); return -1; } @@ -886,7 +884,7 @@ } else { mp_msg(MSGT_VO, MSGL_WARN, - "Xv: Invalid port parameter, overriding with port 0\n"); + MSGTR_LIBVO_XV_InvalidPortParameter); xv_port = 0; } } @@ -904,7 +902,7 @@ } else { mp_msg(MSGT_VO, MSGL_WARN, - "Xv: could not grab port %i\n", (int) xv_p); + MSGTR_LIBVO_XV_CouldNotGrabPort, (int) xv_p); ++busy_ports; } } @@ -913,14 +911,10 @@ { if (busy_ports) mp_msg(MSGT_VO, MSGL_ERR, - "Could not find free Xvideo port - maybe another process is already using it.\n" - "Close all video applications, and try again. If that does not help,\n" - "see 'mplayer -vo help' for other (non-xv) video out drivers.\n"); + MSGTR_LIBVO_XV_CouldNotFindFreePort); else mp_msg(MSGT_VO, MSGL_ERR, - "It seems there is no Xvideo support for your video card available.\n" - "Run 'xvinfo' to verify its Xv support and read DOCS/HTML/en/video.html#xv!\n" - "See 'mplayer -vo help' for other (non-xv) video out drivers. Try -vo x11\n"); + MSGTR_LIBVO_XV_NoXvideoSupport); return -1; }