Merge pull request #5 from virinext/small_bug_fixes

Small bug fixes
This commit is contained in:
virinext 2016-11-14 22:23:05 +07:00 committed by GitHub
commit 692b81f393
3 changed files with 27 additions and 19 deletions

View file

@ -329,26 +329,30 @@ bool PipelineIE::Export(QSharedPointer<GraphManager> pgraph, const QString &file
GstPad *pad = gst_element_get_static_pad(element, info[i].m_pads[j].m_name.c_str());
GstPadTemplate *templ = gst_pad_get_pad_template(pad);
if (templ) {
QString presence;
switch(GST_PAD_TEMPLATE_PRESENCE(templ))
{
case GST_PAD_ALWAYS:
presence = "always";
break;
QString presence;
switch(GST_PAD_TEMPLATE_PRESENCE(templ))
{
case GST_PAD_ALWAYS:
presence = "always";
break;
case GST_PAD_SOMETIMES:
presence = "sometimes";
break;
case GST_PAD_SOMETIMES:
presence = "sometimes";
break;
case GST_PAD_REQUEST:
presence = "request";
break;
};
xmlWriter.writeAttribute("presence", presence);
xmlWriter.writeAttribute("template-name", GST_PAD_TEMPLATE_NAME_TEMPLATE(templ));
case GST_PAD_REQUEST:
presence = "request";
break;
};
xmlWriter.writeAttribute("presence", presence);
xmlWriter.writeAttribute("template-name", GST_PAD_TEMPLATE_NAME_TEMPLATE(templ));
} else {
qDebug() << "Unable to find a template for" << info[i].m_pads[j].m_name.c_str();
xmlWriter.writeAttribute("presence", "always");
xmlWriter.writeAttribute("template-name", "");
}
gst_object_unref(pad);
if(info[i].m_connections[j].m_elementId != (size_t)-1 &&

View file

@ -165,6 +165,10 @@ void PluginsList::showInfo(QListWidgetItem *pitem, QListWidgetItem *previous)
void PluginsList::insert(QListWidgetItem *pitem)
{
if(!pitem) {
qDebug() << "Do not insert null item";
return;
}
qDebug() << "Insert: " << pitem -> text();
if(!m_pGraph || !m_pGraph -> AddPlugin(pitem -> text().toStdString().c_str(), NULL))
@ -183,7 +187,7 @@ bool PluginsList::eventFilter(QObject *obj, QEvent *event)
{
QKeyEvent *key = static_cast<QKeyEvent*>(event);
if((key -> key() == Qt::Key_Enter) || (key -> key() == Qt::Key_Return))
if((key -> key() == Qt::Key_Enter) || (key -> key() == Qt::Key_Return) && m_pPlugins -> currentItem())
{
insert(m_pPlugins -> currentItem());
return true;

View file

@ -15,7 +15,7 @@ class PluginsList: public QDialog
{
Q_OBJECT
public:
PluginsList(QWidget *pwgt = NULL, Qt::WindowFlags f = 0);
PluginsList(QWidget *pwgt = NULL, Qt::WindowFlags f = Qt::Window);
GraphManager *m_pGraph;