Added library names

[asdcplib.git] / src / wavesplit.cpp

diff --git a/src/wavesplit.cpp b/src/wavesplit.cpp
index c1897333aa4fb787ff6211019e8b2bc44115b1f1..71448ce37015cc3f1e4dec6d0aece42b120086a3 100755 (executable)
--- a/src/wavesplit.cpp
+++ b/src/wavesplit.cpp
@@ -50,7 +50,7 @@ static const char* PROGRAM_NAME = "wavesplit";    // program name for messages
 // otherwise sets the given flag.
 #define TEST_SET_MAJOR_MODE(f) if ( TEST_MAJOR_MODE() ) \
                                  { \
-                                   fputs("Conflicting major mode, choose one of -(ic)).\n", stderr); \
+                                   fputs("Conflicting major mode, choose one of -(ic).\n", stderr); \
                                    return; \
                                  } \
                                  (f) = true;
@@ -138,12 +138,12 @@ 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 'f':
                TEST_EXTRA_ARG(i, 'f');
-               start_frame = atoi(argv[i]); // TODO: test for negative value, should use strtol()
+               start_frame = Kumu::xabs(strtol(argv[i], 0, 10));
                break;
 
              case 'h': help_flag = true; break;
@@ -200,7 +200,7 @@ wav_file_info(CommandOptions& Options)
   if ( ASDCP_SUCCESS(result) )
     {
       Parser.FillAudioDescriptor(ADesc);
-      ADesc.SampleRate = PictureRate;
+      ADesc.EditRate = PictureRate;
       fprintf(stderr, "48Khz PCM Audio, %s fps (%u spf)\n", "24",
              PCM::CalcSamplesPerFrame(ADesc));
       fputs("AudioDescriptor:\n", stderr);
@@ -253,7 +253,7 @@ split_wav_file(CommandOptions& Options)
     {
       Parser.FillAudioDescriptor(ADesc);
 
-      ADesc.SampleRate = PictureRate;
+      ADesc.EditRate = PictureRate;
       ui32_t fb_size = PCM::CalcFrameBufferSize(ADesc);
       assert((fb_size % 2) == 0);
       FrameBuffer.Capacity(fb_size);