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

fixed a bunch of clang warnings

Browse Source
This commit is contained in:
itsmattkc
2018-11-11 15:30:17 -08:00
parent 660b1d7547
commit 967a91b8f0
18 changed files with 4536 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.qmake.stash
+31
View File
@@ -0,0 +1,31 @@
QMAKE_XCODE_DEVELOPER_PATH = /Applications/Xcode.app/Contents/Developer
QMAKE_XCODE_VERSION = 6.2
QMAKE_MAC_SDK.macosx.path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk
QMAKE_MAC_SDK.macosx.platform_path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform
QMAKE_MAC_SDK.macosx.version = 10.10
QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_CXX = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_FIX_RPATH = \
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool \
-id
QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_AR = \
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar \
cq
QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_RANLIB = \
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib \
-s
QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_LINK_SHLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++
QMAKE_MAC_SDK.macosx.platform_name = macosx
QMAKE_MAC_SDK.macosx.Path = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk
QMAKE_MAC_SDK.macosx.PlatformPath = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform
QMAKE_MAC_SDK.macosx.SDKVersion = 10.10
QMAKE_MAC_SDK.macx-clang.macosx.QMAKE_ACTOOL = /Applications/Xcode.app/Contents/Developer/usr/bin/actool
QMAKE_DEFAULT_INCDIRS = \
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 \
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/6.0/include \
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include \
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include
QMAKE_DEFAULT_LIBDIRS = \
/lib \
/usr/lib
Makefile
+4432
View File
File diff suppressed because it is too large Load Diff
effects/effect.cpp
+9 -8
View File
@@ -229,15 +229,15 @@ double double_lerp(double a, double b, double t) {
Effect::Effect(Clip* c, const EffectMeta *em) :
parent_clip(c),
meta(em),
length(30),
tlink(NULL),
enable_shader(false),
enable_coords(false),
enable_superimpose(false),
isOpen(false),
enable_superimpose(false),
glslProgram(NULL),
texture(NULL),
bound(false),
tlink(NULL),
length(30)
texture(NULL),
isOpen(false),
bound(false)
{
// set up base UI
container = new CollapsibleWidget();
@@ -822,7 +822,8 @@ GLuint Effect::process_superimpose(double timecode) {
return 0;
}
void Effect::process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count) {
//void Effect::process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count) {
void Effect::process_audio(double, double, quint8*, int, int) {
// only volume/pan, hand off to AU and VST for all other cases
/*double interval = (timecode_end-timecode_start)/nb_bytes;
@@ -843,7 +844,7 @@ void Effect::process_audio(double timecode_start, double timecode_end, quint8* s
}*/
}
void Effect::redraw(double timecode) {
void Effect::redraw(double) {
/*
// run javascript
QPainter p(&img);
io/config.cpp
+1 -1
View File
@@ -12,11 +12,11 @@ Config::Config()
: saved_layout(false),
show_track_lines(true),
scroll_zooms(false),
img_seq_formats("jpg|jpeg|bmp|tiff|tif|psd|png|tga|jp2|gif"),
edit_tool_selects_links(false),
edit_tool_also_seeks(false),
select_also_seeks(false),
paste_seeks(true),
img_seq_formats("jpg|jpeg|bmp|tiff|tif|psd|png|tga|jp2|gif"),
rectified_waveforms(false),
default_transition_length(30),
timecode_view(TIMECODE_DROP),
io/previewgenerator.h
+1 -1
View File
@@ -26,9 +26,9 @@ private:
bool retrieve_preview(const QString &hash);
void generate_waveform();
void finalize_media();
AVFormatContext* fmt_ctx;
QTreeWidgetItem* item;
Media* media;
AVFormatContext* fmt_ctx;
bool retrieve_duration;
bool contains_still_image;
bool replace;
panels/timeline.cpp
+8 -8
View File
@@ -44,6 +44,7 @@ Timeline::Timeline(QWidget *parent) :
cursor_frame(0),
cursor_track(0),
zoom(1.0),
showing_all(false),
snapping(true),
snapped(false),
snap_point(0),
@@ -52,20 +53,19 @@ Timeline::Timeline(QWidget *parent) :
rect_select_proc(false),
moving_init(false),
moving_proc(false),
move_insert(false),
trim_target(-1),
trim_in_point(false),
splitting(false),
importing(false),
importing_files(false),
ui(new Ui::Timeline),
last_frame(0),
creating(false),
scroll(0),
transition_tool_clip(-1),
creating(false),
transition_tool_init(false),
transition_tool_proc(false),
move_insert(false),
showing_all(false)
transition_tool_proc(false),
transition_tool_clip(-1),
ui(new Ui::Timeline),
last_frame(0),
scroll(0)
{
default_track_height = (QGuiApplication::primaryScreen()->logicalDotsPerInch() / 96) * TRACK_DEFAULT_HEIGHT;
panels/viewer.cpp
+6 -6
View File
@@ -30,13 +30,13 @@ extern "C" {
#include <QTimer>
Viewer::Viewer(QWidget *parent) :
QDockWidget(parent),
ui(new Ui::Viewer),
seq(NULL),
QDockWidget(parent),
playing(false),
created_sequence(false),
cue_recording_internal(false),
just_played(false)
just_played(false),
seq(NULL),
ui(new Ui::Viewer),
created_sequence(false),
cue_recording_internal(false)
{
ui->setupUi(this);
ui->headers->viewer = this;
playback/playback.cpp
+2 -1
View File
@@ -225,7 +225,8 @@ void get_clip_frame(Clip* c, long playhead) {
c->queue_lock.unlock();
// get more frames
if (cache) cache_clip(c, playhead, reset, false, QVector<Clip*>());
QVector<Clip*> empty;
if (cache) cache_clip(c, playhead, reset, false, empty);
}
}
project/clip.cpp
+11 -11
View File
@@ -21,20 +21,20 @@ Clip::Clip(Sequence* s) :
timeline_in(0),
timeline_out(0),
track(0),
undeletable(0),
speed(1.0),
media(NULL),
speed(1.0),
reverse(false),
maintain_audio_pitch(false),
autoscale(config.autoscale_by_default),
opening_transition(NULL),
closing_transition(NULL),
replaced(false),
closing_transition(NULL),
undeletable(false),
replaced(false),
ignore_reverse(false),
use_existing_frame(false),
filter_graph(NULL),
texture(NULL),
fbo(NULL),
autoscale(config.autoscale_by_default),
maintain_audio_pitch(false),
reverse(false),
use_existing_frame(false),
ignore_reverse(false)
fbo(NULL),
texture(NULL)
{
pkt = av_packet_alloc();
reset();
project/undo.cpp
+14 -10
View File
@@ -1306,7 +1306,11 @@ void KeyframeMove::redo() {
mainWindow->setWindowModified(true);
}
KeyframeDelete::KeyframeDelete() : old_project_changed(mainWindow->isWindowModified()), disable_keyframes_on_row(NULL), sorted(false) {}
KeyframeDelete::KeyframeDelete() :
disable_keyframes_on_row(NULL),
old_project_changed(mainWindow->isWindowModified()),
sorted(false)
{}
void KeyframeDelete::undo() {
if (disable_keyframes_on_row != NULL) disable_keyframes_on_row->setKeyframing(true);
@@ -1481,9 +1485,9 @@ AddMarkerAction::AddMarkerAction(Sequence* s, long t, QString n) :
void AddMarkerAction::undo() {
if (index == -1) {
sequence->markers.removeLast();
seq->markers.removeLast();
} else {
sequence->markers[index].name = old_name;
seq->markers[index].name = old_name;
}
mainWindow->setWindowModified(old_project_changed);
@@ -1491,8 +1495,8 @@ void AddMarkerAction::undo() {
void AddMarkerAction::redo() {
index = -1;
for (int i=0;i<sequence->markers.size();i++) {
if (sequence->markers.at(i).frame == time) {
for (int i=0;i<seq->markers.size();i++) {
if (seq->markers.at(i).frame == time) {
index = i;
break;
}
@@ -1501,10 +1505,10 @@ void AddMarkerAction::redo() {
if (index == -1) {
Marker m;
m.frame = time;
sequence->markers.append(m);
seq->markers.append(m);
} else {
old_name = sequence->markers.at(index).name;
sequence->markers[index].name = name;
old_name = seq->markers.at(index).name;
seq->markers[index].name = name;
}
mainWindow->setWindowModified(true);
@@ -1600,14 +1604,14 @@ SetSelectionsCommand::SetSelectionsCommand(Sequence* s) :
{}
void SetSelectionsCommand::undo() {
sequence->selections = old_data;
seq->selections = old_data;
done = false;
mainWindow->setWindowModified(old_project_changed);
}
void SetSelectionsCommand::redo() {
if (!done) {
sequence->selections = new_data;
seq->selections = new_data;
done = true;
}
mainWindow->setWindowModified(true);
project/undo.h
+5 -5
View File
@@ -49,16 +49,16 @@ public:
private:
Clip* clip;
long new_in;
long new_out;
long new_clip_in;
int new_track;
long old_in;
long old_out;
long old_clip_in;
int old_track;
long new_in;
long new_out;
long new_clip_in;
int new_track;
bool old_project_changed;
};
ui/keyframeview.cpp
+3 -3
View File
@@ -27,12 +27,12 @@ long KeyframeView::adjust_row_keyframe(EffectRow* row, long time) {
KeyframeView::KeyframeView(QWidget *parent) :
QWidget(parent),
visible_in(0),
visible_out(0),
mousedown(false),
dragging(false),
keys_selected(false),
select_rect(false),
visible_in(0),
visible_out(0),
select_rect(false),
x_scroll(0),
y_scroll(0)
{
ui/timelineheader.cpp
+2 -2
View File
@@ -21,11 +21,11 @@
TimelineHeader::TimelineHeader(QWidget *parent) :
QWidget(parent),
snapping(true),
dragging(false),
resizing_workarea(false),
zoom(1),
in_visible(0),
snapping(true),
in_visible(0),
fm(font()),
dragging_markers(false),
scroll(0)
ui/timelineheader.h
+2 -2
View File
@@ -44,10 +44,10 @@ private:
long temp_workarea_out;
long sequence_end;
long in_visible;
double zoom;
long in_visible;
void set_playhead(int mouse_x);
QFontMetrics fm;
ui/timelinewidget.cpp
+4 -1
View File
@@ -1590,7 +1590,10 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
}
}
if (!found) {
Selection link_sel = {s.in, s.out, linked_tracks.at(k)};
Selection link_sel;
link_sel.in = s.in;
link_sel.out = s.out;
link_sel.track = linked_tracks.at(k);
sequence->selections.append(link_sel);
}
}
ui/viewercontainer.cpp
+2 -2
View File
@@ -6,8 +6,8 @@
// enforces aspect ratio
ViewerContainer::ViewerContainer(QWidget *parent) :
QWidget(parent),
child(NULL),
aspect_ratio(1)
aspect_ratio(1),
child(NULL)
{}
void ViewerContainer::adjust() {
ui/viewerwidget.cpp
+1 -1
View File
@@ -188,7 +188,7 @@ GLuint ViewerWidget::draw_clip(QOpenGLFramebufferObject* fbo, GLuint texture) {
glTexCoord2f(0, 1); // bottom left
glVertex2f(0, 1); // bottom left
glEnd();
glBindTexture(GL_TEXTURE_2D, NULL);
glBindTexture(GL_TEXTURE_2D, 0);
fbo->release();
if (default_fbo != NULL) default_fbo->bind();
ui/viewerwidget.h
+2 -2
View File
@@ -26,11 +26,11 @@ public:
void initializeGL();
Viewer* viewer;
QOpenGLFramebufferObject* default_fbo;
bool waveform;
Clip* waveform_clip;
MediaStream* waveform_ms;
QOpenGLFramebufferObject* default_fbo;
protected:
void paintEvent(QPaintEvent *e);
// void resizeGL(int w, int h);