aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/Engines/mplayer/mplayerengine.cpp2
-rw-r--r--src/plugins/Engines/mplayer/settingsdialog.cpp55
-rw-r--r--src/plugins/Engines/mplayer/settingsdialog.h7
-rw-r--r--src/plugins/Engines/mplayer/settingsdialog.ui135
4 files changed, 110 insertions, 89 deletions
diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp
index 12feaf73f..217db97de 100644
--- a/src/plugins/Engines/mplayer/mplayerengine.cpp
+++ b/src/plugins/Engines/mplayer/mplayerengine.cpp
@@ -151,6 +151,8 @@ bool MplayerEngine::initialize()
if (settings.value("autosync", false).toBool())
m_args << "-autosync" << QString("%1").arg(settings.value("autosync_factor", 100).toInt());
+ m_args << settings.value("cmd_options").toString().split(" ", QString::SkipEmptyParts);
+
if(m_source->offset() > 0)
m_args << "-ss" << QString("%1").arg(m_source->offset()/1000);
m_args << m_source->url();
diff --git a/src/plugins/Engines/mplayer/settingsdialog.cpp b/src/plugins/Engines/mplayer/settingsdialog.cpp
index 1cc9299b9..c50d1e905 100644
--- a/src/plugins/Engines/mplayer/settingsdialog.cpp
+++ b/src/plugins/Engines/mplayer/settingsdialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Ilya Kotov *
+ * Copyright (C) 2009-2014 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -18,41 +18,39 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <QSettings>
-
#include <qmmp/qmmp.h>
-
#include "settingsdialog.h"
SettingsDialog::SettingsDialog(QWidget *parent)
: QDialog(parent)
{
- ui.setupUi(this);
+ m_ui.setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
- ui.videoComboBox->addItem(tr("default"));
- ui.videoComboBox->addItem("xv");
- ui.videoComboBox->addItem("x11");
- ui.videoComboBox->addItem("gl");
- ui.videoComboBox->addItem("gl2");
- ui.videoComboBox->addItem("dga");
- ui.videoComboBox->addItem("sdl");
- ui.videoComboBox->addItem("null");
- ui.audioComboBox->addItem(tr("default"));
- ui.audioComboBox->addItem("oss");
- ui.audioComboBox->addItem("alsa");
- ui.audioComboBox->addItem("pulse");
- ui.audioComboBox->addItem("jack");
- ui.audioComboBox->addItem("nas");
- ui.audioComboBox->addItem("null");
+ m_ui.videoComboBox->addItem(tr("default"));
+ m_ui.videoComboBox->addItem("xv");
+ m_ui.videoComboBox->addItem("x11");
+ m_ui.videoComboBox->addItem("gl");
+ m_ui.videoComboBox->addItem("gl2");
+ m_ui.videoComboBox->addItem("dga");
+ m_ui.videoComboBox->addItem("sdl");
+ m_ui.videoComboBox->addItem("null");
+ m_ui.audioComboBox->addItem(tr("default"));
+ m_ui.audioComboBox->addItem("oss");
+ m_ui.audioComboBox->addItem("alsa");
+ m_ui.audioComboBox->addItem("pulse");
+ m_ui.audioComboBox->addItem("jack");
+ m_ui.audioComboBox->addItem("nas");
+ m_ui.audioComboBox->addItem("null");
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.beginGroup("mplayer");
- ui.audioComboBox->setEditText(settings.value("ao","default").toString().replace("default", tr("default")));
- ui.videoComboBox->setEditText(settings.value("vo","default").toString().replace("default", tr("default")));
- ui.autoSyncCheckBox->setChecked(settings.value("autosync", false).toBool());
- ui.syncFactorSpinBox->setValue(settings.value("autosync_factor", 100).toInt());
+ m_ui.audioComboBox->setEditText(settings.value("ao","default").toString().replace("default", tr("default")));
+ m_ui.videoComboBox->setEditText(settings.value("vo","default").toString().replace("default", tr("default")));
+ m_ui.autoSyncCheckBox->setChecked(settings.value("autosync", false).toBool());
+ m_ui.syncFactorSpinBox->setValue(settings.value("autosync_factor", 100).toInt());
+ m_ui.cmdOptionsLineEdit->setText(settings.value("cmd_options").toString());
settings.endGroup();
}
-
SettingsDialog::~SettingsDialog()
{}
@@ -60,10 +58,11 @@ void SettingsDialog::accept()
{
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.beginGroup("mplayer");
- settings.setValue("ao",ui.audioComboBox->currentText().replace(tr("default"), "default"));
- settings.setValue("vo",ui.videoComboBox->currentText().replace(tr("default"), "default"));
- settings.setValue("autosync",ui.autoSyncCheckBox->isChecked());
- settings.setValue("autosync_factor",ui.syncFactorSpinBox->value());
+ settings.setValue("ao",m_ui.audioComboBox->currentText().replace(tr("default"), "default"));
+ settings.setValue("vo",m_ui.videoComboBox->currentText().replace(tr("default"), "default"));
+ settings.setValue("autosync",m_ui.autoSyncCheckBox->isChecked());
+ settings.setValue("autosync_factor",m_ui.syncFactorSpinBox->value());
+ settings.setValue("cmd_options",m_ui.cmdOptionsLineEdit->text());
settings.endGroup();
QDialog::accept();
}
diff --git a/src/plugins/Engines/mplayer/settingsdialog.h b/src/plugins/Engines/mplayer/settingsdialog.h
index c8aa7e640..28fb03407 100644
--- a/src/plugins/Engines/mplayer/settingsdialog.h
+++ b/src/plugins/Engines/mplayer/settingsdialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Ilya Kotov *
+ * Copyright (C) 2009-2014 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -21,11 +21,10 @@
#define SETTINGSDIALOG_H
#include <QDialog>
-
#include "ui_settingsdialog.h"
/**
- @author Ilya Kotov <forkotov02@hotmail.ru>
+ @author Ilya Kotov <forkotov02@hotmail.ru>
*/
class SettingsDialog : public QDialog
{
@@ -40,7 +39,7 @@ public slots:
virtual void accept();
private:
- Ui::SettingsDialog ui;
+ Ui::SettingsDialog m_ui;
};
#endif
diff --git a/src/plugins/Engines/mplayer/settingsdialog.ui b/src/plugins/Engines/mplayer/settingsdialog.ui
index 86dbfe8f6..58d5e7dc6 100644
--- a/src/plugins/Engines/mplayer/settingsdialog.ui
+++ b/src/plugins/Engines/mplayer/settingsdialog.ui
@@ -6,14 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
- <width>259</width>
- <height>143</height>
+ <width>355</width>
+ <height>210</height>
</rect>
</property>
<property name="windowTitle">
<string>MPlayer Settings</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
+ <layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>6</number>
</property>
@@ -23,62 +23,83 @@
<property name="bottomMargin">
<number>6</number>
</property>
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Video:</string>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2">
- <widget class="QComboBox" name="videoComboBox">
- <property name="editable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Audio:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2">
- <widget class="QComboBox" name="audioComboBox">
- <property name="editable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="3">
- <widget class="QCheckBox" name="autoSyncCheckBox">
- <property name="text">
- <string>Audio/video auto synchronization</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="0" colspan="2">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Synchronization factor:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="QSpinBox" name="syncFactorSpinBox">
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>999</number>
- </property>
- </widget>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Video:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="videoComboBox">
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Audio:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="audioComboBox">
+ <property name="editable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QCheckBox" name="autoSyncCheckBox">
+ <property name="text">
+ <string>Audio/video auto synchronization</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Synchronization factor:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QSpinBox" name="syncFactorSpinBox">
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>999</number>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Extra options:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="cmdOptionsLineEdit">
+ <property name="toolTip">
+ <string>Extra command line options</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="4" column="0" colspan="3">
+ <item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 22:57:59 +0000