Modified to enforce execution order of the predicates

[asdcplib.git] / src / blackwave.cpp

diff --git a/src/blackwave.cpp b/src/blackwave.cpp
index 35e5e776eb097e3bd069cb7ff33cc85508c33003..1a89a0e2f6ba5ec350a0670c88da4124e5ec2076 100644 (file)
--- a/src/blackwave.cpp
+++ b/src/blackwave.cpp
@@ -100,7 +100,7 @@ public:
   const char* filename;  // filename prefix for files written by the extract mode
 
   CommandOptions(int argc, const char** argv) :
-    error_flag(true), verbose_flag(false), version_flag(false), help_flag(false),
+    error_flag(true), verbose_flag(false), version_flag(false), help_flag(false), s96_flag(false),
     duration(1440), filename(0)
   {
     for ( int i = 1; i < argc; i++ )
@@ -115,7 +115,7 @@ public:
 
              case 'd':
                TEST_EXTRA_ARG(i, 'd');
-               duration = atoi(argv[i]); // TODO: test for negative value, should use strtol()
+               duration = Kumu::xabs(strtol(argv[i], 0, 10));
                break;
 
              case '9':
@@ -175,7 +175,7 @@ make_black_wav_file(CommandOptions& Options)
 
   if ( Options.verbose_flag )
     {
-      fprintf(stderr, "%s kHz PCM Audio, %s fps (%u spf)\n", "24",
+      fprintf(stderr, "%s kHz PCM Audio, 24 fps (%u spf)\n",
              (Options.s96_flag?"96":"48"), PCM::CalcSamplesPerFrame(ADesc));
       fputs("AudioDescriptor:\n", stderr);
       PCM::AudioDescriptorDump(ADesc);
@@ -187,8 +187,8 @@ make_black_wav_file(CommandOptions& Options)
 
   if ( ASDCP_SUCCESS(result) )
     {
-      Wav::SimpleWaveHeader WavHeader(ADesc);
-      result = WavHeader.WriteToFile(OutFile);
+       RF64::SimpleRF64Header WavHeader(ADesc);
+       result = WavHeader.WriteToFile(OutFile);
     }
 
   if ( ASDCP_SUCCESS(result) )