msg/i18n fixes and some printf->mp_msg

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6297 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 20 insertions, 19 deletions

diff --git a/subreader.c b/subreader.c
index 003303d63e..ef613ee73c 100644
--- a/subreader.c
+++ b/subreader.c
@@ -13,6 +13,7 @@
 #include <ctype.h>
 
 #include "config.h"
+#include "mp_msg.h"
 #include "subreader.h"
 
 #define ERR ((void *) -1)
@@ -188,7 +189,7 @@ subtitle *sub_read_line_microdvd(FILE *fd,subtitle *current) {
     while ((next =sub_readtext (next, &(current->text[i])))) {
         if (current->text[i]==ERR) {return ERR;}
 	i++;
-	if (i>=SUB_MAX_TEXT) { printf ("Too many lines in a subtitle\n");current->lines=i;return current;}
+	if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;}
     }
     current->lines= ++i;
 
@@ -325,7 +326,7 @@ subtitle *sub_read_line_vplayer(FILE *fd,subtitle *current) {
 			while ((next =sub_readtext (next, &(current->text[i])))) {
 				if (current->text[i]==ERR) {return ERR;}
 				i++;
-				if (i>=SUB_MAX_TEXT) { printf ("Too many lines in a subtitle\n");current->lines=i;return current;}
+				if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;}
 			}
 			current->lines=i+1;
 		}
@@ -366,7 +367,7 @@ subtitle *sub_read_line_rt(FILE *fd,subtitle *current) {
 	  while ((next =sub_readtext (next, &(current->text[i])))) {
 		if (current->text[i]==ERR) {return ERR;}
 		i++;
-		if (i>=SUB_MAX_TEXT) { printf ("Too many lines in a subtitle\n");current->lines=i;return current;}
+		if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;}
 	  }
 	}
 			current->lines=i+1;
@@ -505,7 +506,7 @@ subtitle *sub_read_line_aqt(FILE *fd,subtitle *current) {
     while ((next =sub_readtext (next, &(current->text[i])))) {
 	if (current->text[i]==ERR) {return ERR;}
 	i++;
-	if (i>=SUB_MAX_TEXT) { printf ("Too many lines in a subtitle\n");current->lines=i;return current;}
+	if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;}
 	}
     current->lines=i+1;
 
@@ -551,7 +552,7 @@ subtitle *sub_read_line_subrip09(FILE *fd,subtitle *current) {
     while ((next =sub_readtext (next, &(current->text[i])))) {
 	if (current->text[i]==ERR) {return ERR;}
 	i++;
-	if (i>=SUB_MAX_TEXT) { printf ("Too many lines in a subtitle\n");current->lines=i;return current;}
+	if (i>=SUB_MAX_TEXT) { mp_msg(MSGT_SUBREADER,MSGL_WARN,"Too many lines in a subtitle\n");current->lines=i;return current;}
 	}
     current->lines=i+1;
 
@@ -633,10 +634,10 @@ void	subcp_open (void)
 	icdsc = (iconv_t)(-1);
 	if (sub_cp){
 		if ((icdsc = iconv_open (tocp, sub_cp)) != (iconv_t)(-1)){
-			printf ("SUB: opened iconv descriptor.\n");
+			mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: opened iconv descriptor.\n");
 			sub_utf8 = 2;
 		} else
-			printf ("SUB: error opening iconv descriptor.\n");
+			mp_msg(MSGT_SUBREADER,MSGL_ERR,"SUB: error opening iconv descriptor.\n");
 	}
 }
 
@@ -644,7 +645,7 @@ void	subcp_close (void)
 {
 	if (icdsc != (iconv_t)(-1)){
 		(void) iconv_close (icdsc);
-	   	printf ("SUB: closed iconv descriptor.\n");
+	   	mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: closed iconv descriptor.\n");
 	}
 }
 
@@ -665,12 +666,12 @@ subtitle* subcp_recode (subtitle *sub)
 		
 		if (iconv(icdsc, &ip, &ileft,
 			  &op, &oleft) == (size_t)(-1)) {
-			printf ("SUB: error recoding line.\n");
+			mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error recoding line.\n");
 			l++;
 			break;
 		}
 		if (!(ot = (char *)malloc(op - icbuffer + 1))){
-			printf ("SUB: error allocating mem.\n");
+			mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error allocating mem.\n");
 			l++;
 		   	break;
 		}
@@ -714,7 +715,7 @@ static void adjust_subs_time(subtitle* sub, float subtime, float fps){
 		sub = nextsub;
 		m = 0;
 	}
-	if (n) printf ("SUB: Adjusted %d subtitle(s).\n", n);
+	if (n) mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Adjusted %d subtitle(s).\n", n);
 }
 
 subtitle* sub_read_file (char *filename, float fps) {
@@ -743,8 +744,8 @@ subtitle* sub_read_file (char *filename, float fps) {
     fd=fopen (filename, "r"); if (!fd) return NULL;
 
     sub_format=sub_autodetect (fd);
-    if (sub_format==SUB_INVALID) {printf ("SUB: Could not determine file format\n");return NULL;}
-    printf ("SUB: Detected subtitle file format: %s\n", fmtname[sub_format]);
+    if (sub_format==SUB_INVALID) {mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: Could not determine file format\n");return NULL;}
+    mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Detected subtitle file format: %s\n", fmtname[sub_format]);
     
     rewind (fd);
 
@@ -779,9 +780,9 @@ subtitle* sub_read_file (char *filename, float fps) {
 #endif
 
 //    printf ("SUB: Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use");
-    printf ("SUB: Read %i subtitles", sub_num);
-    if (sub_errs) printf (", %i bad line(s).\n", sub_errs);
-    else 	  printf (".\n");
+    mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Read %i subtitles", sub_num);
+    if (sub_errs) mp_msg(MSGT_SUBREADER,MSGL_INFO,", %i bad line(s).\n", sub_errs);
+    else 	  mp_msg(MSGT_SUBREADER,MSGL_INFO,".\n");
 
     if(sub_num<=0){
 	free(first);
@@ -861,7 +862,7 @@ char * sub_filename(char* path,  char * fname )
 //   printf("trying: '%s'\n",sub_name);
    if((f=fopen( sub_name,"rt" ))) {
      fclose( f );
-     printf( "SUB: Detected sub file: %s\n",sub_name );
+     mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Detected sub file: %s\n",sub_name );
      if (i<2) sub_utf8=1;
      return sub_name;
    }
@@ -929,7 +930,7 @@ unsigned long temp;
 	fprintf(fd,"\n");
     }
     fclose(fd);
-    printf ("SUB: Subtitles dumped in \'dumpsub.srt\'.\n");
+    mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dumpsub.srt\'.\n");
 }
 
 void dump_mpsub(subtitle* subs, float fps){
@@ -976,7 +977,7 @@ void dump_mpsub(subtitle* subs, float fps){
 		fprintf (fd, "\n");
 	}
 	fclose (fd);
-	printf ("SUB: Subtitles dumped in \'dump.mpsub\'.\n");
+	mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Subtitles dumped in \'dump.mpsub\'.\n");
 }
 
 void sub_free( subtitle * subs )