Add configuration option for ffmpeg

2 files changed, 26 insertions, 11 deletions

diff --git a/configurationwidget.cpp b/configurationwidget.cpp
index 599e0fb..c757bc5 100644
--- a/configurationwidget.cpp
+++ b/configurationwidget.cpp
@@ -35,15 +35,21 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent, Qt::WindowFlags f) : Q
     mFfProbe = new QLineEdit;
     extL->addWidget(new QLabel(tr("ffprobe")), 0, 0);
     extL->addWidget(mFfProbe, 0, 1);
-    QPushButton *browseffBtn = new QPushButton(tr("Browse..."));
-    connect(browseffBtn, SIGNAL(clicked()), this, SLOT(browseff()));
-    extL->addWidget(browseffBtn, 0, 2);
+    QPushButton *browseFfProbeBtn = new QPushButton(tr("Browse..."));
+    connect(browseFfProbeBtn, SIGNAL(clicked()), this, SLOT(browseFfProbe()));
+    extL->addWidget(browseFfProbeBtn, 0, 2);
+    mFfMpeg = new QLineEdit;
+    extL->addWidget(new QLabel(tr("ffmpeg")), 1, 0);
+    extL->addWidget(mFfMpeg, 1, 1);
+    QPushButton *browseFfMpegBtn = new QPushButton(tr("Browse..."));
+    connect(browseFfMpegBtn, SIGNAL(clicked()), this, SLOT(browseFfMpeg()));
+    extL->addWidget(browseFfMpegBtn, 1, 2);
     mMkvInfo = new QLineEdit;
-    extL->addWidget(new QLabel(tr("mkvinfo")), 1, 0);
-    extL->addWidget(mMkvInfo, 1, 1);
+    extL->addWidget(new QLabel(tr("mkvinfo")), 2, 0);
+    extL->addWidget(mMkvInfo, 2, 1);
     QPushButton *browsemkvBtn = new QPushButton(tr("Browse..."));
-    connect(browsemkvBtn, SIGNAL(clicked()), this, SLOT(browsemkv()));
-    extL->addWidget(browsemkvBtn, 1, 2);
+    connect(browsemkvBtn, SIGNAL(clicked()), this, SLOT(browseMkvInfo()));
+    extL->addWidget(browsemkvBtn, 2, 2);
     extL->setAlignment(Qt::AlignTop);
     QWidget *extWidget = new QWidget;
     extWidget->setLayout(extL);
@@ -78,16 +84,22 @@ void ConfigurationWidget::accept(){
     s.setValue("dbpass", mDbPass->text());
     s.setValue("dbname", mDbName->text());
     s.setValue("ext/ffprobe", mFfProbe->text());
+    s.setValue("ext/ffmpeg", mFfMpeg->text());
     s.setValue("ext/mkvinfo", mMkvInfo->text());
     QDialog::accept();
 }
 
-void ConfigurationWidget::browseff(){
+void ConfigurationWidget::browseFfProbe(){
     QString ffprobe = QFileDialog::getOpenFileName(this, tr("Select ffprobe"), QDir::homePath());
     mFfProbe->setText(QDir::toNativeSeparators(ffprobe));
 }
 
-void ConfigurationWidget::browsemkv(){
+void ConfigurationWidget::browseFfMpeg(){
+    QString ffmpeg = QFileDialog::getOpenFileName(this, tr("Select ffmpeg"), QDir::homePath());
+    mFfMpeg->setText(QDir::toNativeSeparators(ffmpeg));
+}
+
+void ConfigurationWidget::browseMkvInfo(){
     QString mkvinfo = QFileDialog::getOpenFileName(this, tr("Select mkvinfo"), QDir::homePath());
     mMkvInfo->setText(QDir::toNativeSeparators(mkvinfo));
 }
@@ -99,5 +111,6 @@ void ConfigurationWidget::readSettings(){
     mDbPass->setText(s.value("dbpass").toString());
     mDbName->setText(s.value("dbname").toString());
     mFfProbe->setText(s.value("ext/ffprobe").toString());
+    mFfMpeg->setText(s.value("ext/ffmpeg").toString());
     mMkvInfo->setText(s.value("ext/mkvinfo").toString());
 }
diff --git a/configurationwidget.h b/configurationwidget.h
index 526e13b..53fb230 100644
--- a/configurationwidget.h
+++ b/configurationwidget.h
@@ -15,8 +15,9 @@ class ConfigurationWidget : public QDialog {
         virtual void accept();
 
     private slots:
-        void browseff();
-        void browsemkv();
+        void browseFfProbe();
+        void browseFfMpeg();
+        void browseMkvInfo();
 
     private:
         void readSettings();
@@ -25,6 +26,7 @@ class ConfigurationWidget : public QDialog {
         QLineEdit *mDbPass;
         QLineEdit *mDbName;
         QLineEdit *mFfProbe;
+        QLineEdit *mFfMpeg;
         QLineEdit *mMkvInfo;
         QPushButton *mAccept;
         QPushButton *mCancel;