aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/Input/mplayer/decoder_mplayer.cpp4
-rw-r--r--src/plugins/Input/mplayer/settingsdialog.cpp4
-rw-r--r--src/plugins/Input/mplayer/settingsdialog.ui61
-rw-r--r--src/plugins/Input/mplayer/translations/mplayer_plugin_cs.ts14
-rw-r--r--src/plugins/Input/mplayer/translations/mplayer_plugin_de.ts14
-rw-r--r--src/plugins/Input/mplayer/translations/mplayer_plugin_ru.ts14
-rw-r--r--src/plugins/Input/mplayer/translations/mplayer_plugin_uk_UA.ts34
-rw-r--r--src/plugins/Input/mplayer/translations/mplayer_plugin_zh_CN.ts14
-rw-r--r--src/plugins/Input/mplayer/translations/mplayer_plugin_zh_TW.ts14
9 files changed, 152 insertions, 21 deletions
diff --git a/src/plugins/Input/mplayer/decoder_mplayer.cpp b/src/plugins/Input/mplayer/decoder_mplayer.cpp
index f9a5ff26a..b3ad9af24 100644
--- a/src/plugins/Input/mplayer/decoder_mplayer.cpp
+++ b/src/plugins/Input/mplayer/decoder_mplayer.cpp
@@ -118,6 +118,10 @@ bool DecoderMplayer::initialize()
m_args << "ao=" + ao_str;
if (vo_str != "default")
m_args << "vo=" + vo_str;
+
+ if (settings.value("autosync", FALSE).toBool())
+ m_args << QString("-autosync %1").arg(settings.value("autosync_factor", 100).toInt());
+
m_args << m_url;
connect(m_process, SIGNAL(readyReadStandardOutput()), SLOT(readStdOut()));
return TRUE;
diff --git a/src/plugins/Input/mplayer/settingsdialog.cpp b/src/plugins/Input/mplayer/settingsdialog.cpp
index 9dc84088d..029890eb1 100644
--- a/src/plugins/Input/mplayer/settingsdialog.cpp
+++ b/src/plugins/Input/mplayer/settingsdialog.cpp
@@ -47,6 +47,8 @@ SettingsDialog::SettingsDialog(QWidget *parent)
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());
settings.endGroup();
}
@@ -60,6 +62,8 @@ void SettingsDialog::accept()
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.endGroup();
QDialog::accept();
}
diff --git a/src/plugins/Input/mplayer/settingsdialog.ui b/src/plugins/Input/mplayer/settingsdialog.ui
index a5faa97be..86dbfe8f6 100644
--- a/src/plugins/Input/mplayer/settingsdialog.ui
+++ b/src/plugins/Input/mplayer/settingsdialog.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>229</width>
- <height>93</height>
+ <width>259</width>
+ <height>143</height>
</rect>
</property>
<property name="windowTitle">
@@ -30,7 +30,7 @@
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item row="0" column="1" colspan="2">
<widget class="QComboBox" name="videoComboBox">
<property name="editable">
<bool>true</bool>
@@ -44,14 +44,41 @@
</property>
</widget>
</item>
- <item row="1" column="1">
+ <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="1">
+ <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>
+ <item row="4" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
@@ -69,8 +96,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>199</x>
- <y>78</y>
+ <x>205</x>
+ <y>136</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
@@ -85,8 +112,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>202</x>
- <y>78</y>
+ <x>208</x>
+ <y>136</y>
</hint>
<hint type="destinationlabel">
<x>40</x>
@@ -94,5 +121,21 @@
</hint>
</hints>
</connection>
+ <connection>
+ <sender>autoSyncCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>syncFactorSpinBox</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>216</x>
+ <y>67</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>237</x>
+ <y>96</y>
+ </hint>
+ </hints>
+ </connection>
</connections>
</ui>
diff --git a/src/plugins/Input/mplayer/translations/mplayer_plugin_cs.ts b/src/plugins/Input/mplayer/translations/mplayer_plugin_cs.ts
index ff3bd22eb..94972e1fb 100644
--- a/src/plugins/Input/mplayer/translations/mplayer_plugin_cs.ts
+++ b/src/plugins/Input/mplayer/translations/mplayer_plugin_cs.ts
@@ -153,8 +153,8 @@
<location filename="../settingsdialog.cpp" line="39"/>
<location filename="../settingsdialog.cpp" line="48"/>
<location filename="../settingsdialog.cpp" line="49"/>
- <location filename="../settingsdialog.cpp" line="61"/>
- <location filename="../settingsdialog.cpp" line="62"/>
+ <location filename="../settingsdialog.cpp" line="63"/>
+ <location filename="../settingsdialog.cpp" line="64"/>
<source>default</source>
<translation type="unfinished"></translation>
</message>
@@ -173,5 +173,15 @@
<source>Audio:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="57"/>
+ <source>Audio/video auto synchronization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="67"/>
+ <source>Synchronization factor:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/Input/mplayer/translations/mplayer_plugin_de.ts b/src/plugins/Input/mplayer/translations/mplayer_plugin_de.ts
index 7328ad7d4..508fc4b2d 100644
--- a/src/plugins/Input/mplayer/translations/mplayer_plugin_de.ts
+++ b/src/plugins/Input/mplayer/translations/mplayer_plugin_de.ts
@@ -154,8 +154,8 @@
<location filename="../settingsdialog.cpp" line="39"/>
<location filename="../settingsdialog.cpp" line="48"/>
<location filename="../settingsdialog.cpp" line="49"/>
- <location filename="../settingsdialog.cpp" line="61"/>
- <location filename="../settingsdialog.cpp" line="62"/>
+ <location filename="../settingsdialog.cpp" line="63"/>
+ <location filename="../settingsdialog.cpp" line="64"/>
<source>default</source>
<translation type="unfinished"></translation>
</message>
@@ -174,5 +174,15 @@
<source>Audio:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="57"/>
+ <source>Audio/video auto synchronization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="67"/>
+ <source>Synchronization factor:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/Input/mplayer/translations/mplayer_plugin_ru.ts b/src/plugins/Input/mplayer/translations/mplayer_plugin_ru.ts
index 85f2c9120..a83e794c5 100644
--- a/src/plugins/Input/mplayer/translations/mplayer_plugin_ru.ts
+++ b/src/plugins/Input/mplayer/translations/mplayer_plugin_ru.ts
@@ -153,8 +153,8 @@
<location filename="../settingsdialog.cpp" line="39"/>
<location filename="../settingsdialog.cpp" line="48"/>
<location filename="../settingsdialog.cpp" line="49"/>
- <location filename="../settingsdialog.cpp" line="61"/>
- <location filename="../settingsdialog.cpp" line="62"/>
+ <location filename="../settingsdialog.cpp" line="63"/>
+ <location filename="../settingsdialog.cpp" line="64"/>
<source>default</source>
<translation>по умолчанию</translation>
</message>
@@ -173,5 +173,15 @@
<source>Audio:</source>
<translation>Аудио:</translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="57"/>
+ <source>Audio/video auto synchronization</source>
+ <translation>Автоматическая синхронизация аудио/видео</translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="67"/>
+ <source>Synchronization factor:</source>
+ <translation>Фактор синхрогизации:</translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/Input/mplayer/translations/mplayer_plugin_uk_UA.ts b/src/plugins/Input/mplayer/translations/mplayer_plugin_uk_UA.ts
index b5712b368..100c80e6f 100644
--- a/src/plugins/Input/mplayer/translations/mplayer_plugin_uk_UA.ts
+++ b/src/plugins/Input/mplayer/translations/mplayer_plugin_uk_UA.ts
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="uk">
+<!DOCTYPE TS>
+<TS version="2.0" language="uk">
<defaultcodec></defaultcodec>
<context>
<name>DecoderMplayerFactory</name>
@@ -42,6 +43,18 @@
<translation>Закрити</translation>
</message>
<message>
+ <location filename="../detailsdialog.ui" line="58"/>
+ <location filename="../detailsdialog.ui" line="72"/>
+ <location filename="../detailsdialog.ui" line="86"/>
+ <location filename="../detailsdialog.ui" line="127"/>
+ <location filename="../detailsdialog.ui" line="147"/>
+ <location filename="../detailsdialog.ui" line="167"/>
+ <location filename="../detailsdialog.ui" line="187"/>
+ <location filename="../detailsdialog.ui" line="207"/>
+ <location filename="../detailsdialog.ui" line="227"/>
+ <location filename="../detailsdialog.ui" line="262"/>
+ <location filename="../detailsdialog.ui" line="282"/>
+ <location filename="../detailsdialog.ui" line="302"/>
<location filename="../detailsdialog.ui" line="322"/>
<source>-</source>
<translation>-</translation>
@@ -87,6 +100,7 @@
<translation>Роздільність:</translation>
</message>
<message>
+ <location filename="../detailsdialog.ui" line="140"/>
<location filename="../detailsdialog.ui" line="295"/>
<source>Bitrate:</source>
<translation>Бітрейт:</translation>
@@ -102,6 +116,7 @@
<translation>Кадрів в секунду:</translation>
</message>
<message>
+ <location filename="../detailsdialog.ui" line="200"/>
<location filename="../detailsdialog.ui" line="249"/>
<source>Codec:</source>
<translation>Кодек:</translation>
@@ -135,7 +150,12 @@
<context>
<name>SettingsDialog</name>
<message>
- <location filename="../settingsdialog.cpp" line="62"/>
+ <location filename="../settingsdialog.cpp" line="31"/>
+ <location filename="../settingsdialog.cpp" line="39"/>
+ <location filename="../settingsdialog.cpp" line="48"/>
+ <location filename="../settingsdialog.cpp" line="49"/>
+ <location filename="../settingsdialog.cpp" line="63"/>
+ <location filename="../settingsdialog.cpp" line="64"/>
<source>default</source>
<translation>за умовчанням</translation>
</message>
@@ -154,5 +174,15 @@
<source>Audio:</source>
<translation>Аудіо:</translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="57"/>
+ <source>Audio/video auto synchronization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="67"/>
+ <source>Synchronization factor:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/Input/mplayer/translations/mplayer_plugin_zh_CN.ts b/src/plugins/Input/mplayer/translations/mplayer_plugin_zh_CN.ts
index 8d4a129ea..24e194e26 100644
--- a/src/plugins/Input/mplayer/translations/mplayer_plugin_zh_CN.ts
+++ b/src/plugins/Input/mplayer/translations/mplayer_plugin_zh_CN.ts
@@ -153,8 +153,8 @@
<location filename="../settingsdialog.cpp" line="39"/>
<location filename="../settingsdialog.cpp" line="48"/>
<location filename="../settingsdialog.cpp" line="49"/>
- <location filename="../settingsdialog.cpp" line="61"/>
- <location filename="../settingsdialog.cpp" line="62"/>
+ <location filename="../settingsdialog.cpp" line="63"/>
+ <location filename="../settingsdialog.cpp" line="64"/>
<source>default</source>
<translation type="unfinished"></translation>
</message>
@@ -173,5 +173,15 @@
<source>Audio:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="57"/>
+ <source>Audio/video auto synchronization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="67"/>
+ <source>Synchronization factor:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff --git a/src/plugins/Input/mplayer/translations/mplayer_plugin_zh_TW.ts b/src/plugins/Input/mplayer/translations/mplayer_plugin_zh_TW.ts
index 09bae6a2e..d6abd1651 100644
--- a/src/plugins/Input/mplayer/translations/mplayer_plugin_zh_TW.ts
+++ b/src/plugins/Input/mplayer/translations/mplayer_plugin_zh_TW.ts
@@ -153,8 +153,8 @@
<location filename="../settingsdialog.cpp" line="39"/>
<location filename="../settingsdialog.cpp" line="48"/>
<location filename="../settingsdialog.cpp" line="49"/>
- <location filename="../settingsdialog.cpp" line="61"/>
- <location filename="../settingsdialog.cpp" line="62"/>
+ <location filename="../settingsdialog.cpp" line="63"/>
+ <location filename="../settingsdialog.cpp" line="64"/>
<source>default</source>
<translation type="unfinished"></translation>
</message>
@@ -173,5 +173,15 @@
<source>Audio:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../settingsdialog.ui" line="57"/>
+ <source>Audio/video auto synchronization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../settingsdialog.ui" line="67"/>
+ <source>Synchronization factor:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 14:43:15 +0000