From 4903153c87ec645b53d073c0a5396f58b2cf542b Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Sat, 18 Feb 2012 11:08:09 +0100 Subject: [PATCH] Audio align: Menu entry names changed --- src/customtrackview.cpp | 5 +++++ src/mainwindow.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index f45eabe2..0a79ea54 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -6014,7 +6014,12 @@ void CustomTrackView::alignAudio() QList selection = scene()->selectedItems(); foreach (QGraphicsItem *item, selection) { if (item->type() == AVWIDGET) { + ClipItem *clip = static_cast(item); + if (clip == m_audioAlignmentReference) { + continue; + } + if (clip->clipType() == AV || clip->clipType() == AUDIO) { AudioEnvelope *envelope = new AudioEnvelope(clip->getProducer(clip->track()), clip->info().cropStart.frames(m_document->fps()), diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 6ed7c1ec..0fb17639 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1516,11 +1516,11 @@ void MainWindow::setupActions() collection.addAction("split_audio", splitAudio); connect(splitAudio, SIGNAL(triggered(bool)), this, SLOT(slotSplitAudio())); - KAction* setAudioAlignReference = new KAction(i18n("Set reference for audio alignment"), this); + KAction* setAudioAlignReference = new KAction(i18n("Set Audio Reference"), this); collection.addAction("set_audio_align_ref", setAudioAlignReference); connect(setAudioAlignReference, SIGNAL(triggered()), this, SLOT(slotSetAudioAlignReference())); - KAction* alignAudio = new KAction(i18n("Align audio to reference"), this); + KAction* alignAudio = new KAction(i18n("Align Audio to Reference"), this); collection.addAction("align_audio", alignAudio); connect(alignAudio, SIGNAL(triggered()), this, SLOT(slotAlignAudio())); -- 2.39.5