oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timeline: show media in adj in ghost overlays

Browse Source
This commit is contained in:
itsmattkc
2022-05-21 19:55:14 -07:00
parent ee87ac27af
commit 3cf01c1464
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/tool/pointer.cpp
+1
View File
@@ -568,6 +568,7 @@ void PointerTool::ProcessDrag(const TimelineCoordinate &mouse_pos)
break;
case Timeline::kTrimIn:
ghost->SetInAdjustment(time_movement);
ghost->SetMediaInAdjustment(time_movement);
break;
case Timeline::kTrimOut:
ghost->SetOutAdjustment(time_movement);
app/widget/timelinewidget/view/timelineview.cpp
+5 -5
View File
@@ -315,9 +315,9 @@ void TimelineView::drawForeground(QPainter *painter, const QRectF &rect)
qreal old_opacity = painter->opacity();
painter->setOpacity(0.5);
rational in = ghost->GetAdjustedIn(), out = ghost->GetAdjustedOut();
DrawBlock(painter, false, attached, track_top, track_height, in, out);
DrawBlock(painter, true, attached, track_top, track_height, in, out);
rational in = ghost->GetAdjustedIn(), out = ghost->GetAdjustedOut(), media_in = ghost->GetAdjustedMediaIn();
DrawBlock(painter, false, attached, track_top, track_height, in, out, media_in);
DrawBlock(painter, true, attached, track_top, track_height, in, out, media_in);
painter->setOpacity(old_opacity);
}
@@ -465,7 +465,7 @@ void TimelineView::DrawBlocks(QPainter *painter, bool foreground)
}
}
void TimelineView::DrawBlock(QPainter *painter, bool foreground, Block *block, qreal block_top, qreal block_height, const rational &in, const rational &out)
void TimelineView::DrawBlock(QPainter *painter, bool foreground, Block *block, qreal block_top, qreal block_height, const rational &in, const rational &out, const rational &media_in)
{
if (dynamic_cast<ClipBlock*>(block) || dynamic_cast<TransitionBlock*>(block)) {
@@ -524,7 +524,7 @@ void TimelineView::DrawBlock(QPainter *painter, bool foreground, Block *block, q
QRect waveform_rect = r.adjusted(0, text_total_height, 0, 0).toRect();
painter->setPen(shadow_color);
AudioVisualWaveform::DrawWaveform(painter, waveform_rect, this->GetScale(), clip->waveform(),
SceneToTime(block_left - block_in, GetScale(), connected_track_list_->parent()->GetAudioParams().sample_rate_as_time_base()));
SceneToTime(block_left - block_in, GetScale(), connected_track_list_->parent()->GetAudioParams().sample_rate_as_time_base()) + media_in);
}
// Draw zebra stripes and markers
app/widget/timelinewidget/view/timelineview.h
+3 -2
View File
@@ -126,10 +126,11 @@ private:
void DrawBlocks(QPainter* painter, bool foreground);
void DrawBlock(QPainter *painter, bool foreground, Block *block, qreal top, qreal height, const rational &in, const rational &out);
void DrawBlock(QPainter *painter, bool foreground, Block *block, qreal top, qreal height, const rational &in, const rational &out, const rational &media_in);
void DrawBlock(QPainter *painter, bool foreground, Block *block, qreal top, qreal height)
{
DrawBlock(painter, foreground, block, top, height, block->in(), block->out());
ClipBlock *cb = dynamic_cast<ClipBlock*>(block);
DrawBlock(painter, foreground, block, top, height, block->in(), block->out(), cb ? cb->media_in() : 0);
}
void DrawZebraStripes(QPainter *painter, const QRectF &r);