[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso dialogs/BusSelectorDialog...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso/src/traverso dialogs/BusSelectorDialog... |
|
Date: |
Mon, 05 Nov 2007 15:53:04 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/11/05 15:53:04
Modified files:
src/traverso/dialogs: BusSelectorDialog.cpp CDWritingDialog.cpp
ExportDialog.cpp InsertSilenceDialog.cpp
MarkerDialog.cpp
src/traverso/widgets: MessageWidget.cpp MessageWidget.h
ResourcesWidget.cpp ResourcesWidget.h
Removed files:
src/traverso/dialogs: AudioClipEditDialog.cpp
AudioClipEditDialog.h
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/traverso/dialogs/BusSelectorDialog.cpp?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/CDWritingDialog.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/ExportDialog.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/InsertSilenceDialog.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/MarkerDialog.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/AudioClipEditDialog.cpp?cvsroot=traverso&r1=1.12&r2=0
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/AudioClipEditDialog.h?cvsroot=traverso&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/MessageWidget.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/MessageWidget.h?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.cpp?cvsroot=traverso&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.h?cvsroot=traverso&r1=1.10&r2=1.11
Patches:
Index: dialogs/BusSelectorDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/BusSelectorDialog.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- dialogs/BusSelectorDialog.cpp 12 Oct 2007 08:53:25 -0000 1.5
+++ dialogs/BusSelectorDialog.cpp 5 Nov 2007 15:53:03 -0000 1.6
@@ -184,5 +184,6 @@
trackComboBox->setCurrentIndex(index);
}
+
//eof
Index: dialogs/CDWritingDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/CDWritingDialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- dialogs/CDWritingDialog.cpp 29 Oct 2007 09:00:12 -0000 1.3
+++ dialogs/CDWritingDialog.cpp 5 Nov 2007 15:53:03 -0000 1.4
@@ -614,3 +614,4 @@
return cdDeviceComboBox->itemData(index).toString();
#endif
}
+
Index: dialogs/ExportDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/ExportDialog.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- dialogs/ExportDialog.cpp 30 Oct 2007 15:10:42 -0000 1.7
+++ dialogs/ExportDialog.cpp 5 Nov 2007 15:53:03 -0000 1.8
@@ -514,3 +514,4 @@
}
hide();
}
+
Index: dialogs/InsertSilenceDialog.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/dialogs/InsertSilenceDialog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- dialogs/InsertSilenceDialog.cpp 3 Oct 2007 20:15:33 -0000 1.6
+++ dialogs/InsertSilenceDialog.cpp 5 Nov 2007 15:53:03 -0000 1.7
@@ -92,5 +92,6 @@
hide();
}
+
//eof
Index: dialogs/MarkerDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/MarkerDialog.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- dialogs/MarkerDialog.cpp 20 Sep 2007 18:25:15 -0000 1.12
+++ dialogs/MarkerDialog.cpp 5 Nov 2007 15:53:03 -0000 1.13
@@ -525,5 +525,6 @@
out << " </table>\n <hr>\n " << dt.toString("MMM dd, yyyy, hh:mm")
<< "\n</body>\n</html>\n";
}
+
//eof
Index: widgets/MessageWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/MessageWidget.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- widgets/MessageWidget.cpp 10 Oct 2007 10:58:24 -0000 1.8
+++ widgets/MessageWidget.cpp 5 Nov 2007 15:53:04 -0000 1.9
@@ -30,36 +30,6 @@
#include "Themer.h"
#include <QDir>
-class MessageWidgetPrivate : public QWidget
-{
- Q_OBJECT
-
-public:
- MessageWidgetPrivate(QWidget* parent = 0);
-
-public slots:
- void queue_message(InfoStruct );
- void dequeue_messagequeue();
- void show_history();
-
-protected:
- void resizeEvent( QResizeEvent* e);
- void paintEvent( QPaintEvent* e);
- QSize sizeHint() const;
-
-private:
- QTimer m_messageTimer;
- QQueue<InfoStruct > m_messageQueue;
- InfoStruct m_infoStruct;
- QTextBrowser* m_log;
- QDialog* m_logDialog;
- QString m_stringLog;
-
- void log(InfoStruct infostruct);
-};
-
-#include "MessageWidget.moc"
-
// Always put me below _all_ includes, this is needed
// in case we run with memory leak detection enabled!
#include "Debugger.h"
Index: widgets/MessageWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/MessageWidget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- widgets/MessageWidget.h 8 Mar 2007 19:39:39 -0000 1.1
+++ widgets/MessageWidget.h 5 Nov 2007 15:53:04 -0000 1.2
@@ -29,6 +29,36 @@
#include "Information.h"
class QPushButton;
+class QTextBrowser;
+class QDialog;
+
+class MessageWidgetPrivate : public QWidget
+{
+ Q_OBJECT
+
+public:
+ MessageWidgetPrivate(QWidget* parent = 0);
+
+public slots:
+ void queue_message(InfoStruct );
+ void dequeue_messagequeue();
+ void show_history();
+
+protected:
+ void resizeEvent( QResizeEvent* e);
+ void paintEvent( QPaintEvent* e);
+ QSize sizeHint() const;
+
+private:
+ QTimer m_messageTimer;
+ QQueue<InfoStruct > m_messageQueue;
+ InfoStruct m_infoStruct;
+ QTextBrowser* m_log;
+ QDialog* m_logDialog;
+ QString m_stringLog;
+
+ void log(InfoStruct infostruct);
+};
class MessageWidget : public QWidget
{
Index: widgets/ResourcesWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- widgets/ResourcesWidget.cpp 29 Oct 2007 13:35:37 -0000 1.34
+++ widgets/ResourcesWidget.cpp 5 Nov 2007 15:53:04 -0000 1.35
@@ -39,16 +39,7 @@
#include <QVBoxLayout>
#include <QComboBox>
-class FileWidget : public QWidget
-{
- Q_OBJECT
-public:
-
- FileWidget(QWidget* parent=0) : QWidget(parent) {
- m_dirModel = 0;
- }
-
- void showEvent ( QShowEvent * event ) {
+void FileWidget::showEvent( QShowEvent * event ) {
Q_UNUSED(event);
if (m_dirModel) {
@@ -109,23 +100,7 @@
connect(upButton, SIGNAL(clicked()), this,
SLOT(dir_up_button_clicked()));
connect(refreshButton, SIGNAL(clicked()), this,
SLOT(refresh_button_clicked()));
connect(m_box, SIGNAL(activated(int)), this,
SLOT(box_actived(int)));
- }
-
- void set_current_path(const QString& path) const;
-
-private slots:
- void dirview_item_clicked(const QModelIndex & index);
- void dir_up_button_clicked();
- void refresh_button_clicked();
- void box_actived(int i);
-
-private:
- QListView* m_dirView;
- QDirModel* m_dirModel;
- QComboBox* m_box;
-};
-
-#include "ResourcesWidget.moc"
+}
void FileWidget::dirview_item_clicked(const QModelIndex & index)
{
Index: widgets/ResourcesWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- widgets/ResourcesWidget.h 24 Oct 2007 18:11:41 -0000 1.10
+++ widgets/ResourcesWidget.h 5 Nov 2007 15:53:04 -0000 1.11
@@ -28,11 +28,38 @@
class Project;
class Song;
-class FileWidget;
class AudioClip;
class ReadSource;
class SourceTreeItem;
class QShowEvent;
+class QListView;
+class QDirModel;
+class QComboBox;
+
+class FileWidget : public QWidget
+{
+ Q_OBJECT
+public:
+
+ FileWidget(QWidget* parent=0) : QWidget(parent) {
+ m_dirModel = 0;
+ }
+
+ void showEvent ( QShowEvent * event );
+ void set_current_path(const QString& path) const;
+
+private slots:
+ void dirview_item_clicked(const QModelIndex & index);
+ void dir_up_button_clicked();
+ void refresh_button_clicked();
+ void box_actived(int i);
+
+private:
+ QListView* m_dirView;
+ QDirModel* m_dirModel;
+ QComboBox* m_box;
+};
+
class ClipTreeItem : public QObject, public QTreeWidgetItem
{
Index: dialogs/AudioClipEditDialog.cpp
===================================================================
RCS file: dialogs/AudioClipEditDialog.cpp
diff -N dialogs/AudioClipEditDialog.cpp
--- dialogs/AudioClipEditDialog.cpp 26 Sep 2007 20:46:33 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,477 +0,0 @@
-/*
-Copyright (C) 2007 Remon Sijrier
-
-This file is part of Traverso
-
-Traverso is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-*/
-
-
-#include "AudioClipEditDialog.h"
-
-#include <QWidget>
-#include <QDomDocument>
-#include <QDomElement>
-#include "ui_AudioClipEditWidget.h"
-
-#include "AudioClip.h"
-#include "FadeCurve.h"
-#include "ProjectManager.h"
-#include "Project.h"
-#include "Utils.h"
-#include "defines.h"
-#include "Mixer.h"
-#include "Command.h"
-#include "AudioClipExternalProcessing.h"
-#include "InputEngine.h"
-#include "AudioDevice.h"
-
-#define TIME_FORMAT "hh:mm:ss.zzz"
-
-class AudioClipEditWidget : public QWidget, protected Ui::AudioClipEditWidget
-{
- Q_OBJECT
-
-public:
- AudioClipEditWidget(AudioClip* clip, QWidget* parent) :
QWidget(parent), m_clip(clip)
- {
- setupUi(this);
-
- locked = false;
-
- // Used for cancelling the changes on Cancel button activated
- QDomDocument tempDoc;
- m_origState = clip->get_state(tempDoc);
-
- clipStartEdit->setDisplayFormat(TIME_FORMAT);
- clipLengthEdit->setDisplayFormat(TIME_FORMAT);
- fadeInEdit->setDisplayFormat(TIME_FORMAT);
- fadeOutEdit->setDisplayFormat(TIME_FORMAT);
-
- fadeInModeBox->insertItem(1, "Bended");
- fadeInModeBox->insertItem(2, "S-Shape");
- fadeInModeBox->insertItem(3, "Long");
-
- fadeOutModeBox->insertItem(1, "Bended");
- fadeOutModeBox->insertItem(2, "S-Shape");
- fadeOutModeBox->insertItem(3, "Long");
-
- // Used to set gain and name
- clip_state_changed();
-
- // used for length, track start position
- clip_position_changed();
-
- // detect and set fade params
- fade_curve_added();
-
- connect(clip, SIGNAL(stateChanged()), this,
SLOT(clip_state_changed()));
- connect(clip, SIGNAL(positionChanged(Snappable*)), this,
SLOT(clip_position_changed()));
- connect(clip, SIGNAL(fadeAdded(FadeCurve*)), this,
SLOT(fade_curve_added()));
-
- connect(clipGainSpinBox, SIGNAL(valueChanged(double)), this,
SLOT(gain_spinbox_value_changed(double)));
-
- connect(clipStartEdit, SIGNAL(timeChanged(const QTime&)), this,
SLOT(clip_start_edit_changed(const QTime&)));
- connect(clipLengthEdit, SIGNAL(timeChanged(const QTime&)),
this, SLOT(clip_length_edit_changed(const QTime&)));
-
- connect(fadeInEdit, SIGNAL(timeChanged(const QTime&)), this,
SLOT(fadein_edit_changed(const QTime&)));
- connect(fadeInModeBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(fadein_mode_edit_changed(int)));
- connect(fadeInBendingBox, SIGNAL(valueChanged(double)), this,
SLOT(fadein_bending_edit_changed(double)));
- connect(fadeInStrengthBox, SIGNAL(valueChanged(double)), this,
SLOT(fadein_strength_edit_changed(double)));
- connect(fadeInLinearButton, SIGNAL(clicked()), this,
SLOT(fadein_linear()));
- connect(fadeInDefaultButton, SIGNAL(clicked()), this,
SLOT(fadein_default()));
-
- connect(fadeOutEdit, SIGNAL(timeChanged(const QTime&)), this,
SLOT(fadeout_edit_changed(const QTime&)));
- connect(fadeOutModeBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(fadeout_mode_edit_changed(int)));
- connect(fadeOutBendingBox, SIGNAL(valueChanged(double)), this,
SLOT(fadeout_bending_edit_changed(double)));
- connect(fadeOutStrengthBox, SIGNAL(valueChanged(double)), this,
SLOT(fadeout_strength_edit_changed(double)));
- connect(fadeOutLinearButton, SIGNAL(clicked()), this,
SLOT(fadeout_linear()));
- connect(fadeOutDefaultButton, SIGNAL(clicked()), this,
SLOT(fadeout_default()));
-
- connect(externalProcessingButton, SIGNAL(clicked()), this,
SLOT(external_processing()));
- connect(buttonBox, SIGNAL(accepted()), this,
SLOT(save_changes()));
- connect(buttonBox, SIGNAL(rejected()), this,
SLOT(cancel_changes()));
- }
-
- ~AudioClipEditWidget() {}
-
-private:
- AudioClip* m_clip;
- QDomNode m_origState;
- friend class AudioClipEditDialog;
-
- TimeRef qtime_to_timeref(const QTime& time);
- QTime timeref_to_qtime(TimeRef& ref);
- bool locked;
-
-private slots:
- void external_processing();
- void clip_state_changed();
- void save_changes();
- void cancel_changes();
- void clip_position_changed();
- void gain_spinbox_value_changed(double value);
-
- void fadein_length_changed();
- void fadein_edit_changed(const QTime& time);
- void fadein_mode_changed();
- void fadein_mode_edit_changed(int index);
- void fadein_bending_changed();
- void fadein_bending_edit_changed(double value);
- void fadein_strength_changed();
- void fadein_strength_edit_changed(double value);
- void fadein_linear();
- void fadein_default();
-
- void fadeout_edit_changed(const QTime& time);
- void fadeout_length_changed();
- void fadeout_mode_changed();
- void fadeout_mode_edit_changed(int index);
- void fadeout_bending_changed();
- void fadeout_bending_edit_changed(double value);
- void fadeout_strength_changed();
- void fadeout_strength_edit_changed(double value);
- void fadeout_linear();
- void fadeout_default();
-
- void clip_start_edit_changed(const QTime& time);
- void clip_length_edit_changed(const QTime& time);
- void update_clip_end();
-
- void fade_curve_added();
-};
-
-
-AudioClipEditDialog::AudioClipEditDialog(AudioClip* clip, QWidget* parent)
- : QDialog(parent)
-{
- m_edit = new AudioClipEditWidget(clip, this);
-
- QHBoxLayout* mainLayout = new QHBoxLayout(this);
- mainLayout->setMargin(0);
- mainLayout->addWidget(m_edit);
-
- setLayout(mainLayout);
-
- connect(m_edit->buttonBox, SIGNAL(rejected()), this, SLOT(close()));
-}
-
-void AudioClipEditWidget::external_processing()
-{
- parentWidget()->hide();
- Command::process_command(new AudioClipExternalProcessing(m_clip));
-}
-
-void AudioClipEditWidget::clip_state_changed()
-{
- if (m_clip->get_name() != clipNameLineEdit->text()) {
- parentWidget()->setWindowTitle(m_clip->get_name());
- clipNameLineEdit->setText(m_clip->get_name());
- }
-
- clipGainSpinBox->setValue(coefficient_to_dB(m_clip->get_gain()));
-}
-
-void AudioClipEditWidget::save_changes()
-{
- parentWidget()->hide();
- QString name = clipNameLineEdit->text();
- if (!name.isEmpty()) {
- m_clip->set_name(name);
- } else {
- clipNameLineEdit->setText(m_clip->get_name());
- }
-}
-
-void AudioClipEditWidget::cancel_changes()
-{
- parentWidget()->hide();
- m_clip->set_state(m_origState);
-
-}
-
-void AudioClipEditWidget::gain_spinbox_value_changed(double value)
-{
- float gain = dB_to_scale_factor(value);
- m_clip->set_gain(gain);
-}
-
-void AudioClipEditWidget::clip_position_changed()
-{
- if (locked) return;
-
- QTime clipLengthTime = timeref_to_qtime(m_clip->get_length());
- clipLengthEdit->setTime(clipLengthTime);
-
- QTime clipStartTime =
timeref_to_qtime(m_clip->get_track_start_location());
- clipStartEdit->setTime(clipStartTime);
-
- update_clip_end();
-}
-
-void AudioClipEditWidget::fadein_length_changed()
-{
- if (ie().is_holding()) return;
- if (locked) return;
-
- TimeRef ref(qint64(m_clip->get_fade_in()->get_range()));
- QTime fadeTime = timeref_to_qtime(ref);
- fadeInEdit->setTime(fadeTime);
-}
-
-void AudioClipEditWidget::fadeout_length_changed()
-{
- if (locked) return;
-
- TimeRef ref(qint64(m_clip->get_fade_out()->get_range()));
- QTime fadeTime = timeref_to_qtime(ref);
- fadeOutEdit->setTime(fadeTime);
-}
-
-void AudioClipEditWidget::fadein_edit_changed(const QTime& time)
-{
- // Hmm, we can't distinguish between hand editing the time edit
- // or moving the clip with the mouse! In the latter case this function
- // causes trouble when moving the right edge with the mouse!
- // This 'fixes' it .....
- if (ie().is_holding()) return;
-
- locked = true;
- double range = double(qtime_to_timeref(time).universal_frame());
- if (range == 0) {
- m_clip->set_fade_in(1);
- } else {
- m_clip->set_fade_in(range);
- }
- locked = false;
-}
-
-void AudioClipEditWidget::fadeout_edit_changed(const QTime& time)
-{
- if (ie().is_holding()) return;
-
- locked = true;
- double range = double(qtime_to_timeref(time).universal_frame());
- if (range == 0) {
- m_clip->set_fade_out(1);
- } else {
- m_clip->set_fade_out(range);
- }
- locked = false;
-}
-
-void AudioClipEditWidget::clip_length_edit_changed(const QTime& time)
-{
- if (ie().is_holding()) return;
-
- locked = true;
-
- TimeRef ref = qtime_to_timeref(time);
-
- if (ref >= m_clip->get_source_length()) {
- ref = m_clip->get_source_length();
- QTime clipLengthTime = timeref_to_qtime(ref);
- clipLengthEdit->setTime(clipLengthTime);
- }
-
- m_clip->set_right_edge(ref + m_clip->get_track_start_location());
- update_clip_end();
- locked = false;
-}
-
-void AudioClipEditWidget::clip_start_edit_changed(const QTime& time)
-{
- if (ie().is_holding()) return;
-
- locked = true;
- m_clip->set_track_start_location(qtime_to_timeref(time));
- update_clip_end();
- locked = false;
-}
-
-void AudioClipEditWidget::fadein_mode_changed()
-{
- if (locked) return;
-
- int m = m_clip->get_fade_in()->get_mode();
- fadeInModeBox->setCurrentIndex(m);
-}
-
-void AudioClipEditWidget::fadeout_mode_changed()
-{
- if (locked) return;
-
- int m = m_clip->get_fade_out()->get_mode();
- fadeOutModeBox->setCurrentIndex(m);
-}
-
-void AudioClipEditWidget::fadein_bending_changed()
-{
- if (locked) return;
- fadeInBendingBox->setValue(m_clip->get_fade_in()->get_bend_factor());
-}
-
-void AudioClipEditWidget::fadeout_bending_changed()
-{
- if (locked) return;
- fadeOutBendingBox->setValue(m_clip->get_fade_out()->get_bend_factor());
-}
-
-void AudioClipEditWidget::fadein_strength_changed()
-{
- if (locked) return;
-
fadeInStrengthBox->setValue(m_clip->get_fade_in()->get_strength_factor());
-}
-
-void AudioClipEditWidget::fadeout_strength_changed()
-{
- if (locked) return;
-
fadeOutStrengthBox->setValue(m_clip->get_fade_out()->get_strength_factor());
-}
-
-void AudioClipEditWidget::fadein_mode_edit_changed(int index)
-{
- if (!m_clip->get_fade_in()) return;
- locked = true;
- m_clip->get_fade_in()->set_mode(index);
- locked = false;
-}
-
-void AudioClipEditWidget::fadeout_mode_edit_changed(int index)
-{
- if (!m_clip->get_fade_out()) return;
- locked = true;
- m_clip->get_fade_out()->set_mode(index);
- locked = false;
-}
-
-void AudioClipEditWidget::fadein_bending_edit_changed(double value)
-{
- if (!m_clip->get_fade_in()) return;
- locked = true;
- m_clip->get_fade_in()->set_bend_factor(value);
- locked = false;
-}
-
-void AudioClipEditWidget::fadeout_bending_edit_changed(double value)
-{
- if (!m_clip->get_fade_out()) return;
- locked = true;
- m_clip->get_fade_out()->set_bend_factor(value);
- locked = false;
-}
-
-void AudioClipEditWidget::fadein_strength_edit_changed(double value)
-{
- if (!m_clip->get_fade_in()) return;
- locked = true;
- m_clip->get_fade_in()->set_strength_factor(value);
- locked = false;
-}
-
-void AudioClipEditWidget::fadeout_strength_edit_changed(double value)
-{
- if (!m_clip->get_fade_out()) return;
- locked = true;
- m_clip->get_fade_out()->set_strength_factor(value);
- locked = false;
-}
-
-void AudioClipEditWidget::fadein_linear()
-{
- if (!m_clip->get_fade_in()) return;
- fadeInBendingBox->setValue(0.5);
- fadeInStrengthBox->setValue(0.5);
-}
-
-void AudioClipEditWidget::fadein_default()
-{
- if (!m_clip->get_fade_in()) return;
- fadeInBendingBox->setValue(0.0);
- fadeInStrengthBox->setValue(0.5);
-}
-
-void AudioClipEditWidget::fadeout_linear()
-{
- if (!m_clip->get_fade_out()) return;
- fadeOutBendingBox->setValue(0.5);
- fadeOutStrengthBox->setValue(0.5);
-}
-
-void AudioClipEditWidget::fadeout_default()
-{
- if (!m_clip->get_fade_out()) return;
- fadeOutBendingBox->setValue(0.0);
- fadeOutStrengthBox->setValue(0.5);
-}
-
-TimeRef AudioClipEditWidget::qtime_to_timeref(const QTime & time)
-{
- TimeRef ref(time.hour() * ONE_HOUR_UNIVERSAL_SAMPLE_RATE +
time.minute() * ONE_MINUTE_UNIVERSAL_SAMPLE_RATE + time.second() *
UNIVERSAL_SAMPLE_RATE + (time.msec() * UNIVERSAL_SAMPLE_RATE) / 1000);
- return ref;
-}
-
-QTime AudioClipEditWidget::timeref_to_qtime(TimeRef& ref)
-{
- qint64 remainder;
- int hours, mins, secs, msec;
-
- qint64 universalframe = ref.universal_frame();
-
- hours = universalframe / (ONE_HOUR_UNIVERSAL_SAMPLE_RATE);
- remainder = universalframe - (hours * ONE_HOUR_UNIVERSAL_SAMPLE_RATE);
- mins = remainder / ( ONE_MINUTE_UNIVERSAL_SAMPLE_RATE );
- remainder = remainder - (mins * ONE_MINUTE_UNIVERSAL_SAMPLE_RATE );
- secs = remainder / UNIVERSAL_SAMPLE_RATE;
- remainder -= secs * UNIVERSAL_SAMPLE_RATE;
- msec = remainder * 1000 / UNIVERSAL_SAMPLE_RATE;
-
- QTime time(hours, mins, secs, msec);
- return time;
-}
-
-void AudioClipEditWidget::fade_curve_added()
-{
- if (m_clip->get_fade_in()) {
- fadein_length_changed();
- fadein_mode_changed();
- fadein_bending_changed();
- fadein_strength_changed();
- connect(m_clip->get_fade_in(), SIGNAL(rangeChanged()), this,
SLOT(fadein_length_changed()));
- connect(m_clip->get_fade_in(), SIGNAL(modeChanged()), this,
SLOT(fadein_mode_changed()));
- connect(m_clip->get_fade_in(), SIGNAL(bendValueChanged()),
this, SLOT(fadein_bending_changed()));
- connect(m_clip->get_fade_in(), SIGNAL(strengthValueChanged()),
this, SLOT(fadein_strength_changed()));
- }
- if (m_clip->get_fade_out()) {
- fadeout_length_changed();
- fadeout_mode_changed();
- fadeout_bending_changed();
- fadeout_strength_changed();
- connect(m_clip->get_fade_out(), SIGNAL(rangeChanged()), this,
SLOT(fadeout_length_changed()));
- connect(m_clip->get_fade_out(), SIGNAL(modeChanged()), this,
SLOT(fadeout_mode_changed()));
- connect(m_clip->get_fade_out(), SIGNAL(bendValueChanged()),
this, SLOT(fadeout_bending_changed()));
- connect(m_clip->get_fade_out(), SIGNAL(strengthValueChanged()),
this, SLOT(fadeout_strength_changed()));
- }
-}
-
-void AudioClipEditWidget::update_clip_end()
-{
- TimeRef clipEndLocation = m_clip->get_track_start_location() +
m_clip->get_length();
- QTime clipEndTime = timeref_to_qtime(clipEndLocation);
- clipEndLineEdit->setText(clipEndTime.toString(TIME_FORMAT));
-}
-
-#include "AudioClipEditDialog.moc"
Index: dialogs/AudioClipEditDialog.h
===================================================================
RCS file: dialogs/AudioClipEditDialog.h
diff -N dialogs/AudioClipEditDialog.h
--- dialogs/AudioClipEditDialog.h 28 Jun 2007 15:03:56 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-/*
-Copyright (C) 2007 Remon Sijrier
-
-This file is part of Traverso
-
-Traverso is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-*/
-
-#ifndef AUDIOCLIP_EDIT_DIALOG_H
-#define AUDIOCLIP_EDIT_DIALOG_H
-
-#include <QDialog>
-
-class AudioClipEditWidget;
-class AudioClip;
-
-class AudioClipEditDialog : public QDialog
-{
-public:
- AudioClipEditDialog(AudioClip* clip, QWidget* parent=0);
- ~AudioClipEditDialog() {};
-
-private:
- AudioClipEditWidget* m_edit;
-};
-
-#endif
- [Traverso-commit] traverso/src/traverso dialogs/BusSelectorDialog...,
Remon Sijrier <=