[vlc-commits] bluray: Removing useless title management code.

Hugo Beauzée-Luyssen git at videolan.org
Thu Mar 8 13:27:19 CET 2012


vlc/vlc-2.0 | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Thu Mar  8 13:03:14 2012 +0100| [dd22509c567bda5e0937747c1b9b9c259605f06e] | committer: Jean-Baptiste Kempf

bluray: Removing useless title management code.

As pointed by fenrir, this is already handled by the core.
(cherry picked from commit aef79d832965b10a923aa47b89475ae44bb11b53)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=dd22509c567bda5e0937747c1b9b9c259605f06e
---

 modules/access/bluray.c |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 274753c..bf28cb8 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -148,8 +148,6 @@ static int blurayOpen( vlc_object_t *object )
     demux_t *p_demux = (demux_t*)object;
     demux_sys_t *p_sys;
 
-    char *pos_title;
-    int i_title = -1;
     char bd_path[PATH_MAX] = { '\0' };
     const char *error_msg = NULL;
 
@@ -273,16 +271,9 @@ static int blurayOpen( vlc_object_t *object )
         /* Registering overlay event handler */
         bd_register_overlay_proc(p_sys->bluray, p_demux, blurayOverlayProc);
     } else {
-        /* get title request */
-        if ((pos_title = strrchr(bd_path, ':'))) {
-            /* found character ':' for title information */
-            *(pos_title++) = '\0';
-            i_title = atoi(pos_title);
-        }
-
         /* set start title number */
-        if (bluraySetTitle(p_demux, i_title) != VLC_SUCCESS) {
-            msg_Err( p_demux, "Could not set the title %d", i_title );
+        if (bluraySetTitle(p_demux, p_sys->i_longest_title) != VLC_SUCCESS) {
+            msg_Err( p_demux, "Could not set the title %d", p_sys->i_longest_title );
             goto error;
         }
     }



More information about the vlc-commits mailing list