uncommit from master and move into own branch

Revert "mediaplyer: use glib uri escape function for filenames"

This reverts commit 7a2b79adb5fc43d08663faaf95a72f2899751ab1.

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 154f4868..2c84f7be 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -302,11 +302,11 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 		if ( ret == -1 ) // this is a "REAL" VCD
 			uri = g_strdup_printf ("vcd://");
 		else
-			uri = g_filename_to_uri(filename, NULL, NULL);
+			uri = g_strdup_printf ("file://%s", filename);
 	}
 	else
 
-		uri = g_filename_to_uri(filename, NULL, NULL);
+		uri = g_strdup_printf ("file://%s", filename);
 
 	eDebug("eServiceMP3::playbin2 uri=%s", uri);
 
@@ -340,8 +340,9 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 		struct stat buffer;
 		if (stat(srt_filename, &buffer) == 0)
 		{
-			eDebug("eServiceMP3::subtitle uri: %s", g_filename_to_uri(srt_filename, NULL, NULL));
-			g_object_set (G_OBJECT (m_gst_playbin), "suburi", g_filename_to_uri(srt_filename, NULL, NULL), NULL);
+			std::string suburi = "file://" + (std::string)srt_filename;
+			eDebug("eServiceMP3::subtitle uri: %s",suburi.c_str());
+			g_object_set (G_OBJECT (m_gst_playbin), "suburi", suburi.c_str(), NULL);
 			subtitleStream subs;
 			subs.type = stSRT;
 			subs.language_code = std::string("und");