From b5972d6f14c04384d88d3f813b435d484562403f Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Mon, 6 Jul 2009 02:41:23 +0300 Subject: Translation system changes part 1: wrap translated strings Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings. --- stream/stream_cue.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'stream/stream_cue.c') diff --git a/stream/stream_cue.c b/stream/stream_cue.c index 85628131d0..6b43c00e0f 100644 --- a/stream/stream_cue.c +++ b/stream/stream_cue.c @@ -147,7 +147,7 @@ static int cue_getTrackinfo(char *Line, tTrack *track) } else if (strncmp(&Line[4], "PREGAP ", 7)==0) { ; /* ignore */ } else if (strncmp(&Line[4], "FLAGS ", 6)==0) { ; /* ignore */ } - else mp_msg (MSGT_OPEN,MSGL_INFO, + else mp_tmsg (MSGT_OPEN,MSGL_INFO, MSGTR_MPDEMUX_CUEREAD_UnexpectedCuefileLine, Line); } return 0; @@ -199,7 +199,7 @@ static int cue_find_bin (char *firstline) { fd_bin = open (bin_filename, O_RDONLY); if (fd_bin == -1) { - mp_msg(MSGT_OPEN,MSGL_STATUS, MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, + mp_tmsg(MSGT_OPEN,MSGL_STATUS, MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, bin_filename); /* now try to find it with the path of the cue file */ @@ -207,7 +207,7 @@ static int cue_find_bin (char *firstline) { fd_bin = open (s, O_RDONLY); if (fd_bin == -1) { - mp_msg(MSGT_OPEN,MSGL_STATUS, + mp_tmsg(MSGT_OPEN,MSGL_STATUS, MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s); /* now I would say the whole filename is shit, build our own */ strncpy(s, cue_filename, strlen(cue_filename) - 3 ); @@ -216,7 +216,7 @@ static int cue_find_bin (char *firstline) { fd_bin = open (s, O_RDONLY); if (fd_bin == -1) { - mp_msg(MSGT_OPEN,MSGL_STATUS, + mp_tmsg(MSGT_OPEN,MSGL_STATUS, MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s); /* ok try it with path */ @@ -224,7 +224,7 @@ static int cue_find_bin (char *firstline) { fd_bin = open (t, O_RDONLY); if (fd_bin == -1) { - mp_msg(MSGT_OPEN,MSGL_STATUS, + mp_tmsg(MSGT_OPEN,MSGL_STATUS, MSGTR_MPDEMUX_CUEREAD_BinFilenameTested,t); /* now I would say the whole filename is shit, build our own */ strncpy(s, cue_filename, strlen(cue_filename) - 3 ); @@ -233,18 +233,18 @@ static int cue_find_bin (char *firstline) { fd_bin = open (s, O_RDONLY); if (fd_bin == -1) { - mp_msg(MSGT_OPEN,MSGL_STATUS, + mp_tmsg(MSGT_OPEN,MSGL_STATUS, MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s); /* ok try it with path */ snprintf(t, sizeof( t ), "%s/%s", bincue_path, s); fd_bin = open (t, O_RDONLY); if (fd_bin == -1) { - mp_msg(MSGT_OPEN,MSGL_STATUS, + mp_tmsg(MSGT_OPEN,MSGL_STATUS, MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s); /* I'll give up */ - mp_msg(MSGT_OPEN,MSGL_ERR, + mp_tmsg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_CannotFindBinFile); return -1; } @@ -257,7 +257,7 @@ static int cue_find_bin (char *firstline) { } - mp_msg(MSGT_OPEN,MSGL_INFO, + mp_tmsg(MSGT_OPEN,MSGL_INFO, MSGTR_MPDEMUX_CUEREAD_UsingBinFile, bin_filename); return 0; } @@ -291,7 +291,7 @@ static inline int cue_mode_2_sector_size(int mode) case MODE2_2336: return SIZEISO_MODE2_FORM2; default: - mp_msg(MSGT_OPEN,MSGL_FATAL, + mp_tmsg(MSGT_OPEN,MSGL_FATAL, MSGTR_MPDEMUX_CUEREAD_UnknownModeForBinfile); abort(); } @@ -342,7 +342,7 @@ static int cue_read_cue (char *in_cue_filename) fd_cue = fopen (in_cue_filename, "r"); if (fd_cue == NULL) { - mp_msg(MSGT_OPEN,MSGL_ERR, + mp_tmsg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_CannotOpenCueFile, in_cue_filename); return -1; } @@ -352,7 +352,7 @@ static int cue_read_cue (char *in_cue_filename) if(! fgets( sLine, 256, fd_cue ) ) { - mp_msg(MSGT_OPEN,MSGL_ERR, + mp_tmsg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_ErrReadingFromCueFile, in_cue_filename); fclose (fd_cue); return -1; @@ -368,7 +368,7 @@ static int cue_read_cue (char *in_cue_filename) /* red the next line and call our track finder */ if(! fgets( sLine, 256, fd_cue ) ) { - mp_msg(MSGT_OPEN,MSGL_ERR, + mp_tmsg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_ErrReadingFromCueFile, in_cue_filename); fclose (fd_cue); return -1; @@ -378,7 +378,7 @@ static int cue_read_cue (char *in_cue_filename) { if (cue_getTrackinfo(sLine, &tracks[nTracks++]) != 0) { - mp_msg(MSGT_OPEN,MSGL_ERR, + mp_tmsg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_ErrReadingFromCueFile, in_cue_filename); fclose (fd_cue); return -1; @@ -387,7 +387,7 @@ static int cue_read_cue (char *in_cue_filename) /* make a fake track with stands for the Lead out */ if (fstat (fd_bin, &filestat) == -1) { - mp_msg(MSGT_OPEN,MSGL_ERR, + mp_tmsg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_ErrGettingBinFileSize); fclose (fd_cue); return -1; @@ -482,7 +482,7 @@ static void cue_vcd_read_toc(void){ int i; for (i = 0; i < nTracks; ++i) { - mp_msg(MSGT_OPEN,MSGL_INFO, + mp_tmsg(MSGT_OPEN,MSGL_INFO, MSGTR_MPDEMUX_CUEREAD_InfoTrackFormat, i+1, tracks[i].mode, @@ -509,12 +509,12 @@ static int cue_vcd_read(stream_t *stream, char *mem, int size) { return 0; if(lseek(fd_bin, position+VCD_SECTOR_OFFS, SEEK_SET) == -1) { - mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_UnexpectedBinFileEOF); + mp_tmsg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_UnexpectedBinFileEOF); return 0; } if(read(fd_bin, mem, VCD_SECTOR_DATA) != VCD_SECTOR_DATA) { - mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_CannotReadNBytesOfPayload, VCD_SECTOR_DATA); + mp_tmsg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_CannotReadNBytesOfPayload, VCD_SECTOR_DATA); return 0; } @@ -570,10 +570,10 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { ret2=cue_vcd_get_track_end(track); ret=cue_vcd_seek_to_track(track); if(ret<0){ - mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_ErrTrackSelect " (seek)\n"); + mp_tmsg(MSGT_OPEN,MSGL_ERR,MSGTR_ErrTrackSelect " (seek)\n"); return STREAM_UNSUPPORTED; } - mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_MPDEMUX_CUEREAD_CueStreamInfo_FilenameTrackTracksavail, filename, track, ret, ret2); + mp_tmsg(MSGT_OPEN,MSGL_INFO,MSGTR_MPDEMUX_CUEREAD_CueStreamInfo_FilenameTrackTracksavail, filename, track, ret, ret2); stream->fd = f; stream->type = STREAMTYPE_VCDBINCUE; -- cgit v1.2.3