diff options
| author | John Stebbins <[email protected]> | 2017-03-10 12:56:55 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-03-10 12:56:55 -0700 |
| commit | bd22891d633e16d7aedddadd2e4dd716f615d847 (patch) | |
| tree | 4194d0fd483759f8e8f5226ac479e5ad193a9ef9 /libhb/dvdnav.c | |
| parent | 1f6c91c00be0f8f47de1d5c77b945ad6ecd50ec5 (diff) | |
subtitles: simplify and shorten subtitle descriptions (#591)
* subtitles: simplify and shorten subtitle descriptions
Generally, it eliminates parens to make things more readable.
I.e. it turns this:
English (Closed Caption)(Wide Screen)(Bitmap)(VOBSUB)
Into this:
English, Closed Caption [Wide Screen, VOBSUB]
* Revise punctuation per BradleyS request
* fix subtitle description formatting
* incorporate suggestions from PR
Diffstat (limited to 'libhb/dvdnav.c')
| -rw-r--r-- | libhb/dvdnav.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/libhb/dvdnav.c b/libhb/dvdnav.c index ed7dd26c7..4a1cbfb57 100644 --- a/libhb/dvdnav.c +++ b/libhb/dvdnav.c @@ -357,31 +357,31 @@ static void add_subtitle( hb_list_t * list_subtitle, int position, switch (lang_extension) { case 2: - strcat( subtitle->lang, " (Caption with bigger size character)" ); + strcat(subtitle->lang, " Large Type"); break; case 3: - strcat( subtitle->lang, " (Caption for Children)" ); + strcat(subtitle->lang, " Children"); break; case 5: - strcat( subtitle->lang, " (Closed Caption)" ); + strcat(subtitle->lang, " Closed Caption"); break; case 6: - strcat( subtitle->lang, " (Closed Caption with bigger size character)" ); + strcat(subtitle->lang, " Closed Caption, Large Type"); break; case 7: - strcat( subtitle->lang, " (Closed Caption for Children)" ); + strcat(subtitle->lang, " Closed Caption, Children"); break; case 9: - strcat( subtitle->lang, " (Forced Caption)" ); + strcat(subtitle->lang, " Forced"); break; case 13: - strcat( subtitle->lang, " (Director's Commentary)" ); + strcat(subtitle->lang, " Director's Commentary"); break; case 14: - strcat( subtitle->lang, " (Director's Commentary with bigger size character)" ); + strcat(subtitle->lang, " Director's Commentary, Large Type"); break; case 15: - strcat( subtitle->lang, " (Director's Commentary for Children)" ); + strcat(subtitle->lang, " Director's Commentary, Children"); default: break; } @@ -389,21 +389,24 @@ static void add_subtitle( hb_list_t * list_subtitle, int position, switch (style) { case HB_VOBSUB_STYLE_4_3: - strcat( subtitle->lang, " (4:3)" ); + strcat(subtitle->lang, " (4:3)"); break; case HB_VOBSUB_STYLE_WIDE: - strcat( subtitle->lang, " (Wide Screen)" ); + strcat(subtitle->lang, " (Wide Screen)"); break; case HB_VOBSUB_STYLE_LETTERBOX: - strcat( subtitle->lang, " (Letterbox)" ); + strcat(subtitle->lang, " (Letterbox)"); break; case HB_VOBSUB_STYLE_PANSCAN: - strcat( subtitle->lang, " (Pan & Scan)" ); + strcat(subtitle->lang, " (Pan & Scan)"); break; } + strcat(subtitle->lang, " ["); + strcat(subtitle->lang, hb_subsource_name(subtitle->source)); + strcat(subtitle->lang, "]"); - hb_log( "scan: id=0x%x, lang=%s, 3cc=%s ext=%i", subtitle->id, - subtitle->lang, subtitle->iso639_2, lang_extension ); + hb_log("scan: id=0x%x, lang=%s, 3cc=%s ext=%i", subtitle->id, + subtitle->lang, subtitle->iso639_2, lang_extension); hb_list_add(list_subtitle, subtitle); } |