From: Chang.H.S <jhs@dev3>
Date: Fri, 29 Jun 2012 09:17:29 +0000 (+0900)
Subject: Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into... 
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=e981b4328e099f62e029e97694e24f19c50d4860;hp=1743f5e172cd8815a5a9d687ead3cd051e681ea3

Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into vuplus_experimental
---

diff --git a/lib/dvb/db.cpp b/lib/dvb/db.cpp
index 0547407..f938cb1 100644
--- a/lib/dvb/db.cpp
+++ b/lib/dvb/db.cpp
@@ -651,11 +651,6 @@ void eDVBDB::loadBouquet(const char *path)
 			{
 				int offs = line[8] == ':' ? 10 : 9;
 				eServiceReference tmp(line+offs);
-				if (tmp.type != eServiceReference::idDVB)
-				{
-					eDebug("only DVB Bouquets supported");
-					continue;
-				}
 				if ( tmp.flags&eServiceReference::canDescent )
 				{
 					size_t pos = tmp.path.rfind('/');
diff --git a/lib/service/service.cpp b/lib/service/service.cpp
old mode 100644
new mode 100755
index 11cf95b..77bfda9
--- a/lib/service/service.cpp
+++ b/lib/service/service.cpp
@@ -65,11 +65,18 @@ eServiceReference::eServiceReference(const std::string &string)
 		if ( sscanf(c, "%d:%d:%x:%x:%x:%x:%n", &type, &flags, &data[0], &data[1], &data[2], &data[3], &pathl) < 2 )
 			type = idInvalid;
 	}
-
 	if (pathl)
 	{
 		const char *pathstr = c+pathl;
-		const char *namestr = strchr(pathstr, ':');
+		const char *namestr = NULL;
+		int found = strlen(pathstr)-1;
+		for(;found >= 0;found--)
+		{
+			if(pathstr[found] == ':')
+				break;
+		}
+		if (found != -1)
+			namestr = pathstr + found;
 		if (namestr)
 		{
 			if (!strncmp(namestr, "://", 3)) // The path is a url (e.g. "http://...")
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index edcc42a..6aac29e 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -696,6 +696,8 @@ RESULT eServiceMP3::isCurrentlySeekable()
 		return 0;
 	if (m_state != stRunning)
 		return 0;
+	if (m_sourceinfo.is_streaming)
+		return 0;
 
 	g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL);