style: unify identifier naming per updated conventions
Automated with clang-tidy readability-identifier-naming (config added to .clang-tidy) plus scripted passes, per the updated rules now documented in CONTRIBUTING.md: - types (class/struct/enum/alias/template params): PascalCase - functions, variables, members: snake_case (incl. rational -> Rational) - private/protected members: trailing underscore; static member variables likewise (instance_, available_themes_) - constants and enum values: snake_case (kLinear -> k_linear, F32P -> f32p); ALL_CAPS reserved for macros - macros: OAK_ prefix (OLIVE_ADD_TEST/OLIVE_ASSERT/OLIVE_CONFIG -> OAK_ADD_TEST/OAK_ASSERT/OAK_CONFIG, GL_PREAMBLE -> OAK_GL_PREAMBLE, include guards -> OAK_*) - file names: all lowercase (Current/Plugin/OliveHost/OliveClip/ OlivePluginInstance -> current/plugin/olivehost/oliveclip/ oliveplugininstance) - getters share the member name sans underscore, setters set_foo() - Qt and third-party (OpenFX) virtual overrides and framework callbacks keep their original names (exempt in .clang-tidy) Manual follow-ups required where automation could not reach: - string-based QMetaObject/SIGNAL/SLOT references updated to renamed methods (AddTask, CreatedFile, DeleteSpecificFile, moveSelectionUp, ...) - macro bodies referencing renamed methods (OLIVE_CONFIG, NODE_DEFAULT_DESTRUCTOR, MANAGEDDISPLAYWIDGET_*) - self-shadowing locals renamed where signals/methods became same-named (size_changed, worker_count, selected_items, import param, filters) - third_party OFX member/namespace usages restored (OFX::Host::*, _created, _clipPrefsDirty, createInstance, clearPersistentMessage) - STL protocol aliases restored (const_iterator) with .clang-tidy ignore rules; qHash overloads restored Full build and test suite pass: ctest 4/4, ~1960 gtest cases green.
This commit is contained in:
@@ -48,33 +48,33 @@ AudioWaveformView::AudioWaveformView(QWidget *parent)
|
||||
setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
||||
}
|
||||
|
||||
void AudioWaveformView::SetViewer(ViewerOutput *playback)
|
||||
void AudioWaveformView::set_viewer(ViewerOutput *playback)
|
||||
{
|
||||
if (playback_) {
|
||||
pool_.clear();
|
||||
pool_.waitForDone();
|
||||
|
||||
disconnect(playback_, &ViewerOutput::ConnectedWaveformChanged,
|
||||
disconnect(playback_, &ViewerOutput::connected_waveform_changed,
|
||||
viewport(),
|
||||
static_cast<void (QWidget::*)()>(&QWidget::update));
|
||||
|
||||
SetTimebase(0);
|
||||
set_timebase(0);
|
||||
}
|
||||
|
||||
playback_ = playback;
|
||||
|
||||
if (playback_) {
|
||||
connect(playback_, &ViewerOutput::ConnectedWaveformChanged, viewport(),
|
||||
connect(playback_, &ViewerOutput::connected_waveform_changed, viewport(),
|
||||
static_cast<void (QWidget::*)()>(&QWidget::update));
|
||||
|
||||
rational tb = playback_->GetVideoParams().frame_rate_as_time_base();
|
||||
Rational tb = playback_->get_video_params().frame_rate_as_time_base();
|
||||
if (tb.isNull()) {
|
||||
tb = OLIVE_CONFIG("DefaultSequenceFrameRate")
|
||||
.value<rational>()
|
||||
tb = OAK_CONFIG("DefaultSequenceFrameRate")
|
||||
.value<Rational>()
|
||||
.flipped();
|
||||
}
|
||||
SetTimebase(tb);
|
||||
UpdateSceneRect();
|
||||
set_timebase(tb);
|
||||
update_scene_rect();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,28 +86,28 @@ void AudioWaveformView::drawForeground(QPainter *p, const QRectF &rect)
|
||||
return;
|
||||
}
|
||||
|
||||
const AudioWaveformCache *wave = playback_->GetConnectedWaveform();
|
||||
const AudioWaveformCache *wave = playback_->get_connected_waveform();
|
||||
if (!wave) {
|
||||
return;
|
||||
}
|
||||
|
||||
const AudioParams ¶ms = wave->GetParameters();
|
||||
const AudioParams ¶ms = wave->get_parameters();
|
||||
if (!params.is_valid()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Draw in/out points
|
||||
DrawWorkArea(p);
|
||||
DrawMarkers(p);
|
||||
draw_work_area(p);
|
||||
draw_markers(p);
|
||||
|
||||
// Draw waveform
|
||||
p->setPen(QColor(64, 255, 160)); // FIXME: Hardcoded color
|
||||
wave->Draw(p, rect.toRect(), GetScale(), SceneToTime(GetScroll()));
|
||||
wave->Draw(p, rect.toRect(), get_scale(), scene_to_time(get_scroll()));
|
||||
|
||||
// Draw playhead
|
||||
p->setPen(PLAYHEAD_COLOR);
|
||||
|
||||
int playhead_x = TimeToScene(GetViewerNode()->GetPlayhead());
|
||||
int playhead_x = time_to_scene(get_viewer_node()->get_playhead());
|
||||
p->drawLine(playhead_x, 0, playhead_x, height());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user