diff options
author | ulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-04 12:34:44 +0000 |
---|---|---|
committer | ulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-04 12:34:44 +0000 |
commit | d2ace632c68224382f9c37d1ac482c3719f2d13f (patch) | |
tree | 7bf06aedcd5b4cb4e379008f29066b3fdc2390f1 | |
parent | a986e2a1f68b1145d51f9b63c70cd0df9731e950 (diff) | |
download | mpv-d2ace632c68224382f9c37d1ac482c3719f2d13f.tar.bz2 mpv-d2ace632c68224382f9c37d1ac482c3719f2d13f.tar.xz |
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
-rw-r--r-- | mp_core.h | 2 | ||||
-rw-r--r-- | mplayer.c | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -125,5 +125,5 @@ double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio, ao_functions_t *audio_out); void exit_player_with_rc(const char* how, int rc); void rm_osd_msg(int id); -void add_subtitles(char *filename, float fps, int silent); +void add_subtitles(char *filename, float fps, int noerr); int reinit_video_chain(void); @@ -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); |