git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9f8056c
)
use glib function to escape file uri in mediaplayer
author
Fraxinas
<andreas.frisch@multimedia-labs.de>
Mon, 15 Mar 2010 10:17:48 +0000
(11:17 +0100)
committer
Fraxinas
<andreas.frisch@multimedia-labs.de>
Mon, 15 Mar 2010 11:26:24 +0000
(12:26 +0100)
lib/service/servicemp3.cpp
patch
|
blob
|
history
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index ccc5fbaf15cca0c8a222c29c503643e8532893c4..0b2ac9d4cb4d0bc5595abcff3fa89ac993814c9b 100644
(file)
--- a/
lib/service/servicemp3.cpp
+++ b/
lib/service/servicemp3.cpp
@@
-303,11
+303,11
@@
eServiceMP3::eServiceMP3(eServiceReference ref)
if ( ret == -1 ) // this is a "REAL" VCD
uri = g_strdup_printf ("vcd://");
else
if ( ret == -1 ) // this is a "REAL" VCD
uri = g_strdup_printf ("vcd://");
else
- uri = g_
strdup_printf ("file://%s", filename
);
+ uri = g_
filename_to_uri(filename, NULL, NULL
);
}
else
}
else
- uri = g_
strdup_printf ("file://%s", filename
);
+ uri = g_
filename_to_uri(filename, NULL, NULL
);
eDebug("eServiceMP3::playbin2 uri=%s", uri);
eDebug("eServiceMP3::playbin2 uri=%s", uri);
@@
-341,9
+341,8
@@
eServiceMP3::eServiceMP3(eServiceReference ref)
struct stat buffer;
if (stat(srt_filename, &buffer) == 0)
{
struct stat buffer;
if (stat(srt_filename, &buffer) == 0)
{
- 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);
+ 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);
subtitleStream subs;
subs.type = stSRT;
subs.language_code = std::string("und");
subtitleStream subs;
subs.type = stSRT;
subs.language_code = std::string("und");