aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.c
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-07-30 23:32:47 +0000
committerEric Wong <normalperson@yhbt.net>2006-07-30 23:32:47 +0000
commit12aec5738b8333a0dd676871bbfb6d6762ea87a5 (patch)
treeb2bb99e19e6a771f01bb465f38f4d878d6a9d805 /src/main.c
parent381d7232a0d63c0a145fae5e2c40e577ff2f44f1 (diff)
downloadmpd-12aec5738b8333a0dd676871bbfb6d6762ea87a5.tar.gz
mpd-12aec5738b8333a0dd676871bbfb6d6762ea87a5.tar.xz
mpd-12aec5738b8333a0dd676871bbfb6d6762ea87a5.zip
Standardize state_file handling routines.
This way it's easier to manage and extend. git-svn-id: https://svn.musicpd.org/mpd/trunk@4494 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 67ae0f76b..3ba2afeb4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,6 +35,7 @@
#include "inputPlugin.h"
#include "audioOutput.h"
#include "inputStream.h"
+#include "state_file.h"
#include "tag.h"
#include "tagTracker.h"
#include "dbUtils.h"
@@ -346,7 +347,6 @@ static void startMainProcess(void)
if (pid > 0) {
initInputStream();
initReplayGainState();
- readAudioDevicesState();
/* free stuff we don't need */
freeAllListenSockets();
@@ -581,7 +581,7 @@ int main(int argc, char *argv[])
my_usleep(1);
openVolumeDevice();
- readPlaylistState();
+ read_state_file();
while (COMMAND_RETURN_KILL != doIOForInterfaces()) {
if (COMMAND_RETURN_KILL == handlePendingSignals())
@@ -591,8 +591,7 @@ int main(int argc, char *argv[])
readDirectoryDBIfUpdateIsFinished();
}
- savePlaylistState();
- saveAudioDevicesState();
+ write_state_file();
freeAllInterfaces();
closeAllListenSockets();