oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/chromaprint/DecoderClient: replace method PrintResult()

Browse Source
This commit is contained in:
Max Kellermann 2019-04-05 13:40:05 +02:00
parent 9f1c23e217
commit a30af2ba42
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/chromaprint/DecoderClient.cxx
View File

@ -26,7 +26,7 @@ ChromaprintDecoderClient::ChromaprintDecoderClient() = default;
ChromaprintDecoderClient::~ChromaprintDecoderClient() noexcept = default; ChromaprintDecoderClient::~ChromaprintDecoderClient() noexcept = default;
void void
ChromaprintDecoderClient::PrintResult() ChromaprintDecoderClient::Finish()
{ {
if (!ready) if (!ready)
throw std::runtime_error("Decoding failed"); throw std::runtime_error("Decoding failed");
@ -38,8 +38,6 @@ ChromaprintDecoderClient::PrintResult()
} }
chromaprint.Finish(); chromaprint.Finish();
printf("%s\n", chromaprint.GetFingerprint().c_str());
} }
void void

6
src/lib/chromaprint/DecoderClient.hxx
View File

@ -45,7 +45,11 @@ public:
ChromaprintDecoderClient(); ChromaprintDecoderClient();
~ChromaprintDecoderClient() noexcept; ~ChromaprintDecoderClient() noexcept;
void PrintResult(); void Finish();
std::string GetFingerprint() const {
return chromaprint.GetFingerprint();
}
/* virtual methods from DecoderClient */ /* virtual methods from DecoderClient */
void Ready(AudioFormat audio_format, void Ready(AudioFormat audio_format,

3
test/RunChromaprint.cxx
View File

@ -135,7 +135,8 @@ try {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
client.PrintResult(); client.Finish();
printf("%s\n", client.GetFingerprint().c_str());
return EXIT_SUCCESS; return EXIT_SUCCESS;
} catch (...) { } catch (...) {
PrintException(std::current_exception()); PrintException(std::current_exception());