group various functions more logically

src/misc.cpp

@@ -23,17 +23,17 @@
 
 #include "misc.h"
 
-/*int Abs(int num)
+namespace
 {
-	return (num < 0 ? -num : num);
-}*/
+	const std::string unallowed_chars = "\"*/:<>?\\|";
+}
 
 void ToLower(std::string &s)
 {
 	transform(s.begin(), s.end(), s.begin(), tolower);
 }
 
-int StrToInt(std::string str)
+int StrToInt(const std::string &str)
 {
 	return atoi(str.c_str());
 }
@@ -45,10 +45,118 @@ std::string IntoStr(int l)
 	return ss.str();
 }
 
-/*string IntoStr(double l, int precision)
+std::string IntoStr(mpd_TagItems tag) // this is only for left column's title in media library
 {
-	std::stringstream ss;
-	ss << std::fixed << std::setprecision(precision) << l;
-	return ss.str();
-}*/
+	switch (tag)
+	{
+		case MPD_TAG_ITEM_ARTIST:
+			return "Artist";
+		case MPD_TAG_ITEM_ALBUM:
+			return "Album";
+		case MPD_TAG_ITEM_TITLE:
+			return "Title";
+		case MPD_TAG_ITEM_TRACK:
+			return "Track";
+		case MPD_TAG_ITEM_GENRE:
+			return "Genre";
+		case MPD_TAG_ITEM_DATE:
+			return "Year";
+		case MPD_TAG_ITEM_COMPOSER:
+			return "Composer";
+		case MPD_TAG_ITEM_PERFORMER:
+			return "Performer";
+		case MPD_TAG_ITEM_COMMENT:
+			return "Comment";
+		case MPD_TAG_ITEM_DISC:
+			return "Disc";
+		case MPD_TAG_ITEM_FILENAME:
+			return "Filename";
+		default:
+			return "";
+	}
+}
+
+std::string IntoStr(Color color)
+{
+	std::string result;
+	
+	if (color == clDefault)
+		result = "default";
+	else if (color == clBlack)
+		result = "black";
+	else if (color == clRed)
+		result = "red";
+	else if (color == clGreen)
+		result = "green";
+	else if (color == clYellow)
+		result = "yellow";
+	else if (color == clBlue)
+		result = "blue";
+	else if (color == clMagenta)
+		result = "magenta";
+	else if (color == clCyan)
+		result = "cyan";
+	else if (color == clWhite)
+		result = "white";
+	
+	return result;
+}
+
+Color IntoColor(const std::string &color)
+{
+	Color result = clDefault;
+	
+	if (color == "black")
+		result = clBlack;
+	else if (color == "red")
+		result = clRed;
+	else if (color == "green")
+		result = clGreen;
+	else if (color == "yellow")
+		result = clYellow;
+	else if (color == "blue")
+		result = clBlue;
+	else if (color == "magenta")
+		result = clMagenta;
+	else if (color == "cyan")
+		result = clCyan;
+	else if (color == "white")
+		result = clWhite;
+	
+	return result;
+}
+
+mpd_TagItems IntoTagItem(char c)
+{
+	switch (c)
+	{
+		case 'a':
+			return MPD_TAG_ITEM_ARTIST;
+		case 'y':
+			return MPD_TAG_ITEM_DATE;
+		case 'g':
+			return MPD_TAG_ITEM_GENRE;
+		case 'c':
+			return MPD_TAG_ITEM_COMPOSER;
+		case 'p':
+			return MPD_TAG_ITEM_PERFORMER;
+		default:
+			return MPD_TAG_ITEM_ARTIST;
+	}
+}
+
+void EscapeUnallowedChars(std::string &s)
+{
+	for (std::string::const_iterator it = unallowed_chars.begin(); it != unallowed_chars.end(); it++)
+	{
+		for (size_t i = 0; i < s.length(); i++)
+		{
+			if (s[i] == *it)
+			{
+				s.erase(s.begin()+i);
+				i--;
+			}
+		}
+	}
+}