From d2ace632c68224382f9c37d1ac482c3719f2d13f Mon Sep 17 00:00:00 2001 From: ulion Date: Tue, 4 Dec 2007 12:34:44 +0000 Subject: When auto loading subs, log warning instead of error for load failure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25292 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index a04637a400..6ad430b0d5 100644 --- a/mplayer.c +++ b/mplayer.c @@ -926,7 +926,7 @@ int playtree_add_playlist(play_tree_t* entry) return PT_NEXT_SRC; } -void add_subtitles(char *filename, float fps, int silent) +void add_subtitles(char *filename, float fps, int noerr) { sub_data *subd; #ifdef USE_ASS @@ -948,11 +948,11 @@ void add_subtitles(char *filename, float fps, int silent) if (ass_enabled && subd && !asst) asst = ass_read_subdata(ass_library, subd, fps); - if (!asst && !subd && !silent) + if (!asst && !subd) #else - if(!subd && !silent) + if(!subd) #endif - mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_CantLoadSub, + mp_msg(MSGT_CPLAYER, noerr ? MSGL_WARN : MSGL_ERR, MSGTR_CantLoadSub, filename_recode(filename)); #ifdef USE_ASS @@ -3158,7 +3158,7 @@ if(mpctx->sh_video) { int i = 0; free(psub); // release the buffer created by get_path() above while (tmp[i]) { - add_subtitles (tmp[i], mpctx->sh_video->fps, 0); + add_subtitles (tmp[i], mpctx->sh_video->fps, 1); free(tmp[i++]); } free(tmp); -- cgit v1.2.3