Mercurial > mplayer.hg
comparison mplayer.c @ 23547:7acb7ac64104
Remove broken option reset from per-file loop
When -loop is used as a per-file option it seeks back to the start of
the file from the end and tries to reset options to their original
values. This reset is not implemented properly: it simply sets the
option variables back without running any of the associated control
code. Implementing the option reset functionality properly would be a
significant amount of work and there is no clear need for it, so I'm
simply removing the broken version.
None of this affects the use of -loop as a global option. That case has
a separate implementation which always starts a new file from scratch
with default option values.
| author | uau |
|---|---|
| date | Sat, 16 Jun 2007 19:47:36 +0000 |
| parents | a6c619ee9d30 |
| children | 21c28c2645fe |
comparison
equal
deleted
inserted
replaced
| 23546:49bfde0ecd33 | 23547:7acb7ac64104 |
|---|---|
| 3538 } | 3538 } |
| 3539 mpctx->was_paused = 0; | 3539 mpctx->was_paused = 0; |
| 3540 | 3540 |
| 3541 /* Looping. */ | 3541 /* Looping. */ |
| 3542 if(mpctx->eof==1 && loop_times>=0) { | 3542 if(mpctx->eof==1 && loop_times>=0) { |
| 3543 int l = loop_times; | |
| 3544 play_tree_iter_step(mpctx->playtree_iter,0,0); | |
| 3545 loop_times = l; | |
| 3546 mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = %d\n", loop_times,mpctx->eof); | 3543 mp_msg(MSGT_CPLAYER,MSGL_V,"loop_times = %d, eof = %d\n", loop_times,mpctx->eof); |
| 3547 | 3544 |
| 3548 if(loop_times>1) loop_times--; else | 3545 if(loop_times>1) loop_times--; else |
| 3549 if(loop_times==1) loop_times=-1; | 3546 if(loop_times==1) loop_times=-1; |
| 3550 play_n_frames=play_n_frames_mf; | 3547 play_n_frames=play_n_frames_mf; |