[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso src/core/AudioClip.cpp src/core/AudioC...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso src/core/AudioClip.cpp src/core/AudioC... |
|
Date: |
Mon, 16 Apr 2007 18:44:27 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/04/16 18:44:26
Modified files:
src/core : AudioClip.cpp AudioClip.h Curve.cpp Curve.h
ProjectManager.cpp ResourcesManager.cpp
src/traverso/dialogs/settings: Pages.cpp Pages.h
SettingsDialog.cpp
src/traverso : Interface.cpp Traverso.cpp traverso.pro
traverso.qrc
src/traverso/ui: KeyboardConfigPage.ui ThemeConfigPage.ui
Added files:
resources/images: performance.png
src/traverso/ui: PerformanceConfigPage.ui
Log message:
* Fixed zero nodes in Gain Curve with newly recorded clips problem
* Moved performance related settings to it's own page in Settings Dialog
* small cleanup in exit routine, fixing crash bug due previous commit
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/images/performance.png?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.h?cvsroot=traverso&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Curve.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Curve.h?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.cpp?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ResourcesManager.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.h?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/SettingsDialog.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Traverso.cpp?cvsroot=traverso&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.pro?cvsroot=traverso&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/traverso.qrc?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/KeyboardConfigPage.ui?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/ThemeConfigPage.ui?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/PerformanceConfigPage.ui?cvsroot=traverso&rev=1.1
Patches:
Index: src/core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- src/core/AudioClip.cpp 11 Apr 2007 22:59:01 -0000 1.75
+++ src/core/AudioClip.cpp 16 Apr 2007 18:44:26 -0000 1.76
@@ -107,7 +107,7 @@
fadeIn = 0;
fadeOut = 0;
m_refcount = 0;
- gainEnvelope = 0;
+ m_gainEnvelope = 0;
}
int AudioClip::set_state(const QDomNode& node)
@@ -148,9 +148,11 @@
private_add_fade(fadeOut);
}
- QDomElement gainEnvelopeNode =
curvesNode.firstChildElement("Curve");
- if (!gainEnvelopeNode.isNull()) {
- gainEnvelope->set_state( gainEnvelopeNode );
+ QDomElement m_gainEnvelopeNode =
curvesNode.firstChildElement("GainCurve");
+ if (!m_gainEnvelopeNode.isNull()) {
+ m_gainEnvelope->set_state( m_gainEnvelopeNode );
+ } else {
+ init_gain_envelope();
}
}
@@ -183,7 +185,7 @@
if (fadeOut) {
curves.appendChild(fadeOut->get_state(doc));
}
- curves.appendChild(gainEnvelope->get_state(doc));
+ curves.appendChild(m_gainEnvelope->get_state(doc, "GainCurve"));
node.appendChild(curves);
@@ -442,7 +444,7 @@
m_fades.at(i)->process(mixdown, read_frames);
}
- gainEnvelope->process(mixdown, (m_song->get_transport_frame() -
trackStartFrame), read_frames);
+ m_gainEnvelope->process(mixdown, (m_song->get_transport_frame() -
trackStartFrame), read_frames);
return 1;
}
@@ -555,6 +557,9 @@
sourceStartFrame = 0;
isTake = 1;
m_recordingStatus = RECORDING;
+
+ init_gain_envelope();
+
connect(m_song, SIGNAL(transferStopped()), this,
SLOT(finish_recording()));
return 1;
@@ -743,11 +748,11 @@
set_history_stack(m_song->get_history_stack());
- if (!gainEnvelope) {
- gainEnvelope = new Curve(this, m_song);
+ if (!m_gainEnvelope) {
+ m_gainEnvelope = new Curve(this, m_song);
}
- gainEnvelope->set_history_stack(get_history_stack());
+ m_gainEnvelope->set_history_stack(get_history_stack());
set_snap_list(m_song->get_snap_list());
}
@@ -966,5 +971,14 @@
THREAD_SAVE_CALL_EMIT_SIGNAL(this, fadeOut,
private_add_fade(FadeCurve*), fadeAdded(FadeCurve*));
}
+void AudioClip::init_gain_envelope()
+{
+ // FIXME Somehow Curves always should have 1 node, which is not allowed
+ // to be removed, or moved horizontally, to avoid code like below.....
!!!!!
+ // Add the default (first) node to the Gain Curve
+ CurveNode* node = new CurveNode(m_gainEnvelope, 0.0, 1.0);
+ Command::process_command(m_gainEnvelope->add_node(node, false));
+}
+
// eof
Index: src/core/AudioClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- src/core/AudioClip.h 2 Apr 2007 09:52:31 -0000 1.39
+++ src/core/AudioClip.h 16 Apr 2007 18:44:26 -0000 1.40
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: AudioClip.h,v 1.39 2007/04/02 09:52:31 r_sijrier Exp $
+$Id: AudioClip.h,v 1.40 2007/04/16 18:44:26 r_sijrier Exp $
*/
#ifndef AUDIOCLIP_H
@@ -95,7 +95,7 @@
QDomNode get_state(QDomDocument doc);
FadeCurve* get_fade_in();
FadeCurve* get_fade_out();
- Curve* get_gain_envelope() {return gainEnvelope;}
+ Curve* get_gain_envelope() {return m_gainEnvelope;}
float get_norm_factor() const;
@@ -139,7 +139,7 @@
AudioBus* captureBus;
FadeCurve* fadeIn;
FadeCurve* fadeOut;
- Curve* gainEnvelope;
+ Curve* m_gainEnvelope;
QString m_name;
nframes_t trackStartFrame;
@@ -160,6 +160,7 @@
int m_refcount;
void init();
+ void init_gain_envelope();
void set_source_end_frame(nframes_t frame);
void set_source_start_frame(nframes_t frame);
void set_track_end_frame(nframes_t endFrame);
Index: src/core/Curve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Curve.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- src/core/Curve.cpp 16 Apr 2007 09:08:31 -0000 1.37
+++ src/core/Curve.cpp 16 Apr 2007 18:44:26 -0000 1.38
@@ -84,10 +84,10 @@
}
-QDomNode Curve::get_state( QDomDocument doc )
+QDomNode Curve::get_state(QDomDocument doc, const QString& name)
{
PENTER3;
- QDomElement domNode = doc.createElement("Curve");
+ QDomElement domNode = doc.createElement(name);
QStringList nodesList;
Index: src/core/Curve.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Curve.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/core/Curve.h 10 Apr 2007 18:32:32 -0000 1.18
+++ src/core/Curve.h 16 Apr 2007 18:44:26 -0000 1.19
@@ -48,7 +48,7 @@
Curve(ContextItem* parent, Song* song, const QDomNode node);
~Curve();
- virtual QDomNode get_state(QDomDocument doc);
+ QDomNode get_state(QDomDocument doc, const QString& name);
virtual int set_state( const QDomNode& node );
virtual int process(audio_sample_t* buffer, nframes_t pos, nframes_t
nframes);
Index: src/core/ProjectManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/core/ProjectManager.cpp 16 Apr 2007 09:08:31 -0000 1.29
+++ src/core/ProjectManager.cpp 16 Apr 2007 18:44:26 -0000 1.30
@@ -87,9 +87,7 @@
{
PENTER;
- if ( ! m_exitInProgress) {
emit projectLoaded(project);
- }
if (currentProject) {
if (m_exitInProgress) {
Index: src/core/ResourcesManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ResourcesManager.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/core/ResourcesManager.cpp 2 Apr 2007 09:53:40 -0000 1.3
+++ src/core/ResourcesManager.cpp 16 Apr 2007 18:44:26 -0000 1.4
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: ResourcesManager.cpp,v 1.3 2007/04/02 09:53:40 r_sijrier Exp $
+$Id: ResourcesManager.cpp,v 1.4 2007/04/16 18:44:26 r_sijrier Exp $
*/
#include "ResourcesManager.h"
@@ -61,6 +61,7 @@
QDomNode ResourcesManager::get_state( QDomDocument doc )
{
+// printf("ResourcesManager::get_state\n");
QDomElement asmNode = doc.createElement("ResourcesManager");
QDomElement audioSourcesElement = doc.createElement("AudioSources");
@@ -74,24 +75,24 @@
QDomElement audioClipsElement = doc.createElement("AudioClips");
- if (m_clips.size() > 10000) {
- Q_ASSERT(m_clips.size() < 10000);
- }
+ QList<AudioClip*> list = m_clips.values();
+
+
+ for (int i=0; i<list.size(); ++i) {
+ AudioClip* clip = list.at(i);
- foreach(AudioClip* clip, m_clips) {
// Omit all clips that were deprecated:
if (m_deprecatedClips.contains(clip->get_id())) {
continue;
}
-// PWARN("Getting state of clip %s", QS_C(clip->get_name()));
// If the clip was refcounted, then it's state has been fully
set
// and likely changed, so we can get the 'new' state from it.
if (clip->get_ref_count()) {
audioClipsElement.appendChild(clip->get_state(doc));
+ } else {
// In case it wasn't we should use the 'old' domNode which
// was set during set_state();
- } else {
audioClipsElement.appendChild(clip->m_domNode);
}
}
Index: src/traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/dialogs/settings/Pages.cpp 16 Apr 2007 09:08:31 -0000
1.10
+++ src/traverso/dialogs/settings/Pages.cpp 16 Apr 2007 18:44:26 -0000
1.11
@@ -444,13 +444,6 @@
update_follow();
- if (oncloseaction == "save") {
- m_configpage->saveRadioButton->setChecked(true);
- } else if (oncloseaction == "ask") {
- m_configpage->askRadioButton->setChecked(true);
- } else {
- m_configpage->neverRadioButton->setChecked(true);
- }
}
@@ -526,7 +519,6 @@
config().set_property("Themer", "usestylepallet",
m_themepage->useStylePalletCheckBox->isChecked());
config().set_property("Themer", "paintaudiorectified",
m_themepage->rectifiedCheckBox->isChecked());
config().set_property("Themer", "paintstereoaudioasmono",
m_themepage->mergedCheckBox->isChecked());
- config().set_property("Interface", "OpenGL",
m_themepage->useOpenGLCheckBox->isChecked());
}
void AppearancePage::load_config()
@@ -554,7 +546,6 @@
QString theme = config().get_property("Themer", "currenttheme",
"TraversoLight").toString();
int coloradjust = config().get_property("Themer", "coloradjust",
100).toInt();
bool usestylepallete = config().get_property("Themer",
"usestylepallet", "").toBool();
- bool useOpenGL = config().get_property("Interface", "OpenGL",
false).toBool();
bool paintRectified = config().get_property("Themer",
"paintaudiorectified", false).toBool();
bool paintStereoAsMono = config().get_property("Themer",
"paintstereoaudioasmono", false).toBool();
@@ -565,7 +556,6 @@
m_themepage->colorAdjustBox->setValue(coloradjust);
m_themepage->useStylePalletCheckBox->setChecked(usestylepallete);
m_themepage->themePathLineEdit->setText(themepath);
- m_themepage->useOpenGLCheckBox->setChecked(useOpenGL);
m_themepage->rectifiedCheckBox->setChecked(paintRectified);
m_themepage->mergedCheckBox->setChecked(paintStereoAsMono);
}
@@ -580,7 +570,6 @@
QString systemstyle =
QString(QApplication::style()->metaObject()->className()).remove("Q").remove("Style");
config().set_property("Themer", "style", systemstyle);
config().set_property("Themer", "usestylepallet", false);
- config().set_property("Interface", "OpenGL", false);
config().set_property("Themer", "paintaudiorectified", false);
config().set_property("Themer", "paintstereoaudioasmono", false);
@@ -592,8 +581,6 @@
: QWidget(parent)
{
setupUi(this);
- // Until we find out how to make properly use of it, set disabled.
- openGlGroupBox->hide();
themeSelecterCombo->setInsertPolicy(QComboBox::InsertAlphabetically);
}
@@ -690,7 +677,7 @@
{
m_configpage = new KeyboardConfigPage(this);
mainLayout->addWidget(m_configpage);
- mainLayout->addStretch(1);
+ mainLayout->addStretch(5);
load_config();
}
@@ -699,11 +686,9 @@
{
int doubleFactTimeout = config().get_property("CCE",
"doublefactTimeout", 200).toInt();
int holdTimeout = config().get_property("CCE", "holdTimeout",
200).toInt();
- int jogUpdateInterval = config().get_property("CCE",
"JogUpdateInterval", 28).toInt();
m_configpage->doubleFactTimeoutSpinBox->setValue(doubleFactTimeout);
m_configpage->holdTimeoutSpinBox->setValue(holdTimeout);
- m_configpage->jogUpdateIntervalSpinBox->setValue(1000 /
jogUpdateInterval);
QString defaultkeymap = config().get_property("CCE", "keymap",
"default").toString();
int index = m_configpage->keymapComboBox->findText(defaultkeymap);
@@ -720,7 +705,6 @@
config().set_property("CCE", "doublefactTimeout",
m_configpage->doubleFactTimeoutSpinBox->value());
config().set_property("CCE", "holdTimeout",
m_configpage->holdTimeoutSpinBox->value());
config().set_property("CCE", "keymap", newkeymap);
- config().set_property("CCE", "JogUpdateInterval", 1000 /
m_configpage->jogUpdateIntervalSpinBox->value());
ie().set_double_fact_interval(m_configpage->doubleFactTimeoutSpinBox->value());
ie().set_hold_sensitiveness(m_configpage->holdTimeoutSpinBox->value());
@@ -734,7 +718,6 @@
config().set_property("CCE", "doublefactTimeout", 180);
config().set_property("CCE", "holdTimeout", 150);
config().set_property("CCE", "keymap", "default");
- config().set_property("CCE", "JogUpdateInterval", 28);
load_config();
}
@@ -830,4 +813,44 @@
reloadWarningLabel->setPixmap(icon.pixmap(22, 22));
}
+
+
+PerformancePage::PerformancePage(QWidget * parent)
+ : ConfigPage(parent)
+{
+ m_configpage = new PerformanceConfigPage(this);
+ mainLayout->addWidget(m_configpage);
+ mainLayout->addStretch(5);
+
+ load_config();
+}
+
+void PerformancePage::load_config()
+{
+ int jogUpdateInterval = config().get_property("CCE",
"JogUpdateInterval", 28).toInt();
+ bool useOpenGL = config().get_property("Interface", "OpenGL",
false).toBool();
+
+ m_configpage->jogUpdateIntervalSpinBox->setValue(1000 /
jogUpdateInterval);
+ m_configpage->useOpenGLCheckBox->setChecked(useOpenGL);
+}
+
+void PerformancePage::save_config()
+{
+ config().set_property("Interface", "OpenGL",
m_configpage->useOpenGLCheckBox->isChecked());
+ config().set_property("CCE", "JogUpdateInterval", 1000 /
m_configpage->jogUpdateIntervalSpinBox->value());
+}
+
+void PerformancePage::reset_default_config()
+{
+ config().set_property("CCE", "JogUpdateInterval", 28);
+ config().set_property("Interface", "OpenGL", false);
+ load_config();
+}
+
+PerformanceConfigPage::PerformanceConfigPage(QWidget* parent)
+{
+ setupUi(this);
+}
+
//eof
+
Index: src/traverso/dialogs/settings/Pages.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/traverso/dialogs/settings/Pages.h 16 Apr 2007 09:08:31 -0000
1.5
+++ src/traverso/dialogs/settings/Pages.h 16 Apr 2007 18:44:26 -0000
1.6
@@ -29,6 +29,7 @@
#include "ui_BehaviorConfigPage.h"
#include "ui_MemoryConfigPage.h"
#include "ui_ThemeConfigPage.h"
+#include "ui_PerformanceConfigPage.h"
#if defined (ALSA_SUPPORT)
#include "ui_AlsaDevicesPage.h"
@@ -38,6 +39,14 @@
#include "ui_PaDriverPage.h"
#endif
+class PerformanceConfigPage : public QWidget, private Ui::PerformanceConfigPage
+{
+public:
+ PerformanceConfigPage(QWidget* parent = 0);
+
+private:
+ friend class PerformancePage;
+};
class DriverConfigPage : public QWidget, private Ui::DriverConfigPage
{
@@ -229,5 +238,16 @@
BehaviorConfigPage* m_configpage;
};
+class PerformancePage : public ConfigPage
+{
+public:
+ PerformancePage(QWidget *parent = 0);
+ void load_config();
+ void save_config();
+ void reset_default_config();
+
+private:
+ PerformanceConfigPage* m_configpage;
+};
#endif
Index: src/traverso/dialogs/settings/SettingsDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/settings/SettingsDialog.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/traverso/dialogs/settings/SettingsDialog.cpp 3 Apr 2007 21:25:25
-0000 1.5
+++ src/traverso/dialogs/settings/SettingsDialog.cpp 16 Apr 2007 18:44:26
-0000 1.6
@@ -36,15 +36,16 @@
contentsWidget->setMovement(QListView::Static);
contentsWidget->setMaximumWidth(140);
contentsWidget->setMinimumWidth(135);
- contentsWidget->setMinimumHeight(350);
+ contentsWidget->setMinimumHeight(390);
contentsWidget->setSpacing(12);
pagesWidget = new QStackedWidget;
- pagesWidget->addWidget(new BehaviorPage);
- pagesWidget->addWidget(new AppearancePage);
- pagesWidget->addWidget(new AudioDriverPage);
- pagesWidget->addWidget(new DiskIOPage);
- pagesWidget->addWidget(new KeyboardPage);
+ pagesWidget->addWidget(new BehaviorPage(this));
+ pagesWidget->addWidget(new AppearancePage(this));
+ pagesWidget->addWidget(new AudioDriverPage(this));
+ pagesWidget->addWidget(new DiskIOPage(this));
+ pagesWidget->addWidget(new KeyboardPage(this));
+ pagesWidget->addWidget(new PerformancePage(this));
createIcons();
contentsWidget->setCurrentRow(0);
@@ -116,6 +117,12 @@
keyboardButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
keyboardButton->setSizeHint(QSize(100, 50));
+ QListWidgetItem* performanceButton = new
QListWidgetItem(contentsWidget);
+ performanceButton->setIcon(QIcon(":/performance"));
+ performanceButton->setText(tr("Performance"));
+ performanceButton->setTextAlignment(Qt::AlignHCenter);
+ performanceButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+ performanceButton->setSizeHint(QSize(100, 50));
connect(contentsWidget,
SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem
*)),
Index: src/traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- src/traverso/Interface.cpp 16 Apr 2007 09:08:31 -0000 1.64
+++ src/traverso/Interface.cpp 16 Apr 2007 18:44:26 -0000 1.65
@@ -754,15 +754,8 @@
void Interface::closeEvent(QCloseEvent * event)
{
- if (m_settingsdialog && m_settingsdialog->isVisible()) {
- m_settingsdialog->close();
- }
-
- if (pm().get_project() && pm().get_project()->is_save_to_close()) {
- event->accept();
- } else {
event->ignore();
- }
+ pm().exit();
}
Command* Interface::show_project_manager_dialog()
Index: src/traverso/Traverso.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Traverso.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- src/traverso/Traverso.cpp 16 Apr 2007 09:08:31 -0000 1.33
+++ src/traverso/Traverso.cpp 16 Apr 2007 18:44:26 -0000 1.34
@@ -99,7 +99,6 @@
QMetaObject::invokeMethod(&pm(), "start", Qt::QueuedConnection);
- setQuitOnLastWindowClosed(false);
connect(this, SIGNAL(lastWindowClosed()), &pm(), SLOT(exit()));
}
Index: src/traverso/traverso.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.pro,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- src/traverso/traverso.pro 10 Apr 2007 17:11:49 -0000 1.42
+++ src/traverso/traverso.pro 16 Apr 2007 18:44:26 -0000 1.43
@@ -101,6 +101,7 @@
ui/BehaviorConfigPage.ui \
ui/MemoryConfigPage.ui \
ui/ThemeConfigPage.ui \
+ ui/PerformanceConfigPage.ui \
ui/SongManagerDialog.ui \
ui/ProjectManagerDialog.ui \
ui/MarkerDialog.ui \
Index: src/traverso/traverso.qrc
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/traverso.qrc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/traverso/traverso.qrc 12 Apr 2007 13:39:12 -0000 1.15
+++ src/traverso/traverso.qrc 16 Apr 2007 18:44:26 -0000 1.16
@@ -28,6 +28,7 @@
<file alias="driver">../../resources/images/driver.png</file>
<file
alias="memorysmall">../../resources/images/memory.png</file>
<file
alias="appearance">../../resources/images/appearance.png</file>
+ <file
alias="performance">../../resources/images/performance.png</file>
<file
alias="playstart">../../resources/images/player_play.png</file>
<file
alias="playstop">../../resources/images/player_stop.png</file>
<file
alias="projectmanagement">../../resources/images/icons/32X32/projects.png</file>
Index: src/traverso/ui/KeyboardConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/KeyboardConfigPage.ui,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/traverso/ui/KeyboardConfigPage.ui 16 Apr 2007 09:08:31 -0000
1.4
+++ src/traverso/ui/KeyboardConfigPage.ui 16 Apr 2007 18:44:26 -0000
1.5
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>341</width>
- <height>324</height>
+ <height>273</height>
</rect>
</property>
<property name="windowTitle" >
@@ -150,60 +150,6 @@
</item>
</layout>
</item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QLabel" name="label_4" >
- <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;">The number of times per
second at which the Graphical</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">Items are repainted
during a jog action, like moving an</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">AudioClip, or changing
the Gain.</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;">The default frames per
second of 35 is a perfect compromise </p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">between smooth
painting, and low cpu usage.</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;">However, if you find
the painting to be not smooth enough,</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">change this value to a
higher one, but keep in mind that it</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">will consume
considerably more 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;">If for example moving
an AudioClip still takes to much cpu,</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">you should consider to
lower this value.</p></body></html></string>
- </property>
- <property name="text" >
- <string>Jog update interval (fps)</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="jogUpdateIntervalSpinBox" >
- <property name="maximumSize" >
- <size>
- <width>100</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="maximum" >
- <number>50</number>
- </property>
- <property name="minimum" >
- <number>20</number>
- </property>
- <property name="value" >
- <number>25</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
</layout>
</widget>
</item>
Index: src/traverso/ui/ThemeConfigPage.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/ThemeConfigPage.ui,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/traverso/ui/ThemeConfigPage.ui 16 Apr 2007 09:08:31 -0000 1.3
+++ src/traverso/ui/ThemeConfigPage.ui 16 Apr 2007 18:44:26 -0000 1.4
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>346</width>
- <height>428</height>
+ <height>359</height>
</rect>
</property>
<property name="windowTitle" >
@@ -275,38 +275,6 @@
</layout>
</widget>
</item>
- <item>
- <widget class="QGroupBox" name="openGlGroupBox" >
- <property name="title" >
- <string>Open GL Options</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QCheckBox" name="useOpenGLCheckBox" >
- <property name="text" >
- <string>Use OpenGL</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
</layout>
</widget>
<resources/>
Index: resources/images/performance.png
===================================================================
RCS file: resources/images/performance.png
diff -N resources/images/performance.png
Binary files /dev/null and /tmp/cvsq9Wx1s differ
Index: src/traverso/ui/PerformanceConfigPage.ui
===================================================================
RCS file: src/traverso/ui/PerformanceConfigPage.ui
diff -N src/traverso/ui/PerformanceConfigPage.ui
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/traverso/ui/PerformanceConfigPage.ui 16 Apr 2007 18:44:26 -0000
1.1
@@ -0,0 +1,110 @@
+<ui version="4.0" >
+ <class>PerformanceConfigPage</class>
+ <widget class="QWidget" name="PerformanceConfigPage" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>247</width>
+ <height>94</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Form</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="title" >
+ <string>Performance Settings</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_4" >
+ <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;">The number of times per
second at which the Graphical</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">Items are repainted
during a jog action, like moving an</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">AudioClip, or changing
the Gain.</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;">The default frames per
second of 35 is a perfect compromise </p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">between smooth
painting, and low cpu usage.</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;">However, if you find
the painting to be not smooth enough,</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">change this value to a
higher one, but keep in mind that it</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">will consume
considerably more 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;">If for example moving
an AudioClip still takes to much cpu,</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">you should consider to
lower this value.</p></body></html></string>
+ </property>
+ <property name="text" >
+ <string>Jog update interval (fps)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="jogUpdateIntervalSpinBox" >
+ <property name="maximumSize" >
+ <size>
+ <width>100</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="maximum" >
+ <number>50</number>
+ </property>
+ <property name="minimum" >
+ <number>20</number>
+ </property>
+ <property name="value" >
+ <number>25</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="useOpenGLCheckBox" >
+ <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;">Paint Tracks and
AudioClip on a GLWidget, depending </p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">on your graphicscard
and driver support, this might</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px;
margin-right:0px; -qt-block-indent:0; text-indent:0px;">lower cpu usage during
e.g. AudioClip move actions.</p></body></html></string>
+ </property>
+ <property name="text" >
+ <string>Use OpenGL</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso src/core/AudioClip.cpp src/core/AudioC...,
Remon Sijrier <=