From 5234c72e28c27e232a35ebcbadc50c5933cccf7d Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 7 Mar 2010 18:33:01 +0200 Subject: Restore collapsed whitespace in output messages For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which replaced translation macro names with the corresponding English strings, also collapsed multiple consecutive space characters into one. Change most of these back. In a couple of cases the amount of whitespace is important for alignment, and for the rest it at least keeps the strings closer to the existing translations. --- libaf/af_ladspa.c | 2 +- libao2/ao_oss.c | 2 +- libao2/ao_sun.c | 2 +- libmpcodecs/ad_libdv.c | 2 +- libmpcodecs/vf_cropdetect.c | 2 +- libmpdemux/aviheader.c | 2 +- libvo/vo_svga.c | 2 +- libvo/vo_xv.c | 2 +- loader/ldt_keeper.c | 2 +- m_config.c | 2 +- m_property.c | 2 +- mencoder.c | 8 ++++---- mplayer.c | 8 ++++---- stream/cache2.c | 2 +- stream/stream_cue.c | 2 +- stream/tv.c | 4 ++-- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/libaf/af_ladspa.c b/libaf/af_ladspa.c index 78a9be26d1..5c1392d543 100644 --- a/libaf/af_ladspa.c +++ b/libaf/af_ladspa.c @@ -213,7 +213,7 @@ static int af_ladspa_parse_plugin(af_ladspa_t *setup) { if (setup->ninputs == 0) { mp_msg(MSGT_AFILTER, MSGL_WARN, "%s: %s\n", setup->myname, - _("WARNING! This LADSPA plugin has no audio inputs.\n The incoming audio signal will be lost.")); + _("WARNING! This LADSPA plugin has no audio inputs.\n The incoming audio signal will be lost.")); } else if (setup->ninputs == 1) { mp_msg(MSGT_AFILTER, MSGL_V, "%s: this is a mono effect\n", setup->myname); } else if (setup->ninputs == 2) { diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index 58d3b233cc..b7f01678e0 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -420,7 +420,7 @@ ac3_retry: } free(data); if(ao_data.buffersize==0){ - mp_tmsg(MSGT_AO,MSGL_ERR,"[AO OSS]\n *** Your audio driver DOES NOT support select() ***\n Recompile MPlayer with #undef HAVE_AUDIO_SELECT in config.h !\n\n"); + mp_tmsg(MSGT_AO,MSGL_ERR,"[AO OSS]\n *** Your audio driver DOES NOT support select() ***\n Recompile MPlayer with #undef HAVE_AUDIO_SELECT in config.h !\n\n"); return 0; } #endif diff --git a/libao2/ao_sun.c b/libao2/ao_sun.c index 72353bc736..96104ef963 100644 --- a/libao2/ao_sun.c +++ b/libao2/ao_sun.c @@ -494,7 +494,7 @@ static int init(int rate,int channels,int format,int flags){ audio_fd=open(audio_dev, O_WRONLY); if(audio_fd<0){ - mp_tmsg(MSGT_AO, MSGL_ERR, "[AO SUN] Can't open audio device %s, %s -> nosound.\n", audio_dev, strerror(errno)); + mp_tmsg(MSGT_AO, MSGL_ERR, "[AO SUN] Can't open audio device %s, %s -> nosound.\n", audio_dev, strerror(errno)); return 0; } diff --git a/libmpcodecs/ad_libdv.c b/libmpcodecs/ad_libdv.c index 868d67303f..0ef885ec67 100644 --- a/libmpcodecs/ad_libdv.c +++ b/libmpcodecs/ad_libdv.c @@ -86,7 +86,7 @@ static int decode_audio(sh_audio_t *audio, unsigned char *buf, int minlen, int m dv_parse_header(decoder, dv_audio_frame); if(xx!=decoder->frame_size) - mp_tmsg(MSGT_GLOBAL,MSGL_WARN,"[AD_LIBDV] Warning! Audio framesize differs! read=%d hdr=%d.\n", + mp_tmsg(MSGT_GLOBAL,MSGL_WARN,"[AD_LIBDV] Warning! Audio framesize differs! read=%d hdr=%d.\n", xx, decoder->frame_size); if (dv_decode_full_audio(decoder, dv_audio_frame,(int16_t**) audioBuffers)) diff --git a/libmpcodecs/vf_cropdetect.c b/libmpcodecs/vf_cropdetect.c index 811df5416e..04aacd8602 100644 --- a/libmpcodecs/vf_cropdetect.c +++ b/libmpcodecs/vf_cropdetect.c @@ -135,7 +135,7 @@ if(++vf->priv->fno>0){ // ignore first 2 frames - they may be empty h -= shrink_by; y += (shrink_by / 2 + 1) & ~1; - mp_tmsg(MSGT_VFILTER, MSGL_INFO, "[CROP] Crop area: X: %d..%d Y: %d..%d (-vf crop=%d:%d:%d:%d).\n", + mp_tmsg(MSGT_VFILTER, MSGL_INFO, "[CROP] Crop area: X: %d..%d Y: %d..%d (-vf crop=%d:%d:%d:%d).\n", vf->priv->x1,vf->priv->x2, vf->priv->y1,vf->priv->y2, w,h,x,y); diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index a57f55997e..6cfd668051 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -454,7 +454,7 @@ while(1){ if(list_end>0 && chunksize+stream_tell(demuxer->stream) == list_end) list_end=0; if(list_end>0 && chunksize+stream_tell(demuxer->stream)>list_end){ - mp_tmsg(MSGT_HEADER,MSGL_V,"Broken chunk? chunksize=%d (id=%.4s)\n",chunksize,(char *) &id); + mp_tmsg(MSGT_HEADER,MSGL_V,"Broken chunk? chunksize=%d (id=%.4s)\n",chunksize,(char *) &id); stream_seek(demuxer->stream,list_end); list_end=0; } else diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c index ed68fd79a6..1223fed8f9 100644 --- a/libvo/vo_svga.c +++ b/libvo/vo_svga.c @@ -534,7 +534,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, if(vidix_name[0]){ vidix_init(width, height, x_pos, y_pos, modeinfo->width, modeinfo->height, format, mode_bpp, modeinfo->width,modeinfo->height); - mp_tmsg(MSGT_VO,MSGL_INFO, "[VO_SVGA] Using VIDIX. w=%i h=%i mw=%i mh=%i\n",width,height, + mp_tmsg(MSGT_VO,MSGL_INFO, "[VO_SVGA] Using VIDIX. w=%i h=%i mw=%i mh=%i\n",width,height, modeinfo->width,modeinfo->height); vidix_start(); /*set colorkey*/ diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 26e03a8941..54eecd2015 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -689,7 +689,7 @@ static int preinit(struct vo *vo, const char *arg) /* check for Xvideo extension */ unsigned int ver, rel, req, ev, err; if (Success != XvQueryExtension(x11->display, &ver, &rel, &req, &ev, &err)) { - mp_tmsg(MSGT_VO, MSGL_ERR, "[VO_XV] Sorry, Xv not supported by this X11 version/driver\n[VO_XV] ******** Try with -vo x11 or -vo sdl *********\n"); + mp_tmsg(MSGT_VO, MSGL_ERR, "[VO_XV] Sorry, Xv not supported by this X11 version/driver\n[VO_XV] ******** Try with -vo x11 or -vo sdl *********\n"); goto error; } diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c index 732d254a28..adbe9900c9 100644 --- a/loader/ldt_keeper.c +++ b/loader/ldt_keeper.c @@ -209,7 +209,7 @@ ldt_fs_t* Setup_LDT_Keeper(void) #ifdef __APPLE__ if (getenv("DYLD_BIND_AT_LAUNCH") == NULL) - mp_tmsg(MSGT_LOADER, MSGL_WARN, "WARNING: Attempting to use DLL codecs but environment variable\n DYLD_BIND_AT_LAUNCH not set. This will likely crash.\n"); + mp_tmsg(MSGT_LOADER, MSGL_WARN, "WARNING: Attempting to use DLL codecs but environment variable\n DYLD_BIND_AT_LAUNCH not set. This will likely crash.\n"); #endif /* __APPLE__ */ fs_seg= diff --git a/m_config.c b/m_config.c index 3f7d32407d..6260123bbb 100644 --- a/m_config.c +++ b/m_config.c @@ -411,7 +411,7 @@ m_config_print_option_list(m_config_t *config) { if(!config->opts) return; - mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "\n Name Type Min Max Global CL Cfg\n\n"); + mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "\n Name Type Min Max Global CL Cfg\n\n"); for(co = config->opts ; co ; co = co->next) { const m_option_t* opt = co->opt; if(opt->type->flags & M_OPT_TYPE_HAS_CHILD) continue; diff --git a/m_property.c b/m_property.c index b296aa1b87..12c2941417 100644 --- a/m_property.c +++ b/m_property.c @@ -181,7 +181,7 @@ void m_properties_print_help_list(const m_option_t* list) { char min[50],max[50]; int i,count = 0; - mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "\n Name Type Min Max\n\n"); + mp_tmsg(MSGT_CFGPARSER, MSGL_INFO, "\n Name Type Min Max\n\n"); for(i = 0 ; list[i].name ; i++) { const m_option_t* opt = &list[i]; if(opt->flags & M_OPT_MIN) diff --git a/mencoder.c b/mencoder.c index 908f9a80e4..25d1c77fbc 100644 --- a/mencoder.c +++ b/mencoder.c @@ -529,7 +529,7 @@ play_next_file: mencoder_exit(1,NULL); } - mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "success: format: %d data: 0x%X - 0x%x\n", file_format, (int)(stream->start_pos), (int)(stream->end_pos)); + mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "success: format: %d data: 0x%X - 0x%x\n", file_format, (int)(stream->start_pos), (int)(stream->end_pos)); #ifdef CONFIG_DVDREAD if(stream->type==STREAMTYPE_DVD){ @@ -607,7 +607,7 @@ sh_video=d_video->sh; mencoder_exit(1,NULL); } - mp_tmsg(MSGT_MENCODER,MSGL_INFO, "[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.3f ftime:=%6.4f\n", + mp_tmsg(MSGT_MENCODER,MSGL_INFO, "[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.3f ftime:=%6.4f\n", demuxer->file_format,sh_video->format, sh_video->disp_w,sh_video->disp_h, sh_video->fps,sh_video->frametime ); @@ -1556,10 +1556,10 @@ if(out_video_codec==VCODEC_FRAMENO && mux_v->timer>100){ mp_tmsg(MSGT_MENCODER, MSGL_INFO, "Recommended video bitrate for %s CD: %d\n","2 x 800MB",(int)((2*800*1024*1024-muxer_f_size)/mux_v->timer/125)); } -mp_tmsg(MSGT_MENCODER, MSGL_INFO, "\nVideo stream: %8.3f kbit/s (%d B/s) size: %"PRIu64" bytes %5.3f secs %d frames\n", +mp_tmsg(MSGT_MENCODER, MSGL_INFO, "\nVideo stream: %8.3f kbit/s (%d B/s) size: %"PRIu64" bytes %5.3f secs %d frames\n", (float)(mux_v->size/mux_v->timer*8.0f/1000.0f), (int)(mux_v->size/mux_v->timer), (uint64_t)mux_v->size, (float)mux_v->timer, decoded_frameno); if(sh_audio) -mp_tmsg(MSGT_MENCODER, MSGL_INFO, "\nAudio stream: %8.3f kbit/s (%d B/s) size: %"PRIu64" bytes %5.3f secs\n", +mp_tmsg(MSGT_MENCODER, MSGL_INFO, "\nAudio stream: %8.3f kbit/s (%d B/s) size: %"PRIu64" bytes %5.3f secs\n", (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), (uint64_t)mux_a->size, (float)mux_a->timer); if(sh_audio){ uninit_audio(sh_audio);sh_audio=NULL; } diff --git a/mplayer.c b/mplayer.c index acc7424f21..ed8bf4da83 100644 --- a/mplayer.c +++ b/mplayer.c @@ -2546,13 +2546,13 @@ static void pause_loop(struct MPContext *mpctx) // The pause string is: "\n == PAUSE == \r" so we need to // take the first and the last char out if (term_osd && !mpctx->sh_video) { - char msg[128] = _("\n ===== PAUSE =====\r"); + char msg[128] = _("\n ===== PAUSE =====\r"); int mlen = strlen(msg); msg[mlen-1] = '\0'; set_osd_msg(OSD_MSG_PAUSE, 1, 0, "%s", msg+1); update_osd_msg(mpctx); } else - mp_tmsg(MSGT_CPLAYER,MSGL_STATUS,"\n ===== PAUSE =====\r"); + mp_tmsg(MSGT_CPLAYER,MSGL_STATUS,"\n ===== PAUSE =====\r"); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_PAUSED\n"); } @@ -3785,7 +3785,7 @@ if(mpctx->sh_video){ mp_tmsg(MSGT_CPLAYER,MSGL_ERR,"Video: Cannot read properties.\n"); mpctx->sh_video=mpctx->d_video->sh=NULL; } else { - mp_tmsg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.3f ftime:=%6.4f\n", + mp_tmsg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.3f ftime:=%6.4f\n", mpctx->demuxer->file_format,mpctx->sh_video->format, mpctx->sh_video->disp_w,mpctx->sh_video->disp_h, mpctx->sh_video->fps,mpctx->sh_video->frametime ); @@ -3999,7 +3999,7 @@ if (!mpctx->sh_video && !mpctx->sh_audio) if(force_fps && mpctx->sh_video){ vo_fps = mpctx->sh_video->fps=force_fps; mpctx->sh_video->frametime=1.0f/mpctx->sh_video->fps; - mp_tmsg(MSGT_CPLAYER,MSGL_INFO,"FPS forced to be %5.3f (ftime: %5.3f).\n",mpctx->sh_video->fps,mpctx->sh_video->frametime); + mp_tmsg(MSGT_CPLAYER,MSGL_INFO,"FPS forced to be %5.3f (ftime: %5.3f).\n",mpctx->sh_video->fps,mpctx->sh_video->frametime); } mp_input_set_section(mpctx->input, NULL); diff --git a/stream/cache2.c b/stream/cache2.c index 70ba5d1c5a..057f3b803c 100644 --- a/stream/cache2.c +++ b/stream/cache2.c @@ -368,7 +368,7 @@ int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){ mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n", (int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,s->eof); while(s->read_fileposmin_filepos || s->max_filepos-s->read_fileposmax_filepos-s->read_filepos)/(float)(s->buffer_size), (int64_t)s->max_filepos-s->read_filepos ); diff --git a/stream/stream_cue.c b/stream/stream_cue.c index fb8b869f76..33b8e84764 100644 --- a/stream/stream_cue.c +++ b/stream/stream_cue.c @@ -483,7 +483,7 @@ static void cue_vcd_read_toc(void){ for (i = 0; i < nTracks; ++i) { mp_tmsg(MSGT_OPEN,MSGL_INFO, - "track %02d: format=%d %02d:%02d:%02d\n", + "track %02d: format=%d %02d:%02d:%02d\n", i+1, tracks[i].mode, tracks[i].minute, diff --git a/stream/tv.c b/stream/tv.c index b6d365429f..69f3d80693 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -444,7 +444,7 @@ static int open_tv(tvi_handle_t *tvh) tvh->tv_param->height = 480/tvh->tv_param->decimation; } mp_tmsg(MSGT_TV, MSGL_INFO, - " MJP: width %d height %d\n", tvh->tv_param->width, tvh->tv_param->height); + " MJP: width %d height %d\n", tvh->tv_param->width, tvh->tv_param->height); } #endif @@ -798,7 +798,7 @@ static demuxer_t* demux_open_tv(demuxer_t *demuxer) sh_audio->wf->nBlockAlign = sh_audio->samplesize * sh_audio->channels; sh_audio->wf->nAvgBytesPerSec = sh_audio->i_bps; - mp_tmsg(MSGT_DECVIDEO, MSGL_V, " TV audio: %d channels, %d bits, %d Hz\n", + mp_tmsg(MSGT_DECVIDEO, MSGL_V, " TV audio: %d channels, %d bits, %d Hz\n", sh_audio->wf->nChannels, sh_audio->wf->wBitsPerSample, sh_audio->wf->nSamplesPerSec); -- cgit v1.2.3