[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 17:26:23 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/11/05 17:26:23
Modified files:
src/commands : AudioClipExternalProcessing.cpp
AudioClipExternalProcessing.h CMakeLists.txt
src/traverso/songcanvas: CMakeLists.txt
Log message:
* should compile fine now with cmake, lets see if it still works with
qmake :D
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AudioClipExternalProcessing.cpp?cvsroot=traverso&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AudioClipExternalProcessing.h?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
Patches:
Index: commands/AudioClipExternalProcessing.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/AudioClipExternalProcessing.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- commands/AudioClipExternalProcessing.cpp 5 Nov 2007 15:49:29 -0000
1.34
+++ commands/AudioClipExternalProcessing.cpp 5 Nov 2007 17:26:22 -0000
1.35
@@ -32,11 +32,7 @@
#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!
@@ -44,41 +40,6 @@
-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"))
Index: commands/AudioClipExternalProcessing.h
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/AudioClipExternalProcessing.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- commands/AudioClipExternalProcessing.h 5 Nov 2007 15:49:29 -0000
1.5
+++ commands/AudioClipExternalProcessing.h 5 Nov 2007 17:26:22 -0000
1.6
@@ -24,11 +24,48 @@
#include <QProcess>
#include <Command.h>
+#include "ui_ExternalProcessing.h"
+#include <QDialog>
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/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/commands/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- commands/CMakeLists.txt 5 Nov 2007 15:47:04 -0000 1.1
+++ commands/CMakeLists.txt 5 Nov 2007 17:26:22 -0000 1.2
@@ -35,6 +35,7 @@
SET(TRAVERSO_COMMANDS_MOC_CLASSES
Gain.h
MoveClip.h
+AudioClipExternalProcessing.h
)
SET(TRAVERSO_COMMANDS_UI_FILES
Index: traverso/songcanvas/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- traverso/songcanvas/CMakeLists.txt 5 Nov 2007 16:19:41 -0000 1.1
+++ traverso/songcanvas/CMakeLists.txt 5 Nov 2007 17:26:22 -0000 1.2
@@ -27,7 +27,6 @@
CurveView.cpp
FadeContextDialogView.cpp
FadeView.cpp
-LineView.cpp
MarkerView.cpp
PluginChainView.cpp
PluginView.cpp
@@ -61,6 +60,11 @@
SongWidget.h
TrackPanelView.h
TimeLineView.h
+LineView.h
+)
+
+SET(TRAVERSO_SONGCANVAS_UI_FILES
+ui/AudioClipEditDialog.ui
)
QT4_WRAP_CPP(TRAVERSO_SONGCANVAS_MOC_SOURCES
${TRAVERSO_SONGCANVAS_MOC_CLASSES})