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

2020-12-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Reimplemented the right-click menu in the 'Voice Tracker' dialog
	in rdlogedit(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2020-12-17 18:24:41 -05:00
parent a0836a3c29
commit cf6e68bd63
10 changed files with 419 additions and 511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20704,3 +20704,6 @@
2020-12-17 Fred Gleason <fredg@paravelsystems.com>
* Refactored the 'Voice Tracker' dialog in rdlogedit(1) to use
Qt's MVC API.
2020-12-17 Fred Gleason <fredg@paravelsystems.com>
* Reimplemented the right-click menu in the 'Voice Tracker' dialog
in rdlogedit(1).

20
rdlogedit/rdlogedit_cs.ts
View File

@ -1355,5 +1355,25 @@ therefore only existing transitions will be editable.</source>
<source>Audio Deletion Error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit Cue Markers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Undo Segue Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set Start Point Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set End Point Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set to Hook Markers</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

20
rdlogedit/rdlogedit_de.ts
View File

@ -1345,5 +1345,25 @@ therefore only existing transitions will be editable.</source>
<source>Audio Deletion Error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit Cue Markers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Undo Segue Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set Start Point Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set End Point Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set to Hook Markers</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

10
rdlogedit/rdlogedit_es.ts
View File

@ -1140,23 +1140,23 @@ See your system administrator for an update!</source>
</message>
<message>
<source>Edit Cue Markers</source>
<translation type="obsolete">Editar marcadores</translation>
<translation type="unfinished">Editar marcadores</translation>
</message>
<message>
<source>Undo Segue Changes</source>
<translation type="obsolete">Deshacer cambios en Segue</translation>
<translation type="unfinished">Deshacer cambios en Segue</translation>
</message>
<message>
<source>Set Start Point Here</source>
<translation type="obsolete">Colocar punto de inicio aquí</translation>
<translation type="unfinished">Colocar punto de inicio aquí</translation>
</message>
<message>
<source>Set End Point Here</source>
<translation type="obsolete">Colocar punto de fin aquí</translation>
<translation type="unfinished">Colocar punto de fin aquí</translation>
</message>
<message>
<source>Set to Hook Markers</source>
<translation type="obsolete">Colocar en los marcadores &quot;Hook&quot;</translation>
<translation type="unfinished">Colocar en los marcadores &quot;Hook&quot;</translation>
</message>
<message>
<source>Start</source>

20
rdlogedit/rdlogedit_fr.ts
View File

@ -773,5 +773,25 @@ therefore only existing transitions will be editable.</source>
<source>Audio Deletion Error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit Cue Markers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Undo Segue Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set Start Point Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set End Point Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set to Hook Markers</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

20
rdlogedit/rdlogedit_nb.ts
View File

@ -1355,5 +1355,25 @@ therefore only existing transitions will be editable.</source>
<source>Audio Deletion Error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit Cue Markers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Undo Segue Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set Start Point Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set End Point Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set to Hook Markers</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

20
rdlogedit/rdlogedit_nn.ts
View File

@ -1355,5 +1355,25 @@ therefore only existing transitions will be editable.</source>
<source>Audio Deletion Error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit Cue Markers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Undo Segue Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set Start Point Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set End Point Here</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set to Hook Markers</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

12
rdlogedit/rdlogedit_pt_BR.ts
View File

@ -1131,19 +1131,19 @@ Continuar?</translation>
</message>
<message>
<source>Edit Cue Markers</source>
<translation type="obsolete">Editar Marcador de Escuta</translation>
<translation type="unfinished">Editar Marcador de Escuta</translation>
</message>
<message>
<source>Undo Segue Changes</source>
<translation type="obsolete">Desfazer Mudanças de Sobre</translation>
<translation type="unfinished">Desfazer Mudanças de Sobre</translation>
</message>
<message>
<source>Set Start Point Here</source>
<translation type="obsolete">Marcar Início aqui</translation>
<translation type="unfinished">Marcar Início aqui</translation>
</message>
<message>
<source>Set End Point Here</source>
<translation type="obsolete">Marcar Término aqui</translation>
<translation type="unfinished">Marcar Término aqui</translation>
</message>
<message>
<source>Start</source>
@ -1377,5 +1377,9 @@ Assim sendo, somente transições existentes serão editáveis.</translation>
<source>Audio Deletion Error!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set to Hook Markers</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

518
rdlogedit/voice_tracker.cpp
View File

@ -197,27 +197,31 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
//
track_log_lock=new RDLogLock(edit_log_name,rda->user(),rda->station(),this);
track_log=new RDLog(edit_log_name);
// track_log_event=new RDLogEvent(edit_log_name);
// track_log_event->load();
//
// Right-Click Menu
//
/*
track_menu=new Q3PopupMenu(this,"track_menu");
connect(track_menu,SIGNAL(aboutToShow()),this,SLOT(updateMenuData()));
connect(track_menu,SIGNAL(aboutToHide()),this,SLOT(hideMenuData()));
track_menu->
insertItem(tr("Edit Cue Markers"),this,SLOT(editAudioData()),0,0);
track_menu->
insertItem(tr("Undo Segue Changes"),this,SLOT(undoChangesData()),0,1);
track_menu->
insertItem(tr("Set Start Point Here"),this,SLOT(setStartPointData()),0,2);
track_menu->
insertItem(tr("Set End Point Here"),this,SLOT(setEndPointData()),0,3);
track_menu->
insertItem(tr("Set to Hook Markers"),this,SLOT(setHookPointData()),0,4);
*/
d_mouse_menu=new QMenu(this);
d_edit_cue_action=d_mouse_menu->
addAction(tr("Edit Cue Markers"),this,SLOT(editAudioData()));
d_edit_cue_action->setCheckable(false);
d_undo_segue_action=d_mouse_menu->
addAction(tr("Undo Segue Changes"),this,SLOT(undoChangesData()));
d_undo_segue_action->setCheckable(false);
d_set_start_action=d_mouse_menu->
addAction(tr("Set Start Point Here"),this,SLOT(setStartPointData()));
d_set_start_action->setCheckable(false);
d_set_end_action=d_mouse_menu->
addAction(tr("Set End Point Here"),this,SLOT(setEndPointData()));
d_set_end_action->setCheckable(false);
d_set_hook_action=d_mouse_menu->
addAction(tr("Set to Hook Markers"),this,SLOT(setHookPointData()));
d_set_hook_action->setCheckable(false);
connect(d_mouse_menu,SIGNAL(aboutToShow()),
this,SLOT(updateMenuData()));
connect(d_mouse_menu,SIGNAL(aboutToHide()),
this,SLOT(hideMenuData()));
//
// Track 1 Button
//
@ -291,7 +295,8 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
//
track_play_button=new RDTransportButton(RDTransportButton::Play,this);
track_play_button->setGeometry(20,265,80,50);
track_play_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color)));
track_play_button->
setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color)));
connect(track_play_button,SIGNAL(clicked()),
this,SLOT(playData()));
@ -300,7 +305,8 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
//
track_stop_button=new RDTransportButton(RDTransportButton::Stop,this);
track_stop_button->setGeometry(110,265,80,50);
track_stop_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color)));
track_stop_button->
setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color)));
track_stop_button->setOnColor(Qt::red);
track_stop_button->on();
connect(track_stop_button,SIGNAL(clicked()),this,SLOT(stopData()));
@ -379,57 +385,12 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
d_log_model->setServiceName(d_log->service());
d_log_view->setModel(d_log_model);
d_log_view->resizeColumnsToContents();
/*
connect(d_log_model,
SIGNAL(dataChanged(const QModelIndex &,const QModelIndex &)),
this,SLOT(dataChangedData(const QModelIndex &,const QModelIndex &)));
connect(d_log_view,SIGNAL(doubleClicked(const QModelIndex &)),
this,SLOT(doubleClickedData(const QModelIndex &)));
connect(d_log_view,SIGNAL(clicked(const QModelIndex &)),
this,SLOT(clickedData(const QModelIndex &)));
*/
// connect(d_log_view,SIGNAL(cartDropped(int,RDLogLine *)),
// this,SLOT(cartDroppedData(int,RDLogLine *)));
connect(d_log_view->selectionModel(),
SIGNAL(selectionChanged(const QItemSelection &,const QItemSelection &)),
this,
SLOT(selectionChangedData(const QItemSelection &,const QItemSelection &)));
connect(rda->ripc(),SIGNAL(notificationReceived(RDNotification *)),
d_log_model,SLOT(processNotification(RDNotification *)));
/*
track_log_list=new LogListView(this);
track_log_list->
setGeometry(10,335,sizeHint().width()-120,sizeHint().height()-405);
track_log_list->setAllColumnsShowFocus(true);
track_log_list->setItemMargin(5);
connect(track_log_list,SIGNAL(clicked(Q3ListViewItem *,const QPoint &,int)),
this,SLOT(logClickedData(Q3ListViewItem *,const QPoint &,int)));
connect(track_log_list,SIGNAL(transitionChanged(int,RDLogLine::TransType)),
this,SLOT(transitionChangedData(int,RDLogLine::TransType)));
track_log_list->addColumn(tr(" "));
track_log_list->setColumnAlignment(0,Qt::AlignCenter);
track_log_list->addColumn(tr("Time"));
track_log_list->setColumnAlignment(1,Qt::AlignCenter);
track_log_list->addColumn(tr("Trans"));
track_log_list->setColumnAlignment(2,Qt::AlignCenter);
track_log_list->addColumn(tr("Cart"));
track_log_list->setColumnAlignment(3,Qt::AlignCenter);
track_log_list->addColumn(tr("Group"));
track_log_list->setColumnAlignment(4,Qt::AlignCenter);
track_log_list->addColumn(tr("Length"));
track_log_list->setColumnAlignment(5,Qt::AlignRight);
track_log_list->addColumn(tr("Title"));
track_log_list->setColumnAlignment(6,Qt::AlignLeft);
track_log_list->addColumn(tr("Artist"));
track_log_list->setColumnAlignment(7,Qt::AlignLeft);
track_log_list->addColumn(tr("Album"));
track_log_list->setColumnAlignment(8,Qt::AlignLeft);
track_log_list->addColumn(tr("Label"));
track_log_list->setColumnAlignment(9,Qt::AlignLeft);
for(int i=0;i<track_log_list->columns();i++) {
track_log_list->setColumnSortType(i,RDListView::LineSort);
}
*/
//
// Reset Button
@ -491,7 +452,6 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
i=d_log_model->lineCount();
}
}
RefreshList();
UpdateControls();
UpdateRemaining();
@ -636,41 +596,40 @@ void VoiceTracker::wheelEvent(QWheelEvent *e)
void VoiceTracker::updateMenuData()
{
/*
if(!edit_wave_name[edit_rightclick_track].isEmpty()) {
if(edit_rightclick_track==1 && track_loaded) {
track_menu->setItemEnabled(0,false);
d_edit_cue_action->setEnabled(false);
}
else {
track_menu->setItemEnabled(0,true);
d_edit_cue_action->setEnabled(true);
}
}
else {
track_menu->setItemEnabled(0,false);
d_edit_cue_action->setEnabled(false);
}
track_menu->setItemEnabled(1,track_changed);
track_menu->setItemEnabled(2,
(!edit_wave_name[edit_rightclick_track].isEmpty()));
track_menu->setItemEnabled(3,
(!edit_wave_name[edit_rightclick_track].isEmpty()));
d_undo_segue_action->setEnabled(track_changed);
d_set_start_action->
setEnabled(!edit_wave_name[edit_rightclick_track].isEmpty());
d_set_end_action->
setEnabled(!edit_wave_name[edit_rightclick_track].isEmpty());
if(!edit_wave_name[edit_rightclick_track].isEmpty()) {
RDCut hook_cut=RDCut(edit_logline[edit_rightclick_track]->cartNumber(),
edit_logline[edit_rightclick_track]->cutNumber());
if(hook_cut.hookStartPoint()>=0 && hook_cut.hookEndPoint()>=0) {
track_menu->setItemEnabled(4,true);
d_set_hook_action->setEnabled(true);
}
else {
track_menu->setItemEnabled(4,false);
d_set_hook_action->setEnabled(false);
}
}
else {
track_menu->setItemEnabled(4,false);
d_set_hook_action->setEnabled(false);
}
menu_clicked_point=edit_rightclick_pos;
DrawTrackMap(edit_rightclick_track);
WriteTrackMap(edit_rightclick_track);
*/
}
@ -802,12 +761,6 @@ void VoiceTracker::track1Data()
if((line=SingleSelectionLine())<0) {
return;
}
/*
RDListViewItem *item=(RDListViewItem *)track_log_list->selectedItem();
if(item==NULL) {
return;
}
*/
if(track_track1_button->text()==tr("Import")) {
if(!ImportTrack(line)) {
QMessageBox::warning(this,tr("Cart Creation Failure"),
@ -839,12 +792,6 @@ void VoiceTracker::recordData()
if((line=SingleSelectionLine())<0) {
return;
}
/*
RDListViewItem *item=(RDListViewItem *)track_log_list->selectedItem();
if(item==NULL) {
return;
}
*/
if(track_record_button->text()==tr("Import")) {
if(!ImportTrack(line)) {
QMessageBox::warning(this,tr("Cart Creation Failure"),
@ -1173,7 +1120,6 @@ void VoiceTracker::deleteData()
void VoiceTracker::deleteData(int line,bool warn)
{
SaveTrack(line);
// d_log_model->remove(line,1,true);
d_log_view->selectRow(line+1);
d_log_model->remove(line,1);
track_line=-1;
@ -1262,7 +1208,6 @@ void VoiceTracker::editAudioData()
void VoiceTracker::setStartPointData()
{
/*
if(!track_changed) {
PushSegues();
track_changed=true;
@ -1273,75 +1218,76 @@ void VoiceTracker::setStartPointData()
int newpoint=edit_rightclick_pos*TRACKER_MSECS_PER_PIXEL+
edit_wave_origin[edit_rightclick_track];
if(newpoint<0)
if(newpoint<0) {
newpoint=0;
if(newpoint>edit_logline[edit_rightclick_track]->endPoint())
}
if(newpoint>edit_logline[edit_rightclick_track]->endPoint()) {
newpoint=edit_logline[edit_rightclick_track]->endPoint();
}
edit_logline[edit_rightclick_track]->
setStartPoint(newpoint,RDLogLine::LogPointer);
if(edit_logline[edit_rightclick_track]->
endPoint(RDLogLine::LogPointer)<0)
endPoint(RDLogLine::LogPointer)<0) {
edit_logline[edit_rightclick_track]->
setEndPoint(edit_logline[edit_rightclick_track]->
endPoint(RDLogLine::CartPointer),
RDLogLine::LogPointer);
}
edit_logline[edit_rightclick_track]->
setFadeupPoint(edit_logline[edit_rightclick_track]->startPoint()+
fadeup_diff,RDLogLine::LogPointer);
if(edit_logline[edit_rightclick_track]->fadeupPoint(RDLogLine::CartPointer)>
edit_logline[edit_rightclick_track]->fadeupPoint())
edit_logline[edit_rightclick_track]->fadeupPoint()) {
edit_logline[edit_rightclick_track]->
setFadeupPoint(edit_logline[edit_rightclick_track]->
fadeupPoint(RDLogLine::CartPointer),RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->fadeupPoint()<
edit_logline[edit_rightclick_track]->startPoint())
edit_logline[edit_rightclick_track]->startPoint()) {
edit_logline[edit_rightclick_track]->
setFadeupPoint(edit_logline[edit_rightclick_track]->startPoint(),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->fadeupPoint()>
edit_logline[edit_rightclick_track]->endPoint())
edit_logline[edit_rightclick_track]->endPoint()) {
edit_logline[edit_rightclick_track]->
setFadeupPoint(edit_logline[edit_rightclick_track]->endPoint(),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->fadedownPoint()<
edit_logline[edit_rightclick_track]->startPoint() &&
edit_logline[edit_rightclick_track]->fadedownPoint()>=0)
edit_logline[edit_rightclick_track]->fadedownPoint()>=0) {
edit_logline[edit_rightclick_track]->
setFadedownPoint(edit_logline[edit_rightclick_track]->startPoint(),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->segueStartPoint()<
edit_logline[edit_rightclick_track]->startPoint() &&
edit_logline[edit_rightclick_track]->segueStartPoint()>=0)
edit_logline[edit_rightclick_track]->segueStartPoint()>=0) {
edit_logline[edit_rightclick_track]->
setSegueStartPoint(edit_logline[edit_rightclick_track]->startPoint(),
RDLogLine::LogPointer);
if(edit_logline[edit_rightclick_track]->fadeupPoint(RDLogLine::CartPointer)>=0)
}
if(edit_logline[edit_rightclick_track]->
fadeupPoint(RDLogLine::CartPointer)>=0) {
edit_logline[edit_rightclick_track]->setFadeupGain(RD_FADE_DEPTH);
edit_logline[edit_rightclick_track]->setForcedLength(
edit_logline[edit_rightclick_track]->endPoint()-
}
edit_logline[edit_rightclick_track]->
setForcedLength(edit_logline[edit_rightclick_track]->endPoint()-
edit_logline[edit_rightclick_track]->startPoint());
edit_logline[edit_rightclick_track]->setHasCustomTransition(true);
RDListViewItem *item=(RDListViewItem *)track_log_list->selectedItem();
RenderTransition(item->line());
RenderTransition(SingleSelectionLine());
UpdateControls();
UpdateRemaining();
RefreshList();
item=(RDListViewItem *)track_log_list->selectedItem();
track_log_list->ensureVisible(0,track_log_list->itemPos(item),0,track_log_list->size().height()/2);
*/
}
void VoiceTracker::setEndPointData()
{
/*
if(!track_changed) {
PushSegues();
track_changed=true;
@ -1353,89 +1299,95 @@ void VoiceTracker::setEndPointData()
int newpoint=edit_rightclick_pos*TRACKER_MSECS_PER_PIXEL+
edit_wave_origin[edit_rightclick_track];
if(newpoint>
edit_logline[edit_rightclick_track]->endPoint(RDLogLine::CartPointer))
edit_logline[edit_rightclick_track]->endPoint(RDLogLine::CartPointer)) {
newpoint=edit_logline[edit_rightclick_track]->
endPoint(RDLogLine::CartPointer);
}
if(newpoint<
edit_logline[edit_rightclick_track]->startPoint())
edit_logline[edit_rightclick_track]->startPoint()) {
newpoint=edit_logline[edit_rightclick_track]->
startPoint();
}
edit_logline[edit_rightclick_track]->
setEndPoint(newpoint,RDLogLine::LogPointer);
if(edit_logline[edit_rightclick_track]->
startPoint(RDLogLine::LogPointer)<0)
startPoint(RDLogLine::LogPointer)<0) {
edit_logline[edit_rightclick_track]->
setStartPoint(edit_logline[edit_rightclick_track]->
startPoint(RDLogLine::CartPointer),
RDLogLine::LogPointer);
}
edit_logline[edit_rightclick_track]->
setFadedownPoint(edit_logline[edit_rightclick_track]->endPoint()-
fadedown_diff,RDLogLine::LogPointer);
if(edit_logline[edit_rightclick_track]->fadedownPoint(RDLogLine::CartPointer)>=0
&& edit_logline[edit_rightclick_track]->fadedownPoint(RDLogLine::CartPointer)<
edit_logline[edit_rightclick_track]->fadedownPoint())
if(edit_logline[edit_rightclick_track]->
fadedownPoint(RDLogLine::CartPointer)>=0
&& edit_logline[edit_rightclick_track]->
fadedownPoint(RDLogLine::CartPointer)<
edit_logline[edit_rightclick_track]->fadedownPoint()) {
edit_logline[edit_rightclick_track]->
setFadedownPoint(edit_logline[edit_rightclick_track]->
fadedownPoint(RDLogLine::CartPointer),RDLogLine::LogPointer);
fadedownPoint(RDLogLine::CartPointer),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->fadedownPoint()>
edit_logline[edit_rightclick_track]->endPoint())
edit_logline[edit_rightclick_track]->endPoint()) {
edit_logline[edit_rightclick_track]->
setFadedownPoint(edit_logline[edit_rightclick_track]->endPoint(),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->segueStartPoint()>
edit_logline[edit_rightclick_track]->endPoint())
edit_logline[edit_rightclick_track]->endPoint()) {
edit_logline[edit_rightclick_track]->
setSegueStartPoint(edit_logline[edit_rightclick_track]->endPoint(),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->fadeupPoint()>
edit_logline[edit_rightclick_track]->endPoint())
edit_logline[edit_rightclick_track]->endPoint()) {
edit_logline[edit_rightclick_track]->
setFadeupPoint(edit_logline[edit_rightclick_track]->endPoint(),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->segueStartPoint()<
edit_logline[edit_rightclick_track]->startPoint() &&
edit_logline[edit_rightclick_track]->segueStartPoint()>=0)
edit_logline[edit_rightclick_track]->segueStartPoint()>=0) {
edit_logline[edit_rightclick_track]->
setSegueStartPoint(edit_logline[edit_rightclick_track]->startPoint(),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->fadedownPoint()<
edit_logline[edit_rightclick_track]->startPoint() &&
edit_logline[edit_rightclick_track]->fadedownPoint()>=0)
edit_logline[edit_rightclick_track]->fadedownPoint()>=0) {
edit_logline[edit_rightclick_track]->
setFadedownPoint(edit_logline[edit_rightclick_track]->startPoint(),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->fadedownPoint(RDLogLine::CartPointer)>=0)
if(edit_logline[edit_rightclick_track]->fadedownPoint(RDLogLine::CartPointer)>=0) {
edit_logline[edit_rightclick_track]->setFadedownGain(RD_FADE_DEPTH);
}
edit_logline[edit_rightclick_track]->
setSegueEndPoint(edit_logline[edit_rightclick_track]->endPoint(),
RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->setForcedLength(
edit_logline[edit_rightclick_track]->endPoint()-
edit_logline[edit_rightclick_track]->
setForcedLength(edit_logline[edit_rightclick_track]->endPoint()-
edit_logline[edit_rightclick_track]->startPoint());
if(edit_logline[edit_rightclick_track+1]!=NULL) {
edit_logline[edit_rightclick_track+1]->setHasCustomTransition(true);
}
RDListViewItem *item=(RDListViewItem *)track_log_list->selectedItem();
RenderTransition(item->line());
RenderTransition(SingleSelectionLine());
UpdateControls();
UpdateRemaining();
RefreshList();
item=(RDListViewItem *)track_log_list->selectedItem();
track_log_list->ensureVisible(0,track_log_list->itemPos(item),0,track_log_list->size().height()/2);
*/
}
void VoiceTracker::setHookPointData()
{
/*
if(!track_changed) {
PushSegues();
track_changed=true;
@ -1444,19 +1396,19 @@ void VoiceTracker::setHookPointData()
RDCut hook_cut=RDCut(edit_logline[edit_rightclick_track]->cartNumber(),
edit_logline[edit_rightclick_track]->cutNumber());
if(hook_cut.hookStartPoint()>=0 && hook_cut.hookEndPoint()>=0 &&
hook_cut.hookStartPoint()<hook_cut.hookEndPoint()){
edit_logline[edit_rightclick_track]->setStartPoint(
hook_cut.hookStartPoint(),RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->setFadeupPoint(
hook_cut.hookStartPoint(),RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->setEndPoint(
hook_cut.hookEndPoint(),RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->setSegueEndPoint(
hook_cut.hookEndPoint(),RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->setSegueStartPoint(
hook_cut.hookEndPoint()-500,RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->setFadedownPoint(
hook_cut.hookEndPoint()-500,RDLogLine::LogPointer);
hook_cut.hookStartPoint()<hook_cut.hookEndPoint()) {
edit_logline[edit_rightclick_track]->
setStartPoint(hook_cut.hookStartPoint(),RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->
setFadeupPoint(hook_cut.hookStartPoint(),RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->
setEndPoint(hook_cut.hookEndPoint(),RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->
setSegueEndPoint(hook_cut.hookEndPoint(),RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->
setSegueStartPoint(hook_cut.hookEndPoint()-500,RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->
setFadedownPoint(hook_cut.hookEndPoint()-500,RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->setFadedownGain(RD_FADE_DEPTH);
}
else {
@ -1464,60 +1416,55 @@ void VoiceTracker::setHookPointData()
}
if(edit_logline[edit_rightclick_track]->endPoint()>
edit_logline[edit_rightclick_track]->endPoint(RDLogLine::CartPointer))
edit_logline[edit_rightclick_track]->setEndPoint(
edit_logline[edit_rightclick_track]->endPoint(RDLogLine::CartPointer),
RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->endPoint(RDLogLine::CartPointer)) {
edit_logline[edit_rightclick_track]->
setEndPoint(edit_logline[edit_rightclick_track]->
endPoint(RDLogLine::CartPointer),RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->endPoint()<
edit_logline[edit_rightclick_track]->startPoint())
edit_logline[edit_rightclick_track]->setEndPoint(
edit_logline[edit_rightclick_track]->startPoint(),
edit_logline[edit_rightclick_track]->startPoint()) {
edit_logline[edit_rightclick_track]->
setEndPoint(edit_logline[edit_rightclick_track]->startPoint(),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->segueStartPoint()<
edit_logline[edit_rightclick_track]->startPoint() &&
edit_logline[edit_rightclick_track]->segueStartPoint()>=0)
edit_logline[edit_rightclick_track]->segueStartPoint()>=0) {
edit_logline[edit_rightclick_track]->
setSegueStartPoint(edit_logline[edit_rightclick_track]->startPoint(),
RDLogLine::LogPointer);
}
if(edit_logline[edit_rightclick_track]->fadedownPoint()<
edit_logline[edit_rightclick_track]->startPoint() &&
edit_logline[edit_rightclick_track]->fadedownPoint()>=0)
edit_logline[edit_rightclick_track]->fadedownPoint()>=0) {
edit_logline[edit_rightclick_track]->
setFadedownPoint(edit_logline[edit_rightclick_track]->startPoint(),
RDLogLine::LogPointer);
edit_logline[edit_rightclick_track]->setForcedLength(
edit_logline[edit_rightclick_track]->endPoint()-
}
edit_logline[edit_rightclick_track]->
setForcedLength(edit_logline[edit_rightclick_track]->endPoint()-
edit_logline[edit_rightclick_track]->startPoint());
edit_logline[edit_rightclick_track]->setHasCustomTransition(true);
if(edit_logline[edit_rightclick_track+1]!=NULL) {
edit_logline[edit_rightclick_track+1]->setHasCustomTransition(true);
}
RDListViewItem *item=(RDListViewItem *)track_log_list->selectedItem();
RenderTransition(item->line());
RenderTransition(SingleSelectionLine());
UpdateControls();
UpdateRemaining();
RefreshList();
item=(RDListViewItem *)track_log_list->selectedItem();
track_log_list->ensureVisible(0,track_log_list->itemPos(item),0,track_log_list->size().height()/2);
*/
}
void VoiceTracker::undoChangesData()
{
/*
PopSegues();
track_changed=false;
RDListViewItem *item=(RDListViewItem *)track_log_list->selectedItem();
RenderTransition(item->line());
RefreshLine(item);
if(GetItemByLine(item->line()+1)!=NULL){
RefreshLine(GetItemByLine(item->line()+1));
int line=SingleSelectionLine();
RenderTransition(line);
RefreshLine(line);
if(line<(d_log_model->lineCount()-1)) {
RefreshLine(line+1);
}
*/
}
@ -2050,6 +1997,16 @@ void VoiceTracker::mousePressEvent(QMouseEvent *e)
if(e->button()==Qt::LeftButton) {
edit_current_track=GetClick(e,edit_previous_point);
}
if(e->button()==Qt::RightButton) {
edit_rightclick_track=GetClick(e,edit_previous_point);
edit_rightclick_pos=edit_previous_point->x();
if(edit_rightclick_track>=0) {
d_mouse_menu->setGeometry(e->globalX(),e->globalY(),
d_mouse_menu->sizeHint().width(),
d_mouse_menu->sizeHint().height());
d_mouse_menu->exec();
}
}
}
@ -2074,11 +2031,13 @@ void VoiceTracker::mouseReleaseEvent(QMouseEvent *e)
}
else {
if(e->y()<(TRACKER_Y_ORIGIN+2*TRACKER_Y_HEIGHT)) {
DragTrack(0,((edit_wave_origin[1]-edit_logline[1]->startPoint())/TRACKER_MSECS_PER_PIXEL)+250);
DragTrack(0,((edit_wave_origin[1]-edit_logline[1]->
startPoint())/TRACKER_MSECS_PER_PIXEL)+250);
}
else {
if(e->y()<(TRACKER_Y_ORIGIN+3*TRACKER_Y_HEIGHT)) {
DragTrack(0,((edit_wave_origin[2]-edit_logline[2]->startPoint())/TRACKER_MSECS_PER_PIXEL)+250);
DragTrack(0,((edit_wave_origin[2]-edit_logline[2]->
startPoint())/TRACKER_MSECS_PER_PIXEL)+250);
}
}
}
@ -2443,28 +2402,6 @@ void VoiceTracker::LoadBlockLength(int line)
}
void VoiceTracker::RefreshList()
{
/*
RDListViewItem *item=NULL;
track_log_list->clear();
item=new RDListViewItem(track_log_list);
item->setLine(TRACKER_MAX_LINENO);
item->setText(6,tr("[end of log]"));
for(int i=track_log_event->size()-1;i>=0;i--) {
item=new RDListViewItem(track_log_list);
item->setId(track_log_event->logLine(i)->id());
item->setLine(i);
RefreshLine(item);
if(track_line==i) {
track_log_list->setSelected(item,true);
track_log_list->ensureVisible(0,track_log_list->itemPos(item),0,track_log_list->size().height()/2);
}
}
*/
}
void VoiceTracker::RefreshLine(int line)
{
RDLogLine *logline=d_log_model->logLine(line);
@ -2472,126 +2409,6 @@ void VoiceTracker::RefreshLine(int line)
return;
}
logline->refreshCart();
/*
switch(logline->type()) {
case RDLogLine::Cart:
switch(logline->source()) {
case RDLogLine::Tracker:
item->setPixmap(0,*edit_track_cart_map);
break;
default:
item->setPixmap(0,*edit_playout_map);
break;
}
item->setText(3,QString().sprintf("%06u",logline->cartNumber()));
item->setText(5,RDGetTimeLength(logline->forcedLength()));
if(logline->title().isEmpty()) {
item->setText(4,"");
item->setText(6,tr("[cart not found]"));
}
else {
item->setText(4,logline->groupName());
if(logline->originUser().isEmpty()||
(!logline->originDateTime().isValid())) {
item->setText(6,logline->title());
}
else {
item->setText(6,logline->title()+" -- "+logline->originUser()+" "+
logline->originDateTime().toString("M/d hh:mm"));
}
}
item->setText(7,logline->artist());
item->setText(8,logline->album());
item->setText(9,logline->label());
break;
case RDLogLine::Macro:
item->setPixmap(0,*edit_macro_map);
item->setText(3,QString().sprintf("%06u",logline->cartNumber()));
item->setText(5,RDGetTimeLength(logline->forcedLength()));
if(logline->title().isEmpty()) {
item->setText(4,"");
item->setText(6,tr("[cart not found]"));
}
else {
item->setText(4,logline->groupName());
item->setText(6,logline->title());
}
item->setText(7,logline->artist());
item->setText(8,logline->album());
item->setText(9,logline->label());
break;
case RDLogLine::Marker:
item->setPixmap(0,*edit_notemarker_map);
item->setText(3,tr("MARKER"));
item->setText(6,RDTruncateAfterWord(logline->markerComment(),5,true));
break;
case RDLogLine::Chain:
item->setPixmap(0,*edit_chain_map);
item->setText(3,tr("LOG CHAIN"));
item->setText(6,logline->markerLabel());
item->setText(7,RDTruncateAfterWord(logline->markerComment(),5,true));
break;
case RDLogLine::Track:
item->setPixmap(0,*edit_mic16_map);
item->setText(3,tr("TRACK"));
item->setText(6,RDTruncateAfterWord(logline->markerComment(),5,true));
break;
case RDLogLine::MusicLink:
item->setPixmap(0,*edit_music_map);
item->setText(3,tr("LINK"));
item->setText(6,tr("[music import]"));
break;
case RDLogLine::TrafficLink:
item->setPixmap(0,*edit_traffic_map);
item->setText(3,tr("LINK"));
item->setText(6,tr("[traffic import]"));
break;
default:
break;
}
if(!logline->startTime(RDLogLine::Logged).isNull()) {
if(logline->timeType()==RDLogLine::Hard) {
item->setText(1,"H"+logline->startTime(RDLogLine::Imported).
toString("hh:mm:ss.zzz").left(11));
}
else {
item->setText(1,logline->startTime(RDLogLine::Imported).
toString("hh:mm:ss.zzz").left(10));
}
}
switch(logline->transType()) {
case RDLogLine::Play:
item->setText(2,tr("PLAY"));
item->setTextColor(2,item->textColor(1),QFont::Normal);
break;
case RDLogLine::Segue:
item->setText(2,tr("SEGUE"));
if(logline->hasCustomTransition()) {
item->setTextColor(2,RD_CUSTOM_TRANSITION_COLOR,QFont::Bold);
}
else {
item->setTextColor(2,item->textColor(1),QFont::Normal);
}
break;
case RDLogLine::Stop:
item->setText(2,tr("STOP"));
item->setTextColor(2,item->textColor(1),QFont::Normal);
break;
default:
break;
}
*/
}
@ -2796,21 +2613,15 @@ void VoiceTracker::DragTrack(int trackno,int xdiff)
}
}
LoadBlockLength(track_line);
// RDListViewItem *item=NULL;
int line=-1;
if(d_log_model->logLine(track_line)->type()==RDLogLine::Track) {
// item=GetItemByLine(track_line+1);
line=track_line+1;
}
else {
// item=GetItemByLine(track_line);
line=track_line;
}
if(line>=0) {
RefreshLine(line);
// if(GetItemByLine(item->line()+1)!=NULL) {
// RefreshLine(GetItemByLine(item->line()+1));
// }
RefreshLine(line+1);
}
UpdateRemaining();
@ -2840,7 +2651,8 @@ void VoiceTracker::DragTarget(int trackno,const QPoint &pt)
case VoiceTracker::TrackFadedownPoint:
if((edit_logline[trackno]->fadedownPoint()<=0 ||
edit_logline[trackno]->fadedownPoint()>=edit_logline[trackno]->endPoint())
edit_logline[trackno]->fadedownPoint()>=edit_logline[trackno]->
endPoint())
&& edit_logline[trackno]->fadedownGain()==0) {
edit_logline[trackno]->setFadedownGain(RD_FADE_DEPTH);
}
@ -2851,8 +2663,9 @@ void VoiceTracker::DragTarget(int trackno,const QPoint &pt)
if(trackno<2) {
if((edit_logline[trackno+1]->transType()==RDLogLine::Segue)
&& (!track_loaded)) {
edit_logline[trackno]->setEndPoint(
edit_logline[trackno]->segueEndPoint(),RDLogLine::LogPointer);
edit_logline[trackno]->
setEndPoint(edit_logline[trackno]->segueEndPoint(),
RDLogLine::LogPointer);
}
}
edit_logline[trackno]->
@ -2873,7 +2686,8 @@ void VoiceTracker::DragTarget(int trackno,const QPoint &pt)
&& edit_logline[trackno]->fadedownPoint()>
edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer)) {
edit_logline[trackno]->
setFadedownPoint(edit_logline[trackno]->fadedownPoint(RDLogLine::CartPointer),
setFadedownPoint(edit_logline[trackno]->
fadedownPoint(RDLogLine::CartPointer),
RDLogLine::LogPointer);
}
DrawTrackMap(trackno);
@ -2889,7 +2703,8 @@ void VoiceTracker::DragTarget(int trackno,const QPoint &pt)
case VoiceTracker::TrackFadedownGain:
if(edit_logline[trackno]->fadedownPoint()>edit_logline[trackno]->endPoint()
|| edit_logline[trackno]->fadedownPoint()<0) {
edit_logline[trackno]->setFadedownPoint(edit_logline[trackno]->endPoint(),RDLogLine::LogPointer);
edit_logline[trackno]->setFadedownPoint(edit_logline[trackno]->endPoint(),
RDLogLine::LogPointer);
}
edit_logline[trackno]->
setFadedownGain((TRACKER_GAIN_MARGIN-pt.y())*TRACKER_MB_PER_PIXEL);
@ -2938,7 +2753,8 @@ void VoiceTracker::DragTarget(int trackno,const QPoint &pt)
if(edit_logline[trackno]->fadeupPoint()>
edit_logline[trackno]->fadedownPoint()
&& edit_logline[trackno]->fadedownPoint()>=0) {
edit_logline[trackno]->setFadeupPoint(edit_logline[trackno]->
edit_logline[trackno]->
setFadeupPoint(edit_logline[trackno]->
fadedownPoint(),RDLogLine::LogPointer);
}
if(edit_logline[trackno]->fadeupPoint()<edit_logline[trackno]->
@ -2949,7 +2765,8 @@ void VoiceTracker::DragTarget(int trackno,const QPoint &pt)
if(edit_logline[trackno]->fadeupPoint()<
edit_logline[trackno]->fadeupPoint(RDLogLine::CartPointer)) {
edit_logline[trackno]->
setFadeupPoint(edit_logline[trackno]->fadeupPoint(RDLogLine::CartPointer),
setFadeupPoint(edit_logline[trackno]->
fadeupPoint(RDLogLine::CartPointer),
RDLogLine::LogPointer);
}
DrawTrackMap(trackno);
@ -2961,8 +2778,10 @@ void VoiceTracker::DragTarget(int trackno,const QPoint &pt)
case VoiceTracker::FadeupGain:
case VoiceTracker::TrackFadeupGain:
if(edit_logline[trackno]->fadeupPoint()<edit_logline[trackno]->startPoint()) {
edit_logline[trackno]->setFadeupPoint(edit_logline[trackno]->startPoint(),RDLogLine::LogPointer);
if(edit_logline[trackno]->fadeupPoint()<
edit_logline[trackno]->startPoint()) {
edit_logline[trackno]->setFadeupPoint(edit_logline[trackno]->
startPoint(),RDLogLine::LogPointer);
}
edit_logline[trackno]->
setFadeupGain((TRACKER_GAIN_MARGIN-pt.y())*TRACKER_MB_PER_PIXEL);
@ -2987,21 +2806,15 @@ void VoiceTracker::DragTarget(int trackno,const QPoint &pt)
break;
}
track_changed=true;
// RDListViewItem *item=NULL;
int line=-1;
if(d_log_model->logLine(track_line)->type()==RDLogLine::Track) {
// item=GetItemByLine(track_line+1);
line=track_line+1;
}
else {
// item=GetItemByLine(track_line);
line=track_line;
}
if(line>=0) {
RefreshLine(line);
// if(GetItemByLine(item->line()+1)!=NULL) {
// RefreshLine(GetItemByLine(item->line()+1));
// }
RefreshLine(line);
}
UpdateControls();
@ -3153,8 +2966,8 @@ void VoiceTracker::DrawTrackMap(int trackno)
if(track_start_time>QTime(0,0,0)) {
p->setPen(TRACKER_TEXT_COLOR);
track_time=track_start_time;
track_time=track_time.addMSecs(
track_time_remaining_start-track_time_counter);
track_time=track_time.
addMSecs(track_time_remaining_start-track_time_counter);
p->drawText(550,75,tr("Time")+" "+track_time.toString("h:mm:ss"));
}
p->end();
@ -3279,8 +3092,8 @@ void VoiceTracker::DrawTrackMap(int trackno)
wpg[2]->eraseRect(0,0,edit_wave_map[2]->size().width(),
edit_wave_map[2]->size().height());
if(!edit_wave_name[2].isEmpty()) {
wpg[2]->drawWaveByMsecs(0,edit_wave_map[2]->width(),
edit_wave_origin[2],
wpg[2]->
drawWaveByMsecs(0,edit_wave_map[2]->width(),edit_wave_origin[2],
edit_wave_origin[2]+edit_wave_width,800,
RDWavePainter::Mono,Qt::black,
edit_logline[2]->startPoint(RDLogLine::CartPointer),
@ -3648,7 +3461,6 @@ void VoiceTracker::UpdateControls()
int line=SingleSelectionLine();
bool transport_idle=!TransportActive();
// RDListViewItem *item=(RDListViewItem *)track_log_list->selectedItem();
if((line<0)||(line==TRACKER_MAX_LINENO)) {
track_track1_button->setDisabled(true);
track_track1_button->setText(tr("Start"));
@ -4064,22 +3876,6 @@ void VoiceTracker::ClearCursor(QPainter *p)
}
RDListViewItem *VoiceTracker::GetItemByLine(int line)
{
/*
RDListViewItem *item=(RDListViewItem *)track_log_list->firstChild();
while(item!=NULL) {
if(item->line()==line) {
return item;
}
item=(RDListViewItem *)item->nextSibling();
}
return NULL;
*/
return NULL;
}
void VoiceTracker::CheckChanges()
{
if(track_changed) {

9
rdlogedit/voice_tracker.h
View File

@ -128,7 +128,6 @@ class VoiceTracker : public RDDialog
bool ImportTrack(int line);
void RenderTransition(int line);
void LoadBlockLength(int line);
void RefreshList();
void RefreshLine(int line);
void StartNext(int finishing_id,int next_id=-1);
QString GetCutName(int line,RDCut **cut);
@ -155,7 +154,6 @@ class VoiceTracker : public RDDialog
bool CanInsertTrack();
bool CanDeleteTrack();
void ClearCursor(QPainter *p);
RDListViewItem *GetItemByLine(int line);
void CheckChanges();
void PushSegues();
void PopSegues();
@ -273,6 +271,13 @@ class VoiceTracker : public RDDialog
LogModel *d_log_model;
RDLog *d_log;
RDSvc *d_svc;
QMenu *d_mouse_menu;
QAction *d_edit_cue_action;
QAction *d_undo_segue_action;
QAction *d_set_start_action;
QAction *d_set_end_action;
QAction *d_set_hook_action;
};