[MPlayer-dev-eng] [PATCH 1/3] vo jpeg, png, pnm: Make output directory message less confusing

[Alexander Strasser]

The current message is rather irritating and could be easily misread
as error.

Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
---
 help/help_mp-en.h | 2 +-
 libvo/vo_jpeg.c   | 3 +--
 libvo/vo_png.c    | 3 +--
 libvo/vo_pnm.c    | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index 1b3d288..d8ed16f 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -892,10 +892,10 @@ static const char help_text[]=
                 "Try appending the scale filter to your filter list,\n"\
                 "e.g. -vf spp,scale instead of -vf spp.\n"
 #define MSGTR_VO_GenericError "This error has occurred"
+#define MSGTR_VO_OutputDirectory "output directory"
 #define MSGTR_VO_UnableToAccess "Unable to access"
 #define MSGTR_VO_ExistsButNoDirectory "already exists, but is not a directory."
 #define MSGTR_VO_DirExistsButNotWritable "Output directory already exists, but is not writable."
-#define MSGTR_VO_DirExistsAndIsWritable "Output directory already exists and is writable."
 #define MSGTR_VO_CantCreateDirectory "Unable to create output directory."
 #define MSGTR_VO_CantCreateFile "Unable to create output file."
 #define MSGTR_VO_DirectoryCreateSuccess "Output directory successfully created."
diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c
index 520d43f..2af42ae 100644
--- a/libvo/vo_jpeg.c
+++ b/libvo/vo_jpeg.c
@@ -134,8 +134,7 @@ static void jpeg_mkdir(const char *buf, int verbose) {
                     exit_player(EXIT_ERROR);
                 }
 
-                mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name,
-                        buf, MSGTR_VO_DirExistsAndIsWritable);
+                mp_msg(MSGT_VO, MSGL_INFO, "%s: %s: %s\n", info.short_name, MSGTR_VO_OutputDirectory, buf);
                 break;
 
             default:
diff --git a/libvo/vo_png.c b/libvo/vo_png.c
index 027209d..0385a87 100644
--- a/libvo/vo_png.c
+++ b/libvo/vo_png.c
@@ -91,8 +91,7 @@ static void png_mkdir(char *buf, int verbose) {
                     exit_player(EXIT_ERROR);
                 }
 
-                mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name,
-                        buf, MSGTR_VO_DirExistsAndIsWritable);
+                mp_msg(MSGT_VO, MSGL_INFO, "%s: %s: %s\n", info.short_name, MSGTR_VO_OutputDirectory, buf);
                 break;
 
             default:
diff --git a/libvo/vo_pnm.c b/libvo/vo_pnm.c
index 192863d..9fd1da1 100644
--- a/libvo/vo_pnm.c
+++ b/libvo/vo_pnm.c
@@ -228,8 +228,7 @@ static void pnm_mkdir(char *buf, int verbose) {
                 }
 
                 if (strcmp(buf, ".") != 0) {
-                mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name,
-                        buf, MSGTR_VO_DirExistsAndIsWritable);
+                    mp_msg(MSGT_VO, MSGL_INFO, "%s: %s: %s\n", info.short_name, MSGTR_VO_OutputDirectory, buf);
                 }
                 break;
 
-- 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20130922/88d57825/attachment.asc>