Merge branch 'check/next-cc'

again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



------------------
This commit was generated by Migit

src/system/helpers.cpp

@@ -284,6 +284,24 @@ bool get_mem_usage(unsigned long &kbtotal, unsigned long &kbfree)
 	return true;
 }
 
+std::string getPathName(std::string &path)
+{
+	size_t pos = path.find_last_of("/");
+	if (pos == std::string::npos)
+		return path;
+	return path.substr(0, pos);
+}
+
+std::string getBaseName(std::string &path)
+{
+	size_t pos = path.find_last_of("/");
+	if (pos == std::string::npos)
+		return path;
+	if (path.length() == pos +1)
+		return "";
+	return path.substr(pos+1);
+}
+
 std::string trim(std::string &str, const std::string &trimChars /*= " \n\r\t"*/)
 {
 	std::string result = str.erase(str.find_last_not_of(trimChars) + 1);