improved ffmpeg plugin: added stream input, fixed some bugs

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1483 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 48 insertions, 38 deletions

diff --git a/src/plugins/Input/ffmpeg/settingsdialog.ui b/src/plugins/Input/ffmpeg/settingsdialog.ui
index 64f30ba0c..958251d8e 100644
--- a/src/plugins/Input/ffmpeg/settingsdialog.ui
+++ b/src/plugins/Input/ffmpeg/settingsdialog.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SettingsDialog</class>
- <widget class="QDialog" name="SettingsDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SettingsDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,16 +10,25 @@
     <height>298</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>FFmpeg Plugin Settings</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="1" column="0" >
-    <spacer name="horizontalSpacer" >
-     <property name="orientation" >
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
+   <item row="1" column="0">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>178</width>
        <height>20</height>
@@ -26,77 +36,77 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="1" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+   <item row="1" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" colspan="2" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+   <item row="0" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Formats</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout" >
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QCheckBox" name="wmaCheckBox" >
-        <property name="text" >
+       <widget class="QCheckBox" name="wmaCheckBox">
+        <property name="text">
          <string>Windows Media Audio</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="apeCheckBox" >
-        <property name="text" >
+       <widget class="QCheckBox" name="apeCheckBox">
+        <property name="text">
          <string>Monkey's Audio</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="ttaCheckBox" >
-        <property name="text" >
+       <widget class="QCheckBox" name="ttaCheckBox">
+        <property name="text">
          <string>True Audio</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="alacCheckBox" >
-        <property name="text" >
+       <widget class="QCheckBox" name="alacCheckBox">
+        <property name="text">
          <string>ALAC (Apple Lossless Audio Codec)</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="aacCheckBox" >
-        <property name="text" >
+       <widget class="QCheckBox" name="aacCheckBox">
+        <property name="text">
          <string>ADTS AAC</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="mp3CheckBox" >
-        <property name="text" >
+       <widget class="QCheckBox" name="mp3CheckBox">
+        <property name="text">
          <string>MP3 (MPEG audio layer 3)</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="mp4CheckBox" >
-        <property name="text" >
+       <widget class="QCheckBox" name="mp4CheckBox">
+        <property name="text">
          <string>MPEG-4 AAC</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="raCheckBox" >
-        <property name="text" >
+       <widget class="QCheckBox" name="raCheckBox">
+        <property name="text">
          <string>RealAudio 1.0/2.0</string>
         </property>
        </widget>
@@ -114,11 +124,11 @@
    <receiver>SettingsDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>214</x>
      <y>167</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>103</x>
      <y>160</y>
     </hint>
@@ -130,11 +140,11 @@
    <receiver>SettingsDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>269</x>
      <y>174</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>148</x>
      <y>169</y>
     </hint>