diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/FileInput.cpp | 2 | ||||
| -rw-r--r-- | src/aac-enc.c | 2 | ||||
| -rw-r--r-- | src/odr-audioenc.cpp | 2 | ||||
| -rw-r--r-- | src/wavfile.c (renamed from src/wavreader.c) | 2 | ||||
| -rw-r--r-- | src/wavfile.h (renamed from src/wavreader.h) | 5 |
6 files changed, 7 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 5848c2b..493dbeb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,13 +94,13 @@ odr_audioenc_SOURCES = src/odr-audioenc.cpp \ src/zmq.hpp \ src/utils.c \ src/utils.h \ - src/wavreader.c \ + src/wavfile.c \ src/common.h \ $(FEC_SOURCES) bin_PROGRAMS = odr-audioenc$(EXEEXT) -noinst_HEADERS = src/wavreader.h +noinst_HEADERS = src/wavfile.h libtoolame_dab_la_SOURCES = \ libtoolame-dab/common.c \ diff --git a/src/FileInput.cpp b/src/FileInput.cpp index d6c33cf..1bad495 100644 --- a/src/FileInput.cpp +++ b/src/FileInput.cpp @@ -17,7 +17,7 @@ */ #include "FileInput.h" -#include "wavreader.h" +#include "wavfile.h" #include <cstring> #include <cstdio> diff --git a/src/aac-enc.c b/src/aac-enc.c index 1528881..3bd09d7 100644 --- a/src/aac-enc.c +++ b/src/aac-enc.c @@ -21,7 +21,7 @@ #include <unistd.h> #include <stdlib.h> #include "libAACenc/include/aacenc_lib.h" -#include "wavreader.h" +#include "wavfile.h" void usage(const char* name) { fprintf(stderr, "%s [-r bitrate] [-t aot] [-a afterburner] [-s sbr] [-v vbr] in.wav out.aac\n", name); diff --git a/src/odr-audioenc.cpp b/src/odr-audioenc.cpp index a33cd2e..84218c8 100644 --- a/src/odr-audioenc.cpp +++ b/src/odr-audioenc.cpp @@ -55,11 +55,11 @@ #include "SampleQueue.h" #include "zmq.hpp" #include "common.h" +#include "wavfile.h" extern "C" { #include "encryption.h" #include "utils.h" -#include "wavreader.h" } #include <vector> diff --git a/src/wavreader.c b/src/wavfile.c index c8bb05d..03f9c94 100644 --- a/src/wavreader.c +++ b/src/wavfile.c @@ -16,7 +16,7 @@ * ------------------------------------------------------------------- */ -#include "wavreader.h" +#include "wavfile.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/wavreader.h b/src/wavfile.h index 57a13ff..e121b33 100644 --- a/src/wavreader.h +++ b/src/wavfile.h @@ -16,8 +16,7 @@ * ------------------------------------------------------------------- */ -#ifndef WAVREADER_H -#define WAVREADER_H +#pragma once #ifdef __cplusplus extern "C" { @@ -33,5 +32,3 @@ int wav_read_data(void* obj, unsigned char* data, unsigned int length); } #endif -#endif - |