Disable asan for stable branch. Remove ghasendtool.

3 files changed, 2 insertions, 99 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 17e364d..0fe7935 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ set (CMAKE_CXX_STANDARD 17)
 set (CMAKE_C_STANDARD 11)
 
 #add_definitions( "-Wall -O2 -g -Rpass-analysis=loop-vectorize" )
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address -fno-omit-frame-pointer")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fno-omit-frame-pointer")
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose Release or Debug" FORCE)
@@ -119,10 +119,3 @@ set(SOURCE_EXE
 add_executable(atracdenc ${SOURCE_EXE})
 target_link_libraries(atracdenc pcm_io oma atracdenc_impl ${SNDFILE_LIBRARIES})
 install(TARGETS atracdenc)
-
-#DEVTOOL
-set(GHASENDTOOL_EXE
-    atrac/at3p/ghasend_tool.cpp
-)
-add_executable(ghasendtool ${GHASENDTOOL_EXE})
-target_link_libraries(ghasendtool pcm_io oma atracdenc_impl ${SNDFILE_LIBRARIES})
diff --git a/src/atrac/at3p/ghasend_tool.cpp b/src/atrac/at3p/ghasend_tool.cpp
deleted file mode 100644
index c6be7c5..0000000
--- a/src/atrac/at3p/ghasend_tool.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "at3p_bitstream.h"
-#include "oma.h"
-
-#include <string>
-#include <iostream>
-
-using namespace std;
-
-void process(const string& in, NAtracDEnc::TAt3PBitStream* bs) {
-    size_t pos = 0;
-    int cur_num_pos = 0;
-    enum {
-        TAB,
-        NUM,
-        ERR,
-    } state = NUM;
-
-    std::vector<int> nums;
-
-    while (pos < in.size()) {
-        switch (state) {
-            case TAB:
-                if (in[pos] == '\t') {
-                    break;
-                } else if (('0' <= in[pos] && in[pos] <= '9') || in[pos] == '-') {
-                    state = NUM;
-                    cur_num_pos = pos;
-                    break;
-                } else {
-                    fprintf(stderr, "TAB state: %s\n", &in[pos]);
-                    abort();
-                }
-            case NUM:
-                if (in[pos] == '\t') {
-                    nums.push_back(stoi(in.substr(cur_num_pos, pos - cur_num_pos)));
-                    state = TAB;
-                    break;
-                } else if (pos == in.size() - 1) {
-                    nums.push_back(stoi(in.substr(cur_num_pos)));
-                    break;
-                } else if (('0' <= in[pos] && in[pos] <= '9') || in[pos] == '-') {
-                    break;
-                } else {
-                    fprintf(stderr, "NUM state: %s\n", &in[pos]);
-                    abort();
-                }
-            case ERR:
-                abort();
-        }
-        pos++;
-    }
-
-    if (nums.size() != 3)
-        return;
-
-    std::cerr << "gen: " << nums[0] << '\t' << nums[1] << '\t' << nums[2] << std::endl;
-
-    NAtracDEnc::TAt3PGhaData frame;
-    frame.NumToneBands = 1;
-    frame.Waves[0].WaveParams.push_back(NAtracDEnc::TAt3PGhaData::TWaveParam{(uint32_t)nums[1], 53, 0, 0});
-    frame.Waves[0].WaveSbInfos.resize(1);
-    frame.Waves[0].WaveSbInfos[0].WaveIndex = 0;
-    frame.Waves[0].WaveSbInfos[0].WaveNums = 1;
-    frame.Waves[0].WaveSbInfos[0].Envelope =  {(uint32_t)nums[0], (uint32_t)nums[2]};
-
-    //bs->WriteFrame(1, &frame);
-}
-
-int main(int argc, char** argv) {
-    if (argc != 2)
-        return -1;
-
-    string path(argv[1]);
-
-    std::unique_ptr<TOma> out(new TOma(path,
-            "test",
-            1,
-            1, OMAC_ID_ATRAC3PLUS,
-            2048,
-            false));
-
-    NAtracDEnc::TAt3PBitStream bs(out.get(), 2048);
-
-    cout << "output: " << path << endl;
-    string textline;
-    while (getline(cin, textline)) {
-        process(textline, &bs);
-    }
-    return 0;
-}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f3b6656..76aed56 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.1...3.26)
 set (CMAKE_CXX_STANDARD 17)
 set (CMAKE_C_STANDARD 11)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address -fno-omit-frame-pointer")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fno-omit-frame-pointer")
 
 include_directories(
     "../src/lib"