[MPlayer-cvslog] r36173 - trunk/stream/stream_bluray.c

[reimar]

Author: reimar
Date: Fri Apr 26 21:19:34 2013
New Revision: 36173

Log:
br://: Fix querying current chapter.

This also fixes specifying an end chapter via -chapter.
Based on patch by Olivier Rolland [billl users.sourceforge.net]

Modified:
   trunk/stream/stream_bluray.c

Modified: trunk/stream/stream_bluray.c
==============================================================================
--- trunk/stream/stream_bluray.c	Thu Apr 18 23:54:53 2013	(r36172)
+++ trunk/stream/stream_bluray.c	Fri Apr 26 21:19:34 2013	(r36173)
@@ -52,7 +52,6 @@ int   bluray_chapter = 0;
 struct bluray_priv_s {
     BLURAY *bd;
     int current_angle;
-    int current_chapter;
     int current_title;
 };
 
@@ -132,7 +131,7 @@ static int bluray_stream_control(stream_
     }
 
     case STREAM_CTRL_GET_CURRENT_CHAPTER: {
-        *((unsigned int *) arg) = b->current_chapter;
+        *((unsigned int *) arg) = bd_get_current_chapter(b->bd);
         return 1;
     }
 
@@ -353,7 +352,6 @@ err_no_info:
     b                  = calloc(1, sizeof(struct bluray_priv_s));
     b->bd              = bd;
     b->current_angle   = angle;
-    b->current_chapter = chapter;
     b->current_title   = title;
 
     s->start_pos   = chapter_pos;