Use well known analyze/synthesis naming instead of split/merge

2 files changed, 13 insertions, 13 deletions

diff --git a/src/atrac/atrac1_qmf.h b/src/atrac/atrac1_qmf.h
index 8b3e5e4..d8fdae3 100644
--- a/src/atrac/atrac1_qmf.h
+++ b/src/atrac/atrac1_qmf.h
@@ -23,7 +23,7 @@
 namespace NAtracDEnc {
 
 template<class TIn>
-class Atrac1SplitFilterBank {
+class Atrac1AnalysisFilterBank {
     const static int nInSamples = 512;
     const static int delayComp = 39;
     TQmf<TIn, nInSamples> Qmf1;
@@ -31,14 +31,14 @@ class Atrac1SplitFilterBank {
     std::vector<TFloat> MidLowTmp;
     std::vector<TFloat> DelayBuf;
 public:
-    Atrac1SplitFilterBank() {
+    Atrac1AnalysisFilterBank() {
         MidLowTmp.resize(512);
         DelayBuf.resize(delayComp + 512);
     }
-    void Split(TIn* pcm, TFloat* low, TFloat* mid, TFloat* hi) {
+    void Analysis(TIn* pcm, TFloat* low, TFloat* mid, TFloat* hi) {
         memcpy(&DelayBuf[0], &DelayBuf[256], sizeof(TFloat) *  delayComp);
-        Qmf1.Split(pcm, &MidLowTmp[0], &DelayBuf[delayComp]);
-        Qmf2.Split(&MidLowTmp[0], low, mid);
+        Qmf1.Analysis(pcm, &MidLowTmp[0], &DelayBuf[delayComp]);
+        Qmf2.Analysis(&MidLowTmp[0], low, mid);
         memcpy(hi, &DelayBuf[0], sizeof(TFloat) * 256);
 
     }
@@ -59,8 +59,8 @@ public:
     void Synthesis(TOut* pcm, TFloat* low, TFloat* mid, TFloat* hi) {
         memcpy(&DelayBuf[0], &DelayBuf[256], sizeof(TFloat) *  delayComp);
         memcpy(&DelayBuf[delayComp], hi, sizeof(TFloat) * 256);
-        Qmf2.Merge(&MidLowTmp[0], &low[0], &mid[0]);
-        Qmf1.Merge(&pcm[0], &MidLowTmp[0], &DelayBuf[0]);
+        Qmf2.Synthesis(&MidLowTmp[0], &low[0], &mid[0]);
+        Qmf1.Synthesis(&pcm[0], &MidLowTmp[0], &DelayBuf[0]);
     }
 };
 
diff --git a/src/atrac/atrac3_qmf.h b/src/atrac/atrac3_qmf.h
index 6f26d54..2fc33fa 100644
--- a/src/atrac/atrac3_qmf.h
+++ b/src/atrac/atrac3_qmf.h
@@ -23,7 +23,7 @@
 namespace NAtracDEnc {
 
 template<class TIn>
-class Atrac3SplitFilterBank {
+class Atrac3AnalysisFilterBank {
     const static int nInSamples = 1024;
     TQmf<TIn, nInSamples> Qmf1;
     TQmf<TIn, nInSamples / 2> Qmf2;
@@ -31,14 +31,14 @@ class Atrac3SplitFilterBank {
     std::vector<TFloat> Buf1;
     std::vector<TFloat> Buf2;
 public:
-    Atrac3SplitFilterBank() {
+    Atrac3AnalysisFilterBank() {
         Buf1.resize(nInSamples);
         Buf2.resize(nInSamples);
     }
-    void Split(TIn* pcm, TFloat* subs[4]) {
-        Qmf1.Split(pcm, Buf1.data(), Buf2.data());
-        Qmf2.Split(Buf1.data(), subs[0], subs[1]);
-        Qmf3.Split(Buf2.data(), subs[3], subs[2]);
+    void Analysis(TIn* pcm, TFloat* subs[4]) {
+        Qmf1.Analysis(pcm, Buf1.data(), Buf2.data());
+        Qmf2.Analysis(Buf1.data(), subs[0], subs[1]);
+        Qmf3.Analysis(Buf2.data(), subs[3], subs[2]);
     }
 };