October 2005 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main AUTHORS,1.163,1.164
by syncmail＠mplayerhq.hu 29 Oct '05

29 Oct '05

CVS change done by Reynaldo H. Verdejo CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv9453 Modified Files: AUTHORS Log Message: Updating little things I have done so far Index: AUTHORS =================================================================== RCS file: /cvsroot/mplayer/main/AUTHORS,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- AUTHORS 1 Oct 2005 11:16:02 -0000 1.163 +++ AUTHORS 29 Oct 2005 23:45:48 -0000 1.164 @@ -742,6 +742,8 @@ Verdejo Pinochet, Reynaldo H. (reynaldo) <reynaldo(a)opendot.cl> * improved EDL support * mp_msg transition on unmaintained libao2 drivers + * translatables to help_mp on input/libmpdemux + * .wpl playlist support hack Wigren, Per <wigren(a)home.se> * bmovl - Bitmap Overlay video filter

1 0

CVS: main playtreeparser.c,1.31,1.32
by syncmail＠mplayerhq.hu 28 Oct '05

28 Oct '05

CVS change done by Reynaldo H. Verdejo CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv22965 Modified Files: playtreeparser.c Log Message: preliminary support for wpl playlists, closes #362 Index: playtreeparser.c =================================================================== RCS file: /cvsroot/mplayer/main/playtreeparser.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- playtreeparser.c 10 Sep 2004 20:53:22 -0000 1.31 +++ playtreeparser.c 28 Oct 2005 22:12:20 -0000 1.32 @@ -436,7 +436,7 @@ strstrip(line); if(line[0] == '\0') // Ignore empties continue; - if (strncasecmp(line,"<smil",5)==0) + if (strncasecmp(line,"<smil",5)==0 || strncasecmp(line,"<?wpl",5)==0) break; // smil header found else return NULL; //line not smil exit @@ -452,7 +452,7 @@ if (line[0]=='\0') continue; if (!entrymode) { // all entries filled so far - if (strncasecmp(line,"<video",6)==0 || strncasecmp(line,"<audio",6)==0) { + if (strncasecmp(line,"<video",6)==0 || strncasecmp(line,"<audio",6)==0 || strncasecmp(line,"<media",6)) { pos=strstr(line,"src="); // Is source present on this line if (pos !=NULL) { s_start=pos+5;

1 0

CVS: main/libmpdemux cache2.c,1.29,1.30
by syncmail＠mplayerhq.hu 27 Oct '05

27 Oct '05

CVS change done by Oded Shimon CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv23882/libmpdemux Modified Files: cache2.c Log Message: add a \n after whole cache fill. Index: cache2.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cache2.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- cache2.c 18 Oct 2005 11:11:25 -0000 1.29 +++ cache2.c 27 Oct 2005 06:55:05 -0000 1.30 @@ -299,6 +299,7 @@ if(mp_input_check_interrupt(PREFILL_SLEEP_TIME)) return 0; } + mp_msg(MSGT_CACHE,MSGL_STATUS,"\n"); return 1; // parent exits }

1 0

CVS: main ChangeLog,1.259,1.260
by syncmail＠mplayerhq.hu 26 Oct '05

26 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv32738 Modified Files: ChangeLog Log Message: updates Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- ChangeLog 21 Oct 2005 14:44:13 -0000 1.259 +++ ChangeLog 26 Oct 2005 22:57:15 -0000 1.260 @@ -112,7 +112,7 @@ * enabled hinting for TrueType fonts * support for file:// syntax * -fb option removed, use the device suboption of -vo fbdev/fbdev2 instead - * full gcc 4 support for IA-32 and AMD-64 ports + * full gcc 4 support * TOOLS/vobshift.py: vobsub time-adjust tool * TOOLS/psnr-video.sh: computes PSNR between two existing video files * fixed auto-insertion of lavc encoder (for DXR2/3 and DVB) @@ -123,7 +123,9 @@ * fixed ugly looking OSD with -vo gl2 and MMX * -rawaudio/-rawvideo requires -demuxer rawaudio/-demuxer rawvideo * libdvdcss updated to 1.2.9 - * configure check and compiler optimization options for VIA C3 + * ~/.dvdcss is used instead of ~/.mplayer/DVDKeys for cached CSS keys + * configure check and compiler optimizations for VIA C3 and Pentium-M + * configure check and compiler optimizations for AMD-64 extended * configure can now run with cross compiling, new configure option --enable-cross-compile

