Audio align: Menu entry names changed

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index f45eabe2bded907b333b60b9b157df4d6561801f..0a79ea54b325f5a15f77232659a9e68c0ec8ae8f 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -6014,7 +6014,12 @@ void CustomTrackView::alignAudio()
     QList<QGraphicsItem *> selection = scene()->selectedItems();
     foreach (QGraphicsItem *item, selection) {
         if (item->type() == AVWIDGET) {
+
             ClipItem *clip = static_cast<ClipItem*>(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 6ed7c1ecc54f3b902f9440bd70b8ef4e2e704722..0fb17639010b9343d318cb0c10cbe160f92c4c99 100644 (file)
--- 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()));