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

fixed selecting bug

Browse Source
This commit is contained in:
itsmattkc
2018-07-05 23:52:28 +01:00
parent 00959ca50a
commit 77defa4ce9
11 changed files with 55 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/project.cpp
-10
View File
@@ -140,16 +140,6 @@ Media* Project::import_file(QString file) {
ms->preview_lock.lock();
ms->file_index = i;
if (pFormatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
// qDebug() << "[WARNING] INFINITE_LENGTH calculation is inaccurate in this build\n";
// qDebug() << "INFINITE_LENGTH heuristics:";
// qDebug() << " start_time:" << pFormatCtx->streams[i]->start_time;
// qDebug() << " duration:" << pFormatCtx->streams[i]->duration;
// qDebug() << " nb_frames:" << pFormatCtx->streams[i]->nb_frames;
// qDebug() << " avg_frame_rate:" << av_q2d(pFormatCtx->streams[i]->avg_frame_rate);
// qDebug() << " codec_info_nb_frames:" << pFormatCtx->streams[i]->codec_info_nb_frames;
// qDebug() << " nb_decoded_frames:" << pFormatCtx->streams[i]->nb_decoded_frames;
// qDebug() << " codec_id:" << pFormatCtx->streams[i]->codecpar->codec_id;
bool infinite_length = (pFormatCtx->streams[i]->avg_frame_rate.den == 0);
ms->video_width = pFormatCtx->streams[i]->codecpar->width;
ms->video_height = pFormatCtx->streams[i]->codecpar->height;
panels/timeline.cpp
+6 -4
View File
@@ -84,10 +84,12 @@ void Timeline::previous_cut() {
long p_cut = 0;
for (int i=0;i<sequence->clip_count();i++) {
Clip* c = sequence->get_clip(i);
if (c->timeline_out > p_cut && c->timeline_out < playhead) {
p_cut = c->timeline_out;
} else if (c->timeline_in > p_cut && c->timeline_in < playhead) {
p_cut = c->timeline_in;
if (c != NULL) {
if (c->timeline_out > p_cut && c->timeline_out < playhead) {
p_cut = c->timeline_out;
} else if (c->timeline_in > p_cut && c->timeline_in < playhead) {
p_cut = c->timeline_in;
}
}
}
seek(p_cut);