#include <KLocale>
-AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_oldcomment(oldcomment), m_comment(comment), m_id(id), m_pos(pos), m_doIt(doIt)
+AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_oldcomment(oldcomment), m_comment(comment), m_id(id), m_pos(pos)
{
if (m_comment.isEmpty()) setText(i18n("Delete marker"));
else if (m_oldcomment.isEmpty()) setText(i18n("Add marker"));
// virtual
void AddMarkerCommand::redo()
{
- if (m_doIt) {
m_view->addMarker(m_id, m_pos, m_comment);
- }
- m_doIt = true;
}
class AddMarkerCommand : public QUndoCommand
{
public:
- AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, bool doIt, QUndoCommand * parent = 0);
+ AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, QUndoCommand * parent = 0);
virtual void undo();
virtual void redo();
QString m_comment;
QString m_id;
GenTime m_pos;
- bool m_doIt;
};
#endif
#include <KLocale>
-AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_info(info), m_addTrack(addTrack), m_doIt(doIt)
+AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_info(info), m_addTrack(addTrack)
{
if (addTrack) setText(i18n("Add track"));
else setText(i18n("Delete track"));
void AddTrackCommand::undo()
{
// kDebug()<<"---- undoing action";
- m_doIt = true;
if (m_addTrack) m_view->removeTrack(m_ix);
else m_view->addTrack(m_info, m_ix);
}
void AddTrackCommand::redo()
{
kDebug() << "---- redoing action";
- if (m_doIt) {
if (m_addTrack) m_view->addTrack(m_info, m_ix);
else m_view->removeTrack(m_ix);
- }
- m_doIt = true;
}
class AddTrackCommand : public QUndoCommand
{
public:
- AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, bool doIt, QUndoCommand * parent = 0);
+ AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, QUndoCommand * parent = 0);
virtual void undo();
virtual void redo();
private:
CustomTrackView *m_view;
int m_ix;
- bool m_doIt;
bool m_addTrack;
TrackInfo m_info;
};
#include <KLocale>
-ChangeClipTypeCommand::ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_videoOnly(videoOnly), m_audioOnly(audioOnly), m_originalVideoOnly(originalVideo), m_originalAudioOnly(originalAudio), m_doIt(doIt)
+ChangeClipTypeCommand::ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_videoOnly(videoOnly), m_audioOnly(audioOnly), m_originalVideoOnly(originalVideo), m_originalAudioOnly(originalAudio)
{
setText(i18n("Change clip type"));
}
void ChangeClipTypeCommand::undo()
{
// kDebug()<<"---- undoing action";
- m_doIt = true;
m_view->doChangeClipType(m_pos, m_track, m_originalVideoOnly, m_originalAudioOnly);
}
// virtual
void ChangeClipTypeCommand::redo()
{
kDebug() << "---- redoing action";
- if (m_doIt)
m_view->doChangeClipType(m_pos, m_track, m_videoOnly, m_audioOnly);
- m_doIt = true;
}
class ChangeClipTypeCommand : public QUndoCommand
{
public:
- ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, bool doIt, QUndoCommand * parent = 0);
+ ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, QUndoCommand * parent = 0);
virtual void undo();
virtual void redo();
bool m_audioOnly;
bool m_originalVideoOnly;
bool m_originalAudioOnly;
- bool m_doIt;
};
#endif
#include <KLocale>
-ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clipInfo(info), m_old_speed(old_speed), m_new_speed(new_speed), m_clipId(clipId), m_doIt(doIt)
+ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clipInfo(info), m_old_speed(old_speed), m_new_speed(new_speed), m_clipId(clipId)
{
setText(i18n("Adjust clip length"));
}
// virtual
void ChangeSpeedCommand::redo()
{
- if (m_doIt) {
m_view->doChangeClipSpeed(m_clipInfo, m_new_speed, m_old_speed, m_clipId);
- }
- m_doIt = true;
}
class ChangeSpeedCommand : public QUndoCommand
{
public:
- ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, bool doIt, QUndoCommand * parent = 0);
+ ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, QUndoCommand * parent = 0);
virtual void undo();
virtual void redo();
CustomTrackView *m_view;
ItemInfo m_clipInfo;
QString m_clipId;
- bool m_doIt;
double m_old_speed;
double m_new_speed;
};
#include <KLocale>
-ChangeTrackCommand::ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_oldinfo(oldInfo), m_newinfo(newInfo), m_doIt(doIt)
+ChangeTrackCommand::ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_oldinfo(oldInfo), m_newinfo(newInfo)
{
setText(i18n("Change track type"));
}
void ChangeTrackCommand::undo()
{
// kDebug()<<"---- undoing action";
- m_doIt = true;
m_view->changeTrack(m_ix, m_oldinfo);
}
// virtual
void ChangeTrackCommand::redo()
{
- if (m_doIt) m_view->changeTrack(m_ix, m_newinfo);
- m_doIt = true;
+ m_view->changeTrack(m_ix, m_newinfo);
}
class ChangeTrackCommand : public QUndoCommand
{
public:
- ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, bool doIt, QUndoCommand * parent = 0);
+ ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, QUndoCommand * parent = 0);
virtual void undo();
virtual void redo();
private:
CustomTrackView *m_view;
int m_ix;
- bool m_doIt;
TrackInfo m_oldinfo;
TrackInfo m_newinfo;
};
return;
}
AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
- RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true);
+ RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()));
m_document->renderer()->pause();
m_commandStack->push(command);
m_document->setModified(true);
void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos)
{
- MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos, true);
+ MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos);
m_commandStack->push(command);
m_document->setModified(true);
}
void CustomTrackView::slotSwitchTrackLock(int ix)
{
int tracknumber = m_document->tracksCount() - ix - 1;
- LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked, true);
+ LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked);
m_commandStack->push(command);
}
count++;
if (item->parentItem()) {
// Clip is in a group, destroy the group
- new GroupClipsCommand(this, QList<ItemInfo>() << item->info(), QList<ItemInfo>(), false, true, deleteCommand);
+ new GroupClipsCommand(this, QList<ItemInfo>() << item->info(), QList<ItemInfo>(), false, deleteCommand);
}
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteCommand);
}
}
}
if (clipInfos.count() > 0) {
- new GroupClipsCommand(this, clipInfos, transitionInfos, false, true, deleteSelected);
+ new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected);
}
}
}
double speed = (double) percent / 100.0;
if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) {
count++;
- new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected);
+ new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected);
}
}
}
if (item->parentItem() && item->parentItem() != m_selectionGroup) {
emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage);
} else if (currentPos > item->startPos() && currentPos < item->endPos()) {
- RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos, true);
+ RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos);
m_commandStack->push(command);
}
}
}
}
if (clipInfos.count() > 0) {
- GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group, true);
+ GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group);
m_commandStack->push(command);
}
}
void CustomTrackView::slotAddClipMarker(const QString &id, GenTime t, QString c)
{
QString oldcomment = m_document->clipManager()->getClipById(id)->markerComment(t);
- AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t, true);
+ AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t);
m_commandStack->push(command);
}
void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position)
{
- AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true);
+ AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position);
m_commandStack->push(command);
}
deleteMarkers->setText("Delete clip markers");
for (int i = 0; i < markers.size(); i++) {
- new AddMarkerCommand(this, markers.at(i).comment(), QString(), id, markers.at(i).time(), true, deleteMarkers);
+ new AddMarkerCommand(this, markers.at(i).comment(), QString(), id, markers.at(i).time(), deleteMarkers);
}
m_commandStack->push(deleteMarkers);
}
info.isBlind = true;
info.isLocked = false;
}
- AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true, true);
+ AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true);
m_commandStack->push(addTrack);
m_document->setModified(true);
}
TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
deleteTimelineTrack(ix, info);
m_document->setModified(true);
- /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false, true);
+ /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false);
m_commandStack->push(command);*/
}
}
}
}
- new AddTrackCommand(this, ix, trackinfo, false, true, deleteTrack);
+ new AddTrackCommand(this, ix, trackinfo, false, deleteTrack);
m_commandStack->push(deleteTrack);
}
void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo)
{
TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
- ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo, true);
+ ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo);
m_commandStack->push(changeTrack);
}
if (clip->parentItem()) {
emit displayMessage(i18n("Cannot split audio of grouped clips"), ErrorMessage);
} else {
- new SplitAudioCommand(this, clip->track(), clip->startPos(), true, splitCommand);
+ new SplitAudioCommand(this, clip->track(), clip->startPos(), splitCommand);
}
}
}
if (clip->parentItem()) {
emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage);
} else {
- new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), true, false, clip->isVideoOnly(), clip->isAudioOnly(), true, videoCommand);
+ new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), true, false, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand);
}
}
}
if (clip->parentItem()) {
emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage);
} else {
- new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, true, clip->isVideoOnly(), clip->isAudioOnly(), true, videoCommand);
+ new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, true, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand);
}
}
}
if (clip->parentItem()) {
emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage);
} else {
- new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, false, clip->isVideoOnly(), clip->isAudioOnly(), true, videoCommand);
+ new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, false, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand);
}
}
}
#include <KLocale>
-GroupClipsCommand::GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> clipInfos, const QList <ItemInfo> transitionInfos, bool group, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clips(clipInfos), m_transitions(transitionInfos), m_group(group), m_doIt(doIt)
+GroupClipsCommand::GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> clipInfos, const QList <ItemInfo> transitionInfos, bool group, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clips(clipInfos), m_transitions(transitionInfos), m_group(group)
{
if (m_group) setText(i18n("Group clips"));
else setText(i18n("Ungroup clips"));
void GroupClipsCommand::undo()
{
// kDebug()<<"---- undoing action";
- m_doIt = true;
m_view->doGroupClips(m_clips, m_transitions, !m_group);
}
// virtual
void GroupClipsCommand::redo()
{
kDebug() << "---- redoing action";
- if (m_doIt)
m_view->doGroupClips(m_clips, m_transitions, m_group);
- m_doIt = true;
}
class GroupClipsCommand : public QUndoCommand
{
public:
- GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> clipInfos, const QList <ItemInfo> transitionInfos, bool group, bool doIt, QUndoCommand * parent = 0);
+ GroupClipsCommand(CustomTrackView *view, const QList <ItemInfo> clipInfos, const QList <ItemInfo> transitionInfos, bool group, QUndoCommand * parent = 0);
virtual void undo();
virtual void redo();
CustomTrackView *m_view;
const QList <ItemInfo> m_clips;
const QList <ItemInfo> m_transitions;
- bool m_doIt;
bool m_group;
};
#include <KLocale>
-LockTrackCommand::LockTrackCommand(CustomTrackView *view, int ix, bool lock, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_lock(lock), m_doIt(doIt)
+LockTrackCommand::LockTrackCommand(CustomTrackView *view, int ix, bool lock, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_lock(lock)
{
if (lock) setText(i18n("Lock track"));
else setText(i18n("Unlock track"));
// virtual
void LockTrackCommand::redo()
{
- if (m_doIt) {
m_view->lockTrack(m_ix, m_lock);
- }
- m_doIt = true;
}
class LockTrackCommand : public QUndoCommand
{
public:
- LockTrackCommand(CustomTrackView *view, int ix, bool lock, bool doIt, QUndoCommand * parent = 0);
+ LockTrackCommand(CustomTrackView *view, int ix, bool lock, QUndoCommand * parent = 0);
virtual void undo();
virtual void redo();
private:
CustomTrackView *m_view;
int m_ix;
- bool m_doIt;
bool m_lock;
};
#include <KLocale>
-MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_oldindex(oldPos), m_newindex(newPos), m_doIt(doIt)
+MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_oldindex(oldPos), m_newindex(newPos)
{
/* QString effectName;
QDomNode namenode = effect.elementsByTagName("name").item(0);
class MoveEffectCommand : public QUndoCommand
{
public:
- MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, bool doIt, QUndoCommand * parent = 0);
+ MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, QUndoCommand * parent = 0);
virtual int id() const;
virtual bool mergeWith(const QUndoCommand * command);
int m_oldindex;
int m_newindex;
GenTime m_pos;
- bool m_doIt;
};
#endif
#include <KLocale>
-RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_info(info), m_cutTime(cutTime), m_doIt(doIt)
+RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_info(info), m_cutTime(cutTime)
{
setText(i18n("Razor clip"));
}
void RazorClipCommand::undo()
{
// kDebug()<<"---- undoing action";
- m_doIt = true;
m_view->cutClip(m_info, m_cutTime, false);
}
// virtual
void RazorClipCommand::redo()
{
// kDebug() << "---- redoing action cut: " << m_cutTime.frames(25);
- if (m_doIt)
m_view->cutClip(m_info, m_cutTime, true);
- m_doIt = true;
}
class RazorClipCommand : public QUndoCommand
{
public:
- RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, bool doIt, QUndoCommand * parent = 0);
+ RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, QUndoCommand * parent = 0);
virtual void undo();
virtual void redo();
CustomTrackView *m_view;
ItemInfo m_info;
GenTime m_cutTime;
- bool m_doIt;
};
#endif
#include <KLocale>
-SplitAudioCommand::SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_doIt(doIt)
+SplitAudioCommand::SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos)
{
setText(i18n("Split audio"));
}
void SplitAudioCommand::undo()
{
// kDebug()<<"---- undoing action";
- m_doIt = true;
m_view->doSplitAudio(m_pos, m_track, false);
}
// virtual
void SplitAudioCommand::redo()
{
kDebug() << "---- redoing action";
- if (m_doIt)
m_view->doSplitAudio(m_pos, m_track, true);
- m_doIt = true;
}
class SplitAudioCommand : public QUndoCommand
{
public:
- SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, bool doIt, QUndoCommand * parent = 0);
+ SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, QUndoCommand * parent = 0);
virtual void undo();
virtual void redo();
CustomTrackView *m_view;
const GenTime m_pos;
const int m_track;
- bool m_doIt;
};
#endif