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 (parent:
0e08cc4
)
fix mem bug by changing c strings to cpp strings
author
Fraxinas
<andreas.frisch@multimedia-labs.de>
Fri, 31 Oct 2008 09:24:17 +0000
(10:24 +0100)
committer
Andreas Oberritter
<obi@saftware.de>
Thu, 6 Nov 2008 00:41:43 +0000
(
01:41
+0100)
lib/service/servicemp3.cpp
patch
|
blob
|
history
diff --git
a/lib/service/servicemp3.cpp
b/lib/service/servicemp3.cpp
index a453f54f961535d67a72bf42ffb1741f4ed434cb..5c982aa1d6841875d808066447320e939ccc7fc0 100644
(file)
--- a/
lib/service/servicemp3.cpp
+++ b/
lib/service/servicemp3.cpp
@@
-273,31
+273,31
@@
eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
queue_audio = gst_element_factory_make("queue", "queue_audio");
queue_video = gst_element_factory_make("queue", "queue_video");
queue_audio = gst_element_factory_make("queue", "queue_audio");
queue_video = gst_element_factory_make("queue", "queue_video");
-
char demux_type[14]
;
+
std::string demux_type
;
switch (sourceinfo.containertype)
{
case ctMPEGTS:
switch (sourceinfo.containertype)
{
case ctMPEGTS:
-
strcat(demux_type, "flutsdemux")
;
+
demux_type = "flutsdemux"
;
break;
case ctMPEGPS:
case ctVCD:
break;
case ctMPEGPS:
case ctVCD:
-
strcat(demux_type, "flupsdemux")
;
+
demux_type = "flupsdemux"
;
break;
case ctMKV:
break;
case ctMKV:
-
strcat(demux_type, "matroskademux")
;
+
demux_type = "matroskademux"
;
break;
case ctAVI:
break;
case ctAVI:
-
strcat(demux_type, "avidemux")
;
+
demux_type = "avidemux"
;
break;
case ctMP4:
break;
case ctMP4:
-
strcat(demux_type, "qtdemux")
;
+
demux_type = "qtdemux"
;
break;
default:
break;
}
break;
default:
break;
}
- videodemux = gst_element_factory_make(demux_type, "videodemux");
+ videodemux = gst_element_factory_make(demux_type
.c_str()
, "videodemux");
if (!videodemux)
if (!videodemux)
- m_error_message = "GStreamer plugin " +
(std::string)
demux_type + " not available!\n";
+ m_error_message = "GStreamer plugin " + demux_type + " not available!\n";
switch_audio = gst_element_factory_make ("input-selector", "switch_audio");
if (!switch_audio)
switch_audio = gst_element_factory_make ("input-selector", "switch_audio");
if (!switch_audio)