Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-21 15:19:34 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed a bug in 'RDMarkerView' that caused an incorrect limit
	stop to be applied to the 'Fade Down' marker after deletion of
	the 'Fade Up' marker'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-03-20 12:50:21 -04:00
parent dc4e3ad960
commit bb4fe56bb7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21291,3 +21291,7 @@
2021-03-20 Fred Gleason <fredg@paravelsystems.com> 2021-03-20 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'RDMarkerView' that transposed the handle direction * Fixed a bug in 'RDMarkerView' that transposed the handle direction
for the 'Fade Up' and 'Fade Down' markers. for the 'Fade Up' and 'Fade Down' markers.
2021-03-20 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'RDMarkerView' that caused an incorrect limit
stop to be applied to the 'Fade Down' marker after deletion of
the 'Fade Up' marker'.

7
lib/rdmarkerview.cpp
View File

@ -695,7 +695,6 @@ void RDMarkerView::addFadeupData()
DrawMarker(RDMarkerHandle::End,RDMarkerHandle::FadeUp,80); DrawMarker(RDMarkerHandle::End,RDMarkerHandle::FadeUp,80);
InterlockFadeMarkerPair(); InterlockFadeMarkerPair();
// InterlockMarkerPair(RDMarkerHandle::FadeUp);
d_has_unsaved_changes=true; d_has_unsaved_changes=true;
@ -710,7 +709,6 @@ void RDMarkerView::addFadedownData()
DrawMarker(RDMarkerHandle::Start,RDMarkerHandle::FadeDown,80); DrawMarker(RDMarkerHandle::Start,RDMarkerHandle::FadeDown,80);
InterlockFadeMarkerPair(); InterlockFadeMarkerPair();
// InterlockMarkerPair(RDMarkerHandle::FadeDown);
d_has_unsaved_changes=true; d_has_unsaved_changes=true;
@ -735,7 +733,6 @@ void RDMarkerView::updateInterlocks()
// //
// Check for "swiped" markers and remove them // Check for "swiped" markers and remove them
// //
/*
for(int i=2;i<(RDMarkerHandle::LastRole);i++) { for(int i=2;i<(RDMarkerHandle::LastRole);i++) {
RDMarkerHandle::PointerRole role=(RDMarkerHandle::PointerRole)i; RDMarkerHandle::PointerRole role=(RDMarkerHandle::PointerRole)i;
if((d_pointers[i]>=0)&& if((d_pointers[i]>=0)&&
@ -764,7 +761,7 @@ void RDMarkerView::updateInterlocks()
} }
} }
} }
*/
// //
// Update the limit stops // Update the limit stops
// //
@ -826,7 +823,7 @@ void RDMarkerView::InterlockFadeMarkerPair()
d_pointers[RDMarkerHandle::FadeUp]); d_pointers[RDMarkerHandle::FadeUp]);
} }
else { else {
d_handles[RDMarkerHandle::FadeUp][i]-> d_handles[RDMarkerHandle::FadeDown][i]->
setMinimum(d_handles[RDMarkerHandle::CutStart][i]->pos().x()-LEFT_MARGIN, setMinimum(d_handles[RDMarkerHandle::CutStart][i]->pos().x()-LEFT_MARGIN,
d_pointers[RDMarkerHandle::CutStart]); d_pointers[RDMarkerHandle::CutStart]);
} }

1
lib/rdmarkerview.h
View File

@ -130,7 +130,6 @@ class RDMarkerView : public QWidget
int Msec(int frame) const; int Msec(int frame) const;
void InterlockMarkerPair(RDMarkerHandle::PointerRole start_marker); void InterlockMarkerPair(RDMarkerHandle::PointerRole start_marker);
void InterlockFadeMarkerPair(); void InterlockFadeMarkerPair();
// void InterlockFadeUp();
bool LoadCutData(); bool LoadCutData();
void WriteWave(); void WriteWave();
void DrawMarker(RDMarkerHandle::PointerType type, void DrawMarker(RDMarkerHandle::PointerType type,