Skip to content

Commit d2a970c

Browse files
author
justforlxz.com
committed
optimize: remove libdmr when disable video
程序启动需要时间加载mpv,但是禁用视频的情况下是不需要加载的。
1 parent cf86de9 commit d2a970c

5 files changed

Lines changed: 19 additions & 2 deletions

File tree

dde-introduction.debug

11.1 MB
Binary file not shown.

dde-introduction.pro

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ INSTALLS += desktop target icon qm_files
8181

8282
host_mips64 | host_sw_64 | host_aarch64: {
8383
DEFINES += DISABLE_VIDEO
84+
HEADERS -= src/modules/videowidget.h
85+
SOURCES -= src/modules/videowidget.cpp
86+
PKGCONFIG -= libdmr
8487
}
8588

8689
deepin_professional {

src/main.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,19 @@
2222
#include <QDebug>
2323
#include <DWidgetUtil>
2424
#include <DPlatformWindowHandle>
25+
26+
#ifndef DISABLE_VIDEO
2527
#include <compositing_manager.h>
28+
#endif
2629

2730
DWIDGET_USE_NAMESPACE
2831

2932
int main(int argc, char *argv[])
3033
{
34+
#ifndef DISABLE_VIDEO
3135
qputenv("DXCB_FAKE_PLATFORM_NAME_XCB", "TRUE");
36+
#endif
37+
3238
DApplication::loadDXcbPlugin();
3339
DApplication a(argc, argv);
3440
a.setApplicationName("dde-introduction");
@@ -45,10 +51,12 @@ int main(int argc, char *argv[])
4551
a.setApplicationVersion(DApplication::buildVersion("1.0"));
4652
a.loadTranslator();
4753

54+
#ifndef DISABLE_VIDEO
4855
setlocale(LC_NUMERIC, "C");
4956

5057
// 强制不使用嵌入mpv窗口的模式
5158
dmr::CompositingManager::get().overrideCompositeMode(true);
59+
#endif
5260

5361
MainWindow w;
5462

src/mainwindow.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818

1919
#include "mainwindow.h"
20-
#include "modules/videowidget.h"
2120
#include "modules/desktopmodemodule.h"
2221
#include "modules/wmmodemodule.h"
2322
#include "modules/iconmodule.h"
@@ -29,6 +28,10 @@
2928
#include <DTitlebar>
3029
#include <DPlatformWindowHandle>
3130

31+
#ifndef DISABLE_VIDEO
32+
#include "modules/videowidget.h"
33+
#endif
34+
3235
DWIDGET_USE_NAMESPACE
3336

3437
static const QSize WINDOW_SIZE { 700, 450 };

src/modules/normalmodule.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121
#include "desktopmodemodule.h"
2222
#include "iconmodule.h"
2323
#include "wmmodemodule.h"
24-
#include "videowidget.h"
2524
#include "support.h"
2625
#include "about.h"
2726
#include "photoslide.h"
2827
#include "../widgets/bottomnavigation.h"
2928

29+
#ifndef DISABLE_VIDEO
30+
#include "videowidget.h"
31+
#endif
32+
3033
NormalModule::NormalModule(QWidget *parent)
3134
: QWidget(parent)
3235
, m_leftNavigationLayout(new QVBoxLayout)

0 commit comments

Comments
 (0)