Convert includes to specify directory. (libmyth)

MythTV · May 3, 2022 · 6d705b5 · 6d705b5
1 parent a74721b
commit 6d705b5
Show file tree

Hide file tree

Showing 52 changed files with 282 additions and 284 deletions.
diff --git a/mythtv/libs/libmyth/audio/audioconvert.cpp b/mythtv/libs/libmyth/audio/audioconvert.cpp
@@ -22,10 +22,9 @@
  */
 #include "audioconvert.h"
 
-#include <cstdint>
-#include <cmath>
-
 #include <algorithm>
+#include <cmath>
+#include <cstdint>
 
 // FFmpeg
 extern "C" {
@@ -35,7 +34,8 @@ extern "C" {
 
 #include <QtGlobal>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
+
 #include "mythaverror.h"
 
 #define LOC QString("AudioConvert: ")

diff --git a/mythtv/libs/libmyth/audio/audiooutput.cpp b/mythtv/libs/libmyth/audio/audiooutput.cpp
@@ -7,10 +7,10 @@
 #include <QDateTime>
 #include <QDir>
 
-#include "audiooutput.h"
-#include "mythmiscutil.h"
-#include "compat.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythmiscutil.h"
 
+#include "audiooutput.h"
 #include "audiooutputnull.h"
 #ifdef _WIN32
 #include "audiooutputdx.h"

diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp
@@ -5,7 +5,7 @@
 #include <sys/time.h>
 
 #include <QFile>
-#include "mythcorecontext.h"
+#include "libmythbase/mythcorecontext.h"
 #include "audiooutputalsa.h"
 
 #define LOC QString("ALSA: ")

diff --git a/mythtv/libs/libmyth/audio/audiooutputaudiotrack.cpp b/mythtv/libs/libmyth/audio/audiooutputaudiotrack.cpp
@@ -2,7 +2,7 @@
 #include <QAndroidJniEnvironment>
 #include <android/log.h>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
 #include "audiooutputaudiotrack.h"
 
 #define CHANNELS_MIN 1

diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
@@ -2,6 +2,7 @@
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <SoundTouch.h>
 
 // POSIX headers
 #include <unistd.h>
@@ -12,16 +13,16 @@
 #include <QMutexLocker>
 
 // MythTV headers
-#include "compat.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythconfig.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythfreesurround/freesurround.h"
+
 #include "audiooutputbase.h"
 #include "audiooutputdigitalencoder.h"
-#include "audiooutpututil.h"
 #include "audiooutputdownmix.h"
-#include "SoundTouch.h"
-#include "freesurround.h"
+#include "audiooutpututil.h"
 #include "spdifencoder.h"
-#include "mythlogging.h"
-#include "mythconfig.h"
 
 // AC3 encode currently disabled for Android
 #if defined(Q_OS_ANDROID)

diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.h b/mythtv/libs/libmyth/audio/audiooutputbase.h
@@ -10,10 +10,10 @@
 #include <QWaitCondition>
 
 // MythTV headers
-#include "audiooutput.h"
-#include "mythlogging.h"
-#include "mthread.h"
+#include "libmythbase/mthread.h"
+#include "libmythbase/mythlogging.h"
 
+#include "audiooutput.h"
 #include "samplerate.h"
 
 #define VBAUDIO(str)   LOG(VB_AUDIO, LOG_INFO, LOC + (str))

diff --git a/mythtv/libs/libmyth/audio/audiooutputca.cpp b/mythtv/libs/libmyth/audio/audiooutputca.cpp
@@ -12,6 +12,8 @@
  * Jeremiah Morris, Andrew Kimpton, Nigel Pearson, Jean-Yves Avenard
  *****************************************************************************/
 
+#include <SoundTouch.h>
+
 #include <array>
 #include <vector>
 
@@ -21,9 +23,8 @@
 #include <AudioToolbox/AudioFormat.h>
 #include <AvailabilityMacros.h>
 
-#include "mythcorecontext.h"
+#include "libmythbase/mythcorecontext.h"
 #include "audiooutputca.h"
-#include "SoundTouch.h"
 
 #if !defined(MAC_OS_VERSION_12_0)
 #define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster

diff --git a/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp b/mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
@@ -3,19 +3,19 @@
 #include <cstring>
 #include <unistd.h>
 
-#include "mythcorecontext.h"
-
 // libav headers
 extern "C" {
 #include "libavutil/mem.h" // for av_free
 #include "libavcodec/avcodec.h"
 }
 
 // MythTV headers
+#include "libmythbase/compat.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythlogging.h"
+
 #include "audiooutputdigitalencoder.h"
 #include "audiooutpututil.h"
-#include "compat.h"
-#include "mythlogging.h"
 
 #define LOC QString("DEnc: ")
 

diff --git a/mythtv/libs/libmyth/audio/audiooutputdx.cpp b/mythtv/libs/libmyth/audio/audiooutputdx.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <cmath>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
 #include "audiooutputdx.h"
 
 #include <windows.h>

diff --git a/mythtv/libs/libmyth/audio/audiooutputgraph.cpp b/mythtv/libs/libmyth/audio/audiooutputgraph.cpp
@@ -1,3 +1,8 @@
+// Std
+#include <climits>
+#include <cmath>
+#include <cstdint>
+
 // Qt
 #include <QtGlobal>
 #include <QImage>
@@ -6,16 +11,12 @@
 #include <QMutexLocker>
 
 // MythTV
-#include "audiooutputgraph.h"
-#include "mythlogging.h"
-#include "mythpainter.h"
-#include "mythimage.h"
-#include "compat.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythui/mythimage.h"
+#include "libmythui/mythpainter.h"
 
-// Std
-#include <climits>
-#include <cmath>
-#include <cstdint>
+#include "audiooutputgraph.h"
 
 using namespace std::chrono_literals;
 

diff --git a/mythtv/libs/libmyth/audio/audiooutputgraph.h b/mythtv/libs/libmyth/audio/audiooutputgraph.h
@@ -5,8 +5,8 @@
 #include <QMutex>
 
 // MythTV
-#include "mythexp.h"
-#include "visual.h"
+#include "libmyth/mythexp.h"
+#include "libmyth/visual.h"
 
 class MythImage;
 class MythPainter;

diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.cpp b/mythtv/libs/libmyth/audio/audiooutputjack.cpp
@@ -27,11 +27,10 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include <iostream>
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythdate.h"
 
-#include "mythcorecontext.h"
 #include "audiooutputjack.h"
-#include "mythdate.h"
 
 #define LOC QString("AOJack: ")
 

diff --git a/mythtv/libs/libmyth/audio/audiooutputnull.cpp b/mythtv/libs/libmyth/audio/audiooutputnull.cpp
@@ -10,10 +10,10 @@
 #ifndef _WIN32
 #include <sys/ioctl.h>
 #else
-#include "compat.h"
+#include "libmythbase/compat.h"
 #endif
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
 #include "audiooutputnull.h"
 
 #define CHANNELS_MIN 1

diff --git a/mythtv/libs/libmyth/audio/audiooutputopensles.cpp b/mythtv/libs/libmyth/audio/audiooutputopensles.cpp
@@ -4,7 +4,7 @@
 
 #include <QAndroidJniEnvironment>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
 #include "audiooutputopensles.h"
 
 

diff --git a/mythtv/libs/libmyth/audio/audiooutputoss.cpp b/mythtv/libs/libmyth/audio/audiooutputoss.cpp
@@ -9,14 +9,14 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "mythconfig.h"
+#include "libmythbase/mythconfig.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythdate.h"
+#include "libmythbase/mythtimer.h"
 
-#define LOC      QString("AOOSS: ")
-
-#include "mythcorecontext.h"
 #include "audiooutputoss.h"
-#include "mythtimer.h"
-#include "mythdate.h"
+
+#define LOC      QString("AOOSS: ")
 
 AudioOutputOSS::AudioOutputOSS(const AudioSettings &settings) :
     AudioOutputBase(settings)

diff --git a/mythtv/libs/libmyth/audio/audiooutputsettings.cpp b/mythtv/libs/libmyth/audio/audiooutputsettings.cpp
@@ -9,14 +9,15 @@
 #include <algorithm>
 #include <vector>
 
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythlogging.h"
+
 #include "audiooutputsettings.h"
-#include "mythlogging.h"
-#include "mythcorecontext.h"
+#include "eldutils.h"
 
 extern "C" {
 #include "libavutil/avutil.h"    // to check version of libavformat
 }
-#include "eldutils.h"
 
 #define LOC QString("AOS: ")
 

diff --git a/mythtv/libs/libmyth/audio/audiooutpututil.cpp b/mythtv/libs/libmyth/audio/audiooutpututil.cpp
@@ -5,7 +5,8 @@
 #include <QtGlobal>
 #include <QtEndian>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
+
 #include "audioconvert.h"
 #include "mythaverror.h"
 

diff --git a/mythtv/libs/libmyth/audio/audiooutputwin.cpp b/mythtv/libs/libmyth/audio/audiooutputwin.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include "mythlogging.h"
+#include "libmythbase/mythlogging.h"
 #include "audiooutputwin.h"
 
 #include <windows.h>

diff --git a/mythtv/libs/libmyth/audio/audiopulsehandler.cpp b/mythtv/libs/libmyth/audio/audiopulsehandler.cpp
@@ -5,10 +5,11 @@
 
 #include <unistd.h> // for usleep
 
+#include "libmythbase/mythmiscutil.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mthread.h"
+
 #include "audiopulsehandler.h"
-#include "mythmiscutil.h"
-#include "mythlogging.h"
-#include "mthread.h"
 
 #define LOC QString("Pulse: ")
 

diff --git a/mythtv/libs/libmyth/audio/spdifencoder.cpp b/mythtv/libs/libmyth/audio/spdifencoder.cpp
@@ -1,8 +1,9 @@
-#include "mythcorecontext.h"
+#include "libmythbase/compat.h"
+#include "libmythbase/mythcorecontext.h"
+#include "libmythbase/mythlogging.h"
 
-#include "compat.h"
 #include "spdifencoder.h"
-#include "mythlogging.h"
+
 extern "C" {
 #include "libavformat/avformat.h"
 #include "libavutil/opt.h"

diff --git a/mythtv/libs/libmyth/audio/spdifencoder.h b/mythtv/libs/libmyth/audio/spdifencoder.h
@@ -3,8 +3,8 @@
 
 #include <QString>
 
-#include "output.h"
-#include "audiooutput.h"
+#include "libmyth/output.h"
+#include "libmyth/audio/audiooutput.h"
 
 extern "C" {
 #include "libavcodec/avcodec.h"

diff --git a/mythtv/libs/libmyth/audio/volumebase.cpp b/mythtv/libs/libmyth/audio/volumebase.cpp
@@ -7,9 +7,10 @@
 #include <QMutex>
 #include <QMutexLocker>
 
+#include "libmythbase/mthread.h"
+#include "libmythbase/mythcorecontext.h"
+
 #include "volumebase.h"
-#include "mythcorecontext.h"
-#include "mthread.h"
 
 
 namespace {

diff --git a/mythtv/libs/libmyth/backendselect.cpp b/mythtv/libs/libmyth/backendselect.cpp
@@ -2,16 +2,17 @@
 
 #include <QEventLoop>
 
-#include "mythuistatetype.h"
-#include "mythmainwindow.h"
-#include "mythdialogbox.h"
+#include "libmythbase/configuration.h"
+#include "libmythbase/mythlogging.h"
+#include "libmythbase/mythversion.h"
+#include "libmythui/mythdialogbox.h"
+#include "libmythui/mythmainwindow.h"
+#include "libmythui/mythuibutton.h"
+#include "libmythui/mythuibuttonlist.h"
+#include "libmythui/mythuistatetype.h"
+#include "libmythupnp/mythxmlclient.h"
+
 #include "backendselect.h"
-#include "configuration.h"
-#include "mythxmlclient.h"
-#include "mythuibuttonlist.h"
-#include "mythuibutton.h"
-#include "mythlogging.h"
-#include "mythversion.h"
 
 BackendSelection::BackendSelection(
     MythScreenStack *parent, DatabaseParams *params,

diff --git a/mythtv/libs/libmyth/backendselect.h b/mythtv/libs/libmyth/backendselect.h
@@ -3,11 +3,10 @@
 
 #include <QMutex>
 
-// libmythui
-#include "mythscreentype.h"
-
-#include "configuration.h"
-#include "upnpdevice.h"
+// MythTV
+#include "libmythbase/configuration.h"
+#include "libmythui/mythscreentype.h"
+#include "libmythupnp/upnpdevice.h"
 
 class QEventLoop;
 class MythUIButtonList;

diff --git a/mythtv/libs/libmyth/dbsettings.cpp b/mythtv/libs/libmyth/dbsettings.cpp
@@ -4,10 +4,11 @@
 #include <QObject>
 
 // MythTV headers
+#include "libmythbase/mythdbcon.h"
+#include "libmythbase/mythdbparams.h"
+
 #include "dbsettings.h"
 #include "mythcontext.h"
-#include "mythdbcon.h"
-#include "mythdbparams.h"
 
 DatabaseSettings::DatabaseSettings(const QString &DBhostOverride)
 {