1 0

CVS: main/DOCS/tech MAINTAINERS,1.60,1.61
by syncmail＠mplayerhq.hu 26 Oct '05

26 Oct '05

CVS change done by Reynaldo H. Verdejo CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv13334/DOCS/tech Modified Files: MAINTAINERS Log Message: make myself console help messages maintainter at diego's request Index: MAINTAINERS =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/MAINTAINERS,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- MAINTAINERS 17 Oct 2005 08:50:37 -0000 1.60 +++ MAINTAINERS 26 Oct 2005 22:52:41 -0000 1.61 @@ -29,7 +29,7 @@ * MPlayer docs: Diego Biurrun * MEncoder docs: Guillaume Poirier * man page: Diego Biurrun - * Help Messages: Diego Biurrun + * Help Messages: Reynaldo H. Verdejo Pinochet * input layer, LIRC, slave mode docs: Alban Bedel * tech/* docs: Alex Beregszaszi * tech/* documentation docs: Diego Biurrun

1 0

CVS: main configure,1.1095,1.1096
by syncmail＠mplayerhq.hu 26 Oct '05

26 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv2947 Modified Files: configure Log Message: gcc -dumpmachine outputs x86_64-something on some machines and amd64-something on others. Handle both cases. Fixes bug #325. patch by Pawel Sakowski < pawel __ dot __ sakowski __ dot __ pl > Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1095 retrieving revision 1.1096 diff -u -r1.1095 -r1.1096 --- configure 25 Oct 2005 13:28:07 -0000 1.1095 +++ configure 26 Oct 2005 20:40:19 -0000 1.1096 @@ -516,7 +516,7 @@ i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;; ia64) host_arch=ia64 ;; x86_64|amd64) - if [ "`$_cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \ + if [ -n "`$_cc -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p'`" -a \ -z "`echo $CFLAGS | grep -- -m32`" ]; then host_arch=x86_64 else

1 0

CVS: main/libvo vo_dfbmga.c,1.28,1.29
by syncmail＠mplayerhq.hu 26 Oct '05

26 Oct '05

