Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
0053cd0d
Commit
0053cd0d
authored
Feb 18, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Main: disable inotify check without database
Fix build failure.
parent
c32477a2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
Makefile.am
Makefile.am
+2
-0
Main.cxx
src/Main.cxx
+6
-5
No files found.
Makefile.am
View file @
0053cd0d
...
...
@@ -249,6 +249,7 @@ src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT)
src_mpd_LDFLAGS
=
-Wl
,src/win32/mpd_win32_rc.
$(OBJEXT)
endif
if
ENABLE_DATABASE
if
ENABLE_INOTIFY
src_mpd_SOURCES
+=
\
src/db/update/InotifyDomain.cxx src/db/update/InotifyDomain.hxx
\
...
...
@@ -256,6 +257,7 @@ src_mpd_SOURCES += \
src/db/update/InotifyQueue.cxx src/db/update/InotifyQueue.hxx
\
src/db/update/InotifyUpdate.cxx src/db/update/InotifyUpdate.hxx
endif
endif
if
ENABLE_SQLITE
src_mpd_SOURCES
+=
\
...
...
src/Main.cxx
View file @
0053cd0d
...
...
@@ -71,16 +71,15 @@
#include "db/plugins/SimpleDatabasePlugin.hxx"
#include "storage/Configured.hxx"
#include "storage/CompositeStorage.hxx"
#ifdef ENABLE_INOTIFY
#include "db/update/InotifyUpdate.hxx"
#endif
#endif
#ifdef ENABLE_NEIGHBOR_PLUGINS
#include "neighbor/Glue.hxx"
#endif
#ifdef ENABLE_INOTIFY
#include "db/update/InotifyUpdate.hxx"
#endif
#ifdef ENABLE_SQLITE
#include "sticker/StickerDatabase.hxx"
#endif
...
...
@@ -519,6 +518,7 @@ int mpd_main(int argc, char *argv[])
instance
->
partition
->
outputs
.
SetReplayGainMode
(
replay_gain_get_real_mode
(
instance
->
partition
->
playlist
.
queue
.
random
));
#ifdef ENABLE_DATABASE
if
(
config_get_bool
(
CONF_AUTO_UPDATE
,
false
))
{
#ifdef ENABLE_INOTIFY
if
(
instance
->
storage
!=
nullptr
&&
...
...
@@ -533,6 +533,7 @@ int mpd_main(int argc, char *argv[])
"inotify: auto_update was disabled. enable during compilation phase"
);
#endif
}
#endif
config_global_check
();
...
...
@@ -557,7 +558,7 @@ int mpd_main(int argc, char *argv[])
/* cleanup */
#if
def ENABLE_INOTIFY
#if
defined(ENABLE_DATABASE) && defined(ENABLE_INOTIFY)
mpd_inotify_finish
();
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment