From: <j-...@us...> - 2008-03-05 11:42:44
|
Revision: 1998 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=1998&view=rev Author: j-b-m Date: 2008-03-05 03:42:50 -0800 (Wed, 05 Mar 2008) Log Message: ----------- config option to normalise audio for thumbnails +?\194?\160small cleanup Modified Paths: -------------- branches/KDE4/src/kdenlivesettings.kcfg branches/KDE4/src/kthumb.cpp branches/KDE4/src/widgets/configdisplay_ui.ui Modified: branches/KDE4/src/kdenlivesettings.kcfg =================================================================== --- branches/KDE4/src/kdenlivesettings.kcfg 2008-03-04 10:38:16 UTC (rev 1997) +++ branches/KDE4/src/kdenlivesettings.kcfg 2008-03-05 11:42:50 UTC (rev 1998) @@ -26,6 +26,11 @@ <default>true</default> </entry> + <entry name="normaliseaudiothumbs" type="Bool"> + <label>Normalise audio before creating thumbnails.</label> + <default>true</default> + </entry> + <entry name="autoscroll" type="Bool"> <label>Auto scroll timeline while playing.</label> <default>true</default> Modified: branches/KDE4/src/kthumb.cpp =================================================================== --- branches/KDE4/src/kthumb.cpp 2008-03-04 10:38:16 UTC (rev 1997) +++ branches/KDE4/src/kthumb.cpp 2008-03-05 11:42:50 UTC (rev 1998) @@ -66,19 +66,19 @@ if (!f.open(QIODevice::WriteOnly)) { kDebug() << "++++++++ ERROR WRITING TO FILE: " << f.fileName() << endl; kDebug() << "++++++++ DISABLING AUDIO THUMBS" << endl; - //TODO KdenliveSettings::setAudiothumbnails(false); + KdenliveSettings::setAudiothumbnails(false); return; } m_isWorking = true; - Mlt::Profile prof((char*) qstrdup(KdenliveSettings::current_profile().toUtf8())); + Mlt::Profile prof((char*) KdenliveSettings::current_profile().toUtf8().data()); Mlt::Producer m_producer(prof, m_url.path().toUtf8().data()); - /*TODO if (KdenliveSettings::normaliseaudiothumbs()) { + if (KdenliveSettings::normaliseaudiothumbs()) { Mlt::Filter m_convert(prof,"volume"); m_convert.set("gain", "normalise"); m_producer.attach(m_convert); - }*/ + } //QApplication::postEvent(m_parent, new ProgressEvent(-1, (QEvent::Type)10005)); @@ -158,7 +158,7 @@ char *tmp = Render::decodedString(url.path()); Mlt::Profile prof((char*) KdenliveSettings::current_profile().data()); Mlt::Producer m_producer(prof, tmp); - delete tmp; + delete[] tmp; if (m_producer.is_blank()) { pix.fill(Qt::black); @@ -187,7 +187,7 @@ QPixmap pix(m_width, m_height); char *tmp = Render::decodedString(m_url.path()); Mlt::Producer m_producer(*m_profile, tmp); - delete tmp; + delete[] tmp; if (m_producer.is_blank()) { pix.fill(Qt::black); Modified: branches/KDE4/src/widgets/configdisplay_ui.ui =================================================================== --- branches/KDE4/src/widgets/configdisplay_ui.ui 2008-03-04 10:38:16 UTC (rev 1997) +++ branches/KDE4/src/widgets/configdisplay_ui.ui 2008-03-05 11:42:50 UTC (rev 1998) @@ -5,39 +5,25 @@ <rect> <x>0</x> <y>0</y> - <width>306</width> - <height>107</height> + <width>348</width> + <height>187</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2" > <item row="0" column="0" > <widget class="QGroupBox" name="groupBox" > <property name="title" > - <string>Timeline</string> + <string>Thumbnails</string> </property> <layout class="QGridLayout" name="gridLayout" > <item row="0" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > - <string>Thumbnails:</string> - </property> - </widget> - </item> - <item row="0" column="1" > <widget class="QCheckBox" name="kcfg_videothumbnails" > <property name="text" > <string>Video</string> </property> </widget> </item> - <item row="0" column="2" > - <widget class="QCheckBox" name="kcfg_audiothumbnails" > - <property name="text" > - <string>Audio</string> - </property> - </widget> - </item> - <item row="0" column="3" > + <item row="0" column="1" > <spacer name="horizontalSpacer" > <property name="orientation" > <enum>Qt::Horizontal</enum> @@ -50,17 +36,31 @@ </property> </spacer> </item> - <item row="1" column="0" colspan="2" > - <widget class="QCheckBox" name="kcfg_autoscroll" > + <item row="1" column="0" > + <widget class="QCheckBox" name="kcfg_audiothumbnails" > <property name="text" > - <string>Autoscroll while playing</string> + <string>Audio</string> </property> </widget> </item> + <item row="1" column="1" > + <widget class="QCheckBox" name="kcfg_normaliseaudiothumbs" > + <property name="text" > + <string>Normalise audio for thumbnails</string> + </property> + </widget> + </item> </layout> </widget> </item> <item row="1" column="0" > + <widget class="QCheckBox" name="kcfg_autoscroll" > + <property name="text" > + <string>Autoscroll while playing</string> + </property> + </widget> + </item> + <item row="2" column="0" > <spacer name="verticalSpacer" > <property name="orientation" > <enum>Qt::Vertical</enum> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |