summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-07-24 10:55:08 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-07-24 10:55:08 +0200
commit0dbcb9a977fd9b91d86c79657d1007c77feaffd9 (patch)
treefc4485862753057fb9d6ba74811887814ee5b425 /src
parent9e18f010539eb0d02e5b7f43a20bfcc5ebc3a674 (diff)
downloadODR-AudioEnc-0dbcb9a977fd9b91d86c79657d1007c77feaffd9.tar.gz
ODR-AudioEnc-0dbcb9a977fd9b91d86c79657d1007c77feaffd9.tar.bz2
ODR-AudioEnc-0dbcb9a977fd9b91d86c79657d1007c77feaffd9.zip
Rename wavreader to wavfile
Diffstat (limited to 'src')
-rw-r--r--src/FileInput.cpp2
-rw-r--r--src/aac-enc.c2
-rw-r--r--src/odr-audioenc.cpp2
-rw-r--r--src/wavfile.c (renamed from src/wavreader.c)2
-rw-r--r--src/wavfile.h (renamed from src/wavreader.h)5
5 files changed, 5 insertions, 8 deletions
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
-