Use ffmpeg to read audio files, instead of assuming raw format.

[c64tapwav] / decode.cpp

diff --git a/decode.cpp b/decode.cpp
index 49be647ea2cc67442718f2765e66ff508cd91064..e85f57934e685f214f4cda1cf02fc247a9a332fa 100644 (file)
--- a/decode.cpp
+++ b/decode.cpp
@@ -6,6 +6,7 @@
 #include <vector>
 #include <algorithm>
 
 #include <vector>
 #include <algorithm>
 

+#include "audioreader.h"

 #include "interpolate.h"
 #include "tap.h"
 
 #include "interpolate.h"
 #include "tap.h"
 


@@ -55,14 +56,9 @@ int main(int argc, char **argv)
 {
        make_lanczos_weight_table();
        std::vector<short> pcm;
 {
        make_lanczos_weight_table();
        std::vector<short> pcm;

-
-       while (!feof(stdin)) {
-               short buf[BUFSIZE];
-               ssize_t ret = fread(buf, 2, BUFSIZE, stdin);
-               if (ret >= 0) {
-                       pcm.insert(pcm.end(), buf, buf + ret);
-               }
-       }       
+       if (!read_audio_file(argv[1], &pcm)) {
+               exit(1);
+       }

 
 #if 0
        for (int i = 0; i < LEN; ++i) {
 
 #if 0
        for (int i = 0; i < LEN; ++i) {