Merge branch 'refs/heads/t/play_fix'
authorAndre Noll <maan@systemlinux.org>
Thu, 31 Jul 2014 06:59:47 +0000 (08:59 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 31 Jul 2014 06:59:47 +0000 (08:59 +0200)
Cooking since two weeks.

* 9c1aa5 Never start playback at an empty chunk.

Conflicts:
afh_recv.c

1  2 
afh_common.c
afh_recv.c
vss.c

diff --cc afh_common.c
Simple merge
diff --cc afh_recv.c
@@@ -59,7 -59,9 +59,8 @@@ static int afh_execute(struct btr_node 
                        return ret;
                if (x >= pard->afhi.chunks_total)
                        return -ERRNO_TO_PARA_ERROR(EINVAL);
-               pard->first_chunk = pard->current_chunk = x;
+               pard->first_chunk = afh_get_start_chunk(x, &pard->afhi);
+               pard->current_chunk = pard->first_chunk;
 -              rn->task.error = 0;
                return 1;
        }
        return -E_BTR_NAVAIL;
diff --cc vss.c
Simple merge