- Allow to set volume for monitors

- Apply monitor background change without restart

svn path=/trunk/kdenlive/; revision=4620

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 2d52c34aedfb240a2f619c5f4ff5f64b99d411f3..21f197d0befd7572e1771aed72f5098ea5294345 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -132,6 +132,11 @@
       <default>#999999</default>
     </entry>
 
+    <entry name="volume" type="Int">
+      <label>Volume used for SDL output.</label>
+      <default>100</default>
+    </entry>
+
     <entry name="dropbframes" type="Bool">
       <label>Drop B Frames on H.264 clips for faster playback (For monitor preview only).</label>
       <default>false</default>

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index affc5e1fc14271697832afd384cd8a37d0752ee4..e7a8f4321015ff65b1de52ed9eed3568ec4635ab 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -477,6 +477,16 @@ void KdenliveSettingsDialog::updateSettings()
         resetProfile = true;
     }
 
+    if (m_configSdl.kcfg_window_background->color() != KdenliveSettings::window_background()) {
+        KdenliveSettings::setWindow_background(m_configSdl.kcfg_window_background->color());
+        resetProfile = true;
+    }
+
+    if (m_configSdl.kcfg_volume->value() != KdenliveSettings::volume()) {
+        KdenliveSettings::setVolume(m_configSdl.kcfg_volume->value());
+        resetProfile = true;
+    }
+
     bool updatePreview = false;
     if (m_configSdl.kcfg_dropbframes->isChecked() != KdenliveSettings::dropbframes()) {
         KdenliveSettings::setDropbframes(m_configSdl.kcfg_dropbframes->isChecked());

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 52105a4d4a1887b0b3743d2e6ab69a2046750f68..3e7e53f113e958cf0d715afeb38d607bbc59cbf0 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -230,6 +230,8 @@ void Render::buildConsumer(const QString profileName)
         delete[] tmp;
     }
 
+    int volume = KdenliveSettings::volume();
+    m_mltConsumer->set("volume", (float)volume / 100);
 
     m_mltConsumer->set("progressive", 1);
     m_mltConsumer->set("audio_buffer", 1024);
@@ -257,7 +259,11 @@ int Render::resetProfile(const QString profileName)
         QString videoDriver = KdenliveSettings::videodrivername();
         QString currentDriver = m_mltConsumer->get("video_driver");
         if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
-        if (m_activeProfile == profileName && currentDriver == videoDriver) {
+        QString background = KdenliveSettings::window_background().name();
+        QString currentBackground = m_mltConsumer->get("window_background");
+        int volume = KdenliveSettings::volume();
+        int currentVolume = (int)(QString(m_mltConsumer->get("volume")).toDouble() * 100.0);
+        if (m_activeProfile == profileName && currentDriver == videoDriver && volume == currentVolume && background == currentBackground) {
             kDebug() << "reset to same profile, nothing to do";
             return 1;
         }

diff --git a/src/widgets/configsdl_ui.ui b/src/widgets/configsdl_ui.ui
index 3473ad29aeaaf912e3a32249feb8f0157750be77..49fc26d556c22da53d24e28c380b65c97e0216be 100644 (file)
--- a/src/widgets/configsdl_ui.ui
+++ b/src/widgets/configsdl_ui.ui
@@ -1,86 +1,80 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ConfigSdl_UI</class>
- <widget class="QWidget" name="ConfigSdl_UI" >
-  <property name="geometry" >
+ <widget class="QWidget" name="ConfigSdl_UI">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>358</width>
-    <height>217</height>
+    <width>352</width>
+    <height>239</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2" >
-   <item row="0" column="0" colspan="3" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" colspan="3">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
       <string>Warning: changes to the drivers and devices can make Kdenlive unstable. Change only if you know what you do.</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="textLabel1_2_2" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+   <item row="1" column="0">
+    <widget class="QLabel" name="textLabel1_2_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Video driver:</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2" >
-    <widget class="KComboBox" name="kcfg_video_driver" />
+   <item row="1" column="1" colspan="2">
+    <widget class="KComboBox" name="kcfg_video_driver"/>
    </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="textLabel1_2" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+   <item row="2" column="0">
+    <widget class="QLabel" name="textLabel1_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Audio driver:</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="2" >
-    <widget class="KComboBox" name="kcfg_audio_driver" />
+   <item row="2" column="1" colspan="2">
+    <widget class="KComboBox" name="kcfg_audio_driver"/>
    </item>
-   <item row="3" column="0" >
-    <widget class="QLabel" name="textLabel1" >
-     <property name="text" >
+   <item row="3" column="0">
+    <widget class="QLabel" name="textLabel1">
+     <property name="text">
       <string>Audio device:</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" colspan="2" >
-    <widget class="KComboBox" name="kcfg_audio_device" />
+   <item row="3" column="1" colspan="2">
+    <widget class="KComboBox" name="kcfg_audio_device"/>
    </item>
-   <item row="4" column="0" colspan="2" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Monitor background color (requires restart)</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2" >
-    <widget class="KColorButton" name="kcfg_window_background" >
-     <property name="defaultColor" >
+   <item row="5" column="2">
+    <widget class="KColorButton" name="kcfg_window_background">
+     <property name="defaultColor">
       <color>
        <red>180</red>
        <green>180</green>
@@ -89,15 +83,28 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+   <item row="8" column="1" colspan="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="7" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Monitor Preview Speedup Settings</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout" >
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="kcfg_dropbframes" >
-        <property name="text" >
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="kcfg_dropbframes">
+        <property name="text">
          <string>Drop B frames on H.264 clips</string>
         </property>
        </widget>
@@ -105,32 +112,46 @@
      </layout>
     </widget>
    </item>
-   <item row="6" column="1" colspan="2" >
-    <spacer name="verticalSpacer" >
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+   <item row="5" column="0" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Monitor background color:</string>
      </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>20</width>
-       <height>0</height>
-      </size>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Preview volume:</string>
      </property>
-    </spacer>
+    </widget>
+   </item>
+   <item row="4" column="2">
+    <widget class="QSpinBox" name="kcfg_volume">
+     <property name="suffix">
+      <string>%</string>
+     </property>
+     <property name="maximum">
+      <number>200</number>
+     </property>
+     <property name="value">
+      <number>100</number>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KColorButton</class>
-   <extends>QPushButton</extends>
-   <header>kcolorbutton.h</header>
-  </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
+  <customwidget>
+   <class>KColorButton</class>
+   <extends>QPushButton</extends>
+   <header>kcolorbutton.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>