projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into...
[vuplus_dvbapp]
/
lib
/
service
/
servicemp3.cpp
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
old mode 100644
(file)
new mode 100755
(executable)
index
edcc42a
..
6aed865
--- a/
lib/service/servicemp3.cpp
+++ b/
lib/service/servicemp3.cpp
@@
-47,6
+47,10
@@
eServiceFactoryMP3::eServiceFactoryMP3()
extensions.push_back("mp4");
extensions.push_back("mov");
extensions.push_back("m4a");
extensions.push_back("mp4");
extensions.push_back("mov");
extensions.push_back("m4a");
+ extensions.push_back("flv");
+ extensions.push_back("3gp");
+ extensions.push_back("3g2");
+ extensions.push_back("dts");
sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
}
sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
}
@@
-1251,7
+1255,7
@@
void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
GError *err;
gst_message_parse_error (msg, &err, &debug);
g_free (debug);
GError *err;
gst_message_parse_error (msg, &err, &debug);
g_free (debug);
- eWarning("Gstreamer error: %s (
%i) from %s", err->message
, err->code, sourceName );
+ eWarning("Gstreamer error: %s (
domain:%i, code:%i) from %s", err->message, err->domain
, err->code, sourceName );
if ( err->domain == GST_STREAM_ERROR )
{
if ( err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND )
if ( err->domain == GST_STREAM_ERROR )
{
if ( err->code == GST_STREAM_ERROR_CODEC_NOT_FOUND )
@@
-1262,6
+1266,11
@@
void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
m_event((iPlayableService*)this, evUser+10);
}
}
m_event((iPlayableService*)this, evUser+10);
}
}
+ else //if( err->domain == 1232 )
+ {
+ if ( err->code == 5 )
+ m_event((iPlayableService*)this, evUser+20);
+ }
g_error_free(err);
break;
}
g_error_free(err);
break;
}