[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src commands/AudioClipExternalProcessi...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso/src commands/AudioClipExternalProcessi... |
|
Date: |
Mon, 05 Nov 2007 15:49:33 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/11/05 15:49:33
Modified files:
src/commands : AudioClipExternalProcessing.cpp
AudioClipExternalProcessing.h Fade.cpp
MoveClip.cpp
src/common : Tsar.cpp Tsar.h
src/core : AudioClip.cpp AudioClipManager.cpp
AudioFileMerger.cpp Config.cpp
ContextPointer.cpp Curve.cpp DiskIO.cpp
FadeCurve.cpp FileHelpers.cpp Information.cpp
Marker.cpp Peak.cpp Project.cpp
ProjectManager.cpp SnapList.cpp Song.cpp
Themer.cpp TimeLine.cpp Track.cpp ViewPort.cpp
WriteSource.cpp
src/plugins/native: CorrelationMeter.cpp SpectralMeter.cpp
src/plugins : PluginChain.cpp Plugin.cpp
PluginPropertiesDialog.cpp PluginSlider.cpp
src/traverso : CorrelationMeterWidget.cpp
FadeContextDialog.cpp Interface.cpp
PluginSelectorDialog.cpp
QuickDriverConfigWidget.cpp
src/traverso/songcanvas: AudioClipView.cpp ClipsViewPort.cpp
Cursors.cpp CurveNodeView.cpp
CurveView.cpp CurveView.h FadeView.cpp
MarkerView.cpp PluginChainView.cpp
PluginView.cpp PositionIndicator.cpp
songcanvas.pro SongView.cpp
SongWidget.cpp SongWidget.h
TimeLineView.cpp TimeLineView.h
TrackPanelView.cpp TrackView.cpp
ViewItem.cpp ViewItem.h
Added files:
src/traverso/songcanvas/ui: AudioClipEditDialog.ui
Removed files:
src/traverso/ui: AudioClipEditWidget.ui
Log message:
* moved to using .moc includes, but that didn't work out with qmake, so
reverted it at the same time ... Makes for a lot of almost no-change commit
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AudioClipExternalProcessing.cpp?cvsroot=traverso&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AudioClipExternalProcessing.h?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Fade.cpp?cvsroot=traverso&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/Tsar.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/common/Tsar.h?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClipManager.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioFileMerger.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Config.cpp?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ContextPointer.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Curve.cpp?cvsroot=traverso&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/DiskIO.cpp?cvsroot=traverso&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FadeCurve.cpp?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FileHelpers.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Information.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Marker.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectManager.cpp?cvsroot=traverso&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/SnapList.cpp?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.150&r2=1.151
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Themer.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/TimeLine.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Track.cpp?cvsroot=traverso&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ViewPort.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/WriteSource.cpp?cvsroot=traverso&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/native/CorrelationMeter.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/native/SpectralMeter.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/PluginChain.cpp?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/Plugin.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/PluginPropertiesDialog.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/PluginSlider.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.cpp?cvsroot=traverso&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/FadeContextDialog.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/PluginSelectorDialog.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/QuickDriverConfigWidget.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ClipsViewPort.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/Cursors.cpp?cvsroot=traverso&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveNodeView.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.h?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/FadeView.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/MarkerView.cpp?cvsroot=traverso&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PluginChainView.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PluginView.cpp?cvsroot=traverso&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PositionIndicator.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/songcanvas.pro?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongWidget.cpp?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongWidget.h?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.h?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.cpp?cvsroot=traverso&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackView.cpp?cvsroot=traverso&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ViewItem.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ViewItem.h?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ui/AudioClipEditDialog.ui?cvsroot=traverso&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/AudioClipEditWidget.ui?cvsroot=traverso&r1=1.7&r2=0
Patches:
Index: commands/AudioClipExternalProcessing.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/AudioClipExternalProcessing.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- commands/AudioClipExternalProcessing.cpp 10 Oct 2007 16:41:56 -0000
1.33
+++ commands/AudioClipExternalProcessing.cpp 5 Nov 2007 15:49:29 -0000
1.34
@@ -32,13 +32,54 @@
#include <Utils.h>
#include "Interface.h"
+#include "ui_ExternalProcessing.h"
+
#include <QFile>
+#include <QDialog>
+
// Always put me below _all_ includes, this is needed
// in case we run with memory leak detection enabled!
#include "Debugger.h"
+
+class ExternalProcessingDialog : public QDialog, protected
Ui::ExternalProcessing
+{
+ Q_OBJECT
+
+ public:
+ ExternalProcessingDialog(QWidget* parent,
AudioClipExternalProcessing* acep);
+ ~ExternalProcessingDialog();
+
+
+ private:
+ AudioClipExternalProcessing* m_acep;
+ QProcess* m_processor;
+ QString m_filename;
+ QString m_program;
+ bool m_queryOptions;
+ QStringList m_arguments;
+ QString m_commandargs;
+ QString m_infilename;
+ QString m_outfilename;
+ QString m_newClipName;
+
+ void query_options();
+
+ private slots:
+ void read_standard_output();
+ void prepare_for_external_processing();
+ void process_started();
+ void process_finished(int exitcode, QProcess::ExitStatus
exitstatus);
+ void arg_combo_index_changed ( const QString & text );
+ void start_external_processing();
+ void command_lineedit_text_changed(const QString & text);
+ void process_error(QProcess::ProcessError error);
+};
+
+#include "AudioClipExternalProcessing.moc"
+
AudioClipExternalProcessing::AudioClipExternalProcessing(AudioClip* clip)
: Command(clip, tr("Clip: External Processing"))
{
@@ -288,4 +329,3 @@
}
}
-
Index: commands/AudioClipExternalProcessing.h
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/AudioClipExternalProcessing.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- commands/AudioClipExternalProcessing.h 10 Oct 2007 16:41:56 -0000
1.4
+++ commands/AudioClipExternalProcessing.h 5 Nov 2007 15:49:29 -0000
1.5
@@ -22,51 +22,13 @@
#ifndef AUDIOCLIP_EXTERNAL_PROCESSING_H
#define AUDIOCLIP_EXTERNAL_PROCESSING_H
-#include <QDialog>
#include <QProcess>
#include <Command.h>
-#include "build/ui_ExternalProcessing.h"
-
class AudioClip;
class Track;
class AudioClipExternalProcessing;
-class ExternalProcessingDialog : public QDialog, protected
Ui::ExternalProcessing
-{
- Q_OBJECT
-
-public:
- ExternalProcessingDialog(QWidget* parent, AudioClipExternalProcessing*
acep);
- ~ExternalProcessingDialog();
-
-
-private:
- AudioClipExternalProcessing* m_acep;
- QProcess* m_processor;
- QString m_filename;
- QString m_program;
- bool m_queryOptions;
- QStringList m_arguments;
- QString m_commandargs;
- QString m_infilename;
- QString m_outfilename;
- QString m_newClipName;
-
- void query_options();
-
-private slots:
- void read_standard_output();
- void prepare_for_external_processing();
- void process_started();
- void process_finished(int exitcode, QProcess::ExitStatus exitstatus);
- void arg_combo_index_changed ( const QString & text );
- void start_external_processing();
- void command_lineedit_text_changed(const QString & text);
- void process_error(QProcess::ProcessError error);
-};
-
-
class AudioClipExternalProcessing : public Command
{
public :
Index: commands/Fade.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Fade.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- commands/Fade.cpp 28 Sep 2007 18:33:43 -0000 1.24
+++ commands/Fade.cpp 5 Nov 2007 15:49:29 -0000 1.25
@@ -359,5 +359,3 @@
return 1;
}
-
-// eof
Index: commands/MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- commands/MoveClip.cpp 22 Oct 2007 18:44:00 -0000 1.53
+++ commands/MoveClip.cpp 5 Nov 2007 15:49:29 -0000 1.54
@@ -463,5 +463,6 @@
leftlocation -= snapDiff;
}
+
// eof
Index: common/Tsar.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/common/Tsar.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- common/Tsar.cpp 20 Oct 2007 17:38:17 -0000 1.1
+++ common/Tsar.cpp 5 Nov 2007 15:49:29 -0000 1.2
@@ -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: Tsar.cpp,v 1.1 2007/10/20 17:38:17 r_sijrier Exp $
+$Id: Tsar.cpp,v 1.2 2007/11/05 15:49:29 r_sijrier Exp $
*/
#include "Tsar.h"
@@ -314,6 +314,5 @@
process_event_signal(event);
}
-
//eof
Index: common/Tsar.h
===================================================================
RCS file: /sources/traverso/traverso/src/common/Tsar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- common/Tsar.h 20 Oct 2007 17:38:17 -0000 1.1
+++ common/Tsar.h 5 Nov 2007 15:49:29 -0000 1.2
@@ -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: Tsar.h,v 1.1 2007/10/20 17:38:17 r_sijrier Exp $
+$Id: Tsar.h,v 1.2 2007/11/05 15:49:29 r_sijrier Exp $
*/
#ifndef TSAR_H
@@ -110,11 +110,12 @@
};
-#endif
-
// use this function to access the context pointer
Tsar& tsar();
+#endif
+
+
//eof
Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- core/AudioClip.cpp 22 Oct 2007 18:44:00 -0000 1.147
+++ core/AudioClip.cpp 5 Nov 2007 15:49:29 -0000 1.148
@@ -947,5 +947,3 @@
m_captureBus = audiodevice().get_capture_bus(m_captureBusName);
}
-// eof
-
Index: core/AudioClipManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClipManager.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- core/AudioClipManager.cpp 22 Oct 2007 18:44:00 -0000 1.19
+++ core/AudioClipManager.cpp 5 Nov 2007 15:49:29 -0000 1.20
@@ -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: AudioClipManager.cpp,v 1.19 2007/10/22 18:44:00 r_sijrier Exp $
+ $Id: AudioClipManager.cpp,v 1.20 2007/11/05 15:49:29 r_sijrier Exp $
*/
#include "AudioClipManager.h"
@@ -207,5 +207,4 @@
return group;
}
-
//eof
Index: core/AudioFileMerger.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioFileMerger.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- core/AudioFileMerger.cpp 22 Oct 2007 18:44:00 -0000 1.3
+++ core/AudioFileMerger.cpp 5 Nov 2007 15:49:29 -0000 1.4
@@ -135,3 +135,4 @@
emit taskFinished(name.left(length-28));
}
+
Index: core/Config.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Config.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- core/Config.cpp 20 Oct 2007 17:38:17 -0000 1.17
+++ core/Config.cpp 5 Nov 2007 15:49:29 -0000 1.18
@@ -141,3 +141,4 @@
audiodevice().set_driver_properties(hardwareconfigs);
}
+
Index: core/ContextPointer.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ContextPointer.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- core/ContextPointer.cpp 29 Oct 2007 15:08:48 -0000 1.15
+++ core/ContextPointer.cpp 5 Nov 2007 15:49:30 -0000 1.16
@@ -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: ContextPointer.cpp,v 1.15 2007/10/29 15:08:48 r_sijrier Exp $
+$Id: ContextPointer.cpp,v 1.16 2007/11/05 15:49:30 r_sijrier Exp $
*/
#include "ContextPointer.h"
@@ -210,5 +210,3 @@
}
}
-//eof
-
Index: core/Curve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Curve.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- core/Curve.cpp 24 Sep 2007 16:58:38 -0000 1.44
+++ core/Curve.cpp 5 Nov 2007 15:49:30 -0000 1.45
@@ -660,3 +660,4 @@
m_song = song;
set_history_stack(m_song->get_history_stack());
}
+
Index: core/DiskIO.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/DiskIO.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- core/DiskIO.cpp 12 Oct 2007 19:38:51 -0000 1.50
+++ core/DiskIO.cpp 5 Nov 2007 15:49:30 -0000 1.51
@@ -503,5 +503,3 @@
// m_workTimer.stop();
}
-//eof
-
Index: core/FadeCurve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FadeCurve.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- core/FadeCurve.cpp 16 Oct 2007 13:15:07 -0000 1.29
+++ core/FadeCurve.cpp 5 Nov 2007 15:49:30 -0000 1.30
@@ -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: FadeCurve.cpp,v 1.29 2007/10/16 13:15:07 r_sijrier Exp $
+$Id: FadeCurve.cpp,v 1.30 2007/11/05 15:49:30 r_sijrier Exp $
*/
#include "FadeCurve.h"
@@ -394,5 +394,3 @@
return 0;
}
-//eof
-
Index: core/FileHelpers.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FileHelpers.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- core/FileHelpers.cpp 6 Oct 2007 14:17:58 -0000 1.9
+++ core/FileHelpers.cpp 5 Nov 2007 15:49:30 -0000 1.10
@@ -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: FileHelpers.cpp,v 1.9 2007/10/06 14:17:58 r_sijrier Exp $
+$Id: FileHelpers.cpp,v 1.10 2007/11/05 15:49:30 r_sijrier Exp $
*/
#include "FileHelpers.h"
@@ -130,9 +130,12 @@
int fileDescFrom = fileFrom.handle();
int fileDescTo = fileTo.handle();
+#if defined(DHAVE_SYS_STAT_H)
struct stat fileStat;
- if (fstat(fileDescFrom, &fileStat) == 0)
+ if (fstat(fileDescFrom, &fileStat) == 0) {
bufferSize = (int)fileStat.st_blksize;
+ }
+#endif
void *buffer = malloc(sizeof(char) * bufferSize);
// QMemArray<char> buffer(bufferSize);
Index: core/Information.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Information.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- core/Information.cpp 20 Oct 2007 17:38:18 -0000 1.5
+++ core/Information.cpp 5 Nov 2007 15:49:30 -0000 1.6
@@ -78,3 +78,4 @@
connect(&audiodevice(), SIGNAL(message(QString, int)),
this, SLOT(audiodevice_message(QString, int)));
}
+
Index: core/Marker.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Marker.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- core/Marker.cpp 17 Oct 2007 15:23:11 -0000 1.14
+++ core/Marker.cpp 5 Nov 2007 15:49:30 -0000 1.15
@@ -178,4 +178,3 @@
return m_copyprotect;
}
-//eof
Index: core/Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- core/Peak.cpp 29 Oct 2007 13:25:31 -0000 1.74
+++ core/Peak.cpp 5 Nov 2007 15:49:30 -0000 1.75
@@ -236,29 +236,29 @@
}
-static int
-cnt_bits(unsigned long val, int & highbit)
-{
- int cnt = 0;
- highbit = 0;
- while (val) {
- if (val & 1) cnt++;
- val>>=1;
- highbit++;
- }
- return cnt;
-}
-
-// returns the next power of two greater or equal to val
-static unsigned long
-nearest_power_of_two(unsigned long val)
-{
- int highbit;
- if (cnt_bits(val, highbit) > 1) {
- return 1<<highbit;
- }
- return val;
-}
+// static int
+// cnt_bits(unsigned long val, int & highbit)
+// {
+// int cnt = 0;
+// highbit = 0;
+// while (val) {
+// if (val & 1) cnt++;
+// val>>=1;
+// highbit++;
+// }
+// return cnt;
+// }
+//
+// // returns the next power of two greater or equal to val
+// static unsigned long
+// nearest_power_of_two(unsigned long val)
+// {
+// int highbit;
+// if (cnt_bits(val, highbit) > 1) {
+// return 1<<highbit;
+// }
+// return val;
+// }
int Peak::calculate_peaks(int chan, float** buffer, int zoomLevel, TimeRef
startlocation, int pixelcount)
@@ -951,3 +951,4 @@
return framesRead;
}
+
Index: core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- core/Project.cpp 24 Oct 2007 18:11:40 -0000 1.61
+++ core/Project.cpp 5 Nov 2007 15:49:30 -0000 1.62
@@ -25,9 +25,6 @@
#include <QMessageBox>
#include <QString>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <stdlib.h>
#include <cfloat>
#include "Project.h"
Index: core/ProjectManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectManager.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- core/ProjectManager.cpp 29 Oct 2007 10:42:31 -0000 1.48
+++ core/ProjectManager.cpp 5 Nov 2007 15:49:30 -0000 1.49
@@ -628,3 +628,4 @@
return 1;
}
+
Index: core/SnapList.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/SnapList.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- core/SnapList.cpp 22 Oct 2007 18:44:00 -0000 1.21
+++ core/SnapList.cpp 5 Nov 2007 15:49:30 -0000 1.22
@@ -34,7 +34,7 @@
//#define debugsnaplist
-#if defined (debugsnaplist)
+#if defined(debugsnaplist)
#define SLPRINT(args...) printf(args)
#else
#define SLPRINT(args...)
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- core/Song.cpp 22 Oct 2007 18:44:00 -0000 1.150
+++ core/Song.cpp 5 Nov 2007 15:49:30 -0000 1.151
@@ -1347,5 +1347,3 @@
PMESG2("Song :: leaving seek_finished");
}
-
-// eof
Index: core/Themer.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Themer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- core/Themer.cpp 15 Aug 2007 16:08:07 -0000 1.6
+++ core/Themer.cpp 5 Nov 2007 15:49:30 -0000 1.7
@@ -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: Themer.cpp,v 1.6 2007/08/15 16:08:07 n_doebelin Exp $
+$Id: Themer.cpp,v 1.7 2007/11/05 15:49:30 r_sijrier Exp $
*/
#include "Themer.h"
@@ -435,4 +435,3 @@
return c;
}
-//eof
Index: core/TimeLine.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/TimeLine.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- core/TimeLine.cpp 20 Sep 2007 18:25:15 -0000 1.8
+++ core/TimeLine.cpp 5 Nov 2007 15:49:30 -0000 1.9
@@ -148,6 +148,3 @@
return false;
}
-//eof
-
-
Index: core/Track.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Track.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- core/Track.cpp 22 Oct 2007 18:44:01 -0000 1.71
+++ core/Track.cpp 5 Nov 2007 15:49:30 -0000 1.72
@@ -566,5 +566,3 @@
emit inBusChanged();
}
-// eof
-
Index: core/ViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ViewPort.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- core/ViewPort.cpp 29 Oct 2007 15:08:48 -0000 1.23
+++ core/ViewPort.cpp 5 Nov 2007 15:49:30 -0000 1.24
@@ -322,5 +322,5 @@
m_text = "";
}
-//eof
+
Index: core/WriteSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/WriteSource.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- core/WriteSource.cpp 29 Oct 2007 14:42:04 -0000 1.41
+++ core/WriteSource.cpp 5 Nov 2007 15:49:30 -0000 1.42
@@ -471,5 +471,3 @@
prepare_rt_buffers();
}
-//eof
-
Index: plugins/native/CorrelationMeter.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/native/CorrelationMeter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- plugins/native/CorrelationMeter.cpp 27 Nov 2006 21:53:42 -0000 1.1
+++ plugins/native/CorrelationMeter.cpp 5 Nov 2007 15:49:31 -0000 1.2
@@ -16,7 +16,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: CorrelationMeter.cpp,v 1.1 2006/11/27 21:53:42 r_sijrier Exp $
+$Id: CorrelationMeter.cpp,v 1.2 2007/11/05 15:49:31 r_sijrier Exp $
*/
@@ -233,5 +233,3 @@
return QString(tr("Correlation Meter"));
}
-//eof
-
Index: plugins/native/SpectralMeter.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/native/SpectralMeter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- plugins/native/SpectralMeter.cpp 11 Aug 2007 22:54:58 -0000 1.5
+++ plugins/native/SpectralMeter.cpp 5 Nov 2007 15:49:31 -0000 1.6
@@ -16,7 +16,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: SpectralMeter.cpp,v 1.5 2007/08/11 22:54:58 benjie Exp $
+$Id: SpectralMeter.cpp,v 1.6 2007/11/05 15:49:31 r_sijrier Exp $
*/
@@ -205,6 +205,3 @@
return 1;
}
-//eof
-
-
Index: plugins/PluginChain.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/PluginChain.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- plugins/PluginChain.cpp 30 May 2007 13:14:47 -0000 1.11
+++ plugins/PluginChain.cpp 5 Nov 2007 15:49:31 -0000 1.12
@@ -139,4 +139,3 @@
m_fader->set_song(song);
}
-
Index: plugins/Plugin.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/Plugin.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- plugins/Plugin.cpp 11 Aug 2007 22:54:58 -0000 1.6
+++ plugins/Plugin.cpp 5 Nov 2007 15:49:31 -0000 1.7
@@ -242,3 +242,4 @@
{
return m_automation;
}
+
Index: plugins/PluginPropertiesDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/PluginPropertiesDialog.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- plugins/PluginPropertiesDialog.cpp 30 May 2007 13:14:48 -0000 1.1
+++ plugins/PluginPropertiesDialog.cpp 5 Nov 2007 15:49:31 -0000 1.2
@@ -124,5 +124,3 @@
}
}
-//eof
-
Index: plugins/PluginSlider.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/PluginSlider.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- plugins/PluginSlider.cpp 11 Aug 2007 22:54:58 -0000 1.10
+++ plugins/PluginSlider.cpp 5 Nov 2007 15:49:31 -0000 1.11
@@ -157,5 +157,3 @@
update_slider_position();
}
-//eof
-
Index: traverso/CorrelationMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- traverso/CorrelationMeterWidget.cpp 8 Jul 2007 20:51:29 -0000 1.24
+++ traverso/CorrelationMeterWidget.cpp 5 Nov 2007 15:49:31 -0000 1.25
@@ -308,4 +308,5 @@
range = config().get_property("CorrelationMeter", "Range", 360).toInt();
}
+
//eof
Index: traverso/FadeContextDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/FadeContextDialog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- traverso/FadeContextDialog.cpp 30 Jun 2007 16:30:55 -0000 1.6
+++ traverso/FadeContextDialog.cpp 5 Nov 2007 15:49:31 -0000 1.7
@@ -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: FadeContextDialog.cpp,v 1.6 2007/06/30 16:30:55 n_doebelin Exp $
+$Id: FadeContextDialog.cpp,v 1.7 2007/11/05 15:49:31 r_sijrier Exp $
*/
#include "FadeContextDialog.h"
@@ -136,6 +136,5 @@
}
}
-//eof
Index: traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- traverso/Interface.cpp 25 Oct 2007 17:03:00 -0000 1.105
+++ traverso/Interface.cpp 5 Nov 2007 15:49:31 -0000 1.106
@@ -1112,3 +1112,4 @@
dialog.set_project(rootdir, projectname);
dialog.exec();
}
+
Index: traverso/PluginSelectorDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/PluginSelectorDialog.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- traverso/PluginSelectorDialog.cpp 27 Jun 2007 12:17:28 -0000 1.15
+++ traverso/PluginSelectorDialog.cpp 5 Nov 2007 15:49:31 -0000 1.16
@@ -145,5 +145,3 @@
objectToAddPluginTooLabel->setText(des);
}
-//eof
-
Index: traverso/QuickDriverConfigWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/QuickDriverConfigWidget.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- traverso/QuickDriverConfigWidget.cpp 25 May 2007 04:13:11 -0000
1.10
+++ traverso/QuickDriverConfigWidget.cpp 5 Nov 2007 15:49:31 -0000
1.11
@@ -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: QuickDriverConfigWidget.cpp,v 1.10 2007/05/25 04:13:11 benjie Exp $
+$Id: QuickDriverConfigWidget.cpp,v 1.11 2007/11/05 15:49:31 r_sijrier Exp $
*/
#include "QuickDriverConfigWidget.h"
@@ -150,6 +150,5 @@
}
-
//eof
Index: traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- traverso/songcanvas/AudioClipView.cpp 25 Oct 2007 17:05:07 -0000
1.113
+++ traverso/songcanvas/AudioClipView.cpp 5 Nov 2007 15:49:31 -0000
1.114
@@ -40,7 +40,7 @@
#include "PluginChain.h"
#include <QFileDialog>
-#include "AudioClipEditDialog.h"
+#include "dialogs/AudioClipEditDialog.h"
#include "Fade.h"
#include "AudioDevice.h"
@@ -984,3 +984,4 @@
create_clipinfo_string();
update();
}
+
Index: traverso/songcanvas/ClipsViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ClipsViewPort.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- traverso/songcanvas/ClipsViewPort.cpp 28 Sep 2007 18:33:44 -0000
1.27
+++ traverso/songcanvas/ClipsViewPort.cpp 5 Nov 2007 15:49:31 -0000
1.28
@@ -216,4 +216,3 @@
}
}
-//eof
Index: traverso/songcanvas/Cursors.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/Cursors.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- traverso/songcanvas/Cursors.cpp 16 Oct 2007 13:43:00 -0000 1.30
+++ traverso/songcanvas/Cursors.cpp 5 Nov 2007 15:49:31 -0000 1.31
@@ -285,6 +285,4 @@
}
-//eof
-
Index: traverso/songcanvas/CurveNodeView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveNodeView.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- traverso/songcanvas/CurveNodeView.cpp 28 Sep 2007 18:33:45 -0000
1.12
+++ traverso/songcanvas/CurveNodeView.cpp 5 Nov 2007 15:49:32 -0000
1.13
@@ -138,5 +138,4 @@
calculate_bounding_rect();
}
-//eof
Index: traverso/songcanvas/CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- traverso/songcanvas/CurveView.cpp 22 Oct 2007 18:45:10 -0000 1.64
+++ traverso/songcanvas/CurveView.cpp 5 Nov 2007 15:49:32 -0000 1.65
@@ -39,51 +39,6 @@
#define NODE_SOFT_SELECTION_DISTANCE 40
-
-class DragNode : public Command
-{
- Q_OBJECT
- Q_CLASSINFO("move_up", tr("Move Up"));
- Q_CLASSINFO("move_down", tr("Move Down"));
-
-public:
- DragNode(CurveNode* node, CurveView* curveview, qint64 scalefactor,
TimeRef rangeMin, TimeRef rangeMax, const QString& des);
-
- int prepare_actions();
- int do_action();
- int undo_action();
- int finish_hold();
- void cancel_action();
- int begin_hold();
- int jog();
-
-private :
- class Private {
- public:
- CurveView* curveView;
- qint64 scalefactor;
- TimeRef rangeMin;
- TimeRef rangeMax;
- QPoint mousepos;
- };
-
- Private* d;
- CurveNode* m_node;
- double m_origWhen;
- double m_origValue;
- double m_newWhen;
- double m_newValue;
-
-
-public slots:
- void move_up(bool autorepeat);
- void move_down(bool autorepeat);
-};
-
-
-#include "CurveView.moc"
-
-
DragNode::DragNode(CurveNode* node, CurveView* curveview, qint64 scalefactor,
TimeRef rangeMin, TimeRef rangeMax, const QString& des)
: Command(curveview->get_context(), des)
, d(new Private)
Index: traverso/songcanvas/CurveView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- traverso/songcanvas/CurveView.h 26 Sep 2007 16:32:53 -0000 1.14
+++ traverso/songcanvas/CurveView.h 5 Nov 2007 15:49:32 -0000 1.15
@@ -23,6 +23,7 @@
#define CURVE_VIEW_H
#include "ViewItem.h"
+#include "Command.h"
#include <QTimer>
@@ -30,6 +31,48 @@
class CurveNode;
class CurveNodeView;
class QPoint;
+class CurveView;
+
+class DragNode : public Command
+{
+ Q_OBJECT
+ Q_CLASSINFO("move_up", tr("Move Up"));
+ Q_CLASSINFO("move_down", tr("Move Down"));
+
+ public:
+ DragNode(CurveNode* node, CurveView* curveview, qint64
scalefactor, TimeRef rangeMin, TimeRef rangeMax, const QString& des);
+
+ int prepare_actions();
+ int do_action();
+ int undo_action();
+ int finish_hold();
+ void cancel_action();
+ int begin_hold();
+ int jog();
+
+ private :
+ class Private {
+ public:
+ CurveView* curveView;
+ qint64 scalefactor;
+ TimeRef rangeMin;
+ TimeRef rangeMax;
+ QPoint mousepos;
+ };
+
+ Private* d;
+ CurveNode* m_node;
+ double m_origWhen;
+ double m_origValue;
+ double m_newWhen;
+ double m_newValue;
+
+
+ public slots:
+ void move_up(bool autorepeat);
+ void move_down(bool autorepeat);
+};
+
class CurveView : public ViewItem
{
Index: traverso/songcanvas/FadeView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/FadeView.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- traverso/songcanvas/FadeView.cpp 24 Sep 2007 16:58:39 -0000 1.19
+++ traverso/songcanvas/FadeView.cpp 5 Nov 2007 15:49:32 -0000 1.20
@@ -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: FadeView.cpp,v 1.19 2007/09/24 16:58:39 r_sijrier Exp $
+$Id: FadeView.cpp,v 1.20 2007/11/05 15:49:32 r_sijrier Exp $
*/
#include "FadeView.h"
@@ -274,5 +274,3 @@
calculate_bounding_rect();
}
-//eof
-
Index: traverso/songcanvas/MarkerView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/MarkerView.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- traverso/songcanvas/MarkerView.cpp 28 Sep 2007 18:33:45 -0000 1.24
+++ traverso/songcanvas/MarkerView.cpp 5 Nov 2007 15:49:32 -0000 1.25
@@ -166,5 +166,3 @@
m_dragging = dragging;
}
-//eof
-
Index: traverso/songcanvas/PluginChainView.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/songcanvas/PluginChainView.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- traverso/songcanvas/PluginChainView.cpp 11 Aug 2007 22:54:58 -0000
1.16
+++ traverso/songcanvas/PluginChainView.cpp 5 Nov 2007 15:49:32 -0000
1.17
@@ -150,5 +150,3 @@
ViewItem::calculate_bounding_rect();
}
-//eof
-
Index: traverso/songcanvas/PluginView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/PluginView.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- traverso/songcanvas/PluginView.cpp 30 May 2007 13:14:48 -0000 1.20
+++ traverso/songcanvas/PluginView.cpp 5 Nov 2007 15:49:32 -0000 1.21
@@ -145,5 +145,3 @@
setPos(x(), y);
}
-//eof
-
Index: traverso/songcanvas/PositionIndicator.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/songcanvas/PositionIndicator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- traverso/songcanvas/PositionIndicator.cpp 28 Jun 2007 14:57:22 -0000
1.5
+++ traverso/songcanvas/PositionIndicator.cpp 5 Nov 2007 15:49:32 -0000
1.6
@@ -68,5 +68,3 @@
m_value = value;
}
-//eof
-
Index: traverso/songcanvas/songcanvas.pro
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/songcanvas.pro,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- traverso/songcanvas/songcanvas.pro 20 Oct 2007 13:09:28 -0000 1.9
+++ traverso/songcanvas/songcanvas.pro 5 Nov 2007 15:49:32 -0000 1.10
@@ -33,7 +33,9 @@
TrackPanelView.cpp \
TrackPanelViewPort.cpp \
TrackView.cpp \
-ViewItem.cpp
+ViewItem.cpp \
+dialogs/AudioClipEditDialog.cpp
+
HEADERS += AudioClipView.h \
ClipsViewPort.h \
Cursors.h \
@@ -54,7 +56,11 @@
TrackPanelViewPort.h \
TrackView.h \
ViewItem.h \
-LineView.h
+LineView.h \
+dialogs/AudioClipEditDialog.h
+
+FORMS += \
+ui/AudioClipEditDialog.ui \
contains(DEFINES, LV2_SUPPORT){
Index: traverso/songcanvas/SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- traverso/songcanvas/SongView.cpp 28 Sep 2007 18:33:45 -0000 1.79
+++ traverso/songcanvas/SongView.cpp 5 Nov 2007 15:49:32 -0000 1.80
@@ -650,5 +650,3 @@
m_song->set_scrollbar_xy(m_hScrollBar->value(), m_vScrollBar->value());
}
-//eof
-
Index: traverso/songcanvas/SongWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongWidget.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- traverso/songcanvas/SongWidget.cpp 16 Jun 2007 15:28:56 -0000 1.21
+++ traverso/songcanvas/SongWidget.cpp 5 Nov 2007 15:49:32 -0000 1.22
@@ -25,7 +25,6 @@
#include "ClipsViewPort.h"
#include "TimeLineViewPort.h"
#include "SongView.h"
-#include "ViewItem.h"
#include "Themer.h"
#include "Config.h"
@@ -44,27 +43,6 @@
#include <Debugger.h>
-class SongPanelGain : public ViewItem
-{
- Q_OBJECT
-public:
- SongPanelGain(ViewItem* parent, Song* song);
- SongPanelGain(){}
-
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget);
-
-public slots:
- Command* gain_increment();
- Command* gain_decrement();
-
-private slots:
- void update_gain() {update();}
-
-private:
- Song* m_song;
-};
-
-
SongPanelGain::SongPanelGain(ViewItem* parent, Song* song)
: ViewItem(parent, song)
, m_song(song)
@@ -125,20 +103,6 @@
}
-class SongPanelView : public ViewItem
-{
- Q_OBJECT
-public:
- SongPanelView(QGraphicsScene* scene, Song* song);
- ~SongPanelView() {}
-
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget);
-
-private:
- SongPanelGain* m_gainview;
- Song* m_song;
-};
-
SongPanelView::SongPanelView(QGraphicsScene* scene, Song* song)
: ViewItem(0, 0)
, m_song(song)
@@ -213,10 +177,6 @@
}
-#include "SongWidget.moc"
-
-
-
SongWidget::SongWidget(Song* song, QWidget* parent)
: QFrame(parent)
, m_song(song)
@@ -335,6 +295,3 @@
return m_sv;
}
-//eof
-
-
Index: traverso/songcanvas/SongWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongWidget.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- traverso/songcanvas/SongWidget.h 5 May 2007 20:40:35 -0000 1.12
+++ traverso/songcanvas/SongWidget.h 5 Nov 2007 15:49:32 -0000 1.13
@@ -17,13 +17,14 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- $Id: SongWidget.h,v 1.12 2007/05/05 20:40:35 r_sijrier Exp $
+ $Id: SongWidget.h,v 1.13 2007/11/05 15:49:32 r_sijrier Exp $
*/
#ifndef SONG_WIDGET_H
#define SONG_WIDGET_H
#include <QFrame>
+#include "ViewItem.h"
class QGridLayout;
class QGraphicsScene;
@@ -39,6 +40,40 @@
class Command;
class SongView;
+class SongPanelGain : public ViewItem
+{
+ Q_OBJECT
+public:
+ SongPanelGain(ViewItem* parent, Song* song);
+ SongPanelGain(){}
+
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget);
+
+public slots:
+ Command* gain_increment();
+ Command* gain_decrement();
+
+private slots:
+ void update_gain() {update();}
+
+private:
+ Song* m_song;
+};
+
+class SongPanelView : public ViewItem
+{
+ Q_OBJECT
+public:
+ SongPanelView(QGraphicsScene* scene, Song* song);
+ ~SongPanelView() {}
+
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
QWidget *widget);
+
+private:
+ SongPanelGain* m_gainview;
+ Song* m_song;
+};
+
class SongWidget : public QFrame
{
Q_OBJECT
Index: traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- traverso/songcanvas/TimeLineView.cpp 29 Oct 2007 13:15:03 -0000
1.52
+++ traverso/songcanvas/TimeLineView.cpp 5 Nov 2007 15:49:32 -0000
1.53
@@ -36,7 +36,6 @@
#include <Marker.h>
#include <ContextPointer.h>
#include <Utils.h>
-#include <Command.h>
#include <defines.h>
#include <AddRemove.h>
#include <CommandGroup.h>
@@ -54,44 +53,6 @@
#define MARKER_SOFT_SELECTION_DISTANCE 50
-class DragMarker : public Command
-{
- Q_OBJECT
- Q_CLASSINFO("move_left", tr("Move Left"))
- Q_CLASSINFO("move_right", tr("Move right"))
-
-public:
- DragMarker(MarkerView* mview, qint64 scalefactor, const QString& des);
-
- int prepare_actions();
- int do_action();
- int undo_action();
- int finish_hold();
- int begin_hold();
- void cancel_action();
- int jog();
-
-private :
- Marker* m_marker;
- TimeRef m_origWhen;
- TimeRef m_newWhen;
- struct Data {
- MarkerView* view;
- qint64 scalefactor;
- bool bypassjog;
- int jogBypassPos;
- };
- Data* d;
-
-public slots:
- void move_left(bool autorepeat);
- void move_right(bool autorepeat);
-};
-
-
-#include "TimeLineView.moc"
-
-
DragMarker::DragMarker(MarkerView* mview, qint64 scalefactor, const QString&
des)
: Command(mview->get_marker(), des)
{
@@ -527,5 +488,3 @@
calculate_bounding_rect();
}
-//eof
-
Index: traverso/songcanvas/TimeLineView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- traverso/songcanvas/TimeLineView.h 26 Sep 2007 20:46:34 -0000 1.13
+++ traverso/songcanvas/TimeLineView.h 5 Nov 2007 15:49:32 -0000 1.14
@@ -23,6 +23,7 @@
#define TIME_LINE_VIEW_H
#include "ViewItem.h"
+#include <Command.h>
#include <QTimer>
@@ -31,6 +32,40 @@
class MarkerView;
class Marker;
+class DragMarker : public Command
+{
+ Q_OBJECT
+ Q_CLASSINFO("move_left", tr("Move Left"))
+ Q_CLASSINFO("move_right", tr("Move right"))
+
+public:
+ DragMarker(MarkerView* mview, qint64 scalefactor, const QString& des);
+
+ int prepare_actions();
+ int do_action();
+ int undo_action();
+ int finish_hold();
+ int begin_hold();
+ void cancel_action();
+ int jog();
+
+private :
+ Marker* m_marker;
+ TimeRef m_origWhen;
+ TimeRef m_newWhen;
+ struct Data {
+ MarkerView* view;
+ qint64 scalefactor;
+ bool bypassjog;
+ int jogBypassPos;
+ };
+ Data* d;
+
+public slots:
+ void move_left(bool autorepeat);
+ void move_right(bool autorepeat);
+};
+
class TimeLineView : public ViewItem
{
Q_OBJECT
Index: traverso/songcanvas/TrackPanelView.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/songcanvas/TrackPanelView.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- traverso/songcanvas/TrackPanelView.cpp 17 Oct 2007 14:46:18 -0000
1.30
+++ traverso/songcanvas/TrackPanelView.cpp 5 Nov 2007 15:49:32 -0000
1.31
@@ -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: TrackPanelView.cpp,v 1.30 2007/10/17 14:46:18 r_sijrier Exp $
+$Id: TrackPanelView.cpp,v 1.31 2007/11/05 15:49:32 r_sijrier Exp $
*/
#include <QGraphicsScene>
@@ -495,6 +495,3 @@
update();
}
-
-
-//eof
Index: traverso/songcanvas/TrackView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TrackView.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- traverso/songcanvas/TrackView.cpp 24 May 2007 13:11:38 -0000 1.34
+++ traverso/songcanvas/TrackView.cpp 5 Nov 2007 15:49:32 -0000 1.35
@@ -215,5 +215,3 @@
return 0;
}
-//eof
-
Index: traverso/songcanvas/ViewItem.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ViewItem.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- traverso/songcanvas/ViewItem.cpp 17 Apr 2007 11:51:20 -0000 1.4
+++ traverso/songcanvas/ViewItem.cpp 5 Nov 2007 15:49:32 -0000 1.5
@@ -17,10 +17,20 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: ViewItem.cpp,v 1.4 2007/04/17 11:51:20 r_sijrier Exp $
+$Id: ViewItem.cpp,v 1.5 2007/11/05 15:49:32 r_sijrier Exp $
*/
#include "ViewItem.h"
+ViewItem::ViewItem(ViewItem* parentViewItem, ContextItem* parentContext)
+ : ContextItem(parentViewItem)
+ , QGraphicsItem(parentViewItem)
+{
+ set_context_item(parentContext);
+ m_parentViewItem = parentViewItem;
+ setCursor(themer()->get_cursor("Default"));
+}
+
+
//eof
Index: traverso/songcanvas/ViewItem.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ViewItem.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- traverso/songcanvas/ViewItem.h 17 Apr 2007 11:51:20 -0000 1.16
+++ traverso/songcanvas/ViewItem.h 5 Nov 2007 15:49:32 -0000 1.17
@@ -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: ViewItem.h,v 1.16 2007/04/17 11:51:20 r_sijrier Exp $
+$Id: ViewItem.h,v 1.17 2007/11/05 15:49:32 r_sijrier Exp $
*/
#ifndef VIEW_ITEM_H
@@ -53,15 +53,7 @@
public:
- ViewItem(ViewItem* parentViewItem=0, ContextItem* parentContext=0)
- : ContextItem(parentViewItem)
- , QGraphicsItem(parentViewItem)
- {
- set_context_item(parentContext);
- m_parentViewItem = parentViewItem;
- setCursor(themer()->get_cursor("Default"));
- }
-
+ ViewItem(ViewItem* parentViewItem=0, ContextItem* parentContext=0);
~ViewItem() {};
enum {Type = UserType + 1};
Index: traverso/songcanvas/ui/AudioClipEditDialog.ui
===================================================================
RCS file: traverso/songcanvas/ui/AudioClipEditDialog.ui
diff -N traverso/songcanvas/ui/AudioClipEditDialog.ui
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ traverso/songcanvas/ui/AudioClipEditDialog.ui 5 Nov 2007 15:49:33
-0000 1.1
@@ -0,0 +1,341 @@
+<ui version="4.0" >
+ <class>AudioClipEditDialog</class>
+ <widget class="QDialog" name="AudioClipEditDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>500</width>
+ <height>285</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Dialog</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QTabWidget" name="tabWidget" >
+ <property name="currentIndex" >
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="tab" >
+ <attribute name="title" >
+ <string>Clip Parameters</string>
+ </attribute>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="5" column="0" colspan="2" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>261</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="5" column="2" >
+ <widget class="QPushButton" name="externalProcessingButton" >
+ <property name="text" >
+ <string>External Processing</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" colspan="2" >
+ <widget class="QLineEdit" name="clipNameLineEdit" />
+ </item>
+ <item row="1" column="1" colspan="2" >
+ <widget class="QDoubleSpinBox" name="clipGainSpinBox" >
+ <property name="maximum" >
+ <double>30.000000000000000</double>
+ </property>
+ <property name="minimum" >
+ <double>-120.000000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.200000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="2" >
+ <widget class="QTimeEdit" name="clipStartEdit" >
+ <property name="toolTip" >
+ <string>hh:mm:ss.sss</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" colspan="2" >
+ <widget class="QTimeEdit" name="clipLengthEdit" >
+ <property name="toolTip" >
+ <string>hh:mm:ss.sss</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" colspan="2" >
+ <widget class="QLabel" name="clipEndLineEdit" >
+ <property name="frameShape" >
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <property name="text" >
+ <string>TextLabel</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QLabel" name="label_6" >
+ <property name="text" >
+ <string>End</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string>Length</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="label_3" >
+ <property name="text" >
+ <string>Track start</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label_4" >
+ <property name="text" >
+ <string>Gain</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>Name</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_2" >
+ <attribute name="title" >
+ <string>Fades</string>
+ </attribute>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="title" >
+ <string>Fade In</string>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="0" column="1" >
+ <widget class="QTimeEdit" name="fadeInEdit" >
+ <property name="maximumTime" >
+ <time>
+ <hour>22</hour>
+ <minute>0</minute>
+ <second>0</second>
+ </time>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="QDoubleSpinBox" name="fadeInStrengthBox" >
+ <property name="maximum" >
+ <double>1.000000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.050000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QDoubleSpinBox" name="fadeInBendingBox" >
+ <property name="maximum" >
+ <double>1.000000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.050000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label_7" >
+ <property name="text" >
+ <string>Mode</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="label_10" >
+ <property name="text" >
+ <string>Bending</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label_5" >
+ <property name="text" >
+ <string>Length</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QComboBox" name="fadeInModeBox" />
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="label_11" >
+ <property name="text" >
+ <string>Strength</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QPushButton" name="fadeInLinearButton" >
+ <property name="text" >
+ <string>&Linear</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" >
+ <widget class="QPushButton" name="fadeInDefaultButton" >
+ <property name="text" >
+ <string>&Default</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_2" >
+ <property name="title" >
+ <string>Fade Out</string>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="3" column="1" >
+ <widget class="QDoubleSpinBox" name="fadeOutStrengthBox" >
+ <property name="maximum" >
+ <double>1.000000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.050000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="label_12" >
+ <property name="text" >
+ <string>Bending</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label_8" >
+ <property name="text" >
+ <string>Mode</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QComboBox" name="fadeOutModeBox" />
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label_9" >
+ <property name="text" >
+ <string>Length</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QTimeEdit" name="fadeOutEdit" />
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="label_13" >
+ <property name="text" >
+ <string>Strength</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QDoubleSpinBox" name="fadeOutBendingBox" >
+ <property name="maximum" >
+ <double>1.000000000000000</double>
+ </property>
+ <property name="singleStep" >
+ <double>0.050000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QPushButton" name="fadeOutLinearButton" >
+ <property name="text" >
+ <string>&Linear</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1" >
+ <widget class="QPushButton" name="fadeOutDefaultButton" >
+ <property name="text" >
+ <string>&Default</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons" >
+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
Index: traverso/ui/AudioClipEditWidget.ui
===================================================================
RCS file: traverso/ui/AudioClipEditWidget.ui
diff -N traverso/ui/AudioClipEditWidget.ui
--- traverso/ui/AudioClipEditWidget.ui 2 Aug 2007 17:57:26 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,347 +0,0 @@
-<ui version="4.0" >
- <class>AudioClipEditWidget</class>
- <widget class="QWidget" name="AudioClipEditWidget" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>450</width>
- <height>285</height>
- </rect>
- </property>
- <property name="minimumSize" >
- <size>
- <width>450</width>
- <height>0</height>
- </size>
- </property>
- <property name="windowTitle" >
- <string>Form</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QTabWidget" name="tabWidget" >
- <property name="currentIndex" >
- <number>0</number>
- </property>
- <widget class="QWidget" name="tab" >
- <attribute name="title" >
- <string>Clip Parameters</string>
- </attribute>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="5" column="0" colspan="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>261</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="5" column="2" >
- <widget class="QPushButton" name="externalProcessingButton" >
- <property name="text" >
- <string>External Processing</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2" >
- <widget class="QLineEdit" name="clipNameLineEdit" />
- </item>
- <item row="1" column="1" colspan="2" >
- <widget class="QDoubleSpinBox" name="clipGainSpinBox" >
- <property name="maximum" >
- <double>30.000000000000000</double>
- </property>
- <property name="minimum" >
- <double>-120.000000000000000</double>
- </property>
- <property name="singleStep" >
- <double>0.200000000000000</double>
- </property>
- </widget>
- </item>
- <item row="2" column="1" colspan="2" >
- <widget class="QTimeEdit" name="clipStartEdit" >
- <property name="toolTip" >
- <string>hh:mm:ss.sss</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1" colspan="2" >
- <widget class="QTimeEdit" name="clipLengthEdit" >
- <property name="toolTip" >
- <string>hh:mm:ss.sss</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1" colspan="2" >
- <widget class="QLabel" name="clipEndLineEdit" >
- <property name="frameShape" >
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="text" >
- <string>TextLabel</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0" >
- <widget class="QLabel" name="label_6" >
- <property name="text" >
- <string>End</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
- <string>Length</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
- <string>Track start</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_4" >
- <property name="text" >
- <string>Gain</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Name</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab_2" >
- <attribute name="title" >
- <string>Fades</string>
- </attribute>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="title" >
- <string>Fade In</string>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="1" >
- <widget class="QTimeEdit" name="fadeInEdit" >
- <property name="maximumTime" >
- <time>
- <hour>22</hour>
- <minute>0</minute>
- <second>0</second>
- </time>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QDoubleSpinBox" name="fadeInStrengthBox" >
- <property name="maximum" >
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep" >
- <double>0.050000000000000</double>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QDoubleSpinBox" name="fadeInBendingBox" >
- <property name="maximum" >
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep" >
- <double>0.050000000000000</double>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_7" >
- <property name="text" >
- <string>Mode</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_10" >
- <property name="text" >
- <string>Bending</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label_5" >
- <property name="text" >
- <string>Length</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QComboBox" name="fadeInModeBox" />
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="label_11" >
- <property name="text" >
- <string>Strength</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0" >
- <widget class="QPushButton" name="fadeInLinearButton" >
- <property name="text" >
- <string>&Linear</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="QPushButton" name="fadeInDefaultButton" >
- <property name="text" >
- <string>&Default</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_2" >
- <property name="title" >
- <string>Fade Out</string>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="3" column="1" >
- <widget class="QDoubleSpinBox" name="fadeOutStrengthBox" >
- <property name="maximum" >
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep" >
- <double>0.050000000000000</double>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_12" >
- <property name="text" >
- <string>Bending</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_8" >
- <property name="text" >
- <string>Mode</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QComboBox" name="fadeOutModeBox" />
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label_9" >
- <property name="text" >
- <string>Length</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QTimeEdit" name="fadeOutEdit" />
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="label_13" >
- <property name="text" >
- <string>Strength</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QDoubleSpinBox" name="fadeOutBendingBox" >
- <property name="maximum" >
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep" >
- <double>0.050000000000000</double>
- </property>
- </widget>
- </item>
- <item row="4" column="0" >
- <widget class="QPushButton" name="fadeOutLinearButton" >
- <property name="text" >
- <string>&Linear</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="QPushButton" name="fadeOutDefaultButton" >
- <property name="text" >
- <string>&Default</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
- [Traverso-commit] traverso/src commands/AudioClipExternalProcessi...,
Remon Sijrier <=