git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow multiple sources for elements. last added source will be in .source, a list...
[enigma2.git]
/
lib
/
service
/
servicemp3.cpp
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index 79098f2c81eae0d2f91b2332fd766ef25deee6a9..73a12430ad01ce654bd5c46cb3d3890cb1eef1d1 100644
(file)
--- a/
lib/service/servicemp3.cpp
+++ b/
lib/service/servicemp3.cpp
@@
-17,6
+17,12
@@
/* for subtitles */
#include <lib/gui/esubtitle.h>
/* for subtitles */
#include <lib/gui/esubtitle.h>
+#ifndef GST_SEEK_FLAG_SKIP
+#warning Compiling for legacy gstreamer, things will break
+#define GST_SEEK_FLAG_SKIP 0
+#define GST_TAG_HOMEPAGE ""
+#endif
+
// eServiceFactoryMP3
eServiceFactoryMP3::eServiceFactoryMP3()
// eServiceFactoryMP3
eServiceFactoryMP3::eServiceFactoryMP3()
@@
-603,7
+609,7
@@
RESULT eServiceMP3::getName(std::string &name)
int eServiceMP3::getInfo(int w)
{
int eServiceMP3::getInfo(int w)
{
- gchar *tag = 0;
+
const
gchar *tag = 0;
switch (w)
{
switch (w)
{
@@
-702,9
+708,9
@@
int eServiceMP3::getInfo(int w)
std::string eServiceMP3::getInfoString(int w)
{
std::string eServiceMP3::getInfoString(int w)
{
- if ( !m_stream_tags )
+ if ( !m_stream_tags
&& w < sUser && w > 26
)
return "";
return "";
- gchar *tag = 0;
+
const
gchar *tag = 0;
switch (w)
{
case sTagTitle:
switch (w)
{
case sTagTitle:
@@
-800,7
+806,6
@@
std::string eServiceMP3::getInfoString(int w)
case sTagChannelMode:
tag = "channel-mode";
break;
case sTagChannelMode:
tag = "channel-mode";
break;
-
case sUser+12:
return m_error_message;
default:
case sUser+12:
return m_error_message;
default:
@@
-820,7
+825,7
@@
std::string eServiceMP3::getInfoString(int w)
PyObject *eServiceMP3::getInfoObject(int w)
{
PyObject *eServiceMP3::getInfoObject(int w)
{
- gchar *tag = 0;
+
const
gchar *tag = 0;
bool isBuffer = false;
switch (w)
{
bool isBuffer = false;
switch (w)
{
@@
-1039,7
+1044,7
@@
void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
GstTagList *tags, *result;
gst_message_parse_tag(msg, &tags);
GstTagList *tags, *result;
gst_message_parse_tag(msg, &tags);
- result = gst_tag_list_merge(m_stream_tags, tags, GST_TAG_MERGE_
PREPEND
);
+ result = gst_tag_list_merge(m_stream_tags, tags, GST_TAG_MERGE_
REPLACE
);
if (result)
{
if (m_stream_tags)
if (result)
{
if (m_stream_tags)
@@
-1128,6
+1133,7
@@
eDebug("AUDIO STRUCT=%s", g_type);
g_free (g_lang);
// g_free (g_type);
}
g_free (g_lang);
// g_free (g_type);
}
+ m_event((iPlayableService*)this, evUpdatedEventInfo);
}
case GST_MESSAGE_ELEMENT:
{
}
case GST_MESSAGE_ELEMENT:
{