From 058ff6b8c9ef04422908b8e83bb7ced1e7a26c64 Mon Sep 17 00:00:00 2001 From: Kitteh Date: Sat, 10 Nov 2018 13:50:13 +0000 Subject: [PATCH] [Formatting] Improved code formatting. --- .clang-format | 118 +++++++++++++++++++++++ src/MpvPlayerBackend.cpp | 195 +++++++++++++-------------------------- src/main.cpp | 17 +--- src/setenv_mingw.hpp | 3 +- src/utils.cpp | 24 ++--- src/utils.hpp | 6 +- 6 files changed, 199 insertions(+), 164 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..65fe744 --- /dev/null +++ b/.clang-format @@ -0,0 +1,118 @@ +--- +Language: Cpp +# BasedOnStyle: Mozilla +AccessModifierOffset: -2 +AlignAfterOpenBracket: DontAlign +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlines: Right +AlignOperands: true +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: Inline +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: Yes +BinPackArguments: false +BinPackParameters: false +BraceWrapping: + AfterClass: true + AfterControlStatement: false + AfterEnum: true + AfterFunction: true + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: true + AfterUnion: true + AfterExternBlock: true + BeforeCatch: false + BeforeElse: false + IndentBraces: false + SplitEmptyFunction: true + SplitEmptyRecord: false + SplitEmptyNamespace: true +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Mozilla +BreakBeforeInheritanceComma: false +BreakInheritanceList: BeforeComma +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializers: BeforeComma +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true +ColumnLimit: 120 +CommentPragmas: '^ IWYU pragma:' +CompactNamespaces: false +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 2 +ContinuationIndentWidth: 1 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +FixNamespaceComments: false +ForEachMacros: + - foreach + - Q_FOREACH + - BOOST_FOREACH +IncludeBlocks: Preserve +IncludeCategories: + - Regex: '^"(llvm|llvm-c|clang|clang-c)/' + Priority: 2 + - Regex: '^(<|"(gtest|gmock|isl|json)/)' + Priority: 3 + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '(Test)?$' +IndentCaseLabels: true +IndentPPDirectives: None +IndentWidth: 2 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: true +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +ObjCBinPackProtocolList: Auto +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: false +PenaltyBreakAssignment: 2 +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyBreakTemplateDeclaration: 10 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 200 +PointerAlignment: Left +ReflowComments: true +SortIncludes: true +SortUsingDeclarations: true +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true +SpaceBeforeParens: ControlStatements +SpaceBeforeRangeBasedForLoopColon: true +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 8 +UseTab: Never +... + diff --git a/src/MpvPlayerBackend.cpp b/src/MpvPlayerBackend.cpp index 0242f57..3a7ebba 100644 --- a/src/MpvPlayerBackend.cpp +++ b/src/MpvPlayerBackend.cpp @@ -14,21 +14,17 @@ namespace { -void -wakeup(void* ctx) +void wakeup(void* ctx) { - QMetaObject::invokeMethod( - (MpvPlayerBackend*)ctx, "on_mpv_events", Qt::QueuedConnection); + QMetaObject::invokeMethod((MpvPlayerBackend*)ctx, "on_mpv_events", Qt::QueuedConnection); } -void -on_mpv_redraw(void* ctx) +void on_mpv_redraw(void* ctx) { MpvPlayerBackend::on_update(ctx); } -static void* -get_proc_address_mpv(void* ctx, const char* name) +static void* get_proc_address_mpv(void* ctx, const char* name) { Q_UNUSED(ctx) @@ -58,15 +54,10 @@ public: { // init mpv_gl: if (!obj->mpv_gl) { - mpv_opengl_init_params gl_init_params{ get_proc_address_mpv, - nullptr, - nullptr }; - mpv_render_param params[]{ - { MPV_RENDER_PARAM_API_TYPE, - const_cast(MPV_RENDER_API_TYPE_OPENGL) }, + mpv_opengl_init_params gl_init_params{ get_proc_address_mpv, nullptr, nullptr }; + mpv_render_param params[]{ { MPV_RENDER_PARAM_API_TYPE, const_cast(MPV_RENDER_API_TYPE_OPENGL) }, { MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params }, - { MPV_RENDER_PARAM_INVALID, nullptr } - }; + { MPV_RENDER_PARAM_INVALID, nullptr } }; if (mpv_render_context_create(&obj->mpv_gl, obj->mpv, params) < 0) throw std::runtime_error("failed to initialize mpv GL context"); mpv_render_context_set_update_callback(obj->mpv_gl, on_mpv_redraw, obj); @@ -81,14 +72,12 @@ public: obj->window()->resetOpenGLState(); QOpenGLFramebufferObject* fbo = framebufferObject(); - mpv_opengl_fbo mpfbo{ .fbo = static_cast(fbo->handle()), - .w = fbo->width(), - .h = fbo->height(), - .internal_format = 0 }; + mpv_opengl_fbo mpfbo{ + .fbo = static_cast(fbo->handle()), .w = fbo->width(), .h = fbo->height(), .internal_format = 0 + }; int flip_y{ 0 }; - mpv_render_param params[] = { - // Specify the default framebuffer (0) as target. This will + mpv_render_param params[] = { // Specify the default framebuffer (0) as target. This will // render onto the entire screen. If you want to show the video // in a smaller rectangle or apply fancy transformations, you'll // need to render into a separate FBO and draw it manually. @@ -143,11 +132,7 @@ MpvPlayerBackend::MpvPlayerBackend(QQuickItem* parent) if (mpv_initialize(mpv) < 0) throw std::runtime_error("could not initialize mpv context"); - connect(this, - &MpvPlayerBackend::onUpdate, - this, - &MpvPlayerBackend::doUpdate, - Qt::QueuedConnection); + connect(this, &MpvPlayerBackend::onUpdate, this, &MpvPlayerBackend::doUpdate, Qt::QueuedConnection); } MpvPlayerBackend::~MpvPlayerBackend() @@ -157,53 +142,44 @@ MpvPlayerBackend::~MpvPlayerBackend() mpv_terminate_destroy(mpv); } -void -MpvPlayerBackend::on_update(void* ctx) +void MpvPlayerBackend::on_update(void* ctx) { MpvPlayerBackend* self = (MpvPlayerBackend*)ctx; emit self->onUpdate(); } -void -MpvPlayerBackend::doUpdate() +void MpvPlayerBackend::doUpdate() { update(); } -QVariant -MpvPlayerBackend::getProperty(const QString& name) const +QVariant MpvPlayerBackend::getProperty(const QString& name) const { return mpv::qt::get_property_variant(mpv, name); } -void -MpvPlayerBackend::command(const QVariant& params) +void MpvPlayerBackend::command(const QVariant& params) { mpv::qt::command_variant(mpv, params); } -void -MpvPlayerBackend::setProperty(const QString& name, const QVariant& value) +void MpvPlayerBackend::setProperty(const QString& name, const QVariant& value) { mpv::qt::set_property_variant(mpv, name, value); } -void -MpvPlayerBackend::setOption(const QString& name, const QVariant& value) +void MpvPlayerBackend::setOption(const QString& name, const QVariant& value) { mpv::qt::set_option_variant(mpv, name, value); } -void -MpvPlayerBackend::launchAboutQt() +void MpvPlayerBackend::launchAboutQt() { - QApplication* qapp = - qobject_cast(QCoreApplication::instance()); + QApplication* qapp = qobject_cast(QCoreApplication::instance()); qapp->aboutQt(); } -QVariant -MpvPlayerBackend::getaudioDevices() const +QVariant MpvPlayerBackend::getaudioDevices() const { QVariant drivers = getProperty("audio-device-list"); QVariant currentDevice = getProperty("audio-device"); @@ -224,111 +200,94 @@ MpvPlayerBackend::getaudioDevices() const return QVariant(newDrivers); } -void -MpvPlayerBackend::setAudioDevice(const QString& name) +void MpvPlayerBackend::setAudioDevice(const QString& name) { setProperty("audio-device", name); } -void -MpvPlayerBackend::togglePlayPause() +void MpvPlayerBackend::togglePlayPause() { command(QVariantList() << "cycle" << "pause"); } -void -MpvPlayerBackend::toggleMute() +void MpvPlayerBackend::toggleMute() { command(QVariantList() << "cycle" << "mute"); } -void -MpvPlayerBackend::nextAudioTrack() +void MpvPlayerBackend::nextAudioTrack() { command(QVariantList() << "cycle" << "audio"); } -void -MpvPlayerBackend::nextSubtitleTrack() +void MpvPlayerBackend::nextSubtitleTrack() { command(QVariantList() << "cycle" << "sub"); } -void -MpvPlayerBackend::nextVideoTrack() +void MpvPlayerBackend::nextVideoTrack() { command(QVariantList() << "cycle" << "video"); } -void -MpvPlayerBackend::prevPlaylistItem() +void MpvPlayerBackend::prevPlaylistItem() { command(QVariantList() << "playlist-prev"); } -void -MpvPlayerBackend::nextPlaylistItem() +void MpvPlayerBackend::nextPlaylistItem() { command(QVariantList() << "playlist-next" << "force"); } -void -MpvPlayerBackend::loadFile(const QVariant& filename) +void MpvPlayerBackend::loadFile(const QVariant& filename) { command(QVariantList() << "loadfile" << filename); } -void -MpvPlayerBackend::setVolume(const QVariant& volume) +void MpvPlayerBackend::setVolume(const QVariant& volume) { command(QVariantList() << "set" << "volume" << volume); } -void -MpvPlayerBackend::addVolume(const QVariant& volume) +void MpvPlayerBackend::addVolume(const QVariant& volume) { command(QVariantList() << "add" << "volume" << volume); } -void -MpvPlayerBackend::seekAbsolute(const QVariant& seekTime) +void MpvPlayerBackend::seekAbsolute(const QVariant& seekTime) { command(QVariantList() << "seek" << seekTime << "absolute"); } -void -MpvPlayerBackend::seek(const QVariant& seekTime) +void MpvPlayerBackend::seek(const QVariant& seekTime) { command(QVariantList() << "seek" << seekTime); } -QVariant -MpvPlayerBackend::getTracks() const +QVariant MpvPlayerBackend::getTracks() const { return mpv::qt::get_property_variant(mpv, "track-list"); } -void -MpvPlayerBackend::setTrack(const QVariant& track, const QVariant& id) +void MpvPlayerBackend::setTrack(const QVariant& track, const QVariant& id) { command(QVariantList() << "set" << track << id); } -QVariant -MpvPlayerBackend::getTrack(const QString& track) +QVariant MpvPlayerBackend::getTrack(const QString& track) { return mpv::qt::get_property_variant(mpv, track); } -QVariant -MpvPlayerBackend::createTimestamp(const QVariant& seconds) const +QVariant MpvPlayerBackend::createTimestamp(const QVariant& seconds) const { int d = seconds.toInt(); double h = floor(d / 3600); @@ -336,60 +295,50 @@ MpvPlayerBackend::createTimestamp(const QVariant& seconds) const double s = floor(d % 3600 % 60); QString hour = h > 0 ? QString::number(h) + ":" : ""; - QString minute = h < 1 ? QString::number(m) + ":" - : (m < 10 ? "0" + QString::number(m) + ":" - : QString::number(m) + ":"); + QString minute = + h < 1 ? QString::number(m) + ":" : (m < 10 ? "0" + QString::number(m) + ":" : QString::number(m) + ":"); QString second = s < 10 ? "0" + QString::number(s) : QString::number(s); return hour + minute + second; } -void -MpvPlayerBackend::toggleOnTop() +void MpvPlayerBackend::toggleOnTop() { onTop = !onTop; AlwaysOnTop(window()->winId(), onTop); } -void -MpvPlayerBackend::toggleStats() +void MpvPlayerBackend::toggleStats() { command(QVariantList() << "script-binding" << "stats/display-stats-toggle"); } -void -MpvPlayerBackend::addSpeed(const QVariant& speed) +void MpvPlayerBackend::addSpeed(const QVariant& speed) { - QString speedString = - QString::number(getProperty("speed").toDouble() + speed.toDouble()); + QString speedString = QString::number(getProperty("speed").toDouble() + speed.toDouble()); speedString = speedString.left(speedString.lastIndexOf('.') + 2); setSpeed(QVariant(speedString)); } -void -MpvPlayerBackend::subtractSpeed(const QVariant& speed) +void MpvPlayerBackend::subtractSpeed(const QVariant& speed) { - QString speedString = - QString::number(getProperty("speed").toDouble() - speed.toDouble()); + QString speedString = QString::number(getProperty("speed").toDouble() - speed.toDouble()); speedString = speedString.left(speedString.lastIndexOf('.') + 2); setSpeed(QVariant(speedString)); } -void -MpvPlayerBackend::changeSpeed(const QVariant& speedFactor) +void MpvPlayerBackend::changeSpeed(const QVariant& speedFactor) { setSpeed(QVariant(getProperty("speed").toDouble() * speedFactor.toDouble())); } -void -MpvPlayerBackend::setSpeed(const QVariant& speed) +void MpvPlayerBackend::setSpeed(const QVariant& speed) { command(QVariantList() << "set" << "speed" << speed.toString()); } -void -MpvPlayerBackend::on_mpv_events() +void MpvPlayerBackend::on_mpv_events() { while (mpv) { mpv_event* event = mpv_wait_event(mpv, 0); @@ -400,19 +349,17 @@ MpvPlayerBackend::on_mpv_events() } } -void -MpvPlayerBackend::updateDurationStringText() +void MpvPlayerBackend::updateDurationStringText() { findChild("timeLabel") - ->setProperty("text", - QString("%1 / %2 (%3x)") - .arg(createTimestamp(getProperty("time-pos")).toString(), - createTimestamp(getProperty("duration")).toString(), - getProperty("speed").toString())); + ->setProperty("text", + QString("%1 / %2 (%3x)") + .arg(createTimestamp(getProperty("time-pos")).toString(), + createTimestamp(getProperty("duration")).toString(), + getProperty("speed").toString())); } -void -MpvPlayerBackend::updatePrev(const QVariant& val) +void MpvPlayerBackend::updatePrev(const QVariant& val) { if (val.toDouble() != 0) { findChild("playlistPrevButton")->setProperty("visible", true); @@ -421,37 +368,29 @@ MpvPlayerBackend::updatePrev(const QVariant& val) } } -void -MpvPlayerBackend::updateVolume(const QVariant& val) +void MpvPlayerBackend::updateVolume(const QVariant& val) { if (getProperty("mute").toBool() || (val.toDouble() == 0)) { - findChild("volumeButton") - ->setProperty("iconSource", "qrc:/player/icons/volume-mute.svg"); + findChild("volumeButton")->setProperty("iconSource", "qrc:/player/icons/volume-mute.svg"); } else { if (val.toDouble() < 25) { - findChild("volumeButton") - ->setProperty("iconSource", "qrc:/player/icons/volume-down.svg"); + findChild("volumeButton")->setProperty("iconSource", "qrc:/player/icons/volume-down.svg"); } else { - findChild("volumeButton") - ->setProperty("iconSource", "qrc:/player/icons/volume-up.svg"); + findChild("volumeButton")->setProperty("iconSource", "qrc:/player/icons/volume-up.svg"); } } } -void -MpvPlayerBackend::updatePlayPause(const QVariant& val) +void MpvPlayerBackend::updatePlayPause(const QVariant& val) { if (val.toBool()) { - findChild("playPauseButton") - ->setProperty("iconSource", "qrc:/player/icons/play.svg"); + findChild("playPauseButton")->setProperty("iconSource", "qrc:/player/icons/play.svg"); } else { - findChild("playPauseButton") - ->setProperty("iconSource", "qrc:/player/icons/pause.svg"); + findChild("playPauseButton")->setProperty("iconSource", "qrc:/player/icons/pause.svg"); } } -void -MpvPlayerBackend::handle_mpv_event(mpv_event* event) +void MpvPlayerBackend::handle_mpv_event(mpv_event* event) { switch (event->event_id) { case MPV_EVENT_PROPERTY_CHANGE: { @@ -488,8 +427,7 @@ MpvPlayerBackend::handle_mpv_event(mpv_event* event) } else if (strcmp(prop->name, "demuxer-cache-duration") == 0) { if (prop->format == MPV_FORMAT_DOUBLE) { double duration = *(double*)prop->data; - QMetaObject::invokeMethod( - this, "setCachedDuration", Q_ARG(QVariant, duration)); + QMetaObject::invokeMethod(this, "setCachedDuration", Q_ARG(QVariant, duration)); } } else if (strcmp(prop->name, "playlist-pos") == 0) { if (prop->format == MPV_FORMAT_DOUBLE) { @@ -516,8 +454,7 @@ MpvPlayerBackend::handle_mpv_event(mpv_event* event) } } -QQuickFramebufferObject::Renderer* -MpvPlayerBackend::createRenderer() const +QQuickFramebufferObject::Renderer* MpvPlayerBackend::createRenderer() const { window()->setPersistentOpenGLContext(true); window()->setPersistentSceneGraph(true); diff --git a/src/main.cpp b/src/main.cpp index 9d336d8..15f23af 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,8 +16,7 @@ #include "setenv_mingw.hpp" #endif -int -main(int argc, char* argv[]) +int main(int argc, char* argv[]) { setenv("QT_QUICK_CONTROLS_STYLE", "Desktop", 1); QApplication app(argc, argv); @@ -26,15 +25,10 @@ main(int argc, char* argv[]) app.setApplicationName("KittehPlayer"); for (int i = 1; i < argc; ++i) { if (!qstrcmp(argv[i], "--update")) { - QString program = - QProcessEnvironment::systemEnvironment().value("APPDIR", "") + - "/usr/bin/appimageupdatetool"; + QString program = QProcessEnvironment::systemEnvironment().value("APPDIR", "") + "/usr/bin/appimageupdatetool"; QProcess updater; updater.setProcessChannelMode(QProcess::ForwardedChannels); - updater.start(program, - QStringList() - << QProcessEnvironment::systemEnvironment().value( - "APPIMAGE", "")); + updater.start(program, QStringList() << QProcessEnvironment::systemEnvironment().value("APPIMAGE", "")); updater.waitForFinished(); exit(0); } @@ -42,9 +36,8 @@ main(int argc, char* argv[]) SetDPMS(false); - QString newpath = - QProcessEnvironment::systemEnvironment().value("APPDIR", "") + - "/usr/bin:" + QProcessEnvironment::systemEnvironment().value("PATH", ""); + QString newpath = QProcessEnvironment::systemEnvironment().value("APPDIR", "") + + "/usr/bin:" + QProcessEnvironment::systemEnvironment().value("PATH", ""); setenv("PATH", newpath.toUtf8().constData(), 1); QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); diff --git a/src/setenv_mingw.hpp b/src/setenv_mingw.hpp index b547c64..a5c2ed5 100644 --- a/src/setenv_mingw.hpp +++ b/src/setenv_mingw.hpp @@ -36,8 +36,7 @@ #include #include -int -setenv(const char* var, const char* value, int overwrite) +int setenv(const char* var, const char* value, int overwrite) { /* Core implementation for both setenv() and unsetenv() functions; * at the outset, assume that the requested operation may fail. diff --git a/src/utils.cpp b/src/utils.cpp index b2d92e0..9ba4856 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -4,11 +4,9 @@ #include #include -QString -getPlatformName() +QString getPlatformName() { - QGuiApplication* qapp = - qobject_cast(QCoreApplication::instance()); + QGuiApplication* qapp = qobject_cast(QCoreApplication::instance()); return qapp->platformName(); } @@ -20,8 +18,7 @@ getPlatformName() #include #include -void -SetDPMS(bool on) +void SetDPMS(bool on) { qDebug() << getPlatformName(); if (getPlatformName() != "xcb") { @@ -37,8 +34,7 @@ SetDPMS(bool on) } } -void -AlwaysOnTop(WId wid, bool on) +void AlwaysOnTop(WId wid, bool on) { qDebug() << "On Top:" << on; Display* display = QX11Info::display(); @@ -57,23 +53,17 @@ AlwaysOnTop(WId wid, bool on) event.xclient.data.l[3] = 0; event.xclient.data.l[4] = 0; - XSendEvent(display, - DefaultRootWindow(display), - False, - SubstructureRedirectMask | SubstructureNotifyMask, - &event); + XSendEvent(display, DefaultRootWindow(display), False, SubstructureRedirectMask | SubstructureNotifyMask, &event); } #else -void -AlwaysOnTop(WId wid, bool on) +void AlwaysOnTop(WId wid, bool on) { qDebug() << "Can't set on top for platform: " << getPlatformName(); } -void -SetDPMS(bool on) +void SetDPMS(bool on) { qDebug() << "Can't set DPMS for platform: " << getPlatformName(); } diff --git a/src/utils.hpp b/src/utils.hpp index 8af9fff..7082c90 100644 --- a/src/utils.hpp +++ b/src/utils.hpp @@ -3,9 +3,7 @@ #include #include -void -SetDPMS(bool on); -void -AlwaysOnTop(WId wid, bool on); +void SetDPMS(bool on); +void AlwaysOnTop(WId wid, bool on); #endif