Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 34 insertions, 0 deletions

diff --git a/lib/libhts/htsmsg_binary.h b/lib/libhts/htsmsg_binary.h
new file mode 100644
index 0000000000..02b41cac73
--- /dev/null
+++ b/lib/libhts/htsmsg_binary.h
@@ -0,0 +1,34 @@
+/*
+ *  Functions converting HTSMSGs to/from a simple binary format
+ *  Copyright (C) 2007 Andreas Öman
+ *
+ *  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef HTSMSG_BINARY_H_
+#define HTSMSG_BINARY_H_
+
+#include "htsmsg.h"
+
+/**
+ * htsmsg_binary_deserialize
+ */
+htsmsg_t *htsmsg_binary_deserialize(const void *data, size_t len,
+				    const void *buf);
+
+int htsmsg_binary_serialize(htsmsg_t *msg, void **datap, size_t *lenp,
+			    int maxlen);
+
+#endif /* HTSMSG_BINARY_H_ */