git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix compiler warnings
[enigma2.git]
/
lib
/
service
/
servicemp3.cpp
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index df9bfe07027a814afd8e695153bde71902b9e61f..516ce6eb780e3cb590a04d1ea0b50f38f8746cd5 100644
(file)
--- a/
lib/service/servicemp3.cpp
+++ b/
lib/service/servicemp3.cpp
@@
-814,19
+814,19
@@
RESULT eServiceMP3::getTrackInfo(struct iAudioTrackInfo &info, unsigned int i)
// eDebug("eServiceMP3::getTrackInfo(&info, %i)",i);
if (i >= m_audioStreams.size())
return -2;
// eDebug("eServiceMP3::getTrackInfo(&info, %i)",i);
if (i >= m_audioStreams.size())
return -2;
- if (m_audioStreams[i].type == a
udioStream::a
tMPEG)
+ if (m_audioStreams[i].type == atMPEG)
info.m_description = "MPEG";
info.m_description = "MPEG";
- else if (m_audioStreams[i].type == a
udioStream::a
tMP3)
+ else if (m_audioStreams[i].type == atMP3)
info.m_description = "MP3";
info.m_description = "MP3";
- else if (m_audioStreams[i].type == a
udioStream::a
tAC3)
+ else if (m_audioStreams[i].type == atAC3)
info.m_description = "AC3";
info.m_description = "AC3";
- else if (m_audioStreams[i].type == a
udioStream::a
tAAC)
+ else if (m_audioStreams[i].type == atAAC)
info.m_description = "AAC";
info.m_description = "AAC";
- else if (m_audioStreams[i].type == a
udioStream::a
tDTS)
+ else if (m_audioStreams[i].type == atDTS)
info.m_description = "DTS";
info.m_description = "DTS";
- else if (m_audioStreams[i].type == a
udioStream::a
tPCM)
+ else if (m_audioStreams[i].type == atPCM)
info.m_description = "PCM";
info.m_description = "PCM";
- else if (m_audioStreams[i].type == a
udioStream::a
tOGG)
+ else if (m_audioStreams[i].type == atOGG)
info.m_description = "OGG";
else
info.m_description = "???";
info.m_description = "OGG";
else
info.m_description = "???";
@@
-949,7
+949,7
@@
GstBusSyncReply eServiceMP3::gstBusSyncHandler(GstBus *bus, GstMessage *message,
return GST_BUS_PASS;
}
return GST_BUS_PASS;
}
-
in
t eServiceMP3::gstCheckAudioPad(GstStructure* structure)
+
audiotype_
t eServiceMP3::gstCheckAudioPad(GstStructure* structure)
{
const gchar* type;
type = gst_structure_get_name(structure);
{
const gchar* type;
type = gst_structure_get_name(structure);
@@
-963,29
+963,29
@@
int eServiceMP3::gstCheckAudioPad(GstStructure* structure)
case 1:
{
if ( layer == 3 )
case 1:
{
if ( layer == 3 )
- return a
udioStream::a
tMP3;
+ return atMP3;
else
else
- return a
udioStream::a
tMPEG;
+ return atMPEG;
}
case 2:
}
case 2:
- return a
udioStream::a
tMPEG;
+ return atMPEG;
case 4:
case 4:
- return a
udioStream::a
tAAC;
+ return atAAC;
default:
default:
- return a
udioStream::a
tUnknown;
+ return atUnknown;
}
}
else
{
eDebug("mime %s", type);
if (!strcmp(type, "audio/x-ac3") || !strcmp(type, "audio/ac3"))
}
}
else
{
eDebug("mime %s", type);
if (!strcmp(type, "audio/x-ac3") || !strcmp(type, "audio/ac3"))
- return a
udioStream::a
tAC3;
+ return atAC3;
else if (!strcmp(type, "audio/x-dts") || !strcmp(type, "audio/dts"))
else if (!strcmp(type, "audio/x-dts") || !strcmp(type, "audio/dts"))
- return a
udioStream::a
tDTS;
+ return atDTS;
else if (!strcmp(type, "audio/x-raw-int"))
else if (!strcmp(type, "audio/x-raw-int"))
- return a
udioStream::a
tPCM;
+ return atPCM;
}
}
- return a
udioStream::a
tUnknown;
+ return atUnknown;
}
void eServiceMP3::gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer user_data)
}
void eServiceMP3::gstCBpadAdded(GstElement *decodebin, GstPad *pad, gpointer user_data)