[MPlayer-cvslog] r33447 - trunk/stream/cache2.c

[Clément Bœsch]

On Sun, May 08, 2011 at 08:44:43PM +0200, reimar wrote:
> Author: reimar
> Date: Sun May  8 20:44:43 2011
> New Revision: 33447
> 
> Log:
> 100l, fix seek cache controls with cache enabled,
> broken by r33435.
> 
> Modified:
>    trunk/stream/cache2.c
> 
> Modified: trunk/stream/cache2.c
> ==============================================================================
> --- trunk/stream/cache2.c	Sun May  8 20:14:37 2011	(r33446)
> +++ trunk/stream/cache2.c	Sun May  8 20:44:43 2011	(r33447)
> @@ -276,18 +276,20 @@ static int cache_execute_control(cache_v
>    }
>    if (s->control == -1) return 1;
>    switch (s->control) {
> -    case STREAM_CTRL_GET_CURRENT_TIME:
>      case STREAM_CTRL_SEEK_TO_TIME:
> +      double_res = s->control_double_arg;
> +    case STREAM_CTRL_GET_CURRENT_TIME:
>      case STREAM_CTRL_GET_ASPECT_RATIO:
>        s->control_res = s->stream->control(s->stream, s->control, &double_res);
>        s->control_double_arg = double_res;
>        break;
>      case STREAM_CTRL_SEEK_TO_CHAPTER:
> +    case STREAM_CTRL_SET_ANGLE:
> +      uint_res = s->control_uint_arg;
>      case STREAM_CTRL_GET_NUM_CHAPTERS:
>      case STREAM_CTRL_GET_CURRENT_CHAPTER:
>      case STREAM_CTRL_GET_NUM_ANGLES:
>      case STREAM_CTRL_GET_ANGLE:
> -    case STREAM_CTRL_SET_ANGLE:
>        s->control_res = s->stream->control(s->stream, s->control, &uint_res);
>        s->control_uint_arg = uint_res;
>        break;

Seems not enough according to the user…

< ivanich_> ubitux: no it doesn't, with cache enabled the same freezes rev
r33447

Sorry, I'm not really of any help here.

-- 
Clément B.