Store alsa device name instead of item order:

http://www.kdenlive.org:80/mantis/view.php?id=573

svn path=/branches/KDE4/; revision=2934

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 8685e4d77970b19d093b23183dd46d8d5a512903..7ef596864362261a0389c8ee6ccd864a37fc9aae 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -71,11 +71,6 @@
       <default>50</default>
     </entry>
 
-    <entry name="audio_device" type="UInt">
-      <label>Audio device used for sound output.</label>
-      <default>0</default>
-    </entry>
-
     <entry name="audio_driver" type="UInt">
       <label>Audio driver used for sound output.</label>
       <default>0</default>
@@ -235,11 +230,6 @@
       <default>system:capture_1</default>
     </entry>
 
-    <entry name="rmd_alsa_device" type="UInt">
-      <label>Audio device used for sound recording.</label>
-      <default>0</default>
-    </entry>
-
     <entry name="rmd_capture_type" type="UInt">
       <label>capture type.</label>
       <default>0</default>

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index b7cff27151b2d9ab328003ce84635752be5cb8c9..0653346aed522b17be1dd6943b544d11045dd6ba 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -209,8 +209,8 @@ void KdenliveSettingsDialog::initDevices() {
     m_configSdl.kcfg_video_driver->addItem(i18n("Ascii art library"), "aalib");
 
     // Fill the list of audio playback devices
-    m_configSdl.kcfg_audio_device->addItem(i18n("Default"), QString());
-    m_configCapture.kcfg_rmd_alsa_device->addItem(i18n("Default"), QString());
+    m_configSdl.audio_device->addItem(i18n("Default"), QString());
+    m_configCapture.rmd_alsa_device->addItem(i18n("Default"), QString());
     if (KStandardDirs::findExe("aplay") != QString::null) {
         m_readProcess.setOutputChannelMode(KProcess::OnlyStdoutChannel);
         m_readProcess.setProgram("aplay", QStringList() << "-l");
@@ -227,16 +227,26 @@ void KdenliveSettingsDialog::initDevices() {
                 line = stream.readLine();
                 if (line.contains("playback")) {
                     deviceId = line.section(":", 0, 0);
-                    m_configSdl.kcfg_audio_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
+                    m_configSdl.audio_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
                 }
                 if (line.contains("capture")) {
                     deviceId = line.section(":", 0, 0);
-                    m_configCapture.kcfg_rmd_alsa_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
+                    m_configCapture.rmd_alsa_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
                 }
             }
             file.close();
         }
     }
+    if (!KdenliveSettings::audiodevicename().isEmpty()) {
+        // Select correct alsa device
+        int ix = m_configSdl.audio_device->findData(KdenliveSettings::audiodevicename());
+        if (ix > 0) m_configSdl.audio_device->setCurrentIndex(ix);
+    }
+    if (!KdenliveSettings::rmd_alsadevicename().isEmpty()) {
+        // Select correct alsa device
+        int ix = m_configCapture.rmd_alsa_device->findData(KdenliveSettings::rmd_alsadevicename());
+        if (ix > 0) m_configCapture.rmd_alsa_device->setCurrentIndex(ix);
+    }
 }
 
 
@@ -250,8 +260,8 @@ void KdenliveSettingsDialog::slotReadAudioDevices() {
         if (data.simplified().startsWith("card")) {
             QString card = data.section(":", 0, 0).section(" ", -1);
             QString device = data.section(":", 1, 1).section(" ", -1);
-            m_configSdl.kcfg_audio_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
-            m_configCapture.kcfg_rmd_alsa_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
+            m_configSdl.audio_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
+            m_configCapture.rmd_alsa_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
         }
     }
 }
