[*] 优化

acgist · Feb 26, 2024 · 3f936c2 · 3f936c2
1 parent af468d2
commit 3f936c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 41 deletions.
diff --git a/boot/main/src/header/Window.hpp b/boot/main/src/header/Window.hpp
@@ -69,52 +69,25 @@ class PoetryGCWindow;
 class PoetryTSWindow;
 class AboutWindow;
 
+#ifndef MEDIA_MODULE
+#define MEDIA_MODULE(mediaTypeLower, mediaTypeUpper)                     \
+    Fl_Button* ##mediaTypeLower##GcPtr = nullptr;                        \
+    Fl_Button* ##mediaTypeLower##TsPtr = nullptr;                        \
+    ##mediaTypeUpper##GCWindow* ##mediaTypeLower##GcWindowPtr = nullptr; \
+    ##mediaTypeUpper##GCWindow* ##mediaTypeLower##TsWindowPtr = nullptr; \
+    Fl_Group* ##mediaTypeLower##GroupPtr = nullptr;
+#endif
+
 /**
  * 主窗口
  */
 class MainWindow : public LFRWindow {
 
 private:
-    // AudioGC按钮
-    Fl_Button* audioGcPtr = nullptr;
-    // AudioTS按钮
-    Fl_Button* audioTsPtr = nullptr;
-    // AudioGC窗口
-    AudioGCWindow* audioGcWindowPtr = nullptr;
-    // AudioTS窗口
-    AudioGCWindow* audioTsWindowPtr = nullptr;
-    // Audio分组
-    Fl_Group* audioGroupPtr = nullptr;
-    // ImageGC按钮
-    Fl_Button* imageGcPtr = nullptr;
-    // ImageTS按钮
-    Fl_Button* imageTsPtr = nullptr;
-    // ImageGC窗口
-    ImageGCWindow* imageGcWindowPtr = nullptr;
-    // ImageTS窗口
-    ImageGCWindow* imageTsWindowPtr = nullptr;
-    // Image分组
-    Fl_Group* imageGroupPtr = nullptr;
-    // VideoGC按钮
-    Fl_Button* videoGcPtr = nullptr;
-    // VideoTS按钮
-    Fl_Button* videoTsPtr = nullptr;
-    // VideoGC窗口
-    VideoGCWindow* videoGcWindowPtr = nullptr;
-    // VideoTS窗口
-    VideoGCWindow* videoTsWindowPtr = nullptr;
-    // Video分组
-    Fl_Group* videoGroupPtr = nullptr;
-    // PoetryGC按钮
-    Fl_Button* poetryGcPtr = nullptr;
-    // PoetryTS按钮
-    Fl_Button* poetryTsPtr = nullptr;
-    // PoetryGC窗口
-    PoetryGCWindow* poetryGcWindowPtr = nullptr;
-    // PoetryTS窗口
-    PoetryTSWindow* poetryTsWindowPtr = nullptr;
-    // Poetry分组
-    Fl_Group* poetryGroupPtr = nullptr;
+    MEDIA_MODULE(audio, Audio);
+    MEDIA_MODULE(image, Image);
+    MEDIA_MODULE(video, Video);
+    MEDIA_MODULE(poetry, Poetry);
     // 关于按钮
     Fl_Button* aboutButtonPtr = nullptr;
     // 关于窗口

diff --git a/boot/main/src/source/AboutWindow.cpp b/boot/main/src/source/AboutWindow.cpp
@@ -8,8 +8,9 @@ lifuren::AboutWindow::AboutWindow(int width, int height, const char* titlePtr) :
 lifuren::AboutWindow::~AboutWindow() {
     SPDLOG_DEBUG("关闭AboutWindow");
     DELETE_PTR(homePagePtr);
-    DELETE_PTR(aboutBufferPtr);
+    // 注意顺序：display->buffer
     DELETE_PTR(aboutDisplayPtr);
+    DELETE_PTR(aboutBufferPtr);
 }
 
 void lifuren::AboutWindow::drawElement() {