[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso src/commands/MoveClip.cpp src/core/Con...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso src/commands/MoveClip.cpp src/core/Con... |
|
Date: |
Mon, 26 Jan 2009 20:11:43 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 09/01/26 20:11:43
Modified files:
src/commands : MoveClip.cpp
src/core : Config.cpp InputEngine.cpp Project.cpp
ProjectManager.cpp Sheet.cpp
src/sheetcanvas: AudioClipView.cpp
src/traverso/dialogs: ExportDialog.cpp
src/traverso/dialogs/project: OpenProjectDialog.cpp
src/traverso/dialogs/settings: Pages.cpp
src/traverso : Interface.cpp Traverso.cpp
. : TODO
Log message:
* various small fixes, micro optimizations
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Config.cpp?cvsroot=traverso&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/InputEngine.cpp?cvsroot=traverso&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.cpp?cvsroot=traverso&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Sheet.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/ExportDialog.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.155&r2=1.156
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Traverso.cpp?cvsroot=traverso&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/traverso/TODO?cvsroot=traverso&r1=1.22&r2=1.23
Patches:
Index: src/commands/MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- src/commands/MoveClip.cpp 17 Jan 2009 18:18:01 -0000 1.82
+++ src/commands/MoveClip.cpp 26 Jan 2009 20:11:41 -0000 1.83
@@ -446,6 +446,8 @@
void MoveClip::toggle_vertical_only(bool autorepeat)
{
+ if (autorepeat) return;
+
d->verticalOnly = !d->verticalOnly;
if (d->verticalOnly) {
set_cursor_shape(0, 1);
Index: src/core/Config.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Config.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/core/Config.cpp 23 Jan 2008 21:16:45 -0000 1.20
+++ src/core/Config.cpp 26 Jan 2009 20:11:42 -0000 1.21
@@ -51,7 +51,7 @@
QStringList keys = settings.allKeys();
- foreach(QString key, keys) {
+ foreach(const QString &key, keys) {
m_configs.insert(key, settings.value(key));
}
Index: src/core/InputEngine.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/InputEngine.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- src/core/InputEngine.cpp 3 Oct 2008 20:09:10 -0000 1.74
+++ src/core/InputEngine.cpp 26 Jan 2009 20:11:42 -0000 1.75
@@ -189,7 +189,7 @@
#if !defined (STATIC_BUILD)
QDir pluginsDir("lib/commandplugins");
- foreach (QString fileName, pluginsDir.entryList(QDir::Files)) {
+ foreach (const QString &fileName, pluginsDir.entryList(QDir::Files)) {
QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
CommandPlugin* plug =
qobject_cast<CommandPlugin*>(loader.instance());
if (plug) {
Index: src/core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- src/core/Project.cpp 1 Jan 2009 11:30:06 -0000 1.67
+++ src/core/Project.cpp 26 Jan 2009 20:11:42 -0000 1.68
@@ -47,6 +47,16 @@
// in case we run with memory leak detection enabled!
#include "Debugger.h"
+/** \class Project
+ \brief Project restores and saves the state of a Traverso Project
+
+ A Project can have as much Sheet's as one likes. A Project with one
Sheet acts like a 'Session'
+ where the Sheet can be turned into a CD with various Tracks using
Marker 's
+ When a Project has multiple Sheet's, each Sheet will be a CD Track,
this can be usefull if each
+ Track on a CD is independend of the other CD Tracks.
+
+ */
+
Project::Project(const QString& title)
: ContextItem(), m_title(title)
@@ -527,6 +537,14 @@
return -1;
}
+ QDir dir(spec->exportdir);
+ if (!spec->exportdir.isEmpty() && !dir.exists()) {
+ if (!dir.mkdir(spec->exportdir)) {
+ info().warning(tr("Unable to create export directory!
Please check permissions for this directory: %1").arg(spec->exportdir));
+ return -1;
+ }
+ }
+
spec->progress = 0;
spec->running = true;
spec->stop = false;
Index: src/core/ProjectManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/core/ProjectManager.cpp 23 Jan 2008 21:16:45 -0000 1.54
+++ src/core/ProjectManager.cpp 26 Jan 2009 20:11:42 -0000 1.55
@@ -470,7 +470,7 @@
QStringList list = newdir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
m_projectDirs.clear();
- foreach(QString string, list) {
+ foreach(const QString &string, list) {
m_projectDirs += path + "/" + string;
}
@@ -491,7 +491,7 @@
QStringList list = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
bool startwhining = false;
- foreach(QString string, list) {
+ foreach(const QString &string, list) {
if (!m_projectDirs.contains(path + "/" + string)) {
startwhining = true;
break;
Index: src/core/Sheet.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Sheet.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/core/Sheet.cpp 17 Jan 2009 18:18:37 -0000 1.18
+++ src/core/Sheet.cpp 26 Jan 2009 20:11:42 -0000 1.19
@@ -65,6 +65,16 @@
#include "Debugger.h"
+/** \class Sheet
+ \brief The 'work space' (as in WorkSheet) holding the Track 's and the
Master Out AudioBus
+
+ A Sheet processes each Track, and mixes the result into it's Master Out
AudioBus.
+ Sheet connects it's Client to the AudioDevice, to become part of audio
processing
+ chain. The connection is instantiated by Project, who owns the Sheet
objects.
+
+
+ */
+
Sheet::Sheet(Project* project)
: ContextItem()
, m_project(project)
@@ -470,7 +480,6 @@
resize_buffer(false, spec->blocksize);
renderDecodeBuffer = new DecodeBuffer;
-// renderDecodeBuffer->use_custom_destination_buffer(true);
return 1;
}
@@ -758,6 +767,14 @@
void Sheet::set_hzoom( qreal hzoom )
{
+ // Traverso <= 0.42.0 doesn't store the real zoom factor, but an
+ // index. This currently causes problems as there is no real support
+ // (yet) for zoomlevels other then powers of 2, so we force that for
now.
+ // NOTE: Remove those 2 lines when floating point zoomlevel is
implemented!
+ int highbit;
+ hzoom = nearest_power_of_two(hzoom, highbit);
+
+
if (hzoom > Peak::max_zoom_value()) {
hzoom = Peak::max_zoom_value();
}
Index: src/sheetcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/AudioClipView.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Index: src/traverso/dialogs/ExportDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/ExportDialog.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/traverso/dialogs/ExportDialog.cpp 22 May 2008 16:40:44 -0000
1.13
+++ src/traverso/dialogs/ExportDialog.cpp 26 Jan 2009 20:11:42 -0000
1.14
@@ -75,16 +75,6 @@
return false;
}
- QDir exportDir;
- QString dirName = exportDirName->text();
-
- if (!dirName.isEmpty() && !exportDir.exists(dirName)) {
- if (!exportDir.mkpath(dirName)) {
- info().warning(tr("Unable to create export directory!
Please check permissions for this directory: %1").arg(dirName));
- return false;
- }
- }
-
return true;
}
@@ -95,6 +85,11 @@
return;
}
+ if (exportDirName->text().isEmpty()) {
+ info().warning(tr("No Export Direcoty was given, please supply
one first!"));
+ return;
+ }
+
connect(m_project, SIGNAL(sheetExportProgressChanged(int)), this,
SLOT(update_sheet_progress(int)));
connect(m_project, SIGNAL(overallExportProgressChanged(int)), this,
SLOT(update_overall_progress(int)));
connect(m_project, SIGNAL(exportFinished()), this,
SLOT(render_finished()));
@@ -121,7 +116,10 @@
m_exportSpec->tocFileName = name;
m_exportSpec->isRecording = false;
- m_project->export_project(m_exportSpec);
+
+ if (m_project->export_project(m_exportSpec) == -1) {
+ return;
+ }
startButton->hide();
closeButton->hide();
Index: src/traverso/dialogs/project/OpenProjectDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/project/OpenProjectDialog.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/traverso/dialogs/project/OpenProjectDialog.cpp 24 Jan 2008 07:10:45
-0000 1.18
+++ src/traverso/dialogs/project/OpenProjectDialog.cpp 26 Jan 2009 20:11:42
-0000 1.19
@@ -73,7 +73,7 @@
QStringList list = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
- foreach(QString dirname, list) {
+ foreach(const QString &dirname, list) {
/************ FROM HERE ****************/
QDomDocument doc("Project");
Index: src/traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/traverso/dialogs/settings/Pages.cpp 30 Sep 2008 19:43:05 -0000
1.43
+++ src/traverso/dialogs/settings/Pages.cpp 26 Jan 2009 20:11:43 -0000
1.44
@@ -68,7 +68,7 @@
m_driverCombo = new QComboBox;
QStringList drivers = audiodevice().get_available_drivers();
- foreach(QString name, drivers) {
+ foreach(const QString &name, drivers) {
m_driverCombo->addItem(name);
}
@@ -492,6 +492,7 @@
int scrollMode = config().get_property("PlayHead", "Scrollmode",
2).toInt();
bool resyncAudio = config().get_property("AudioClip", "SyncDuringDrag",
false).toBool();
bool lockClips = config().get_property("AudioClip", "LockByDefault",
false).toBool();
+ QString interfaceLanguage = config().get_property("Interface",
"language", "System Locale").toString();
m_configpage->loadLastProjectCheckBox->setChecked(loadLastUsedProject);
m_configpage->numberOfTrackSpinBox->setValue(defaultNumTracks);
@@ -528,6 +529,7 @@
config().set_property("PlayHead", "Scrollmode", 2);
config().set_property("AudioClip", "SyncDuringDrag", false);
config().set_property("AudioClip", "LockByDefault", false);
+ config().set_property("Interface", "language", "System Locale");
load_config();
}
@@ -588,11 +590,10 @@
QStringList keys = QStyleFactory::keys();
keys.sort();
- foreach(QString key, keys) {
+ foreach(const QString &key, keys) {
m_themepage->styleCombo->addItem(key);
}
-
m_themepage->update_theme_combobox(themepath);
Index: src/traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- src/traverso/Interface.cpp 19 Jan 2009 21:08:02 -0000 1.155
+++ src/traverso/Interface.cpp 26 Jan 2009 20:11:43 -0000 1.156
@@ -1001,7 +1001,7 @@
// actions, a little code duplication here, adding action to the
// menu is also done ~10 lines up ...
QList<QString> keys = submenus.keys();
- foreach(QString key, keys) {
+ foreach(const QString &key, keys) {
QList<MenuData>* list = submenus.value(key);
qSort(list->begin(), list->end(), MenuData::smaller);
Index: src/traverso/Traverso.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Traverso.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- src/traverso/Traverso.cpp 21 Jan 2008 16:22:17 -0000 1.55
+++ src/traverso/Traverso.cpp 26 Jan 2009 20:11:43 -0000 1.56
@@ -79,7 +79,7 @@
and adding of audio processing objects in the audio processing chain.
<br />
- The AddRemove Command class has to be used for adding/removing items
+ The AddRemove Command class is to be used for adding/removing items
to/from ContextItem objects. <br />This class detects if the add/remove
function
can be called directly, or in a thread save way, and uses therefore the
Tsar class, and the Sheet object in case it was given as a
parameter.<br />
Index: TODO
===================================================================
RCS file: /sources/traverso/traverso/TODO,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- TODO 11 Nov 2008 12:18:45 -0000 1.22
+++ TODO 26 Jan 2009 20:11:43 -0000 1.23
@@ -1,7 +1,12 @@
TOBEDONE FOR 0.4x.x
+### NEEDS TESTING ###
+- Fold Sheet/Track with Markers
+- Select clips
+- Copy/move (including un/redo) selected clips
+
+### BUGS / WISHES ###
* Ubuntu Intrepid package does not depend on libfftw3 ?
-* sheetwriter should be songwriter (MarkerDialog?)
* resetting audioclip file: audioclip doesn't play sound
* QFileDialog::getExistingDirectory crashes when it shows a hidden directory
the first time.
* http://traverso-daw.org/forum/index.php/topic,93.0.html (selecting second
burn device not possible)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso src/commands/MoveClip.cpp src/core/Con...,
Remon Sijrier <=