@@ -365,13 +375,13 @@ void KdenliveSettingsDialog::updateSettings() {
     KdenliveSettings::setDefault_profile(m_defaultPath);
 
     bool resetProfile = false;
-    QString value = m_configSdl.kcfg_audio_device->itemData(m_configSdl.kcfg_audio_device->currentIndex()).toString();
+    QString value = m_configSdl.audio_device->itemData(m_configSdl.audio_device->currentIndex()).toString();
     if (value != KdenliveSettings::audiodevicename()) {
         KdenliveSettings::setAudiodevicename(value);
         resetProfile = true;
     }
 
-    value = m_configCapture.kcfg_rmd_alsa_device->itemData(m_configCapture.kcfg_rmd_alsa_device->currentIndex()).toString();
+    value = m_configCapture.rmd_alsa_device->itemData(m_configCapture.rmd_alsa_device->currentIndex()).toString();
     if (value != KdenliveSettings::rmd_alsadevicename()) {
         KdenliveSettings::setRmd_alsadevicename(value);
     }

diff --git a/src/widgets/configcapture_ui.ui b/src/widgets/configcapture_ui.ui
index 915932b2698b829c45b32c124c5a8bd62e63e31a..421ecee254fd70ad1153a0656c5336a99e62ac63 100644 (file)
--- a/src/widgets/configcapture_ui.ui
+++ b/src/widgets/configcapture_ui.ui
@@ -45,7 +45,7 @@
       </size>
      </property>
      <property name="currentIndex" >
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tab" >
       <attribute name="title" >
@@ -143,19 +143,18 @@
        <string>Video4Linux</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout" >
-       <item row="0" column="0" >
-        <widget class="QLabel" name="label_14" >
-         <property name="text" >
-          <string>Video device</string>
+       <item row="9" column="2" >
+        <spacer name="verticalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
          </property>
-        </widget>
-       </item>
-       <item row="0" column="1" colspan="2" >
-        <widget class="KLineEdit" name="kcfg_video4vdevice" >
-         <property name="text" >
-          <string>/dev/video0</string>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
          </property>
-        </widget>
+        </spacer>
        </item>
        <item row="0" column="3" >
         <widget class="QLabel" name="label_3" >
@@ -170,17 +169,10 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="4" colspan="2" >
-        <widget class="KLineEdit" name="kcfg_video4vformat" >
-         <property name="text" >
-          <string>video4linux2</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" >
-        <widget class="QLabel" name="label_16" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_14" >
          <property name="text" >
-          <string>Audio device</string>
+          <string>Video device</string>
          </property>
         </widget>
        </item>
@@ -204,17 +196,10 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="4" colspan="2" >
-        <widget class="KLineEdit" name="kcfg_video4aformat" >
+       <item row="2" column="0" >
+        <widget class="QLabel" name="label_16" >
          <property name="text" >
-          <string>oss</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0" colspan="6" >
-        <widget class="Line" name="line_3" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
+          <string>Audio device</string>
          </property>
         </widget>
        </item>
@@ -231,15 +216,8 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0" colspan="6" >
-        <widget class="KLineEdit" name="kcfg_video4capture" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
+       <item row="8" column="0" colspan="6" >
+        <widget class="KLineEdit" name="kcfg_video4encoding" />
        </item>
        <item row="7" column="0" colspan="2" >
         <widget class="QLabel" name="label_12" >
@@ -254,21 +232,43 @@
          </property>
         </widget>
        </item>
-       <item row="8" column="0" colspan="6" >
-        <widget class="KLineEdit" name="kcfg_video4encoding" />
+       <item row="2" column="4" colspan="2" >
+        <widget class="KLineEdit" name="kcfg_video4aformat" >
+         <property name="text" >
+          <string>oss</string>
+         </property>
+        </widget>
        </item>
-       <item row="9" column="2" >
-        <spacer name="verticalSpacer" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
+       <item row="0" column="4" colspan="2" >
+        <widget class="KLineEdit" name="kcfg_video4vformat" >
+         <property name="text" >
+          <string>video4linux2</string>
          </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
+        </widget>
+       </item>
+       <item row="0" column="1" colspan="2" >
+        <widget class="KLineEdit" name="kcfg_video4vdevice" >
+         <property name="text" >
+          <string>/dev/video0</string>
          </property>
-        </spacer>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="6" >
+        <widget class="KLineEdit" name="kcfg_video4capture" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="6" >
+        <widget class="Line" name="line_3" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
        </item>
        <item row="1" column="0" >
         <widget class="QLabel" name="label_4" >
@@ -305,19 +305,11 @@
         </widget>
        </item>
       </layout>
-      <zorder>label_7</zorder>
-      <zorder>line</zorder>
       <zorder>label_3</zorder>
-      <zorder>label_5</zorder>
-      <zorder>kcfg_video4vencoding</zorder>
       <zorder>label_14</zorder>
-      <zorder>kcfg_video4aencoding</zorder>
       <zorder>kcfg_video4adevice</zorder>
-      <zorder>line_2</zorder>
       <zorder>label_9</zorder>
       <zorder>label_16</zorder>
-      <zorder>label_15</zorder>
-      <zorder>label_13</zorder>
       <zorder>label_11</zorder>
       <zorder>kcfg_video4encoding</zorder>
       <zorder>label_12</zorder>
@@ -376,7 +368,7 @@
            </widget>
           </item>
           <item row="1" column="1" colspan="3" >
-           <widget class="KComboBox" name="kcfg_rmd_alsa_device" />
+           <widget class="KComboBox" name="rmd_alsa_device" />
           </item>
           <item row="2" column="0" >
            <widget class="QRadioButton" name="kcfg_rmd_use_jack" >
@@ -617,9 +609,6 @@
     </widget>
    </item>
   </layout>
-  <zorder>label</zorder>
-  <zorder>kcfg_defaultcapture</zorder>
-  <zorder>tabWidget</zorder>
  </widget>
  <customwidgets>
   <customwidget>
@@ -656,7 +645,7 @@
   <tabstop>kcfg_video4encoding</tabstop>
   <tabstop>kcfg_rmd_capture_audio</tabstop>
   <tabstop>radioButton_2</tabstop>
-  <tabstop>kcfg_rmd_alsa_device</tabstop>
+  <tabstop>rmd_alsa_device</tabstop>
   <tabstop>kcfg_rmd_alsa_buffer</tabstop>
   <tabstop>kcfg_rmd_use_jack</tabstop>
   <tabstop>kcfg_rmd_jackports</tabstop>

diff --git a/src/widgets/configsdl_ui.ui b/src/widgets/configsdl_ui.ui
index 5163b81765e1242bf305be060531bd14a4244019..cd1d086ad0bb3f0f2bc0be06975210baa6467ed1 100644 (file)
--- a/src/widgets/configsdl_ui.ui
+++ b/src/widgets/configsdl_ui.ui
@@ -69,7 +69,7 @@
     </widget>
    </item>
    <item row="3" column="1" >
-    <widget class="KComboBox" name="kcfg_audio_device" />
+    <widget class="KComboBox" name="audio_device" />
    </item>
    <item row="4" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox" >