diff options
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c index a838d0349..239296501 100644 --- a/src/main.c +++ b/src/main.c @@ -20,11 +20,9 @@ #include "command.h" #include "playlist.h" #include "directory.h" -#include "player.h" #include "listen.h" #include "conf.h" #include "path.h" -#include "playerData.h" #include "stats.h" #include "sig_handlers.h" #include "audio.h" @@ -45,6 +43,7 @@ #include "zeroconf.h" #include "main_notify.h" #include "os_compat.h" +#include "outputBuffer.h" #define SYSTEM_CONFIG_FILE_LOCATION "/etc/mpd.conf" #define USER_CONFIG_FILE_LOCATION "/.mpdconf" @@ -412,7 +411,7 @@ int main(int argc, char *argv[]) openDB(&options, argv[0]); initCommands(); - initPlayerData(); + config_output_buffer(); initAudioConfig(); initAudioDriver(); initVolume(); @@ -424,6 +423,7 @@ int main(int argc, char *argv[]) daemonize(&options); init_main_notify(); + init_output_buffer(); setup_log_output(options.stdOutput); initSigHandlers(); @@ -431,8 +431,7 @@ int main(int argc, char *argv[]) initZeroconf(); openVolumeDevice(); - decoderInit(); - playerInit(); + decoder_init(); read_state_file(); while (COMMAND_RETURN_KILL != doIOForInterfaces() && @@ -443,7 +442,7 @@ int main(int argc, char *argv[]) } write_state_file(); - playerKill(); + ob_trigger_action(OB_ACTION_PAUSE_SET); finishZeroconf(); freeAllInterfaces(); closeAllListenSockets(); |