diff options
| author | Daniil Cherednik <dan.cherednik@gmail.com> | 2024-12-22 13:39:37 +0100 |
|---|---|---|
| committer | Daniil Cherednik <dan.cherednik@gmail.com> | 2024-12-22 14:44:27 +0100 |
| commit | eb33c262156f4feb67c523908add841077574021 (patch) | |
| tree | 2f1765702fc2021274ace815e471113b29d79dd0 /src/main.cpp | |
| parent | e2605699b7c79a8cb5d06b0069f32c3b01d4ded4 (diff) | |
| parent | 74d6e04c21bddd435bd74c34dbe027b883772a76 (diff) | |
| download | atracdenc-eb33c262156f4feb67c523908add841077574021.tar.gz | |
Merge branch 'master' into new_psy
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4b40024..faf88e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,8 +46,8 @@ using std::stoi; using namespace NAtracDEnc; -typedef std::unique_ptr<TPCMEngine<TFloat>> TPcmEnginePtr; -typedef std::unique_ptr<IProcessor<TFloat>> TAtracProcessorPtr; +typedef std::unique_ptr<TPCMEngine> TPcmEnginePtr; +typedef std::unique_ptr<IProcessor> TAtracProcessorPtr; static void printUsage(const char* myName, const string& err = string()) { @@ -145,9 +145,9 @@ static void PrepareAtrac1Encoder(const string& inFile, "the result will be incorrect" << std::endl; } TCompressedOutputPtr aeaIO = CreateAeaOutput(outFile, "test", numChannels, (uint32_t)numFrames); - pcmEngine->reset(new TPCMEngine<TFloat>(4096, + pcmEngine->reset(new TPCMEngine(4096, numChannels, - TPCMEngine<TFloat>::TReaderPtr((*wavIO)->GetPCMReader<TFloat>()))); + TPCMEngine::TReaderPtr((*wavIO)->GetPCMReader()))); if (!noStdOut) cout << "Input\n Filename: " << inFile << "\n Channels: " << (int)numChannels @@ -177,9 +177,9 @@ static void PrepareAtrac1Decoder(const string& inFile, << "\n Codec: PCM" << endl; wavIO->reset(new TWav(outFile, aeaIO->GetChannelNum(), 44100)); - pcmEngine->reset(new TPCMEngine<TFloat>(4096, + pcmEngine->reset(new TPCMEngine(4096, aeaIO->GetChannelNum(), - TPCMEngine<TFloat>::TWriterPtr((*wavIO)->GetPCMWriter<TFloat>()))); + TPCMEngine::TWriterPtr((*wavIO)->GetPCMWriter()))); atracProcessor->reset(new TAtrac1Decoder(std::move(aeaIO))); } @@ -237,9 +237,9 @@ static void PrepareAtrac3Encoder(const string& inFile, << "\n Bitrate: " << encoderSettings.ConteinerParams->Bitrate << endl; - pcmEngine->reset(new TPCMEngine<TFloat>(4096, + pcmEngine->reset(new TPCMEngine(4096, numChannels, - TPCMEngine<TFloat>::TReaderPtr(wavIO->GetPCMReader<TFloat>()))); + TPCMEngine::TReaderPtr(wavIO->GetPCMReader()))); atracProcessor->reset(new TAtrac3Encoder(std::move(omaIO), std::move(encoderSettings))); } |