mplayer.hg: mplayer.c comparison

comparison mplayer.c @ 22002:ebd2d5efb11b

filename double-conversion, especially usefull for CJK users :-) Patch by Zuxy Meng <zuxy.meng@gmail.com> date: Oct 25, 2006 2:20 AM subject: [MPlayer-dev-eng] [PATCH] Filename double-conversion

author	gpoirier
date	Fri, 26 Jan 2007 09:57:09 +0000
parents	6af0d674aa53
children	3d415b28e5e4

comparison

equal deleted inserted replaced

-:2934974c366a
+:ebd2d5efb11b
 if (!asst && !subd && !silent)
 #else
 if(!subd && !silent)
 #endif
-mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, filename);
+mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub,
+		filename_recode(filename));
 #ifdef USE_ASS
 if (!asst && !subd) return;
 set_of_ass_tracks[set_of_sub_size] = asst;
 #else
 if (!subd) return;
 #endif
 set_of_subtitles[set_of_sub_size] = subd;
 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_ID=%d\n", set_of_sub_size);
-mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n", filename);
+mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FILE_SUB_FILENAME=%s\n",
+	   filename_recode(filename));
 ++set_of_sub_size;
-mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, set_of_sub_size, filename);
+mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AddedSubtitleFile, set_of_sub_size,
+	    filename_recode(filename));
 }
 // FIXME: if/when the GUI calls this, global sub numbering gets (potentially) broken.
 void update_set_of_subtitles(void)
 // subdata was changed, set_of_sub... have to be updated.
 {
 #endif
 #ifdef HAVE_BITMAP_FONT
 if(font_name){
 vo_font=read_font_desc(font_name,font_factor,verbose>1);
-if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name);
+if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,
+		filename_recode(font_name));
 } else {
 // try default:
 vo_font=read_font_desc( mem_ptr=get_path("font/font.desc"),font_factor,verbose>1);
 free(mem_ptr); // release the buffer created by get_path()
 if(!vo_font)
 filename = play_tree_iter_get_file(playtree_iter, 1);
 }
 }
 //---------------------------------------------------------------------------
-if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);
+if(filename)
+	mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing,
+		filename_recode(filename));
 if (edl_filename) {
 if (edl_records) free_edl(edl_records);
 next_edl_record = edl_records = edl_parse_file();
 }
 if (edl_output_filename) {
 if (edl_fd) fclose(edl_fd);
 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL)
 {
 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite,
-edl_output_filename);
+		filename_recode(edl_output_filename));
 }
 }
 //==================== Open VOB-Sub ============================
 current_module="vobsub";
 if (vobsub_name){
 vo_vobsub=vobsub_open(vobsub_name,spudec_ifo,1,&vo_spudec);
 if(vo_vobsub==NULL)
-mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name);
+mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,
+		filename_recode(vobsub_name));
 }else if(sub_auto && filename && (strlen(filename)>=5)){
 /* try to autodetect vobsub from movie filename ::atmos */
 char *buf = malloc((strlen(filename)-3)),*psub;
 memset(buf,0,strlen(filename)-3); // make sure string is terminated
 strncpy(buf, filename, strlen(filename)-4);
 if(file_format == DEMUXER_TYPE_PLAYLIST) {
 play_tree_t* entry;
 // Handle playlist
 current_module="handle_playlist";
-mp_msg(MSGT_CPLAYER,MSGL_V,"Parsing playlist %s...\n",filename);
+mp_msg(MSGT_CPLAYER,MSGL_V,"Parsing playlist %s...\n",
+	    filename_recode(filename));
 entry = parse_playtree(stream,0);
 eof=playtree_add_playlist(entry);
 goto goto_next_file;
 }
 stream->start_pos+=seek_to_byte;
 current_module="handle_demux_playlist";
 while (ds_get_packet(demuxer->video,&playlist_entry)>0)
 {
 char *temp, *bname;
-mp_msg(MSGT_CPLAYER,MSGL_V,"Adding file %s to element entry.\n",playlist_entry);
+mp_msg(MSGT_CPLAYER,MSGL_V,"Adding file %s to element entry.\n",
+	    filename_recode(playlist_entry));
 bname=mp_basename(playlist_entry);
 if ((strlen(bname)>10) && !strncmp(bname,"qt",2) && !strncmp(bname+3,"gateQT",6))
 continue;
 case 8: dump_jacosub(subdata, sh_video->fps); break;
 case 9: dump_sami(subdata, sh_video->fps); break;
 }
 }
-mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_FILENAME=%s\n", filename);
+mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_FILENAME=%s\n",
+	  filename_recode(filename));
 mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_DEMUXER=%s\n", demuxer->desc->name);
 if (sh_video) {
 /* Assume FOURCC if all bytes >= 0x20 (' ') */
 if (sh_video->format >= 0x20202020)
 	mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_VIDEO_FORMAT=%.4s\n", (char *)&sh_video->format);
 int v = cmd->args[0].v.i;
 sub_data *subd;
 if (v < 0) {
 for (v = 0; v < set_of_sub_size; ++v) {
 subd = set_of_subtitles[v];
-mp_msg(MSGT_CPLAYER, MSGL_STATUS, MSGTR_RemovedSubtitleFile, v + 1, subd->filename);
+mp_msg(MSGT_CPLAYER, MSGL_STATUS, MSGTR_RemovedSubtitleFile, v + 1,
+		    filename_recode(subd->filename));
 sub_free(subd);
 set_of_subtitles[v] = NULL;
 }
 global_sub_indices[SUB_SOURCE_SUBS] = -1;
 global_sub_size -= set_of_sub_size;
 mp_input_queue_cmd(mp_input_parse_cmd("sub_select"));
 }
 }
 else if (v < set_of_sub_size) {
 subd = set_of_subtitles[v];
-mp_msg(MSGT_CPLAYER, MSGL_STATUS, MSGTR_RemovedSubtitleFile, v + 1, subd->filename);
+mp_msg(MSGT_CPLAYER, MSGL_STATUS, MSGTR_RemovedSubtitleFile, v + 1,
+		  filename_recode(subd->filename));
 sub_free(subd);
 if (set_of_sub_pos == v) {
 global_sub_pos = -2;
 vo_sub_last = vo_sub = NULL;
 vo_osd_changed(OSDTYPE_SUBTITLE);

Mercurial > mplayer.hg

comparison mplayer.c @ 22002:ebd2d5efb11b