[refactoring] move some libraries in to library directory

Author: dcherednik

CMakeLists.txt

@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 
 project(atracdenc)
-
+include_directories(src)
 if (UNIX)
     find_package(GTest)
     if (GTest_FOUND)

src/CMakeLists.txt

@@ -56,14 +56,15 @@ if (${BIGENDIAN})
 endif()
 
 include_directories(
+    "."
     "lib"
-    "oma/liboma/include"
+    "lib/liboma/include"
 )
 
 set(SOURCE_FFT_LIB fft/kissfft_impl/kiss_fft.c)
 set_source_files_properties(fft/kissfft_impl/kiss_fft.c PROPERTIES COMPILE_FLAGS -Dkiss_fft_scalar=double)
-set(SOURCE_OMA_LIB oma/liboma/src/liboma.c)
-set(SOURCE_BITSTREAM_LIB bitstream/bitstream.cpp)
+set(SOURCE_OMA_LIB lib/liboma/src/liboma.c)
+set(SOURCE_BITSTREAM_LIB lib/bitstream/bitstream.cpp)
 set(SOURCE_ATRACDENC_IMPL
     wav.cpp
     aea.cpp
@@ -81,7 +82,7 @@ set(SOURCE_ATRACDENC_IMPL
     atrac3denc.cpp
     atrac/atrac3.cpp
     atrac/atrac3_bitstream.cpp
-    mdct/mdct.cpp
+    lib/mdct/mdct.cpp
 )
 
 add_library(fft_impl STATIC ${SOURCE_FFT_LIB})

src/atrac/atrac1.h

@@ -21,8 +21,7 @@
 #include <array>
 #include <map>
 #include <math.h>
-#include "../bitstream/bitstream.h"
-#include "../config.h"
+#include "config.h"
 namespace NAtracDEnc {
 namespace NAtrac1 {
 

src/atrac/atrac1_bitalloc.cpp

@@ -22,7 +22,7 @@
 #include "atrac1.h"
 #include <math.h>
 #include <cassert>
-#include "../bitstream/bitstream.h"
+#include "bitstream/bitstream.h"
 #include "../env.h"
 
 namespace NAtracDEnc {

src/atrac/atrac1_bitalloc.h

@@ -18,7 +18,6 @@
 
 #pragma once
 #include "atrac_scale.h"
-#include "../bitstream/bitstream.h"
 #include "../aea.h"
 #include "../atrac/atrac1.h"
 #include <vector>

src/atrac/atrac3_bitstream.cpp

@@ -18,7 +18,7 @@
 
 #include "atrac3_bitstream.h"
 #include "atrac_psy_common.h"
-#include "../bitstream/bitstream.h"
+#include "bitstream/bitstream.h"
 #include "../util.h"
 #include <algorithm>
 #include <iostream>

src/atrac/atrac3plus_pqf/atrac3plus_pqf.c

@@ -30,7 +30,7 @@
 #include "atrac3plus_pqf.h"
 #include "atrac3plus_pqf_data.h"
 
-#include "../../mdct/dct.h"
+#include "lib/mdct/dct.h"
 
 /*
  * Number of subbands to split input signal

src/atrac/atrac_scale.h

@@ -22,6 +22,7 @@
 #include <cstdint>
 
 #include "atrac1.h"
+#include "lib/bitstream/bitstream.h"
 #include "../config.h"
 
 namespace NAtracDEnc {

src/atrac1denc.h

@@ -23,7 +23,7 @@
 #include "atrac/atrac1.h"
 #include "atrac/atrac1_qmf.h"
 #include "atrac/atrac_scale.h"
-#include "mdct/mdct.h"
+#include "lib/mdct/mdct.h"
 
 #include <assert.h>
 #include <vector>

src/bitstream/bitstream.cpp src/lib/bitstream/bitstream.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "../include/oma.h"
-#include "oma_internal.h"
 
 #include <endian_tools.h>
 
@@ -30,6 +29,11 @@
 
 #define OMA_HEADER_SIZE 96
 
+struct omafile_ctx {
+    FILE* file;
+    oma_info_t info;
+};
+
 static const int liboma_samplerates[8] = { 32000, 44100, 48000, 88200, 96000, 0 };
 static const char* codec_name[6] = { "ATRAC3", "ATRAC3PLUS", "MPEG1LAYER3", "LPCM", "", "OMAC_ID_WMA" };
 static char ea3_str[] = {'E', 'A', '3'};

src/bitstream/bitstream.h src/lib/bitstream/bitstream.h

@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "../config.h"
-#include "../fft/kissfft_impl/kiss_fft.h"
+#include "config.h"
+#include "fft/kissfft_impl/kiss_fft.h"
 #include <vector>
 #include <type_traits>