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

progress on NULL audio

Browse Source
This commit is contained in:
itsmattkc
2018-09-10 15:00:09 +10:00
parent 52c57019fc
commit a2e73fd87e
9 changed files with 350 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/timelinewidget.cpp
+13 -2
View File
@@ -552,7 +552,6 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
Clip* c = new Clip(sequence);
c->media = NULL;
c->media_type = MEDIA_TYPE_SOLID;
c->timeline_in = qMin(g.in, g.out);
c->timeline_out = qMax(g.in, g.out);
c->clip_in = 0;
@@ -566,7 +565,12 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
ta->add_clips(sequence, add);
int clipIndex = sequence->clip_count();
ta->add_effect(sequence, clipIndex, VIDEO_TRANSFORM_EFFECT);
if (c->track < 0) {
// default video effects (before custom effects)
ta->add_effect(sequence, clipIndex, VIDEO_TRANSFORM_EFFECT);
c->media_type = MEDIA_TYPE_SOLID;
}
switch (panel_timeline->creatingObject) {
case ADD_OBJ_TITLE:
c->name = "Title";
@@ -586,6 +590,13 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
break;
}
if (c->track >= 0) {
// default audio effects (after custom effects)
ta->add_effect(sequence, clipIndex, AUDIO_VOLUME_EFFECT);
ta->add_effect(sequence, clipIndex, AUDIO_PAN_EFFECT);
c->media_type = MEDIA_TYPE_TONE;
}
Selection s;
s.in = c->timeline_in;
s.out = c->timeline_out;
ui/viewerwidget.cpp
+13 -7
View File
@@ -136,6 +136,7 @@ GLuint ViewerWidget::compose_sequence(Clip* nest, bool render_audio) {
break;
case MEDIA_TYPE_SEQUENCE:
case MEDIA_TYPE_SOLID:
case MEDIA_TYPE_TONE:
if (is_clip_active(c, playhead)) {
if (!c->open) open_clip(c, !rendering);
clip_is_active = true;
@@ -309,14 +310,19 @@ GLuint ViewerWidget::compose_sequence(Clip* nest, bool render_audio) {
glPopMatrix();
} else {
if ((c->media_type == MEDIA_TYPE_FOOTAGE || c->media_type == MEDIA_TYPE_SOLID)
&& render_audio
&& c->lock.tryLock()) {
// clip is not caching, start caching audio
cache_clip(c, playhead, false, false, c->audio_reset, nest);
c->lock.unlock();
} else if (c->media_type == MEDIA_TYPE_SEQUENCE) {
switch (c->media_type) {
case MEDIA_TYPE_FOOTAGE:
case MEDIA_TYPE_TONE:
if (render_audio
&& c->lock.tryLock()) {
// clip is not caching, start caching audio
cache_clip(c, playhead, false, false, c->audio_reset, nest);
c->lock.unlock();
}
break;
case MEDIA_TYPE_SEQUENCE:
compose_sequence(c, render_audio);
break;
}
}
}