Use the DVD name for the output file

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

diff --git a/libhb/common.h b/libhb/common.h
index f5af73c038231b111adafdfb9d6df72ee746f119..866eb98b2106ca12a825e2a5f7f94325680bd5f7 100644 (file)
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -240,6 +240,7 @@ struct hb_subtitle_s
 struct hb_title_s
 {
     char        dvd[1024];
+    char        name[1024];
     int         index;
     int         vts;
     int         ttn;

diff --git a/libhb/dvd.c b/libhb/dvd.c
index 7d19fae11d7021fb1125fe22fe9e419d3c95fb28..4c894a9078ee497d6ad870d4c8410c6f54797233 100644 (file)
--- a/libhb/dvd.c
+++ b/libhb/dvd.c
@@ -121,8 +121,14 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t )
     int            c;
     uint64_t       duration;
     float          duration_correction;
+    unsigned char  unused[1024];
 
     title = hb_title_init( d->path, t );
+    if( DVDUDFVolumeInfo( d->reader, title->name, sizeof( title->name ),
+                          unused, sizeof( unused ) ) )
+    {
+        goto fail;
+    }
 
     hb_log( "scan: scanning title %d", t );
 

diff --git a/macosx/ExpressController.m b/macosx/ExpressController.m
index 5121f917390f450c826dd229553c190937f86dfe..9191bb7e6c54c98bcb4f4a0a30393ac529c93e2f 100644 (file)
--- a/macosx/ExpressController.m
+++ b/macosx/ExpressController.m
@@ -284,8 +284,9 @@
         }
         
         job->file = strdup( [[NSString stringWithFormat:
-            @"%@/%p - Title %d.mp4", fConvertFolderString, self,
-            title->index] UTF8String] );
+                @"%@/%s - Title %d - %@.mp4", fConvertFolderString,
+                title->name, title->index, [fConvertFormatPopUp
+                titleOfSelectedItem]] UTF8String] );
         hb_add( fHandle, job );
     }