diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-07 18:33:01 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-07 21:34:54 +0200 |
| commit | 5234c72e28c27e232a35ebcbadc50c5933cccf7d (patch) | |
| tree | c413ec85799e5b46fd6d64280f060e2571fc99a3 /stream | |
| parent | 2569c2e2bc1e91f520d887b723d3138107f119f3 (diff) | |
| download | mpv-5234c72e28c27e232a35ebcbadc50c5933cccf7d.tar.bz2 mpv-5234c72e28c27e232a35ebcbadc50c5933cccf7d.tar.xz | |
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.
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/cache2.c | 2 | ||||
| -rw-r--r-- | stream/stream_cue.c | 2 | ||||
| -rw-r--r-- | stream/tv.c | 4 |
3 files changed, 4 insertions, 4 deletions
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_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){ - mp_tmsg(MSGT_CACHE,MSGL_STATUS,"\rCache fill: %5.2f%% (%"PRId64" bytes) ", + mp_tmsg(MSGT_CACHE,MSGL_STATUS,"\rCache fill: %5.2f%% (%"PRId64" bytes) ", 100.0*(float)(s->max_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); |