CVS change done by Ville Syrjälä CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv12816 Modified Files: vo_dfbmga.c Log Message: Added support for remote controls. Index: vo_dfbmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dfbmga.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- vo_dfbmga.c 5 Aug 2005 01:24:36 -0000 1.28 +++ vo_dfbmga.c 26 Oct 2005 07:41:41 -0000 1.29 @@ -83,6 +83,7 @@ static DFBRectangle *subrect; static IDirectFBInputDevice *keyboard; +static IDirectFBInputDevice *remote; static IDirectFBEventBuffer *buffer; static int blit_done; @@ -92,6 +93,7 @@ static int use_crtc2; static int use_spic; static int use_input; +static int use_remote; static int field_parity; static int flipping; static DFBDisplayLayerBufferMode buffermode; @@ -269,6 +271,10 @@ force_input = !opt_no; vo_subdevice += 5; opt_no = 0; + } else if (!strncmp(vo_subdevice, "remote", 6)) { + use_remote = !opt_no; + vo_subdevice += 6; + opt_no = 0; } else if (!strncmp(vo_subdevice, "buffermode=", 11)) { if (opt_no) { show_help = 1; @@ -360,6 +366,7 @@ " crtc2 Use CRTC2\n" " spic Use hardware sub-picture for OSD\n" " input Use DirectFB for keyboard input\n" + " remote Use DirectFB for remote control input\n" "\nOther options:\n" " buffermode=(single|double|triple)\n" " single Use single buffering\n" @@ -498,6 +505,16 @@ } } + if (use_input || use_remote) { + if ((res = dfb->CreateEventBuffer( dfb, &buffer )) != DFB_OK) { + mp_msg( MSGT_VO, MSGL_ERR, + "vo_dfbmga: Can't create event buffer - %s\n", + DirectFBErrorString( res ) ); + uninit(); + return -1; + } + } + if (use_input) { if ((res = dfb->GetInputDevice( dfb, DIDID_KEYBOARD, &keyboard )) != DFB_OK) { mp_msg( MSGT_VO, MSGL_ERR, @@ -506,15 +523,31 @@ uninit(); return -1; } - if ((res = keyboard->CreateEventBuffer( keyboard, &buffer )) != DFB_OK) { + if ((res = keyboard->AttachEventBuffer( keyboard, buffer )) != DFB_OK) { mp_msg( MSGT_VO, MSGL_ERR, - "vo_dfbmga: Can't create event buffer - %s\n", + "vo_dfbmga: Can't attach event buffer to keyboard - %s\n", DirectFBErrorString( res ) ); uninit(); return -1; } } - + if (use_remote) { + if ((res = dfb->GetInputDevice( dfb, DIDID_REMOTE, &remote )) != DFB_OK) { + mp_msg( MSGT_VO, MSGL_ERR, + "vo_dfbmga: Can't get remote control - %s\n", + DirectFBErrorString( res ) ); + uninit(); + return -1; + } + if ((res = remote->AttachEventBuffer( remote, buffer )) != DFB_OK) { + mp_msg( MSGT_VO, MSGL_ERR, + "vo_dfbmga: Can't attach event buffer to remote control - %s\n", + DirectFBErrorString( res ) ); + uninit(); + return -1; + } + } + return 0; } @@ -1155,6 +1188,8 @@ if (buffer) buffer->Release( buffer ); + if (remote) + remote->Release( remote ); if (keyboard) keyboard->Release( keyboard ); if (crtc2) @@ -1167,6 +1202,7 @@ dfb->Release( dfb ); buffer = NULL; + remote = NULL; keyboard = NULL; crtc2 = NULL; bes = NULL; @@ -1396,7 +1432,7 @@ { DFBInputEvent event; - if (!use_input) + if (!buffer) return; if (buffer->GetEvent( buffer, DFB_EVENT( &event )) == DFB_OK) { @@ -1435,6 +1471,37 @@ case DIKS_END: mplayer_put_key( KEY_END ); break; + + case DIKS_POWER: + mplayer_put_key( 'q' ); + break; + case DIKS_MENU: + mplayer_put_key( 'o' ); + break; + case DIKS_PLAY: + case DIKS_STOP: + case DIKS_PAUSE: + case DIKS_PLAYPAUSE: + mplayer_put_key( ' ' ); + break; + case DIKS_FORWARD: + case DIKS_NEXT: + mplayer_put_key( KEY_PAGE_UP ); + break; + case DIKS_REWIND: + case DIKS_PREVIOUS: + mplayer_put_key( KEY_PAGE_DOWN ); + break; + case DIKS_VOLUME_UP: + mplayer_put_key( '0' ); + break; + case DIKS_VOLUME_DOWN: + mplayer_put_key( '9' ); + break; + case DIKS_MUTE: + mplayer_put_key( 'm' ); + break; + default: mplayer_put_key( event.key_symbol ); }

5 6

[MPlayer-cvslog] CVS: main/libmenu menu.c, 1.11, 1.12 menu_cmdlist.c, 1.2, 1.3 menu_console.c, 1.11, 1.12 menu_dvbin.c, 1.3, 1.4 menu_filesel.c, 1.11, 1.12 menu_list.c, 1.4, 1.5 menu_param.c, 1.3, 1.4 menu_pt.c, 1.3, 1.4 menu_txt.c, 1.2, 1.3 vf_menu.c, 1.11, 1.12
by syncmail＠mplayerhq.hu 26 Oct '05

26 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libmenu In directory mail:/var2/tmp/cvs-serv3848 Modified Files: menu.c menu_cmdlist.c menu_console.c menu_dvbin.c menu_filesel.c menu_list.c menu_param.c menu_pt.c menu_txt.c vf_menu.c Log Message: Unify include paths, -I.. is in CFLAGS. Index: menu.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/menu.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- menu.c 16 Aug 2003 09:50:45 -0000 1.11 +++ menu.c 26 Oct 2005 00:07:43 -0000 1.12 @@ -1,5 +1,5 @@ -#include "../config.h" +#include "config.h" #include <stdlib.h> #include <stdio.h> @@ -7,16 +7,16 @@ #include <fcntl.h> #include <unistd.h> -#include "../libvo/osd.h" -#include "../libvo/font_load.h" -#include "../osdep/keycodes.h" -#include "../asxparser.h" -#include "../libmpdemux/stream.h" +#include "libvo/osd.h" +#include "libvo/font_load.h" +#include "osdep/keycodes.h" +#include "asxparser.h" +#include "libmpdemux/stream.h" #include "img_format.h" #include "mp_image.h" -#include "../m_option.h" -#include "../m_struct.h" +#include "m_option.h" +#include "m_struct.h" #include "menu.h" extern menu_info_t menu_info_cmdlist; Index: menu_cmdlist.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/menu_cmdlist.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- menu_cmdlist.c 28 Dec 2002 18:51:09 -0000 1.2 +++ menu_cmdlist.c 26 Oct 2005 00:07:43 -0000 1.3 @@ -1,5 +1,5 @@ -#include "../config.h" +#include "config.h" #include <stdlib.h> #include <stdio.h> @@ -9,16 +9,16 @@ #include "img_format.h" #include "mp_image.h" -#include "../m_option.h" -#include "../m_struct.h" -#include "../asxparser.h" +#include "m_option.h" +#include "m_struct.h" +#include "asxparser.h" #include "menu.h" #include "menu_list.h" -#include "../libvo/font_load.h" +#include "libvo/font_load.h" -#include "../input/input.h" -#include "../version.h" +#include "input/input.h" +#include "version.h" Index: menu_console.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/menu_console.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- menu_console.c 2 Dec 2004 14:37:16 -0000 1.11 +++ menu_console.c 26 Oct 2005 00:07:43 -0000 1.12 @@ -1,5 +1,5 @@ -#include "../config.h" +#include "config.h" #include <stdlib.h> #include <stdio.h> @@ -16,14 +16,14 @@ #include "img_format.h" #include "mp_image.h" -#include "../m_struct.h" -#include "../m_option.h" +#include "m_struct.h" +#include "m_option.h" #include "menu.h" -#include "../libvo/font_load.h" -#include "../osdep/keycodes.h" -#include "../input/input.h" -#include "../osdep/timer.h" +#include "libvo/font_load.h" +#include "osdep/keycodes.h" +#include "input/input.h" +#include "osdep/timer.h" typedef struct history_st history_t; Index: menu_dvbin.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/menu_dvbin.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- menu_dvbin.c 26 Apr 2004 21:20:37 -0000 1.3 +++ menu_dvbin.c 26 Oct 2005 00:07:43 -0000 1.4 @@ -11,20 +11,20 @@ #include <limits.h> -#include "../config.h" +#include "config.h" -#include "../m_struct.h" -#include "../m_option.h" +#include "m_struct.h" +#include "m_option.h" #include "img_format.h" #include "mp_image.h" #include "menu.h" #include "menu_list.h" -#include "../input/input.h" -#include "../osdep/keycodes.h" +#include "input/input.h" +#include "osdep/keycodes.h" -#include "../libmpdemux/dvbin.h" +#include "libmpdemux/dvbin.h" Index: menu_filesel.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/menu_filesel.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- menu_filesel.c 22 Jul 2005 22:52:13 -0000 1.11 +++ menu_filesel.c 26 Oct 2005 00:07:43 -0000 1.12 @@ -11,18 +11,18 @@ #include <limits.h> -#include "../config.h" +#include "config.h" -#include "../m_struct.h" -#include "../m_option.h" +#include "m_struct.h" +#include "m_option.h" #include "img_format.h" #include "mp_image.h" #include "menu.h" #include "menu_list.h" -#include "../input/input.h" -#include "../osdep/keycodes.h" +#include "input/input.h" +#include "osdep/keycodes.h" struct list_entry_s { struct list_entry p; Index: menu_list.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/menu_list.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- menu_list.c 24 Sep 2003 07:35:59 -0000 1.4 +++ menu_list.c 26 Oct 2005 00:07:43 -0000 1.5 @@ -4,7 +4,7 @@ #include <ctype.h> #include <string.h> -#include "../config.h" +#include "config.h" #include "img_format.h" #include "mp_image.h" @@ -12,8 +12,8 @@ #include "m_struct.h" #include "menu.h" -#include "../libvo/font_load.h" -#include "../osdep/keycodes.h" +#include "libvo/font_load.h" +#include "osdep/keycodes.h" #define IMPL 1 #include "menu_list.h" Index: menu_param.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/menu_param.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- menu_param.c 13 Sep 2003 18:02:20 -0000 1.3 +++ menu_param.c 26 Oct 2005 00:07:43 -0000 1.4 @@ -9,20 +9,20 @@ #include <ctype.h> -#include "../config.h" +#include "config.h" -#include "../m_struct.h" -#include "../m_option.h" -#include "../m_config.h" -#include "../asxparser.h" +#include "m_struct.h" +#include "m_option.h" +#include "m_config.h" +#include "asxparser.h" #include "img_format.h" #include "mp_image.h" #include "menu.h" #include "menu_list.h" -#include "../input/input.h" -#include "../osdep/keycodes.h" +#include "input/input.h" +#include "osdep/keycodes.h" struct list_entry_s { struct list_entry p; Index: menu_pt.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/menu_pt.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- menu_pt.c 26 Jan 2003 15:55:35 -0000 1.3 +++ menu_pt.c 26 Oct 2005 00:07:43 -0000 1.4 @@ -4,19 +4,19 @@ #include <string.h> //#include <libgen.h> -#include "../config.h" +#include "config.h" #include "img_format.h" #include "mp_image.h" -#include "../m_struct.h" -#include "../m_option.h" +#include "m_struct.h" +#include "m_option.h" #include "menu.h" #include "menu_list.h" -#include "../playtree.h" -#include "../input/input.h" +#include "playtree.h" +#include "input/input.h" #define mp_basename(s) (strrchr((s),'/')==NULL?(char*)(s):(strrchr((s),'/')+1)) Index: menu_txt.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/menu_txt.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- menu_txt.c 9 Feb 2003 20:18:20 -0000 1.2 +++ menu_txt.c 26 Oct 2005 00:07:43 -0000 1.3 @@ -1,5 +1,5 @@ -#include "../config.h" +#include "config.h" #include <stdlib.h> #include <stdio.h> @@ -8,12 +8,12 @@ #include "img_format.h" #include "mp_image.h" -#include "../m_struct.h" -#include "../m_option.h" +#include "m_struct.h" +#include "m_option.h" #include "menu.h" -#include "../libvo/font_load.h" -#include "../osdep/keycodes.h" +#include "libvo/font_load.h" +#include "osdep/keycodes.h" struct menu_priv_s { char** lines; Index: vf_menu.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/vf_menu.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vf_menu.c 2 Oct 2004 12:17:28 -0000 1.11 +++ vf_menu.c 26 Oct 2005 00:07:43 -0000 1.12 @@ -1,5 +1,5 @@ -#include "../config.h" +#include "config.h" #include <stdio.h> #include <stdlib.h> @@ -9,17 +9,17 @@ #include <malloc.h> #endif -#include "../mp_msg.h" +#include "mp_msg.h" -#include "../libmpcodecs/img_format.h" -#include "../libmpcodecs/mp_image.h" -#include "../libmpcodecs/vf.h" - -#include "../libvo/fastmemcpy.h" -#include "../libvo/video_out.h" -#include "../libvo/font_load.h" -#include "../input/input.h" -#include "../m_struct.h" +#include "libmpcodecs/img_format.h" +#include "libmpcodecs/mp_image.h" +#include "libmpcodecs/vf.h" + +#include "libvo/fastmemcpy.h" +#include "libvo/video_out.h" +#include "libvo/font_load.h" +#include "input/input.h" +#include "m_struct.h" #include "menu.h" extern vo_functions_t* video_out;

1 0

CVS: main/input input.c,1.123,1.124
by syncmail＠mplayerhq.hu 25 Oct '05

25 Oct '05

CVS change done by Reynaldo H. Verdejo CVS Update of /cvsroot/mplayer/main/input In directory mail:/var2/tmp/cvs-serv23516/input Modified Files: input.c Log Message: translatable eng strings to new section on help_mp-en Index: input.c =================================================================== RCS file: /cvsroot/mplayer/main/input/input.c,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- input.c 18 Oct 2005 11:11:24 -0000 1.123 +++ input.c 25 Oct 2005 18:46:25 -0000 1.124 @@ -20,8 +20,8 @@ #include "../osdep/getch2.h" #include "../osdep/keycodes.h" #include "../osdep/timer.h" -#include "../mp_msg.h" -#include "../help_mp.h" +#include "mp_msg.h" +#include "help_mp.h" #include "../m_config.h" #include "../m_option.h" @@ -470,7 +470,7 @@ int mp_input_add_cmd_fd(int fd, int select, mp_cmd_func_t read_func, mp_close_func_t close_func) { if(num_cmd_fd == MP_MAX_CMD_FD) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Too many command fds, unable to register fd %d.\n",fd); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantRegister2ManyCmdFds,fd); return 0; } @@ -526,7 +526,7 @@ int mp_input_add_key_fd(int fd, int select, mp_key_func_t read_func, mp_close_func_t close_func) { if(num_key_fd == MP_MAX_KEY_FD) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Too many key fds, unable to register fd %d.\n",fd); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantRegister2ManyKeyFds,fd); return 0; } @@ -597,7 +597,7 @@ errno = 0; cmd->args[i].v.i = atoi(ptr); if(errno != 0) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Command %s: argument %d isn't an integer.\n",cmd_def->name,i+1); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrArgMustBeInt,cmd_def->name,i+1); ptr = NULL; } break; @@ -605,7 +605,7 @@ errno = 0; cmd->args[i].v.f = atof(ptr); if(errno != 0) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Command %s: argument %d isn't a float.\n",cmd_def->name,i+1); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrArgMustBeFloat,cmd_def->name,i+1); ptr = NULL; } break; @@ -627,7 +627,7 @@ } if(term != ' ' && (!e || e[0] == '\0')) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Command %s: argument %d is unterminated.\n",cmd_def->name,i+1); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnterminatedArg,cmd_def->name,i+1); ptr = NULL; break; } else if(!e) e = ptr+strlen(ptr); @@ -647,14 +647,14 @@ ptr = NULL; break; default : - mp_msg(MSGT_INPUT,MSGL_ERR,"Unknown argument %d\n",i); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnknownArg,i); } } cmd->nargs = i; if(cmd_def->nargs > cmd->nargs) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Got command '%s' but\n",str); - mp_msg(MSGT_INPUT,MSGL_ERR,"command %s requires at least %d arguments, we found only %d so far.\n",cmd_def->name,cmd_def->nargs,cmd->nargs); +/* mp_msg(MSGT_INPUT,MSGL_ERR,"Got command '%s' but\n",str); */ + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_Err2FewArgs,cmd_def->name,cmd_def->nargs,cmd->nargs); mp_cmd_free(cmd); return NULL; } @@ -707,7 +707,7 @@ switch(r) { case MP_INPUT_ERROR: case MP_INPUT_DEAD: - mp_msg(MSGT_INPUT,MSGL_ERR,"Error while reading cmd fd %d: %s\n",mp_fd->fd,strerror(errno)); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrReadingCmdFd,mp_fd->fd,strerror(errno)); case MP_INPUT_NOTHING: return r; case MP_INPUT_RETRY: @@ -734,7 +734,7 @@ if(!end) { // If buffer is full we must drop all until the next \n if(mp_fd->size - mp_fd->pos <= 1) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Cmd buffer of fd %d is full: dropping content\n",mp_fd->fd); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCmdBufferFullDroppingContent,mp_fd->fd); mp_fd->pos = 0; mp_fd->flags |= MP_FD_DROP; } @@ -845,7 +845,7 @@ } ret = mp_input_parse_cmd(cmd); if(!ret) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Invalid command for bound key %s",mp_input_get_key_name(key_down[0])); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrInvalidCommandForKey,mp_input_get_key_name(key_down[0])); if( num_key_down > 1) { unsigned int s; for(s=1; s < num_key_down; s++) @@ -906,7 +906,7 @@ if(select(max_fd+1,&fds,NULL,NULL,time_val) < 0) { if(errno == EINTR) continue; - mp_msg(MSGT_INPUT,MSGL_ERR,"Select error: %s\n",strerror(errno)); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrSelect,strerror(errno)); } break; } @@ -940,9 +940,9 @@ return code; if(code == MP_INPUT_ERROR) - mp_msg(MSGT_INPUT,MSGL_ERR,"Error on key input fd %d\n",key_fds[i].fd); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrOnKeyInFd,key_fds[i].fd); else if(code == MP_INPUT_DEAD) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Dead key input on fd %d\n",key_fds[i].fd); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrDeadKeyOnFd,key_fds[i].fd); key_fds[i].flags |= MP_FD_DEAD; } } @@ -969,7 +969,7 @@ // key pushed if(code & MP_KEY_DOWN) { if(num_key_down > MP_MAX_KEY_DOWN) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Too many key down events at the same time\n"); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_Err2ManyKeyDowns); continue; } code &= ~MP_KEY_DOWN; @@ -995,7 +995,7 @@ } if(j == num_key_down) { // key was not in the down keys : add it if(num_key_down > MP_MAX_KEY_DOWN) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Too many key down events at the same time\n"); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_Err2ManyKeyDowns); continue; } key_down[num_key_down] = code; @@ -1090,7 +1090,7 @@ if(i < 0) { if(errno == EINTR) continue; - mp_msg(MSGT_INPUT,MSGL_ERR,"Select error: %s\n",strerror(errno)); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrSelect,strerror(errno)); } if(!got_cmd) return NULL; @@ -1116,7 +1116,7 @@ r = mp_input_read_cmd(&cmd_fds[i],&cmd); if(r < 0) { if(r == MP_INPUT_ERROR) - mp_msg(MSGT_INPUT,MSGL_ERR,"Error on cmd fd %d\n",cmd_fds[i].fd); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrOnCmdFd,cmd_fds[i].fd); else if(r == MP_INPUT_DEAD) cmd_fds[i].flags |= MP_FD_DEAD; continue; @@ -1373,7 +1373,7 @@ if(r < 0) { if(errno == EINTR) continue; - mp_msg(MSGT_INPUT,MSGL_ERR,"Error while reading input config file %s: %s\n",file,strerror(errno)); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrReadingInputConfig,file,strerror(errno)); mp_input_free_binds(binds); close(fd); return 0; @@ -1431,9 +1431,9 @@ if(end[0] == '\0') { // Key name doesn't fit in the buffer if(buffer == iter) { if(eof && (buffer-iter) == bs) - mp_msg(MSGT_INPUT,MSGL_ERR,"Unfinished binding %s\n",iter); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnfinishedBinding,iter); else - mp_msg(MSGT_INPUT,MSGL_ERR,"Buffer is too small for this key name: %s\n",iter); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForKeyName,iter); mp_input_free_binds(binds); return 0; } @@ -1446,7 +1446,7 @@ strncpy(name,iter,end-iter); name[end-iter] = '\0'; if(! mp_input_get_input_from_name(name,keys)) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Unknown key '%s'\n",name); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnknownKey,name); mp_input_free_binds(binds); close(fd); return 0; @@ -1461,7 +1461,7 @@ // Found new line if(iter[0] == '\n' || iter[0] == '\r') { int i; - mp_msg(MSGT_INPUT,MSGL_ERR,"No command found for key %s" ,mp_input_get_key_name(keys[0])); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrNoCmdForKey,mp_input_get_key_name(keys[0])); for(i = 1; keys[i] != 0 ; i++) mp_msg(MSGT_INPUT,MSGL_ERR,"-%s",mp_input_get_key_name(keys[i])); mp_msg(MSGT_INPUT,MSGL_ERR,"\n"); @@ -1476,7 +1476,7 @@ /* NOTHING */; if(end[0] == '\0' && ! (eof && ((end+1) - buffer) == bs)) { if(iter == buffer) { - mp_msg(MSGT_INPUT,MSGL_ERR,"Buffer is too small for command %s\n",buffer); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrBuffer2SmallForCmd,buffer); mp_input_free_binds(binds); close(fd); return 0; @@ -1502,7 +1502,7 @@ continue; } } - mp_msg(MSGT_INPUT,MSGL_ERR,"What are we doing here?\n"); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrWhyHere); close(fd); return 0; } @@ -1540,7 +1540,7 @@ if(use_joystick) { int fd = mp_input_joystick_init(js_dev); if(fd < 0) - mp_msg(MSGT_INPUT,MSGL_ERR,"Can't init input joystick\n"); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantInitJoystick); else mp_input_add_key_fd(fd,1,mp_input_joystick_read,(mp_close_func_t)close); } @@ -1565,13 +1565,13 @@ if(in_file) { struct stat st; if(stat(in_file,&st)) - mp_msg(MSGT_INPUT,MSGL_ERR,"Can't stat %s: %s\n",in_file,strerror(errno)); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantStatFile,in_file,strerror(errno)); else { in_file_fd = open(in_file,S_ISFIFO(st.st_mode) ? O_RDWR : O_RDONLY); if(in_file_fd >= 0) mp_input_add_cmd_fd(in_file_fd,1,NULL,(mp_close_func_t)close); else - mp_msg(MSGT_INPUT,MSGL_ERR,"Can't open %s: %s\n",in_file,strerror(errno)); + mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrCantOpenFile,in_file,strerror(errno)); } }

2 1

CVS: main/debian rules,1.46,1.47
by syncmail＠mplayerhq.hu 25 Oct '05

25 Oct '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/debian In directory mail:/var2/tmp/cvs-serv12457/debian Modified Files: rules Log Message: Run dh_makeshlibs to create proper shlibs files and avoid warnings. patch by Paul TT < paultt ( at ) hackerjournal ( dot ) it > Index: rules =================================================================== RCS file: /cvsroot/mplayer/main/debian/rules,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- rules 18 Oct 2004 09:20:32 -0000 1.46 +++ rules 25 Oct 2005 22:13:36 -0000 1.47 @@ -69,7 +69,7 @@ dh_strip dh_compress dh_fixperms -# dh_makeshlibs + dh_makeshlibs dh_installdeb dh_perl dh_shlibdeps

1 0