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

neighbor/Plugin: migrate from class Error to C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-09-05 10:53:54 +02:00
parent 135662d6b0
commit 871063dab7
8 changed files with 40 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Main.cxx
View File

@@ -461,10 +461,7 @@ int mpd_main(int argc, char *argv[])
#ifdef ENABLE_NEIGHBOR_PLUGINS
instance->neighbors = new NeighborGlue();
if (!instance->neighbors->Init(io_thread_get(), *instance, error)) {
LogError(error);
return EXIT_FAILURE;
}
instance->neighbors->Init(io_thread_get(), *instance);
if (instance->neighbors->IsEmpty()) {
delete instance->neighbors;
@@ -563,9 +560,8 @@ try {
io_thread_start();
#ifdef ENABLE_NEIGHBOR_PLUGINS
if (instance->neighbors != nullptr &&
!instance->neighbors->Open(error))
FatalError(error);
if (instance->neighbors != nullptr)
instance->neighbors->Open();
#endif
ZeroconfInit(instance->event_loop);