diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-15 01:22:24 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-15 01:22:24 +0000 |
commit | 5141ea8aefeb0f6759836a9114408d80668f8e74 (patch) | |
tree | ef7a92926b83496b0d3a4208eb822010cab83e69 /Gui | |
parent | 85f6dfb5e8eb79c04f789914898c407a72e1a623 (diff) |
printf --> mp_msg conversion, less verbosity
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14157 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r-- | Gui/bitmap.c | 17 | ||||
-rw-r--r-- | Gui/cfg.c | 7 | ||||
-rw-r--r-- | Gui/interface.c | 18 | ||||
-rw-r--r-- | Gui/mplayer/mw.c | 4 | ||||
-rw-r--r-- | Gui/mplayer/widgets.c | 2 | ||||
-rw-r--r-- | Gui/skin/skin.c | 4 | ||||
-rw-r--r-- | Gui/wm/ws.c | 37 | ||||
-rw-r--r-- | Gui/wm/wsxdnd.c | 6 |
8 files changed, 50 insertions, 45 deletions
diff --git a/Gui/bitmap.c b/Gui/bitmap.c index 1cb1f2e2d0..e3c36d5359 100644 --- a/Gui/bitmap.c +++ b/Gui/bitmap.c @@ -4,7 +4,8 @@ #include <png.h> -#include "../../mp_msg.h" +#include "../mp_msg.h" +#include "../help_mp.h" #include "bitmap.h" int pngRead( unsigned char * fname,txSample * bf ) @@ -21,7 +22,7 @@ int pngRead( unsigned char * fname,txSample * bf ) FILE *fp=fopen( fname,"rb" ); if ( !fp ) { - mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] file read error ( %s ).\n",fname ); + mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] file read error ( %s )\n",fname ); return 1; } @@ -40,13 +41,13 @@ int pngRead( unsigned char * fname,txSample * bf ) row_p=(png_bytep *)malloc( sizeof( png_bytep ) * bf->Height ); if ( !row_p ) { - mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] Not enough memory for row buffer.\n" ); + mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] not enough memory for row buffer\n" ); return 2; } bf->Image=(png_bytep)malloc( png_get_rowbytes( png,info ) * bf->Height ); if ( !bf->Image ) { - mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] Not enough memory for image buffer.\n" ); + mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] not enough memory for image buffer\n" ); return 2; } for ( i=0; i < bf->Height; i++ ) row_p[i]=&bf->Image[png_get_rowbytes( png,info ) * i]; @@ -102,7 +103,7 @@ int conv24to32( txSample * bf ) bf->BPP=32; if ( ( bf->Image=malloc( bf->ImageSize ) ) == NULL ) { - mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] Not enough memory for image.\n" ); + mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] not enough memory for image\n" ); return 1; } memset( bf->Image,0,bf->ImageSize ); @@ -173,7 +174,7 @@ int bpRead( char * fname, txSample * bf ) if ( fname == NULL ) return -2; if ( pngRead( fname,bf ) ) { - mp_dbg( MSGT_GPLAYER,MSGL_FATAL,"[bitmap] Unknown file type ( %s ).\n",fname ); + mp_dbg( MSGT_GPLAYER,MSGL_FATAL,"[bitmap] unknown file type ( %s )\n",fname ); return -5; } if ( bf->BPP < 24 ) @@ -198,7 +199,7 @@ void Convert32to1( txSample * in,txSample * out,int adaptivlimit ) out->ImageSize=(out->Width * out->Height + 7) / 8; mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[c32to1] imagesize: %d\n",out->ImageSize ); out->Image=(char *)calloc( 1,out->ImageSize ); - if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[c32to1] Not enough memory for image.\n" ); + if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_NotEnoughMemoryC32To1 ); { int i,b,c=0; unsigned int * buf = NULL; unsigned char tmp = 0; int nothaveshape = 1; buf=(unsigned int *)in->Image; @@ -222,7 +223,7 @@ void Convert1to32( txSample * in,txSample * out ) out->ImageSize=out->Width * out->Height * 4; out->Image=(char *)calloc( 1,out->ImageSize ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[c1to32] imagesize: %d\n",out->ImageSize ); - if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[c1to32] Not enough memory for image.\n" ); + if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_NotEnoughMemoryC1To32 ); { int i,b,c=0; unsigned int * buf = NULL; unsigned char tmp = 0; buf=(unsigned int *)out->Image; @@ -5,6 +5,7 @@ #include "../config.h" #include "../mp_msg.h" +#include "../help_mp.h" #include "../mplayer.h" #include "../m_config.h" #include "../m_option.h" @@ -212,12 +213,12 @@ int cfg_read( void ) #endif // -- read configuration - mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[cfg] read config file: %s\n",cfg ); + mp_msg( MSGT_GPLAYER,MSGL_V,"[cfg] reading config file: %s\n",cfg ); gui_conf=m_config_new(); m_config_register_options( gui_conf,gui_opts ); if ( m_config_parse_config_file( gui_conf,cfg ) < 0 ) { - mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[cfg] config file read error ...\n" ); + mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_ConfigfileError ); // exit( 1 ); } free( cfg ); @@ -298,7 +299,7 @@ int cfg_write( void ) fprintf( f,"%s = \"%s\"\n",gui_opts[i].name, v); free(v); } else if((int)v == -1) - mp_msg(MSGT_GPLAYER,MSGL_WARN,"Unable to save the '%s' option\n", gui_opts[i].name); + mp_msg(MSGT_GPLAYER,MSGL_WARN,MSGTR_UnableToSaveOption, gui_opts[i].name); } fclose( f ); } diff --git a/Gui/interface.c b/Gui/interface.c index 9e3767bcc2..5645ca6515 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -185,13 +185,13 @@ void guiInit( void ) // --- load skin skinDirInHome=get_path("Skin"); skinMPlayerDir=MPLAYER_DATADIR "/Skin"; - printf("SKIN dir 1: '%s'\n",skinDirInHome); - printf("SKIN dir 2: '%s'\n",skinMPlayerDir); + mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1: '%s'\n",skinDirInHome); + mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2: '%s'\n",skinMPlayerDir); if ( !skinName ) skinName=strdup( "default" ); i = skinRead( skinName ); if ((i == -1) && strcmp(skinName,"default")) { - mp_msg( MSGT_GPLAYER,MSGL_INFO,"Selected skin ( %s ) not found, trying 'default'...\n", skinName); + mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_SKIN_SKINCFG_SelectedSkinNotFound, skinName); skinName=strdup( "default" ); i = skinRead( skinName ); } @@ -246,7 +246,7 @@ void guiInit( void ) wsXDNDMakeAwareness(&appMPlayer.mainWindow); #ifdef DEBUG - mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] Depth on screen: %d\n",wsDepthOnScreen ); + mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] depth on screen: %d\n",wsDepthOnScreen ); mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] parent: 0x%x\n",(int)appMPlayer.mainWindow.WindowID ); mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] sub: 0x%x\n",(int)appMPlayer.subWindow.WindowID ); #endif @@ -340,7 +340,7 @@ void guiInit( void ) void guiDone( void ) { mplMainRender=0; - mp_msg( MSGT_GPLAYER,MSGL_V,"[gui] done.\n" ); + mp_msg( MSGT_GPLAYER,MSGL_V,"[GUI] done.\n" ); if ( gui_save_pos ) { @@ -430,7 +430,7 @@ void guiLoadSubtitle( char * name ) } if ( subdata ) { - mp_msg( MSGT_GPLAYER,MSGL_INFO,"[gui] Delete subtitles.\n" ); + mp_msg( MSGT_GPLAYER,MSGL_INFO,MSGTR_DeletingSubtitles ); sub_free( subdata ); subdata=NULL; vo_sub=NULL; @@ -453,7 +453,7 @@ void guiLoadSubtitle( char * name ) } if ( name ) { - mp_msg( MSGT_GPLAYER,MSGL_INFO,"[gui] Load subtitle: %s\n",name ); + mp_msg( MSGT_GPLAYER,MSGL_INFO,MSGTR_LoadingSubtitles,name ); subdata=sub_read_file( gstrdup( name ), guiIntfStruct.FPS ); if ( !subdata ) mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_CantLoadSub,name ); sub_name = (malloc(2 * sizeof(char*))); //when mplayer will be restarted @@ -467,7 +467,7 @@ void guiLoadSubtitle( char * name ) static void add_vop( char * str ) { - mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] add video filter: %s\n",str ); + mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_AddingVideoFilter,str ); if ( vo_plugin_args ) { int i = 0; @@ -483,7 +483,7 @@ static void remove_vop( char * str ) if ( !vo_plugin_args ) return; - mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] remove video filter: %s\n",str ); + mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_RemovingVideoFilter,str ); while ( vo_plugin_args[n++].name ); n--; if ( n > -1 ) diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index b2c8f9615d..f7edb6b292 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -551,7 +551,7 @@ void mplDandDHandler(int num,char** files) if(stat(str,&buf) == 0 && S_ISDIR(buf.st_mode) == 0) { /* this is not a directory so try to play it */ - printf("Received D&D %s\n",str); + mp_msg( MSGT_GPLAYER,MSGL_V,"Received D&D %s\n",str ); /* check if it is a subtitle file */ { @@ -590,7 +590,7 @@ void mplDandDHandler(int num,char** files) } gtkSet(gtkAddPlItem,0,(void*)item); } else { - printf("Received not a file: %s !\n",str); + mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_NotAFile,str ); } free( str ); } diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c index 5bb92f8e41..907e7c990c 100644 --- a/Gui/mplayer/widgets.c +++ b/Gui/mplayer/widgets.c @@ -60,7 +60,7 @@ Pixmap guiIconMask; void gtkInit( void ) { - mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init gtk ...\n" ); + mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init GTK ...\n" ); gtk_set_locale(); gtk_init( 0,NULL ); // gdk_set_use_xshm( TRUE ); diff --git a/Gui/skin/skin.c b/Gui/skin/skin.c index 3fa2cfe966..3b619ed1a3 100644 --- a/Gui/skin/skin.c +++ b/Gui/skin/skin.c @@ -121,7 +121,7 @@ int cmd_window( char * in ) else if ( !strncmp( in,"sub",3 ) ) currSection=&skinAppMPlayer->sub; else if ( !strncmp( in,"playbar",7 ) ) { currSection=&skinAppMPlayer->bar; currSubItem=&skinAppMPlayer->NumberOfBarItems; currSubItems=skinAppMPlayer->barItems; } else if ( !strncmp( in,"menu",4 ) ) { currSection=&skinAppMPlayer->menuBase; currSubItem=&skinAppMPlayer->NumberOfMenuItems; currSubItems=skinAppMPlayer->MenuItems; } - else ERRORMESSAGE( "Unknown window type found ..." ); + else ERRORMESSAGE( MSGTR_UNKNOWNWINDOWTYPE ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"\n[skin] window: %s\n",window_name ); return 0; } @@ -676,7 +676,7 @@ int skinRead( char * dname ) setname( skinMPlayerDir,dname ); if ( ( skinFile = fopen( fn,"rt" ) ) == NULL ) { - mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[skin] file ( %s ) not found.\n",fn ); + mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_SkinFileNotFound,fn ); return -1; } } diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c index 186017ae6f..3af1af3ddb 100644 --- a/Gui/wm/ws.c +++ b/Gui/wm/ws.c @@ -27,6 +27,7 @@ #include "../../postproc/rgb2rgb.h" #include "../../libmpcodecs/vf_scale.h" #include "../../mp_msg.h" +#include "../../help_mp.h" #include "../../mplayer.h" #include <X11/extensions/XShm.h> @@ -168,7 +169,7 @@ void wsWindowDecoration( wsTWindow * win,long d ) int wsIOErrorHandler( Display * dpy ) { - fprintf( stderr,"[ws] io error in display.\n" ); + fprintf( stderr,"[ws] IO error in display.\n" ); exit( 0 ); } @@ -197,7 +198,7 @@ if(mDisplay){ wsDisplay=XOpenDisplay( DisplayName ); if ( !wsDisplay ) { - mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] couldn't open the display !\n" ); + mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_CouldNotOpenDisplay ); exit( 0 ); } } @@ -212,19 +213,19 @@ wsXDNDInitialize(); localdisp=0; wsUseXShm=0; } - mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Display name: %s => %s display.\n",dispname,localdisp?"local":"REMOTE"); - if (!localdisp) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] Remote display, disabling XMITSHM\n"); + mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[ws] display name: %s => %s display.\n",dispname,localdisp?"local":"REMOTE"); + if (!localdisp) mp_msg( MSGT_GPLAYER,MSGL_V,MSGTR_WS_RemoteDisplay ); } if ( !XShmQueryExtension( wsDisplay ) ) { - mp_msg( MSGT_GPLAYER,MSGL_ERR,"[ws] sorry, your system is not supported X shared memory extension.\n" ); + mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshm ); wsUseXShm=0; } #ifdef HAVE_XSHAPE if ( !XShapeQueryExtension( wsDisplay,&eventbase,&errorbase ) ) { - mp_msg( MSGT_GPLAYER,MSGL_ERR,"[ws] sorry, your system is not supported XShape extension.\n" ); + mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshape ); wsUseXShape=0; } #else @@ -247,7 +248,7 @@ wsXDNDInitialize(); wsOrgY = screens[xinerama_screen].y_org; wsMaxX=screens[xinerama_screen].width; wsMaxY=screens[xinerama_screen].height; - mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] screens %d Max %d, %d Org %d,%d\n", + mp_msg( MSGT_GPLAYER,MSGL_V,"[ws] screens %d Max %d, %d Org %d,%d\n", num_screens, wsMaxX, wsMaxY, wsOrgX, wsOrgY); XFree(screens); } @@ -391,7 +392,7 @@ void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,uns depth = vo_find_depth_from_visuals( wsDisplay,wsScreen,NULL ); if ( depth < 15 ) { - mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] sorry, this color depth is not enough.\n" ); + mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_ColorDepthTooLow ); exit( 0 ); } XMatchVisualInfo( wsDisplay,wsScreen,depth,TrueColor,&win->VisualInfo ); @@ -505,7 +506,7 @@ void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,uns for ( i=0;i < wsWLCount;i++ ) if ( wsWindowList[i] == NULL ) break; if ( i == wsWLCount ) - { mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] there are too many open windows\n" ); exit( 0 ); } + { mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_TooManyOpenWindows ); exit( 0 ); } wsWindowList[i]=win; } @@ -578,7 +579,7 @@ Bool wsEvents( Display * display,XEvent * Event,XPointer arg ) if ( (Atom)Event->xclient.data.l[0] == wsWindowList[l]->AtomTakeFocus ) { i=wsWindowFocusIn; wsWindowList[l]->Focused=wsFocused; goto expose; } if ( (Atom)Event->xclient.data.l[0] == wsWindowList[l]->AtomRolle ) - { mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] rolled.\n" ); } + { mp_msg( MSGT_GPLAYER,MSGL_V,"[ws] role set.\n" ); } } else { /* try to process DND events */ wsXDNDProcessClientMessage(wsWindowList[l],&Event->xclient); @@ -720,7 +721,7 @@ void wsHandleEvents( void ){ void wsMainLoop( void ) { int delay=20; - mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] init threads: %d\n",XInitThreads() ); + mp_msg( MSGT_GPLAYER,MSGL_V,"[ws] init threads: %d\n",XInitThreads() ); XSynchronize( wsDisplay,False ); XLockDisplay( wsDisplay ); // XIfEvent( wsDisplay,&wsEvent,wsEvents,NULL ); @@ -1115,14 +1116,14 @@ void wsCreateImage( wsTWindow * win,int Width,int Height ) win->VisualInfo.depth,ZPixmap,NULL,&win->Shminfo,Width,Height ); if ( win->xImage == NULL ) { - mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] shared memory extension error.\n" ); + mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_ShmError ); exit( 0 ); } win->Shminfo.shmid=shmget( IPC_PRIVATE,win->xImage->bytes_per_line * win->xImage->height,IPC_CREAT|0777 ); if ( win->Shminfo.shmid < 0 ) { XDestroyImage( win->xImage ); - mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] shared memory extension error.\n" ); + mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_ShmError ); exit( 0 ); } win->Shminfo.shmaddr=(char *)shmat( win->Shminfo.shmid,0,0 ); @@ -1131,7 +1132,7 @@ void wsCreateImage( wsTWindow * win,int Width,int Height ) { XDestroyImage( win->xImage ); if ( win->Shminfo.shmaddr != ((char *) -1) ) shmdt( win->Shminfo.shmaddr ); - mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] shared memory extension error.\n" ); + mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_ShmError ); exit( 0 ); } win->xImage->data=win->Shminfo.shmaddr; @@ -1147,7 +1148,7 @@ void wsCreateImage( wsTWindow * win,int Width,int Height ) 0 ); if ( ( win->xImage->data=malloc( win->xImage->bytes_per_line * win->xImage->height ) ) == NULL ) { - mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] sorry, not enough memory for draw buffer.\n" ); + mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_NotEnoughMemoryDrawBuffer ); exit( 0 ); } } @@ -1190,15 +1191,15 @@ void wsScreenSaverOn( Display *mDisplay ) { if ( DPMSQueryExtension( mDisplay,¬hing,¬hing ) ) { - if ( !DPMSEnable( mDisplay ) ) mp_msg( MSGT_GPLAYER,MSGL_ERR,"DPMS not available ?\n" ); // restoring power saving settings + if ( !DPMSEnable( mDisplay ) ) mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_DpmsUnavailable ); // restoring power saving settings else { // DPMS does not seem to be enabled unless we call DPMSInfo BOOL onoff; CARD16 state; DPMSInfo( mDisplay,&state,&onoff ); - if ( onoff ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"Successfully enabled DPMS.\n" ); - else mp_msg( MSGT_GPLAYER,MSGL_STATUS,"Could not enable DPMS.\n" ); + if ( onoff ) mp_msg( MSGT_GPLAYER,MSGL_V,"Successfully enabled DPMS.\n" ); + else mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_WS_DpmsNotEnabled ); } } } diff --git a/Gui/wm/wsxdnd.c b/Gui/wm/wsxdnd.c index b05c65abb5..339108e03c 100644 --- a/Gui/wm/wsxdnd.c +++ b/Gui/wm/wsxdnd.c @@ -11,6 +11,8 @@ #include <X11/Xatom.h> +#include "../../mp_msg.h" +#include "../../help_mp.h" #define XDND_VERSION 3L @@ -81,7 +83,7 @@ wsXDNDProcessSelection(wsTWindow* wnd, XEvent *event) XSendEvent(wsDisplay, selowner, 0, 0, &xevent); if (!delme){ - printf("D&D: Nothing returned!\n"); + mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_WS_DDNothing ); return False; } @@ -151,7 +153,7 @@ wsXDNDProcessClientMessage(wsTWindow* wnd, XClientMessageEvent *event) } } if (atom_support == None) { - printf("This doesn't seem as a file...\n"); + mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_WS_NotAFile ); } } else { /* need to check the whole list here */ |