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

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

Browse Source 
* Refactored the 'RDMarkerDialog' dialog to select markers by pairs
	rather than singly.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-03-20 19:00:55 -04:00
parent c96955b767
commit 346fe9ec1e
8 changed files with 217 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lib/rdmarkerdialog.cpp
View File

@@ -82,8 +82,10 @@ RDMarkerDialog::RDMarkerDialog(const QString &caption,int card,int port,
SIGNAL(pointerValueChanged(RDMarkerHandle::PointerRole,int)),
d_player,SLOT(setPointerValue(RDMarkerHandle::PointerRole,int)));
connect(d_marker_view,
SIGNAL(selectedMarkerChanged(RDMarkerHandle::PointerRole)),
d_player,SLOT(setSelectedMarker(RDMarkerHandle::PointerRole)));
SIGNAL(selectedMarkersChanged(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)),
d_player,SLOT(setSelectedMarkers(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)));
connect(d_marker_view,SIGNAL(positionClicked(int)),
d_player,SLOT(setPlayPosition(int)));
@@ -95,8 +97,10 @@ RDMarkerDialog::RDMarkerDialog(const QString &caption,int card,int port,
SIGNAL(pointerValueChanged(RDMarkerHandle::PointerRole,int)),
d_cut_readout,SLOT(setValue(RDMarkerHandle::PointerRole,int)));
connect(d_marker_view,
SIGNAL(selectedMarkerChanged(RDMarkerHandle::PointerRole)),
d_cut_readout,SLOT(setSelectedMarker(RDMarkerHandle::PointerRole)));
SIGNAL(selectedMarkersChanged(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)),
d_cut_readout,SLOT(setSelectedMarkers(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)));
d_cut_readout->setEnabled(true);
d_talk_readout=new RDMarkerReadout(RDMarkerHandle::TalkStart,this);
@@ -104,42 +108,52 @@ RDMarkerDialog::RDMarkerDialog(const QString &caption,int card,int port,
SIGNAL(pointerValueChanged(RDMarkerHandle::PointerRole,int)),
d_talk_readout,SLOT(setValue(RDMarkerHandle::PointerRole,int)));
connect(d_marker_view,
SIGNAL(selectedMarkerChanged(RDMarkerHandle::PointerRole)),
d_talk_readout,SLOT(setSelectedMarker(RDMarkerHandle::PointerRole)));
SIGNAL(selectedMarkersChanged(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)),
d_talk_readout,SLOT(setSelectedMarkers(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)));
d_segue_readout=new RDMarkerReadout(RDMarkerHandle::SegueStart,this);
connect(d_marker_view,
SIGNAL(pointerValueChanged(RDMarkerHandle::PointerRole,int)),
d_segue_readout,SLOT(setValue(RDMarkerHandle::PointerRole,int)));
connect(d_marker_view,
SIGNAL(selectedMarkerChanged(RDMarkerHandle::PointerRole)),
d_segue_readout,SLOT(setSelectedMarker(RDMarkerHandle::PointerRole)));
SIGNAL(selectedMarkersChanged(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)),
d_segue_readout,SLOT(setSelectedMarkers(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)));
d_hook_readout=new RDMarkerReadout(RDMarkerHandle::HookStart,this);
connect(d_marker_view,
SIGNAL(pointerValueChanged(RDMarkerHandle::PointerRole,int)),
d_hook_readout,SLOT(setValue(RDMarkerHandle::PointerRole,int)));
connect(d_marker_view,
SIGNAL(selectedMarkerChanged(RDMarkerHandle::PointerRole)),
d_hook_readout,SLOT(setSelectedMarker(RDMarkerHandle::PointerRole)));
SIGNAL(selectedMarkersChanged(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)),
d_hook_readout,SLOT(setSelectedMarkers(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)));
d_fadeup_readout=new RDMarkerReadout(RDMarkerHandle::FadeUp,this);
connect(d_marker_view,
SIGNAL(pointerValueChanged(RDMarkerHandle::PointerRole,int)),
d_fadeup_readout,SLOT(setValue(RDMarkerHandle::PointerRole,int)));
connect(d_marker_view,
SIGNAL(selectedMarkerChanged(RDMarkerHandle::PointerRole)),
SIGNAL(selectedMarkersChanged(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)),
d_fadeup_readout,
SLOT(setSelectedMarker(RDMarkerHandle::PointerRole)));
SLOT(setSelectedMarkers(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)));
d_fadedown_readout=new RDMarkerReadout(RDMarkerHandle::FadeDown,this);
connect(d_marker_view,
SIGNAL(pointerValueChanged(RDMarkerHandle::PointerRole,int)),
d_fadedown_readout,SLOT(setValue(RDMarkerHandle::PointerRole,int)));
connect(d_marker_view,
SIGNAL(selectedMarkerChanged(RDMarkerHandle::PointerRole)),
SIGNAL(selectedMarkersChanged(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)),
d_fadedown_readout,
SLOT(setSelectedMarker(RDMarkerHandle::PointerRole)));
SLOT(setSelectedMarkers(RDMarkerHandle::PointerRole,
RDMarkerHandle::PointerRole)));
/**************************************************************************
* Navigation Section
@@ -194,19 +208,14 @@ int RDMarkerDialog::exec(unsigned cartnum,int cutnum)
for(int i=0;i<RDMarkerHandle::LastRole;i++) {
RDMarkerHandle::PointerRole role=(RDMarkerHandle::PointerRole)i;
d_cut_readout->setValue(role,d_marker_view->pointerValue(role));
d_cut_readout->setSelectedMarker(RDMarkerHandle::LastRole);
d_talk_readout->setValue(role,d_marker_view->pointerValue(role));
d_talk_readout->setSelectedMarker(RDMarkerHandle::LastRole);
d_segue_readout->setValue(role,d_marker_view->pointerValue(role));
d_segue_readout->setSelectedMarker(RDMarkerHandle::LastRole);
d_hook_readout->setValue(role,d_marker_view->pointerValue(role));
d_hook_readout->setSelectedMarker(RDMarkerHandle::LastRole);
d_fadeup_readout->setValue(role,d_marker_view->pointerValue(role));
d_fadeup_readout->setSelectedMarker(RDMarkerHandle::LastRole);
d_fadedown_readout->setValue(role,d_marker_view->pointerValue(role));
d_fadedown_readout->setSelectedMarker(RDMarkerHandle::LastRole);
d_player->setPointerValue(role,d_marker_view->pointerValue(role));
d_player->setSelectedMarker(RDMarkerHandle::LastRole);
d_player->
setSelectedMarkers(RDMarkerHandle::LastRole,RDMarkerHandle::LastRole);
}
d_marker_view->setSelectedMarker(RDMarkerHandle::CutStart);