Blu-ray: display playlist number in log, CLI scan output, and title drop-down.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4182 b64f7644-9d1e-0410-96f1-a4d463321fa5

6 files changed, 38 insertions, 7 deletions

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 6a6e29a27..f5c3b1046 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -1946,16 +1946,30 @@ title_opts_set(GtkBuilder *builder, const gchar *name)
                 g_free(tmp);
 			}
 		}
+		else if (title->type == HB_BD_TYPE)
+		{
+			if (title->duration != 0)
+			{
+				titles[ii] = g_strdup_printf("%d (%05d.MPLS) - %02dh%02dm%02ds",
+					title->index, title->playlist, title->hours, 
+					title->minutes, title->seconds);
+			}
+			else
+			{
+				titles[ii] = g_strdup_printf("%d (%05d.MPLS) - Unknown Length",
+					title->index, title->playlist);
+			}
+		}
 		else
 		{
 			if (title->duration != 0)
 			{
-				titles[ii]  = g_strdup_printf ("%d - %02dh%02dm%02ds",
+				titles[ii]  = g_strdup_printf("%d - %02dh%02dm%02ds",
 					title->index, title->hours, title->minutes, title->seconds);
 			}
 			else
 			{
-				titles[ii]  = g_strdup_printf ("%d - Unknown Length", 
+				titles[ii]  = g_strdup_printf("%d - Unknown Length",
 										title->index);
 			}
 		}
diff --git a/libhb/bd.c b/libhb/bd.c
index d61e5217a..b0a2ff39b 100644
--- a/libhb/bd.c
+++ b/libhb/bd.c
@@ -207,7 +207,8 @@ hb_title_t * hb_bd_title_scan( hb_bd_t * d, int tt, uint64_t min_duration )
         goto fail;
     }
 
-    hb_deep_log( 2, "bd: playlist %05d.MPLS", ti->playlist);
+    hb_log( "bd: playlist %05d.MPLS", ti->playlist );
+    title->playlist = ti->playlist;
 
     uint64_t pkt_count = 0;
     for ( ii = 0; ii < ti->clip_count; ii++ )
diff --git a/libhb/common.c b/libhb/common.c
index 5cd2867df..db2fac551 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -1049,6 +1049,7 @@ hb_title_t * hb_title_init( char * path, int index )
     t = calloc( sizeof( hb_title_t ), 1 );
 
     t->index         = index;
+    t->playlist      = -1;
     t->list_audio    = hb_list_init();
     t->list_chapter  = hb_list_init();
     t->list_subtitle = hb_list_init();
diff --git a/libhb/common.h b/libhb/common.h
index a042c25fa..d36fd9b9f 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -594,6 +594,7 @@ struct hb_title_s
     char        path[1024];
     char        name[1024];
     int         index;
+    int         playlist;
     int         vts;
     int         ttn;
     int         cell_start;
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 9595a2748..8821e758f 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1894,10 +1894,20 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
                     feature_title = i;
                 }
                 
-                [fSrcTitlePopUp addItemWithTitle: [NSString
-                                                   stringWithFormat: @"%@ %d - %02dh%02dm%02ds",
-                                                   currentSource, title->index, title->hours, title->minutes,
-                                                   title->seconds]];
+                if( title->type == HB_BD_TYPE )
+                {
+                    [fSrcTitlePopUp addItemWithTitle: [NSString
+                                                       stringWithFormat: @"%@ %d (%05d.MPLS) - %02dh%02dm%02ds",
+                                                       currentSource, title->index, title->playlist,
+                                                       title->hours, title->minutes, title->seconds]];
+                }
+                else
+                {
+                    [fSrcTitlePopUp addItemWithTitle: [NSString
+                                                       stringWithFormat: @"%@ %d - %02dh%02dm%02ds",
+                                                       currentSource, title->index,
+                                                       title->hours, title->minutes, title->seconds]];
+                }
             }
             
             /* if we are a stream, select the first title */
diff --git a/test/test.c b/test/test.c
index 55144dd3a..9f11ef7ae 100644
--- a/test/test.c
+++ b/test/test.c
@@ -398,6 +398,10 @@ static void PrintTitleInfo( hb_title_t * title )
                 title->vts, title->ttn, title->cell_start, title->cell_end,
                 title->block_count );
     }
+    else if( title->type == HB_BD_TYPE )
+    {
+        fprintf( stderr, "  + playlist: %05d.MPLS\n", title->playlist );
+    }
     if (title->angle_count > 1)
         fprintf( stderr, "  + angle(s) %d\n", title->angle_count );
     fprintf( stderr, "  + duration: %02d:%02d:%02d\n",