Merge 6c63ba45b6 into 160402e1d0

Consistently use README and no CRLF
move audio files to src/audio
2024-11-27 19:24:08 +00:00 · 2024-11-11 09:15:53 +08:00 · 2024-11-10 17:39:43 -05:00 · 2024-11-10 17:39:43 -05:00
20 changed files with 83 additions and 80 deletions
--- a/icons/README.txt
+++ b/icons/README.txt
--- a/icons/flags/00readme.txt
+++ b/icons/flags/00readme.txt
--- a/src/audio/README.md
+++ b/src/audio/README.md
@ -0,0 +1,3 @@
+Code to support GD's internal/external audio players.
+
+Only `audioplayerinterface.hh` is supposed to be used outside this folder.
--- a/src/audio/audiooutput.cc
+++ b/src/audio/audiooutput.cc
--- a/src/audio/audiooutput.hh
+++ b/src/audio/audiooutput.hh
--- a/src/audio/audioplayerfactory.cc
+++ b/src/audio/audioplayerfactory.cc
--- a/src/audio/audioplayerfactory.hh
+++ b/src/audio/audioplayerfactory.hh
--- a/src/audio/audioplayerinterface.hh
+++ b/src/audio/audioplayerinterface.hh
--- a/src/audio/externalaudioplayer.cc
+++ b/src/audio/externalaudioplayer.cc
--- a/src/audio/externalaudioplayer.hh
+++ b/src/audio/externalaudioplayer.hh
--- a/src/audio/ffmpegaudio.cc
+++ b/src/audio/ffmpegaudio.cc
--- a/src/audio/ffmpegaudio.hh
+++ b/src/audio/ffmpegaudio.hh
--- a/src/audio/ffmpegaudioplayer.hh
+++ b/src/audio/ffmpegaudioplayer.hh
--- a/src/audio/multimediaaudioplayer.cc
+++ b/src/audio/multimediaaudioplayer.cc
--- a/src/audio/multimediaaudioplayer.hh
+++ b/src/audio/multimediaaudioplayer.hh
--- a/src/scripts/README.md
+++ b/src/scripts/README.md
--- a/src/ui/articleview.hh
+++ b/src/ui/articleview.hh
@ -10,7 +10,7 @@
 #include <QWebEngineView>
 #include <list>
 #include "article_netmgr.hh"
-#include "audioplayerinterface.hh"
+#include "audio/audioplayerinterface.hh"
 #include "instances.hh"
 #include "groupcombobox.hh"
 #include "globalbroadcaster.hh"
--- a/src/ui/mainwindow.hh
+++ b/src/ui/mainwindow.hh
@ -14,7 +14,7 @@
 #include "config.hh"
 #include "dict/dictionary.hh"
 #include "article_netmgr.hh"
-#include "audioplayerfactory.hh"
+#include "audio/audioplayerfactory.hh"
 #include "instances.hh"
 #include "article_maker.hh"
 #include "scanpopup.hh"
--- a/thirdparty/fmt/README_about_upgrade.md
+++ b/thirdparty/fmt/README_about_upgrade.md
--- a/tools/generators/readme.txt
+++ b/tools/generators/readme.txt
Author	SHA1	Message	Date
xiaoyifang	2d0a5752c1	Merge `6c63ba45b6` into `160402e1d0`	2024-11-11 09:15:53 +08:00
shenleban tongying	160402e1d0	Consistently use README and no CRLF Some checks are pending SonarCloud / Build and analyze (push) Waiting to run Details	2024-11-10 17:39:43 -05:00
shenleban tongying	fb48f66370	move audio files to src/audio a	2024-11-10 17:39:43 -05:00