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

input/qobuz: initialize the libgcrypt library

Browse Source
This commit is contained in:
Max Kellermann 2018-07-26 18:18:10 +02:00
parent 097e2b6c62
commit e16fd4a09b
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -1462,6 +1462,7 @@ libinput_a_SOURCES += \
$(YAJL_SOURCES) \ $(YAJL_SOURCES) \
src/lib/gcrypt/MD5.cxx src/lib/gcrypt/MD5.hxx \ src/lib/gcrypt/MD5.cxx src/lib/gcrypt/MD5.hxx \
src/lib/gcrypt/Hash.hxx \ src/lib/gcrypt/Hash.hxx \
src/lib/gcrypt/Init.hxx \
src/input/plugins/QobuzSession.hxx \ src/input/plugins/QobuzSession.hxx \
src/input/plugins/QobuzClient.cxx src/input/plugins/QobuzClient.hxx \ src/input/plugins/QobuzClient.cxx src/input/plugins/QobuzClient.hxx \
src/input/plugins/QobuzErrorParser.cxx src/input/plugins/QobuzErrorParser.hxx \ src/input/plugins/QobuzErrorParser.cxx src/input/plugins/QobuzErrorParser.hxx \

3
src/input/plugins/QobuzInputPlugin.cxx
View File

@ -28,6 +28,7 @@
#include "input/FailingInputStream.hxx" #include "input/FailingInputStream.hxx"
#include "input/InputPlugin.hxx" #include "input/InputPlugin.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "lib/gcrypt/Init.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
@ -126,6 +127,8 @@ QobuzInputStream::OnQobuzTrackError(std::exception_ptr e) noexcept
static void static void
InitQobuzInput(EventLoop &event_loop, const ConfigBlock &block) InitQobuzInput(EventLoop &event_loop, const ConfigBlock &block)
{ {
Gcrypt::Init();
const char *base_url = block.GetBlockValue("base_url", const char *base_url = block.GetBlockValue("base_url",
"http://www.qobuz.com/api.json/0.2/"); "http://www.qobuz.com/api.json/0.2/");

45
src/lib/gcrypt/Init.hxx Normal file
View File

@ -0,0 +1,45 @@
/*
* Copyright (C) 2018 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef GCRYPT_INIT_HXX
#define GCRYPT_INIT_HXX
#include <gcrypt.h>
namespace Gcrypt {
inline void
Init() noexcept
{
gcry_check_version(GCRYPT_VERSION);
}
} /* namespace Gcrypt */
#endif