Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code cleanup.

Browse source
This commit is contained in:
mark 2006-11-22 08:46:03 +00:00
parent e66ccc702b
commit f6489b70b8
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
campcaster/src/modules/playlistExecutor/src/GstreamerPlayer.cxx
View file

@ -374,13 +374,14 @@ GstreamerPlayer :: open(const std::string fileUrl)
} }
const bool isSmil = fileUrl.substr(fileUrl.size()-5, fileUrl.size()) == ".smil" ? true : false; const bool isSmil = fileUrl.substr(fileUrl.size()-5, fileUrl.size()) == ".smil" ? true : false;
const bool isPreloaded = (m_preloadUrl == fileUrl);
if ( m_preloadUrl != fileUrl ) { if (isPreloaded)
m_filesrc = m_preloadFilesrc;
else {
m_filesrc = gst_element_factory_make("filesrc", "file-source"); m_filesrc = gst_element_factory_make("filesrc", "file-source");
gst_element_set(m_filesrc, "location", filePath.c_str(), NULL); gst_element_set(m_filesrc, "location", filePath.c_str(), NULL);
} }
else
m_filesrc = m_preloadFilesrc;
// converts between different audio formats (e.g. bitrate) // converts between different audio formats (e.g. bitrate)
m_audioconvert = gst_element_factory_make("audioconvert", NULL); m_audioconvert = gst_element_factory_make("audioconvert", NULL);
@ -392,14 +393,14 @@ GstreamerPlayer :: open(const std::string fileUrl)
// Therefore we instantiate it manually if the file has the .smil extension. // Therefore we instantiate it manually if the file has the .smil extension.
if (isSmil) { if (isSmil) {
debug() << "SMIL file detected." << endl; debug() << "SMIL file detected." << endl;
if (m_preloadUrl != fileUrl) { if (isPreloaded) {
m_decoder = gst_element_factory_make("minimalaudiosmil", NULL);
gst_element_link_many(m_filesrc, m_decoder, m_audioconvert, NULL);
}
else {
m_decoder = m_preloadDecoder; m_decoder = m_preloadDecoder;
gst_element_link(m_decoder, m_audioconvert); gst_element_link(m_decoder, m_audioconvert);
} }
else {
m_decoder = gst_element_factory_make("minimalaudiosmil", NULL);
gst_element_link_many(m_filesrc, m_decoder, m_audioconvert, NULL);
}
if (gst_element_get_parent(m_audiosink) == NULL) if (gst_element_get_parent(m_audiosink) == NULL)
gst_bin_add(GST_BIN(m_pipeline), m_audiosink); gst_bin_add(GST_BIN(m_pipeline), m_audiosink);
} }