[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src core/AudioClip.cpp traverso/dialog...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso/src core/AudioClip.cpp traverso/dialog... |
|
Date: |
Thu, 22 Nov 2007 18:27:05 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/11/22 18:27:05
Modified files:
src/core : AudioClip.cpp
src/traverso/dialogs/settings: Pages.cpp
src/traverso/ui: RecordingConfigPage.ui
Log message:
* added documentation (tooltip) in the Audio settings tabpage for WAV,
WAV64 and WavPack
* Added the WAV64 as recording format
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.151&r2=1.152
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/RecordingConfigPage.ui?cvsroot=traverso&r1=1.2&r2=1.3
Patches:
Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- core/AudioClip.cpp 22 Nov 2007 15:47:11 -0000 1.151
+++ core/AudioClip.cpp 22 Nov 2007 18:27:05 -0000 1.152
@@ -557,7 +557,10 @@
spec->extraFormat["quality"] = compression;
spec->extraFormat["skip_wvx"] = skipwvx;
}
- else {
+ else if (recordFormat == "w64") {
+ spec->writerType = "sndfile";
+ spec->extraFormat["filetype"] = "w64";
+ } else {
spec->writerType = "sndfile";
spec->extraFormat["filetype"] = "wav";
}
Index: traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- traverso/dialogs/settings/Pages.cpp 5 Nov 2007 19:19:25 -0000 1.27
+++ traverso/dialogs/settings/Pages.cpp 22 Nov 2007 18:27:05 -0000 1.28
@@ -932,9 +932,12 @@
QString recordFormat = config().get_property("Recording", "FileFormat",
"wav").toString();
if (recordFormat == "wavpack") {
m_config->encoding_index_changed(1);
+ } else if (recordFormat == "w64") {
+ m_config->encoding_index_changed(2);
} else {
m_config->encoding_index_changed(0);
}
+
QString wavpackcompression = config().get_property("Recording",
"WavpackCompressionType", "fast").toString();
if (wavpackcompression == "very_high") {
m_config->wavpackCompressionComboBox->setCurrentIndex(0);
@@ -949,10 +952,6 @@
index = config().get_property("Conversion",
"ExportResamplingConverterType", 1).toInt();
m_config->exportDefaultResampleQualityComboBox->setCurrentIndex(index);
-
-// ontheflyResampleComboBox
-// exportDefaultResampleQualityComboBox
-// wavpackUseAlmostLosslessCheckBox
}
void RecordingPage::save_config()
@@ -983,9 +982,9 @@
{
setupUi(this);
-
encodingInfoPushButton->setIcon(style()->standardIcon(QStyle::SP_FileDialogInfoView));
encodingComboBox->addItem("WAV", "wav");
encodingComboBox->addItem("WavPack", "wavpack");
+ encodingComboBox->addItem("WAV64", "w64");
wavpackCompressionComboBox->addItem("Very high", "very_high");
wavpackCompressionComboBox->addItem("High", "high");
wavpackCompressionComboBox->addItem("Fast", "fast");
@@ -998,10 +997,9 @@
void RecordingConfigPage::encoding_index_changed(int index)
{
encodingComboBox->setCurrentIndex(index);
- if (index == 0) {
+ if (index != 1) {
wacpackGroupBox->hide();
- }
- if (index == 1) {
+ } else {
wacpackGroupBox->show();
}
}
Index: traverso/ui/RecordingConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/RecordingConfigPage.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- traverso/ui/RecordingConfigPage.ui 15 Oct 2007 11:44:21 -0000 1.2
+++ traverso/ui/RecordingConfigPage.ui 22 Nov 2007 18:27:05 -0000 1.3
@@ -49,6 +49,26 @@
</property>
<item>
<widget class="QLabel" name="label" >
+ <property name="toolTip" >
+ <string><html><head><meta name="qrichtext" content="1"
/><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt;
font-weight:400; font-style:normal; text-decoration:none;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style="
font-weight:600;">WAV</span> : A format without compression. Uses more hard
disk space then compressed encoding formats, but needs very little cpu.</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">Limits : ~ 3.3 hours of
recording time @ 44.1 KHz</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style="
font-weight:600;">WavPack</span> : A format with compression, up to 2 times
smaller compared to WAV, and no quality loss. Uses significantly more cpu then
WAV, but with modern (year 2005 and above) cpu's this shouldn't be a
problem.</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">Using this format
stresses the hard disk much less, increasing hard disk live, and less chance of
saturating the hard disk bandwidth.</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">Limits : ~ 5 hours
recording time @ 44.1 KHz</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style="
font-weight:600;">WAV64</span> : WAV format with 64 bit header, support by
other programs is currently limited.</p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px;
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">Limits : None,
thousands of hours of recording time, supposed that your hard disk can hold
it.</p></body></html></string>
+ </property>
<property name="text" >
<string>Encoding format</string>
</property>
@@ -70,13 +90,6 @@
<item>
<widget class="QComboBox" name="encodingComboBox" />
</item>
- <item>
- <widget class="QPushButton" name="encodingInfoPushButton" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
</layout>
</item>
<item>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src core/AudioClip.cpp traverso/dialog...,
Remon Sijrier <=