WinGui:

[handbrake-jp/handbrake-jp-git.git] / test / test.c

diff --git a/test/test.c b/test/test.c
index ba66974..134e017 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -76,6 +76,7 @@ static char ** srtfile     = NULL;
 static char ** srtcodeset  = NULL;
 static char ** srtoffset   = NULL;
 static char ** srtlang     = NULL;
+static int     srtdefault  = -1;
 static int    subtitle_scan = 0;
 static int    width       = 0;
 static int    height      = 0;
@@ -409,12 +410,19 @@ static void PrintTitleInfo( hb_title_t * title )
         audio = hb_list_audio_config_item( title->list_audio, i );
         if( ( audio->in.codec == HB_ACODEC_AC3 ) || ( audio->in.codec == HB_ACODEC_DCA) )
         {
-            fprintf( stderr, "    + %d, %s, %dHz, %dbps\n", i + 1,
-                     audio->lang.description, audio->in.samplerate, audio->in.bitrate );
+            fprintf( stderr, "    + %d, %s (iso639-2: %s), %dHz, %dbps\n", 
+                     i + 1,
+                     audio->lang.description, 
+                     audio->lang.iso639_2,
+                     audio->in.samplerate, 
+                     audio->in.bitrate );
         }
         else
         {
-            fprintf( stderr, "    + %d, %s\n", i + 1, audio->lang.description );
+            fprintf( stderr, "    + %d, %s (iso639-2: %s)\n", 
+                     i + 1, 
+                     audio->lang.iso639_2,
+                     audio->lang.description );
         }
     }
     fprintf( stderr, "  + subtitle tracks:\n" );
@@ -1821,8 +1829,9 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         lang = srtlang[i];
                     }
+                    sub_config.default_track = 
+                           ( srtdefault != -1 ) && ( srtdefault == i + 1 );
                     sub_config.force = 0;
-                    sub_config.default_track = 0;
                     strncpy( sub_config.src_filename, srtfile[i], 128);
                     strncpy( sub_config.src_codeset, codeset, 40);
                     sub_config.offset = offset;
@@ -2345,7 +2354,7 @@ static void ShowHelp()
     "        --subtitle-burn     \"Burn\" the selected subtitle into the video track\n"
     "          <number>          If \"number\" is omitted, the first trac is burned.\n"
     "        --subtitle-default  Flag the selected subtitle as the default subtitle\n"
-    "          <number>          to be displayed upon playback.  Settings no default\n"
+    "          <number>          to be displayed upon playback.  Setting no default\n"
     "                            means no subtitle will be automatically displayed\n"
     "                            If \"number\" is omitted, the first trac is default.\n"
     "    -N, --native-language   Specifiy the your language preference. When the first\n"
@@ -2371,6 +2380,11 @@ static void ShowHelp()
     "        --srt-lang <string> Language as an iso639-2 code fra, eng, spa et cetera)\n"
     "                            for the SRT file(s) separated by commas. If not specified\n"
     "                            then 'und' is used.\n"
+    "        --srt-default       Flag the selected srt as the default subtitle\n"
+    "          <number>          to be displayed upon playback.  Setting no default\n"
+    "                            means no subtitle will be automatically displayed\n"
+    "                            If \"number\" is omitted, the first srt is default.\n"
+    "                            \"number\" is an 1 based index into the srt-file list\n"
     "\n"
 
 
@@ -2415,6 +2429,17 @@ static void ShowPresets()
     printf("\n>\n");
 }
 
+static char * hb_strndup( char * str, int len )
+{
+       char * res;
+       int str_len = strlen( str );
+
+       res = malloc( len > str_len ? str_len + 1 : len + 1 );
+       strncpy( res, str, len );
+       res[len] = '\0';
+       return res;
+}
+
 static char** str_split( char *str, char delem )
 {
     char *  pos;
@@ -2444,7 +2469,7 @@ static char** str_split( char *str, char delem )
     for ( i = 0; i < count - 1; i++ )
     {
         end = strchr( pos, delem );
-        ret[i] = strndup(pos, end - pos);
+        ret[i] = hb_strndup(pos, end - pos);
         pos = end + 1;
     }
     ret[i] = strdup(pos);
@@ -2474,6 +2499,7 @@ static int ParseOptions( int argc, char ** argv )
     #define SRT_CODESET         270
     #define SRT_OFFSET          271
     #define SRT_LANG            272
+    #define SRT_DEFAULT         273
     
     for( ;; )
     {
@@ -2508,6 +2534,7 @@ static int ParseOptions( int argc, char ** argv )
             { "srt-codeset", required_argument, NULL, SRT_CODESET },
             { "srt-offset",  required_argument, NULL, SRT_OFFSET },
             { "srt-lang",    required_argument, NULL, SRT_LANG },
+            { "srt-default",    optional_argument, NULL, SRT_DEFAULT },
             { "native-language", required_argument, NULL,'N' },
             { "native-dub",  no_argument,       NULL,    NATIVE_DUB },
             { "encoder",     required_argument, NULL,    'e' },
@@ -2739,6 +2766,16 @@ static int ParseOptions( int argc, char ** argv )
             case SRT_LANG:
                 srtlang = str_split( optarg, ',' );
                 break;
+            case SRT_DEFAULT:
+                if( optarg != NULL )
+                {
+                    srtdefault = atoi( optarg );
+                }
+                else
+                {
+                    srtdefault = 1 ;
+                }
+                break;
             case '2':
                 twoPass = 1;
                 break;