Merge branch 'core-rewrite' of git://git.musicpd.org/normalperson/mpd

* 'core-rewrite' of git://git.musicpd.org/normalperson/mpd:
  Remove ob_wait_sync and cleanup triggering in playlist
  fix output buffer deadlock when daemonizing
  log.c: thread-safety for warning log
  core rewrite (decode,player,outputBuffer,playlist)

1 files changed, 40 insertions, 0 deletions

diff --git a/src/player_error.h b/src/player_error.h
new file mode 100644
index 000000000..c90c98420
--- /dev/null
+++ b/src/player_error.h
@@ -0,0 +1,40 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * This project's homepage is: http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef PLAYER_ERROR_H
+#define PLAYER_ERROR_H
+
+#include "song.h"
+
+enum player_error {
+	PLAYER_ERROR_NONE = 0,
+	PLAYER_ERROR_FILE,
+	PLAYER_ERROR_AUDIO,
+	PLAYER_ERROR_SYSTEM,
+	PLAYER_ERROR_UNKTYPE,
+	PLAYER_ERROR_FILENOTFOUND
+};
+
+extern enum player_error player_errno;
+extern Song *player_errsong;
+
+void player_clearerror(void);
+void player_seterror(enum player_error err, Song *song);
+const char *player_strerror(void);
+
+#endif /* PLAYER_ERROR_H */