Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-01-30 09:05:04 +01:00
Code Issues Releases Wiki Activity

Include cstddef before libcdio includes

Browse Source 
Fixes #1610
This commit is contained in:
Jonas Kvinge 2024-11-29 22:50:49 +01:00
parent 2548b4648e
commit d396cb515d
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/device/cddadevice.h
View File

@ -24,9 +24,6 @@
#include "config.h" #include "config.h"
#include <cdio/cdio.h>
#include <gst/audio/gstaudiocdsrc.h>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>

9
src/device/cddalister.cpp
View File

@ -21,6 +21,11 @@
#include <config.h> #include <config.h>
#include <cstddef>
#include <cdio/cdio.h>
#include <cdio/device.h>
#include <QtGlobal> #include <QtGlobal>
#include <QFileInfo> #include <QFileInfo>
#include <QByteArray> #include <QByteArray>
@ -30,10 +35,6 @@
#include <QRegularExpression> #include <QRegularExpression>
#include <QUrl> #include <QUrl>
// This must come after Qt includes
#include <cdio/cdio.h>
#include <cdio/device.h>
#include "cddalister.h" #include "cddalister.h"
#include "core/logging.h" #include "core/logging.h"

10
src/device/cddasongloader.cpp
View File

@ -24,10 +24,16 @@
#include <memory> #include <memory>
#include <cstddef> #include <cstddef>
#include <glib.h> #include <glib.h>
#include <glib/gtypes.h> #include <glib/gtypes.h>
#include <glib-object.h> #include <glib-object.h>
#include <cdio/cdio.h>
#include <gst/gst.h>
#include <gst/tag/tag.h>
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QMutex> #include <QMutex>
@ -35,10 +41,6 @@
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
#include <cdio/cdio.h>
#include <gst/gst.h>
#include <gst/tag/tag.h>
#include "cddasongloader.h" #include "cddasongloader.h"
#include "includes/shared_ptr.h" #include "includes/shared_ptr.h"
#include "core/logging.h" #include "core/logging.h"

14
src/device/cddasongloader.h
View File

@ -24,17 +24,19 @@
#include "config.h" #include "config.h"
#include <cstddef>
#include <cdio/types.h>
#include <cdio/cdio.h>
#include <gst/gstelement.h>
#include <gst/audio/gstaudiocdsrc.h>
#include <QObject> #include <QObject>
#include <QMutex> #include <QMutex>
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
// These must come after Qt includes
#include <cdio/types.h>
#include <cdio/cdio.h>
#include <gst/gstelement.h>
#include <gst/audio/gstaudiocdsrc.h>
#include "includes/shared_ptr.h" #include "includes/shared_ptr.h"
#include "core/song.h" #include "core/song.h"
#ifdef HAVE_MUSICBRAINZ #ifdef HAVE_MUSICBRAINZ