From db5b68f071652db2be954408c920dd0b0ba183dc Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 7 Oct 2011 17:43:49 +0000 Subject: converter: added presets support, fixed flac preset, enabled 'cancel' button git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2381 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/converter/converterhelper.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/plugins/General/converter/converterhelper.cpp') diff --git a/src/plugins/General/converter/converterhelper.cpp b/src/plugins/General/converter/converterhelper.cpp index 2bde69119..44f7337f9 100644 --- a/src/plugins/General/converter/converterhelper.cpp +++ b/src/plugins/General/converter/converterhelper.cpp @@ -44,6 +44,7 @@ ConverterHelper::ConverterHelper(QObject *parent) : QObject(parent) connect(m_converter,SIGNAL(progress(int)),m_progress,SLOT(setValue(int))); connect(m_converter, SIGNAL(finished()), m_progress, SLOT(reset())); connect(m_converter, SIGNAL(desriptionChanged(QString)), m_progress, SLOT(setLabelText(QString))); + connect(m_progress, SIGNAL(canceled()), m_converter, SLOT(stop())); } ConverterHelper::~ConverterHelper() @@ -62,7 +63,13 @@ void ConverterHelper::openConverter() if(d->exec() == QDialog::Accepted) { QStringList urls = d->selectedUrls(); - m_converter->add(urls); + QVariantMap preset = d->preset(); + if(preset.isEmpty()) + { + d->deleteLater(); + return; + } + m_converter->add(urls, preset); if(!m_converter->isRunning()) m_converter->start(); -- cgit v1.2.3-13-gbd6f