[refactoring] Get rid of inheritance from data.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/atrac/atrac3_bitstream.h b/src/atrac/atrac3_bitstream.h
index e67f726..75a39ea 100644
--- a/src/atrac/atrac3_bitstream.h
+++ b/src/atrac/atrac3_bitstream.h
@@ -39,7 +39,7 @@ struct TTonalBlock {
     TScaledBlock ScaledBlock;
 };
 
-class TAtrac3BitStreamWriter : public virtual TAtrac3Data {
+class TAtrac3BitStreamWriter {
 public:
     struct TSingleChannelElement {
         TAtrac3Data::SubbandInfo SubbandInfo;
@@ -59,24 +59,24 @@ private:
     const uint32_t BfuIdxConst;
     std::vector<char> OutBuffer;
 
-    uint32_t CLCEnc(const uint32_t selector, const int mantissas[MaxSpecsPerBlock],
+    uint32_t CLCEnc(const uint32_t selector, const int mantissas[TAtrac3Data::MaxSpecsPerBlock],
                     const uint32_t blockSize, NBitStream::TBitStream* bitStream);
 
-    uint32_t VLCEnc(const uint32_t selector, const int mantissas[MaxSpecsPerBlock],
+    uint32_t VLCEnc(const uint32_t selector, const int mantissas[TAtrac3Data::MaxSpecsPerBlock],
                     const uint32_t blockSize, NBitStream::TBitStream* bitStream);
 
     std::vector<uint32_t> CalcBitsAllocation(const std::vector<TScaledBlock>& scaledBlocks,
                                              uint32_t bfuNum, TFloat spread, TFloat shift, TFloat loudness);
 
     std::pair<uint8_t, std::vector<uint32_t>> CreateAllocation(const TSingleChannelElement& sce,
-                                                               uint16_t targetBits, int mt[MaxSpecs], float laudness);
+                                                               uint16_t targetBits, int mt[TAtrac3Data::MaxSpecs], float laudness);
 
     std::pair<uint8_t, uint32_t> CalcSpecsBitsConsumption(const TSingleChannelElement& sce,
                                                           const std::vector<uint32_t>& precisionPerEachBlocks,
                                                           int* mantisas);
 
     void EncodeSpecs(const TSingleChannelElement& sce, NBitStream::TBitStream* bitStream,
-                     const std::pair<uint8_t, std::vector<uint32_t>>&, const int mt[MaxSpecs]);
+                     const std::pair<uint8_t, std::vector<uint32_t>>&, const int mt[TAtrac3Data::MaxSpecs]);
 
     uint8_t GroupTonalComponents(const std::vector<TTonalBlock>& tonalComponents,
                                  const std::vector<uint32_t>& allocTable,