Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-07 07:57:44 +02:00
Code Issues Projects Releases Wiki Activity

2021-03-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified rdlogedit(1) to use 'RDMarkerDialog' instead of
	'RDEditAudio'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-03-25 13:18:52 -04:00
parent a689a694eb
commit ad122bb9cd
3 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -21352,3 +21352,6 @@
2021-03-25 Fred Gleason <fredg@paravelsystems.com> 2021-03-25 Fred Gleason <fredg@paravelsystems.com>
* Modified rdcatch(1) to use 'RDMarkerDialog' instead of * Modified rdcatch(1) to use 'RDMarkerDialog' instead of
'RDEditAudio'. 'RDEditAudio'.
2021-03-25 Fred Gleason <fredg@paravelsystems.com>
* Modified rdlogedit(1) to use 'RDMarkerDialog' instead of
'RDEditAudio'.

39
rdlogedit/voice_tracker.cpp
View File

@ -25,7 +25,6 @@
#include <rdconf.h> #include <rdconf.h>
#include <rdsvc.h> #include <rdsvc.h>
#include <rdedit_audio.h>
#include <rdimport_audio.h> #include <rdimport_audio.h>
#include <rdrehash.h> #include <rdrehash.h>
@ -165,6 +164,12 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
d_group=new RDGroup(d_svc->trackGroup()); d_group=new RDGroup(d_svc->trackGroup());
d_tracks=d_log->scheduledTracks()-d_log->completedTracks(); d_tracks=d_log->scheduledTracks()-d_log->completedTracks();
//
// Dialogs
//
d_marker_dialog=
new RDMarkerDialog("RDLogEdit",d_output_card,d_output_port,this);
// //
// Play Decks // Play Decks
// //
@ -471,6 +476,7 @@ VoiceTracker::~VoiceTracker()
delete d_wpg[i]; delete d_wpg[i];
d_wpg[i]=NULL; d_wpg[i]=NULL;
} }
delete d_marker_dialog;
delete d_log_lock; delete d_log_lock;
delete d_svc; delete d_svc;
delete d_log; delete d_log;
@ -1154,39 +1160,42 @@ void VoiceTracker::nextData()
void VoiceTracker::editAudioData() void VoiceTracker::editAudioData()
{ {
RDCart *rdcart=new RDCart(d_loglines[d_rightclick_track]->cartNumber()); RDCart *rdcart=new RDCart(d_loglines[d_rightclick_track]->cartNumber());
RDEditAudio *edit=
new RDEditAudio(rdcart,d_loglines[d_rightclick_track]->cutName(), if(d_marker_dialog->
d_output_card,d_output_port,d_tail_preroll, exec(RDCut::cartNumber(d_loglines[d_rightclick_track]->cutName()),
d_threshold_level,this); RDCut::cutNumber(d_loglines[d_rightclick_track]->cutName()))) {
if(edit->exec()!=-1) {
rdcart->updateLength(); rdcart->updateLength();
d_loglines[d_rightclick_track]->refreshPointers(); d_loglines[d_rightclick_track]->refreshPointers();
if(d_loglines[d_rightclick_track]->fadeupPoint()< if(d_loglines[d_rightclick_track]->fadeupPoint()<
d_loglines[d_rightclick_track]->startPoint() && d_loglines[d_rightclick_track]->startPoint() &&
d_loglines[d_rightclick_track]->fadeupPoint()>=0) { d_loglines[d_rightclick_track]->fadeupPoint()>=0) {
d_loglines[d_rightclick_track]->setFadeupPoint( d_loglines[d_rightclick_track]->
d_loglines[d_rightclick_track]->startPoint(),RDLogLine::LogPointer); setFadeupPoint(d_loglines[d_rightclick_track]->startPoint(),
RDLogLine::LogPointer);
} }
if(d_loglines[d_rightclick_track]->fadeupPoint()> if(d_loglines[d_rightclick_track]->fadeupPoint()>
d_loglines[d_rightclick_track]->endPoint()) { d_loglines[d_rightclick_track]->endPoint()) {
d_loglines[d_rightclick_track]->setFadeupPoint( d_loglines[d_rightclick_track]->
d_loglines[d_rightclick_track]->endPoint(),RDLogLine::LogPointer); setFadeupPoint(d_loglines[d_rightclick_track]->endPoint(),
RDLogLine::LogPointer);
} }
if(d_loglines[d_rightclick_track]->fadedownPoint()< if(d_loglines[d_rightclick_track]->fadedownPoint()<
d_loglines[d_rightclick_track]->startPoint() && d_loglines[d_rightclick_track]->startPoint() &&
d_loglines[d_rightclick_track]->fadedownPoint()>=0) { d_loglines[d_rightclick_track]->fadedownPoint()>=0) {
d_loglines[d_rightclick_track]->setFadedownPoint( d_loglines[d_rightclick_track]->
d_loglines[d_rightclick_track]->startPoint(),RDLogLine::LogPointer); setFadedownPoint(d_loglines[d_rightclick_track]->startPoint(),
RDLogLine::LogPointer);
} }
if(d_loglines[d_rightclick_track]->fadedownPoint()> if(d_loglines[d_rightclick_track]->fadedownPoint()>
d_loglines[d_rightclick_track]->endPoint()) { d_loglines[d_rightclick_track]->endPoint()) {
d_loglines[d_rightclick_track]->setFadedownPoint( d_loglines[d_rightclick_track]->
d_loglines[d_rightclick_track]->endPoint(),RDLogLine::LogPointer); setFadedownPoint(d_loglines[d_rightclick_track]->endPoint(),
RDLogLine::LogPointer);
} }
DrawTrackMap(d_rightclick_track); DrawTrackMap(d_rightclick_track);
WriteTrackMap(d_rightclick_track); WriteTrackMap(d_rightclick_track);
} }
delete edit;
delete rdcart; delete rdcart;
} }

2
rdlogedit/voice_tracker.h
View File

@ -26,6 +26,7 @@
#include <rdgroup.h> #include <rdgroup.h>
#include <rdlog.h> #include <rdlog.h>
#include <rdloglock.h> #include <rdloglock.h>
#include <rdmarkerdialog.h>
#include <rdplay_deck.h> #include <rdplay_deck.h>
#include <rdsvc.h> #include <rdsvc.h>
#include <rdstereometer.h> #include <rdstereometer.h>
@ -268,6 +269,7 @@ class VoiceTracker : public RDDialog
QAction *d_set_start_action; QAction *d_set_start_action;
QAction *d_set_end_action; QAction *d_set_end_action;
QAction *d_set_hook_action; QAction *d_set_hook_action;
RDMarkerDialog *d_marker_dialog;
}; };