From ad122bb9cd2bc88e3371f6c045409852bb6c2ca7 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Thu, 25 Mar 2021 13:18:52 -0400
Subject: [PATCH] 2021-03-25 Fred Gleason <fredg@paravelsystems.com> 	*
 Modified rdlogedit(1) to use 'RDMarkerDialog' instead of 	'RDEditAudio'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
---
 ChangeLog                   |  3 ++
 rdlogedit/voice_tracker.cpp | 67 +++++++++++++++++++++----------------
 rdlogedit/voice_tracker.h   |  2 ++
 3 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 846b1293..77eade26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21352,3 +21352,6 @@
 2021-03-25 Fred Gleason <fredg@paravelsystems.com>
 	* Modified rdcatch(1) to use 'RDMarkerDialog' instead of
 	'RDEditAudio'.
+2021-03-25 Fred Gleason <fredg@paravelsystems.com>
+	* Modified rdlogedit(1) to use 'RDMarkerDialog' instead of
+	'RDEditAudio'.
diff --git a/rdlogedit/voice_tracker.cpp b/rdlogedit/voice_tracker.cpp
index ec8a2b88..9dac239b 100644
--- a/rdlogedit/voice_tracker.cpp
+++ b/rdlogedit/voice_tracker.cpp
@@ -25,7 +25,6 @@
 
 #include <rdconf.h>
 #include <rdsvc.h>
-#include <rdedit_audio.h>
 #include <rdimport_audio.h>
 #include <rdrehash.h>
 
@@ -165,6 +164,12 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
   d_group=new RDGroup(d_svc->trackGroup());
   d_tracks=d_log->scheduledTracks()-d_log->completedTracks();
 
+  //
+  // Dialogs
+  //
+  d_marker_dialog=
+    new RDMarkerDialog("RDLogEdit",d_output_card,d_output_port,this);
+
   //
   // Play Decks
   //
@@ -471,6 +476,7 @@ VoiceTracker::~VoiceTracker()
     delete d_wpg[i];
     d_wpg[i]=NULL;
   }
+  delete d_marker_dialog;
   delete d_log_lock;
   delete d_svc;
   delete d_log;
@@ -1154,39 +1160,42 @@ void VoiceTracker::nextData()
 void VoiceTracker::editAudioData()
 {
   RDCart *rdcart=new RDCart(d_loglines[d_rightclick_track]->cartNumber());
-  RDEditAudio *edit=
-    new RDEditAudio(rdcart,d_loglines[d_rightclick_track]->cutName(),
-		    d_output_card,d_output_port,d_tail_preroll,
-		    d_threshold_level,this);
-  if(edit->exec()!=-1) {
+
+  if(d_marker_dialog->
+     exec(RDCut::cartNumber(d_loglines[d_rightclick_track]->cutName()),
+	  RDCut::cutNumber(d_loglines[d_rightclick_track]->cutName()))) {
     rdcart->updateLength();
     d_loglines[d_rightclick_track]->refreshPointers();
-  if(d_loglines[d_rightclick_track]->fadeupPoint()<
-     d_loglines[d_rightclick_track]->startPoint() &&
-     d_loglines[d_rightclick_track]->fadeupPoint()>=0) {
-   d_loglines[d_rightclick_track]->setFadeupPoint(
-       d_loglines[d_rightclick_track]->startPoint(),RDLogLine::LogPointer);
-  }    
-  if(d_loglines[d_rightclick_track]->fadeupPoint()>
-     d_loglines[d_rightclick_track]->endPoint()) {
-   d_loglines[d_rightclick_track]->setFadeupPoint(
-       d_loglines[d_rightclick_track]->endPoint(),RDLogLine::LogPointer);
-  }    
-  if(d_loglines[d_rightclick_track]->fadedownPoint()<
-     d_loglines[d_rightclick_track]->startPoint() &&
-     d_loglines[d_rightclick_track]->fadedownPoint()>=0) {
-   d_loglines[d_rightclick_track]->setFadedownPoint(
-       d_loglines[d_rightclick_track]->startPoint(),RDLogLine::LogPointer);
-  }    
-  if(d_loglines[d_rightclick_track]->fadedownPoint()>
-     d_loglines[d_rightclick_track]->endPoint()) {
-   d_loglines[d_rightclick_track]->setFadedownPoint(
-       d_loglines[d_rightclick_track]->endPoint(),RDLogLine::LogPointer);
-  }    
+    if(d_loglines[d_rightclick_track]->fadeupPoint()<
+       d_loglines[d_rightclick_track]->startPoint() &&
+       d_loglines[d_rightclick_track]->fadeupPoint()>=0) {
+      d_loglines[d_rightclick_track]->
+	setFadeupPoint(d_loglines[d_rightclick_track]->startPoint(),
+		       RDLogLine::LogPointer);
+    }    
+    if(d_loglines[d_rightclick_track]->fadeupPoint()>
+       d_loglines[d_rightclick_track]->endPoint()) {
+      d_loglines[d_rightclick_track]->
+	setFadeupPoint(d_loglines[d_rightclick_track]->endPoint(),
+		       RDLogLine::LogPointer);
+    }    
+    if(d_loglines[d_rightclick_track]->fadedownPoint()<
+       d_loglines[d_rightclick_track]->startPoint() &&
+       d_loglines[d_rightclick_track]->fadedownPoint()>=0) {
+      d_loglines[d_rightclick_track]->
+	setFadedownPoint(d_loglines[d_rightclick_track]->startPoint(),
+			 RDLogLine::LogPointer);
+    }    
+    if(d_loglines[d_rightclick_track]->fadedownPoint()>
+       d_loglines[d_rightclick_track]->endPoint()) {
+      d_loglines[d_rightclick_track]->
+	setFadedownPoint(d_loglines[d_rightclick_track]->endPoint(),
+			 RDLogLine::LogPointer);
+    }    
     DrawTrackMap(d_rightclick_track);
     WriteTrackMap(d_rightclick_track);
   }
-  delete edit;
+
   delete rdcart;
 }
 
diff --git a/rdlogedit/voice_tracker.h b/rdlogedit/voice_tracker.h
index f7987257..4a7145a8 100644
--- a/rdlogedit/voice_tracker.h
+++ b/rdlogedit/voice_tracker.h
@@ -26,6 +26,7 @@
 #include <rdgroup.h>
 #include <rdlog.h>
 #include <rdloglock.h>
+#include <rdmarkerdialog.h>
 #include <rdplay_deck.h>
 #include <rdsvc.h>
 #include <rdstereometer.h>
@@ -268,6 +269,7 @@ class VoiceTracker : public RDDialog
   QAction *d_set_start_action;
   QAction *d_set_end_action;
   QAction *d_set_hook_action;
+  RDMarkerDialog *d_marker_dialog;
 };