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

added go to cut shortcuts and fixed waveform display bug

Browse Source
This commit is contained in:
itsmattkc
2018-06-21 10:50:19 -07:00
parent 937f714183
commit f344e262e8
12 changed files with 88 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/timelineheader.h
+4 -4
View File
@@ -10,10 +10,10 @@ public:
explicit TimelineHeader(QWidget *parent = 0);
protected:
void paintEvent(QPaintEvent*) override;
void mousePressEvent(QMouseEvent*) override;
void mouseMoveEvent(QMouseEvent*) override;
void mouseReleaseEvent(QMouseEvent*) override;
void paintEvent(QPaintEvent*);
void mousePressEvent(QMouseEvent*);
void mouseMoveEvent(QMouseEvent*);
void mouseReleaseEvent(QMouseEvent*);
private:
bool dragging;
ui/timelinewidget.cpp
+1 -13
View File
@@ -205,7 +205,6 @@ void TimelineWidget::mousePressEvent(QMouseEvent *event) {
case TIMELINE_TOOL_EDIT:
panel_timeline->seek(panel_timeline->drag_frame_start);
panel_timeline->selecting = true;
break;
case TIMELINE_TOOL_RAZOR:
{
@@ -807,24 +806,13 @@ void TimelineWidget::redraw_clips() {
for (int i=0;i<clip_rect.width();i++) {
int waveform_index = qFloor((((float)i / (float)clip_rect.width()) * clip->media_stream->audio_preview.size())/divider)*divider;
for (int j=0;j<clip->media_stream->audio_channels;j++) {
int mid = channel_height*j+(channel_height/2);
int mid = clip_rect.top()+channel_height*j+(channel_height/2);
int offset = waveform_index+(j*2);
qint8 min = (float)clip->media_stream->audio_preview[offset] / 128.0f * (channel_height/2);
qint8 max = (float)clip->media_stream->audio_preview[offset+1] / 128.0f * (channel_height/2);
clip_painter.drawLine(clip_rect.left()+i, mid+min, clip_rect.left()+i, mid+max);
}
}
// for (int i=waveform_x;i<waveform_width;i+=waveform_scaled_length) {
// for (int j=0;j<clip->media_stream->audio_channels;j++) {
// int mid = channel_height*j+(channel_height/2);
// int offset = i+(j*2);
// qint8 min = (float)clip->media_stream->audio_preview[offset] / 128.0f * (channel_height/2);
// qint8 max = (float)clip->media_stream->audio_preview[offset+1] / 128.0f * (channel_height/2);
// clip_painter.drawLine(draw_x, mid+min, draw_x, mid+max);
// }
// draw_x++;
// }
}
}
ui/timelinewidget.h
+5 -5
View File
@@ -21,13 +21,13 @@ public:
void redraw_clips();
protected:
void paintEvent(QPaintEvent*) override;
void resizeEvent(QResizeEvent*) override;
void paintEvent(QPaintEvent*);
void resizeEvent(QResizeEvent*);
void mouseDoubleClickEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void dragEnterEvent(QDragEnterEvent *event);
void dragLeaveEvent(QDragLeaveEvent *event);
ui/viewercontainer.h
+1 -1
View File
@@ -13,7 +13,7 @@ public:
void adjust();
protected:
void resizeEvent(QResizeEvent *event) override;
void resizeEvent(QResizeEvent *event);
signals:
ui/viewerwidget.h
+3 -3
View File
@@ -19,10 +19,10 @@ public:
bool force_audio;
bool enable_paint;
protected:
void paintEvent(QPaintEvent *e) override;
void initializeGL() override;
void paintEvent(QPaintEvent *e);
void initializeGL();
// void resizeGL(int w, int h);
void paintGL() override;
void paintGL();
private:
QTimer retry_timer;
private slots: