28 changes: 28 additions & 0 deletions mythtv/libs/libmythbase/mythbaseexp.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#ifndef MYTHBASEEXP_H_
#define MYTHBASEEXP_H_

// This header is called from some non-QT projects,
// and if non C++ then Q_DECL_XXX never defined

#if defined( QT_CORE_LIB ) && defined( __cplusplus )
# include <QtCore/qglobal.h>
# ifdef MBASE_API
# define MBASE_PUBLIC Q_DECL_EXPORT
# else
# define MBASE_PUBLIC Q_DECL_IMPORT
# endif
#else
# define MBASE_PUBLIC
#endif

#if (__GNUC__ >= 4)
# define MHIDDEN __attribute__((visibility("hidden")))
# define MUNUSED __attribute__((unused))
# define MDEPRECATED __attribute__((deprecated))
#else
# define MHIDDEN
# define MUNUSED
# define MDEPRECATED
#endif

#endif // MYTHBASEEXP_H_
2 changes: 1 addition & 1 deletion mythtv/libs/libmythbase/mythcdrom.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "mythmedia.h"

class MPUBLIC MythCDROM : public MythMediaDevice
class MBASE_PUBLIC MythCDROM : public MythMediaDevice
{
Q_OBJECT
protected:
Expand Down
10 changes: 5 additions & 5 deletions mythtv/libs/libmythbase/mythcorecontext.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <QString>

#include "mythdb.h"
#include "mythexp.h"
#include "mythbaseexp.h"
#include "mythobservable.h"
#include "mythsocket_cb.h"
#include "mythverbose.h"
Expand Down Expand Up @@ -38,7 +38,7 @@ enum LogPriorities
* \sa NuppelVideoPlayer::StartPlaying(void)
* \sa MythCoreContext:addPrivRequest(MythPrivRequest::Type, void*)
*/
class MPUBLIC MythPrivRequest
class MBASE_PUBLIC MythPrivRequest
{
public:
typedef enum { MythRealtime, MythExit, PrivEnd } Type;
Expand All @@ -60,7 +60,7 @@ class MPUBLIC MythPrivRequest
* It also contains support for database error printing, and
* database message logging.
*/
class MPUBLIC MythCoreContext : public MythObservable, public MythSocketCBs
class MBASE_PUBLIC MythCoreContext : public MythObservable, public MythSocketCBs
{
public:
MythCoreContext(const QString &binversion, QObject *eventHandler);
Expand Down Expand Up @@ -181,10 +181,10 @@ class MPUBLIC MythCoreContext : public MythObservable, public MythSocketCBs
};

/// This global variable contains the MythCoreContext instance for the app
extern MPUBLIC MythCoreContext *gCoreContext;
extern MBASE_PUBLIC MythCoreContext *gCoreContext;

/// This global variable is used to makes certain calls to avlib threadsafe.
extern MPUBLIC QMutex *avcodeclock;
extern MBASE_PUBLIC QMutex *avcodeclock;

#endif

Expand Down
10 changes: 5 additions & 5 deletions mythtv/libs/libmythbase/mythcoreutil.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@

#include <QString>

#include "mythexp.h"
#include "mythbaseexp.h"

MPUBLIC long long getDiskSpace(const QString&,long long&,long long&);
MBASE_PUBLIC long long getDiskSpace(const QString&,long long&,long long&);

MPUBLIC bool extractZIP(const QString &zipFile, const QString &outDir);
MBASE_PUBLIC bool extractZIP(const QString &zipFile, const QString &outDir);

MPUBLIC QString RemoteDownloadFile(const QString &url,
MBASE_PUBLIC QString RemoteDownloadFile(const QString &url,
const QString &storageGroup,
const QString &filename = "");
MPUBLIC QString RemoteDownloadFileNow(const QString &url,
MBASE_PUBLIC QString RemoteDownloadFileNow(const QString &url,
const QString &storageGroup,
const QString &filename = "");

Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythbase/mythdb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#include <QMap>
#include <QString>
#include <QVariant>
#include "mythexp.h"
#include "mythbaseexp.h"
#include "mythdbcon.h"
#include "mythdbparams.h"

class MythDBPrivate;
class Settings;
class MDBManager;

class MPUBLIC MythDB
class MBASE_PUBLIC MythDB
{
public:
MDBManager *GetDBManager(void);
Expand Down Expand Up @@ -90,7 +90,7 @@ class MPUBLIC MythDB
MythDBPrivate *d;
};

MPUBLIC MythDB *GetMythDB();
MPUBLIC void DestroyMythDB();
MBASE_PUBLIC MythDB *GetMythDB();
MBASE_PUBLIC void DestroyMythDB();

#endif
12 changes: 6 additions & 6 deletions mythtv/libs/libmythbase/mythdbcon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#include <QMutex>
#include <QList>

#include "mythexp.h"
#include "mythbaseexp.h"

class QSemaphore;

/// \brief QSqlDatabase wrapper, used by MSqlQuery. Do not use directly.
class MPUBLIC MSqlDatabase
class MBASE_PUBLIC MSqlDatabase
{
friend class MDBManager;
friend class MSqlQuery;
Expand All @@ -37,7 +37,7 @@ class MPUBLIC MSqlDatabase
};

/// \brief DB connection pool, used by MSqlQuery. Do not use directly.
class MPUBLIC MDBManager
class MBASE_PUBLIC MDBManager
{
friend class MSqlQuery;
public:
Expand Down Expand Up @@ -77,10 +77,10 @@ typedef struct _MSqlQueryInfo
typedef QMap<QString, QVariant> MSqlBindings;

/// \brief Add the entries in addfrom to the map in output
MPUBLIC void MSqlAddMoreBindings(MSqlBindings &output, MSqlBindings &addfrom);
MBASE_PUBLIC void MSqlAddMoreBindings(MSqlBindings &output, MSqlBindings &addfrom);

/// \brief Given a partial query string and a bindings object, escape the string
MPUBLIC void MSqlEscapeAsAQuery(QString &query, MSqlBindings &bindings);
MBASE_PUBLIC void MSqlEscapeAsAQuery(QString &query, MSqlBindings &bindings);

/** \brief QSqlQuery wrapper that fetches a DB connection from the connection pool.
*
Expand All @@ -101,7 +101,7 @@ MPUBLIC void MSqlEscapeAsAQuery(QString &query, MSqlBindings &bindings);
* will crash if closed and reopend - so we never close them and keep them in
* a pool.
*/
class MPUBLIC MSqlQuery : public QSqlQuery
class MBASE_PUBLIC MSqlQuery : public QSqlQuery
{
public:
/// \brief Get DB connection from pool
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/mythdbparams.h
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef MYTHDBPARAMS_H_
#define MYTHDBPARAMS_H_

#include "mythexp.h"
#include "mythbaseexp.h"

/// Structure containing the basic Database parameters
struct MPUBLIC DatabaseParams
struct MBASE_PUBLIC DatabaseParams
{
QString dbHostName; ///< database server
bool dbHostPing; ///< Can we test connectivity using ping?
Expand Down
30 changes: 15 additions & 15 deletions mythtv/libs/libmythbase/mythdirs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
#define MYTHDIRS_H_

#include <QString>
#include "mythexp.h"
#include "mythbaseexp.h"

MPUBLIC void InitializeMythDirs(void);
MBASE_PUBLIC void InitializeMythDirs(void);

MPUBLIC QString GetInstallPrefix(void);
MPUBLIC QString GetShareDir(void);
MPUBLIC QString GetLibraryDir(void);
MPUBLIC QString GetConfDir(void);
MPUBLIC QString GetThemesParentDir(void);
MPUBLIC QString GetPluginsDir(void);
MPUBLIC QString GetTranslationsDir(void);
MPUBLIC QString GetFiltersDir(void);
MBASE_PUBLIC QString GetInstallPrefix(void);
MBASE_PUBLIC QString GetShareDir(void);
MBASE_PUBLIC QString GetLibraryDir(void);
MBASE_PUBLIC QString GetConfDir(void);
MBASE_PUBLIC QString GetThemesParentDir(void);
MBASE_PUBLIC QString GetPluginsDir(void);
MBASE_PUBLIC QString GetTranslationsDir(void);
MBASE_PUBLIC QString GetFiltersDir(void);

MPUBLIC QString GetPluginsNameFilter(void);
MPUBLIC QString FindPluginName(const QString &plugname);
MPUBLIC QString GetTranslationsNameFilter(void);
MPUBLIC QString FindTranslation(const QString &translation);
MPUBLIC QString GetFontsDir(void);
MBASE_PUBLIC QString GetPluginsNameFilter(void);
MBASE_PUBLIC QString FindPluginName(const QString &plugname);
MBASE_PUBLIC QString GetTranslationsNameFilter(void);
MBASE_PUBLIC QString FindTranslation(const QString &translation);
MBASE_PUBLIC QString GetFontsDir(void);

#endif

6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/mythdownloadmanager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
#include <QNetworkReply>
#include <QWaitCondition>

#include "mythexp.h"
#include "mythbaseexp.h"

class MythDownloadInfo;
class RemoteFileDownloadThread;

class MPUBLIC MythDownloadManager : public QThread
class MBASE_PUBLIC MythDownloadManager : public QThread
{
Q_OBJECT

Expand Down Expand Up @@ -102,7 +102,7 @@ class MPUBLIC MythDownloadManager : public QThread
friend class RemoteFileDownloadThread;
};

MPUBLIC MythDownloadManager *GetMythDownloadManager(void);
MBASE_PUBLIC MythDownloadManager *GetMythDownloadManager(void);

#endif

Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythbase/mythevent.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
#include <QEvent>
#include <QHash>

#include "mythexp.h"
#include "mythbaseexp.h"

/** \class MythEvent
\brief This class is used as a container for messages.
Any subclass of this that adds data to the event should override
the clone method. As example, see OutputEvent in output.h.
*/
class MPUBLIC MythEvent : public QEvent
class MBASE_PUBLIC MythEvent : public QEvent
{
public:
MythEvent(int t) : QEvent((QEvent::Type)t)
Expand Down Expand Up @@ -86,7 +86,7 @@ class MPUBLIC MythEvent : public QEvent
QStringList extradata;
};

class MPUBLIC ExternalKeycodeEvent : public QEvent
class MBASE_PUBLIC ExternalKeycodeEvent : public QEvent
{
public:
ExternalKeycodeEvent(const int key) :
Expand All @@ -100,7 +100,7 @@ class MPUBLIC ExternalKeycodeEvent : public QEvent
int keycode;
};

class MPUBLIC UpdateBrowseInfoEvent : public QEvent
class MBASE_PUBLIC UpdateBrowseInfoEvent : public QEvent
{
public:
UpdateBrowseInfoEvent(const QHash<QString,QString> &infoMap) :
Expand Down
26 changes: 0 additions & 26 deletions mythtv/libs/libmythbase/mythexp.h
View file

This file was deleted.

2 changes: 1 addition & 1 deletion mythtv/libs/libmythbase/mythhdd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "mythmedia.h"

class MPUBLIC MythHDD : public MythMediaDevice
class MBASE_PUBLIC MythHDD : public MythMediaDevice
{
public:
MythHDD(QObject* par, const char* DevicePath,
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/mythhttppool.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ using namespace std;
#include <QUrl>

// MythTV headers
#include "mythexp.h"
#include "mythbaseexp.h"

class MPUBLIC MythHttpListener
class MBASE_PUBLIC MythHttpListener
{
public:
virtual void Update(QHttp::Error error,
Expand All @@ -41,7 +41,7 @@ class MythHttpHandler;
typedef QMap<QString,MythHttpHandler*> HostToHandler;
typedef QMultiMap<QUrl,MythHttpListener*> UrlToListener;

class MPUBLIC MythHttpPool
class MBASE_PUBLIC MythHttpPool
{
public:
MythHttpPool(uint max_connections = 20);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/mythlocale.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
// libmythbase
#include "iso3166.h"
#include "iso639.h"
#include "mythexp.h"
#include "mythbaseexp.h"

class MPUBLIC MythLocale
class MBASE_PUBLIC MythLocale
{
public:
MythLocale(QString localeName = QString());
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythbase/mythmedia.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <QEvent>
#include <QPointer>

#include "mythexp.h"
#include "mythbaseexp.h"

typedef enum {
MEDIASTAT_ERROR, ///< Unable to mount, but could be usable
Expand Down Expand Up @@ -45,7 +45,7 @@ typedef enum {
typedef QMap<QString,uint> ext_cnt_t;
typedef QMap<QString,uint> ext_to_media_t;

class MPUBLIC MythMediaDevice : public QObject
class MBASE_PUBLIC MythMediaDevice : public QObject
{
Q_OBJECT
friend class MediaMonitorDarwin; // So these can call setStatus(),
Expand Down Expand Up @@ -171,7 +171,7 @@ class MPUBLIC MythMediaDevice : public QObject
ext_to_media_t m_ext_to_media; ///< Map of extension to media type.
};

class MPUBLIC MythMediaEvent : public QEvent
class MBASE_PUBLIC MythMediaEvent : public QEvent
{
public:
MythMediaEvent(MythMediaStatus oldStatus, MythMediaDevice *pDevice) :
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/mythobservable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

#include <QSet>
#include "mythevent.h"
#include "mythexp.h"
#include "mythbaseexp.h"

class QObject;
class QMutex;

class MPUBLIC MythObservable
class MBASE_PUBLIC MythObservable
{
public:
MythObservable();
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/mythsignalingtimer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
#include <QThread>
#include <QMutex>

#include "mythexp.h"
#include "mythbaseexp.h"

/** \class MythSignalingTimer
* This class is essentially a workaround for a Qt 4.5.2 bug where it
* will get stuck in the Qt event loop for up to 999 nanoseconds per
* timer firing. This lost millisecond is not a huge issue for infrequent
* timers, but causes 7% lost CPU in the MythUI animate() handling.
*/
class MPUBLIC MythSignalingTimer : private QThread
class MBASE_PUBLIC MythSignalingTimer : private QThread
{
Q_OBJECT

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/mythsocket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

#include "msocketdevice.h"
#include "mythsocket_cb.h"
#include "mythexp.h"
#include "mythbaseexp.h"

class QHostAddress;
class MythSocketThread;

class MPUBLIC MythSocket : public MSocketDevice
class MBASE_PUBLIC MythSocket : public MSocketDevice
{
friend class MythSocketThread;
friend class QList<MythSocket*>;
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/mythsocket_cb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
#ifndef _MYTHSOCKET_CB_H_
#define _MYTHSOCKET_CB_H_

#include "mythexp.h"
#include "mythbaseexp.h"

#define kMythSocketShortTimeout 7000
#define kMythSocketLongTimeout 30000

class MythSocket;
class MPUBLIC MythSocketCBs
class MBASE_PUBLIC MythSocketCBs
{
public:
virtual ~MythSocketCBs() {}
Expand Down
16 changes: 8 additions & 8 deletions mythtv/libs/libmythbase/mythstorage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <QString>

// MythTV headers
#include "mythexp.h"
#include "mythbaseexp.h"
#include "mythdbcon.h"

class StorageUser
Expand All @@ -18,7 +18,7 @@ class StorageUser
virtual ~StorageUser() { }
};

class MPUBLIC Storage
class MBASE_PUBLIC Storage
{
public:
Storage() { }
Expand All @@ -31,7 +31,7 @@ class MPUBLIC Storage
virtual void SetSaveRequired(void) { };
};

class MPUBLIC DBStorage : public Storage
class MBASE_PUBLIC DBStorage : public Storage
{
public:
DBStorage(StorageUser *_user, QString _table, QString _column) :
Expand All @@ -48,7 +48,7 @@ class MPUBLIC DBStorage : public Storage
QString columnname;
};

class MPUBLIC SimpleDBStorage : public DBStorage
class MBASE_PUBLIC SimpleDBStorage : public DBStorage
{
public:
SimpleDBStorage(StorageUser *_user,
Expand All @@ -70,7 +70,7 @@ class MPUBLIC SimpleDBStorage : public DBStorage
QString initval;
};

class MPUBLIC GenericDBStorage : public SimpleDBStorage
class MBASE_PUBLIC GenericDBStorage : public SimpleDBStorage
{
public:
GenericDBStorage(StorageUser *_user,
Expand All @@ -92,7 +92,7 @@ class MPUBLIC GenericDBStorage : public SimpleDBStorage
QString keyvalue;
};

class MPUBLIC TransientStorage : public Storage
class MBASE_PUBLIC TransientStorage : public Storage
{
public:
TransientStorage() { }
Expand All @@ -102,7 +102,7 @@ class MPUBLIC TransientStorage : public Storage
virtual void Save(void) { }
};

class MPUBLIC HostDBStorage : public SimpleDBStorage
class MBASE_PUBLIC HostDBStorage : public SimpleDBStorage
{
public:
HostDBStorage(StorageUser *_user, const QString &name);
Expand All @@ -115,7 +115,7 @@ class MPUBLIC HostDBStorage : public SimpleDBStorage
QString settingname;
};

class MPUBLIC GlobalDBStorage : public SimpleDBStorage
class MBASE_PUBLIC GlobalDBStorage : public SimpleDBStorage
{
public:
GlobalDBStorage(StorageUser *_user, const QString &name);
Expand Down
12 changes: 6 additions & 6 deletions mythtv/libs/libmythbase/mythsystem.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef MYTHSYSTEM_H_
#define MYTHSYSTEM_H_

#include "mythexp.h"
#include "mythbaseexp.h"
#include "compat.h"
#include <signal.h>

Expand Down Expand Up @@ -36,7 +36,7 @@ typedef enum MythSystemMask {
typedef QMap<QString, bool> Setting_t;

class MythSystemPrivate;
class MPUBLIC MythSystem : public QObject
class MBASE_PUBLIC MythSystem : public QObject
{
Q_OBJECT

Expand Down Expand Up @@ -122,7 +122,7 @@ class MPUBLIC MythSystem : public QObject
QBuffer m_stdbuff[3];
};

class MPUBLIC MythSystemPrivate : public QObject
class MBASE_PUBLIC MythSystemPrivate : public QObject
{
Q_OBJECT

Expand Down Expand Up @@ -163,15 +163,15 @@ class MPUBLIC MythSystemPrivate : public QObject
};


MPUBLIC unsigned int myth_system(const QString &command,
MBASE_PUBLIC unsigned int myth_system(const QString &command,
uint flags = kMSNone,
uint timeout = 0);
MPUBLIC void myth_system_jump_abort(void);
MBASE_PUBLIC void myth_system_jump_abort(void);
extern "C" {
#endif

/* C prototype */
MPUBLIC unsigned int myth_system_c(char *command, uint flags, uint timeout);
MBASE_PUBLIC unsigned int myth_system_c(char *command, uint flags, uint timeout);

#ifdef __cplusplus
}
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/mythtimer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#define MYTHTIMER_H_

#include <QTime>
#include "mythexp.h"
#include "mythbaseexp.h"

class MPUBLIC MythTimer
class MBASE_PUBLIC MythTimer
{
public:
MythTimer() : m_running(false) {}
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/mythtranslation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include <QString>
#include <QMap>

#include "mythexp.h"
#include "mythbaseexp.h"

class MPUBLIC MythTranslation
class MBASE_PUBLIC MythTranslation
{

public:
Expand Down
12 changes: 6 additions & 6 deletions mythtv/libs/libmythbase/mythverbose.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# endif
#endif

#include "mythexp.h" // MPUBLIC, et c.
#include "mythbaseexp.h" // MBASE_PUBLIC , et c.

/// This MAP is for the various VERBOSITY flags, used to select which
/// messages we want printed to the console.
Expand Down Expand Up @@ -113,9 +113,9 @@ enum VerboseMask

/// This global variable is set at startup with the flags
/// of the verbose messages we want to see.
extern MPUBLIC unsigned int print_verbose_messages;
extern MBASE_PUBLIC unsigned int print_verbose_messages;
#ifdef __cplusplus
extern MPUBLIC QMutex verbose_mutex;
extern MBASE_PUBLIC QMutex verbose_mutex;
#endif

// Helper for checking verbose flags outside of VERBOSE macro
Expand Down Expand Up @@ -231,11 +231,11 @@ extern MPUBLIC unsigned int print_verbose_messages;

#ifdef __cplusplus
/// Verbose helper function for ENO macro
extern MPUBLIC QString safe_eno_to_string(int errnum);
extern MBASE_PUBLIC QString safe_eno_to_string(int errnum);

extern MPUBLIC QString verboseString;
extern MBASE_PUBLIC QString verboseString;

MPUBLIC int parse_verbose_arg(QString arg);
MBASE_PUBLIC int parse_verbose_arg(QString arg);

/// This can be appended to the VERBOSE args with either
/// "+" (with QStrings) or "<<" (with c strings). It uses
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/mythversion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define MYTHVERSION_H_

#include "qglobal.h"
#include "mythexp.h"
#include "mythbaseexp.h"

#if ( QT_VERSION < 0x040500 )
#error You need Qt version >= 4.5.0 to compile MythTV.
Expand Down Expand Up @@ -37,7 +37,7 @@
#define MYTH_PROTO_VERSION "64"
#define MYTH_PROTO_TOKEN "8675309J"

MPUBLIC const char *GetMythSourceVersion();
MBASE_PUBLIC const char *GetMythSourceVersion();

#endif

4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/oldsettings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ using namespace std;
#include <QString>
#include <QPixmap>

#include "mythexp.h"
#include "mythbaseexp.h"

/**This class contains configuration information.
*This object is threadsafe.
*@author Sean Ward
*/

class QPixmap;
class MPUBLIC Settings {
class MBASE_PUBLIC Settings {
public:
Settings(QString strSettingFile = "settings.txt");
~Settings();
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/remotefile.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#include <QStringList>
#include <QMutex>

#include "mythexp.h"
#include "mythbaseexp.h"

class MythSocket;

class MPUBLIC RemoteFile
class MBASE_PUBLIC RemoteFile
{
public:
RemoteFile(const QString &url = "",
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/storagegroup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#include <QHash>
#include <QMap>

#include "mythexp.h"
#include "mythbaseexp.h"

class MPUBLIC StorageGroup
class MBASE_PUBLIC StorageGroup
{
public:
StorageGroup(const QString group = "", const QString hostname = "",
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/system-unix.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef SYSTEM_UNIX_H_
#define SYSTEM_UNIX_H_

#include "mythexp.h"
#include "mythbaseexp.h"
#include <signal.h>
#include <QObject>
#include <QMap>
Expand Down Expand Up @@ -68,7 +68,7 @@ class MythSystemSignalManager : public QThread
};


class MPUBLIC MythSystemUnix : public MythSystemPrivate
class MBASE_PUBLIC MythSystemUnix : public MythSystemPrivate
{
Q_OBJECT

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/system-windows.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef SYSTEM_UNIX_H_
#define SYSTEM_UNIX_H_

#include "mythexp.h"
#include "mythbaseexp.h"
#include <signal.h>
#include <QObject>
#include <QMap>
Expand Down Expand Up @@ -70,7 +70,7 @@ class MythSystemSignalManager : public QThread
};


class MPUBLIC MythSystemWindows : public MythSystemPrivate
class MBASE_PUBLIC MythSystemWindows : public MythSystemPrivate
{
Q_OBJECT

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythbase/unzip.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#include <zlib.h>

#include "mythexp.h"
#include "mythbaseexp.h"

class UnzipPrivate;
class QIODevice;
Expand All @@ -44,7 +44,7 @@ class QStringList;
class QString;


class MPUBLIC UnZip
class MBASE_PUBLIC UnZip
{
public:
enum ErrorCode
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythbase/util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@ bool MythRemoveDirectory(QDir &aDir)
return(has_err);
}

MPUBLIC QString &ShellEscape(QString &string)
MBASE_PUBLIC QString &ShellEscape(QString &string)
{
if (string.contains("\""))
string = string.replace("\"", "\\\"");
Expand Down
66 changes: 33 additions & 33 deletions mythtv/libs/libmythbase/util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,46 @@ using namespace std;
#include <stdint.h>
#include <time.h>

#include "mythexp.h"
#include "mythbaseexp.h"
#include "mythtimer.h"
#include "mythsystem.h"
#include "mythevent.h"

class QFile;

MPUBLIC QDateTime mythCurrentDateTime();
MPUBLIC int calc_utc_offset(void);
MPUBLIC QString getTimeZoneID(void);
MPUBLIC bool checkTimeZone(void);
MPUBLIC bool checkTimeZone(const QStringList &master_settings);
MBASE_PUBLIC QDateTime mythCurrentDateTime();
MBASE_PUBLIC int calc_utc_offset(void);
MBASE_PUBLIC QString getTimeZoneID(void);
MBASE_PUBLIC bool checkTimeZone(void);
MBASE_PUBLIC bool checkTimeZone(const QStringList &master_settings);

MPUBLIC QDateTime MythUTCToLocal(const QDateTime &utc);
MPUBLIC int MythSecsTo(const QDateTime &from, const QDateTime &to);
MPUBLIC QDateTime myth_dt_from_string(const QString &dtstr);
MBASE_PUBLIC QDateTime MythUTCToLocal(const QDateTime &utc);
MBASE_PUBLIC int MythSecsTo(const QDateTime &from, const QDateTime &to);
MBASE_PUBLIC QDateTime myth_dt_from_string(const QString &dtstr);

MPUBLIC bool getUptime(time_t &uptime);
MPUBLIC bool getMemStats(int &totalMB, int &freeMB, int &totalVM, int &freeVM);
MBASE_PUBLIC bool getUptime(time_t &uptime);
MBASE_PUBLIC bool getMemStats(int &totalMB, int &freeMB, int &totalVM, int &freeVM);

MPUBLIC bool hasUtf8(const char *str);
MBASE_PUBLIC bool hasUtf8(const char *str);
#define M_QSTRING_UNICODE(str) hasUtf8(str) ? QString::fromUtf8(str) : str

MPUBLIC bool ping(const QString &host, int timeout);
MPUBLIC bool telnet(const QString &host, int port);
MBASE_PUBLIC bool ping(const QString &host, int timeout);
MBASE_PUBLIC bool telnet(const QString &host, int port);

MPUBLIC long long copy(QFile &dst, QFile &src, uint block_size = 0);
MPUBLIC QString createTempFile(QString name_template = "/tmp/mythtv_XXXXXX",
MBASE_PUBLIC long long copy(QFile &dst, QFile &src, uint block_size = 0);
MBASE_PUBLIC QString createTempFile(QString name_template = "/tmp/mythtv_XXXXXX",
bool dir = false);
MPUBLIC void makeFileAccessible(QString filename);
MBASE_PUBLIC void makeFileAccessible(QString filename);

MPUBLIC QString getResponse(const QString &query, const QString &def);
MPUBLIC int intResponse(const QString &query, int def);
MBASE_PUBLIC QString getResponse(const QString &query, const QString &def);
MBASE_PUBLIC int intResponse(const QString &query, int def);

MPUBLIC QString getSymlinkTarget(const QString &start_file,
MBASE_PUBLIC QString getSymlinkTarget(const QString &start_file,
QStringList *intermediaries = NULL,
unsigned maxLinks = 255);

MPUBLIC void sendPlaybackStart();
MPUBLIC void sendPlaybackEnd();
MBASE_PUBLIC void sendPlaybackStart();
MBASE_PUBLIC void sendPlaybackEnd();

inline float clamp(float val, float minimum, float maximum)
{
Expand All @@ -71,22 +71,22 @@ inline int lerp(float r, int a, int b)
inline float sq(float a) { return a*a; }
inline int sq(int a) { return a*a; }

MPUBLIC bool IsMACAddress(QString MAC);
MPUBLIC bool WakeOnLAN(QString MAC);
MPUBLIC QString FileHash(QString filename);
MBASE_PUBLIC bool IsMACAddress(QString MAC);
MBASE_PUBLIC bool WakeOnLAN(QString MAC);
MBASE_PUBLIC QString FileHash(QString filename);

/// Is A/V Sync destruction daemon is running on this host?
MPUBLIC bool IsPulseAudioRunning(void);
MBASE_PUBLIC bool IsPulseAudioRunning(void);

MPUBLIC bool myth_nice(int val);
MPUBLIC void myth_yield(void);
MPUBLIC bool myth_ioprio(int val); // range -1..8, smaller is higher priority
MBASE_PUBLIC bool myth_nice(int val);
MBASE_PUBLIC void myth_yield(void);
MBASE_PUBLIC bool myth_ioprio(int val); // range -1..8, smaller is higher priority

MPUBLIC bool myth_FileIsDVD(const QString &filename);
MPUBLIC bool myth_FileIsBD(const QString &filename);
MBASE_PUBLIC bool myth_FileIsDVD(const QString &filename);
MBASE_PUBLIC bool myth_FileIsBD(const QString &filename);

MPUBLIC bool MythRemoveDirectory(QDir &aDir);
MPUBLIC QString &ShellEscape(QString &string);
MBASE_PUBLIC bool MythRemoveDirectory(QDir &aDir);
MBASE_PUBLIC QString &ShellEscape(QString &string);

// CPU Tick timing function
#ifdef MMX
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythmetadata/bluraymetadata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
#include <QString>

#include "mythimage.h"
#include "mythexp.h"
#include "mythmetaexp.h"
#include "bluray.h"

typedef QList< QPair < uint,QString > > BlurayTitles;

typedef QHash<QString,QString> MetadataMap;

struct meta_dl;
class MPUBLIC BlurayMetadata : public QObject
class META_PUBLIC BlurayMetadata : public QObject
{
public:
BlurayMetadata(const QString path);
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythmetadata/cleanup.h
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#ifndef CLEANUP_H_
#define CLEANUP_H_

#include "mythexp.h"
#include "mythmetaexp.h"

class MPUBLIC CleanupProc
class META_PUBLIC CleanupProc
{
public:
virtual void doClean() = 0;
virtual ~CleanupProc();
};

class MPUBLIC CleanupHooks
class META_PUBLIC CleanupHooks
{
public:
static CleanupHooks *getInstance();
Expand All @@ -27,7 +27,7 @@ class MPUBLIC CleanupHooks
};

template <typename T>
class MPUBLIC SimpleCleanup : public CleanupProc
class META_PUBLIC SimpleCleanup : public CleanupProc
{
public:
SimpleCleanup(T *inst) : m_inst(inst)
Expand Down
22 changes: 11 additions & 11 deletions mythtv/libs/libmythmetadata/dbaccess.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#include <vector>
#include <utility> // for std::pair

#include "mythexp.h"
#include "mythmetaexp.h"

class SingleValueImp;

class MPUBLIC SingleValue
class META_PUBLIC SingleValue
{
public:
typedef std::pair<int, QString> entry;
Expand All @@ -33,7 +33,7 @@ class MPUBLIC SingleValue
};

class MultiValueImp;
class MPUBLIC MultiValue
class META_PUBLIC MultiValue
{
public:
struct entry
Expand Down Expand Up @@ -62,7 +62,7 @@ class MPUBLIC MultiValue
MultiValueImp *m_imp;
};

class MPUBLIC VideoCategory : public SingleValue
class META_PUBLIC VideoCategory : public SingleValue
{
public:
static VideoCategory &GetCategory();
Expand All @@ -72,7 +72,7 @@ class MPUBLIC VideoCategory : public SingleValue
~VideoCategory();
};

class MPUBLIC VideoCountry : public SingleValue
class META_PUBLIC VideoCountry : public SingleValue
{
public:
static VideoCountry &getCountry();
Expand All @@ -82,7 +82,7 @@ class MPUBLIC VideoCountry : public SingleValue
~VideoCountry();
};

class MPUBLIC VideoGenre : public SingleValue
class META_PUBLIC VideoGenre : public SingleValue
{
public:
static VideoGenre &getGenre();
Expand All @@ -92,7 +92,7 @@ class MPUBLIC VideoGenre : public SingleValue
~VideoGenre();
};

class MPUBLIC VideoGenreMap : public MultiValue
class META_PUBLIC VideoGenreMap : public MultiValue
{
public:
static VideoGenreMap &getGenreMap();
Expand All @@ -102,7 +102,7 @@ class MPUBLIC VideoGenreMap : public MultiValue
~VideoGenreMap();
};

class MPUBLIC VideoCountryMap : public MultiValue
class META_PUBLIC VideoCountryMap : public MultiValue
{
public:
static VideoCountryMap &getCountryMap();
Expand All @@ -112,7 +112,7 @@ class MPUBLIC VideoCountryMap : public MultiValue
~VideoCountryMap();
};

class MPUBLIC VideoCast : public SingleValue
class META_PUBLIC VideoCast : public SingleValue
{
public:
static VideoCast &GetCast();
Expand All @@ -122,7 +122,7 @@ class MPUBLIC VideoCast : public SingleValue
~VideoCast();
};

class MPUBLIC VideoCastMap : public MultiValue
class META_PUBLIC VideoCastMap : public MultiValue
{
public:
static VideoCastMap &getCastMap();
Expand All @@ -132,7 +132,7 @@ class MPUBLIC VideoCastMap : public MultiValue
~VideoCastMap();
};

class MPUBLIC FileAssociations
class META_PUBLIC FileAssociations
{
public:
struct file_association
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythmetadata/dirscan.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef DIRSCAN_H_
#define DIRSCAN_H_

#include "mythexp.h"
#include "mythmetaexp.h"

class MPUBLIC DirectoryHandler
class META_PUBLIC DirectoryHandler
{
public:
virtual ~DirectoryHandler();
Expand All @@ -15,7 +15,7 @@ class MPUBLIC DirectoryHandler
const QString &host) = 0;
};

MPUBLIC bool ScanVideoDirectory(const QString &start_path, DirectoryHandler *handler,
META_PUBLIC bool ScanVideoDirectory(const QString &start_path, DirectoryHandler *handler,
const FileAssociations::ext_ignore_list &ext_disposition,
bool list_unknown_extensions);

Expand Down
50 changes: 25 additions & 25 deletions mythtv/libs/libmythmetadata/globals.h
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
#ifndef GLOBALS_H_
#define GLOBALS_H_

#include "mythexp.h"
#include "mythmetaexp.h"

extern const QString VIDEO_CATEGORY_UNKNOWN MPUBLIC;
extern const QString VIDEO_DIRECTOR_UNKNOWN MPUBLIC;
extern const QString VIDEO_GENRE_UNKNOWN MPUBLIC;
extern const QString VIDEO_COUNTRY_UNKNOWN MPUBLIC;
extern const QString VIDEO_CAST_UNKNOWN MPUBLIC;
extern const QString VIDEO_YEAR_UNKNOWN MPUBLIC;
extern const QString VIDEO_RUNTIME_UNKNOWN MPUBLIC;
META_PUBLIC extern const QString VIDEO_CATEGORY_UNKNOWN;
META_PUBLIC extern const QString VIDEO_DIRECTOR_UNKNOWN;
META_PUBLIC extern const QString VIDEO_GENRE_UNKNOWN;
META_PUBLIC extern const QString VIDEO_COUNTRY_UNKNOWN;
META_PUBLIC extern const QString VIDEO_CAST_UNKNOWN;
META_PUBLIC extern const QString VIDEO_YEAR_UNKNOWN;
META_PUBLIC extern const QString VIDEO_RUNTIME_UNKNOWN;

extern const QString VIDEO_CATEGORY_DEFAULT MPUBLIC;
extern const QString VIDEO_DIRECTOR_DEFAULT MPUBLIC;
extern const QString VIDEO_INETREF_DEFAULT MPUBLIC;
extern const QString VIDEO_COVERFILE_DEFAULT MPUBLIC;
extern const QString VIDEO_TRAILER_DEFAULT MPUBLIC;
extern const QString VIDEO_SCREENSHOT_DEFAULT MPUBLIC;
extern const QString VIDEO_BANNER_DEFAULT MPUBLIC;
extern const QString VIDEO_FANART_DEFAULT MPUBLIC;
extern const QString VIDEO_RATING_DEFAULT MPUBLIC;
extern const QString VIDEO_PLOT_DEFAULT MPUBLIC;
extern const QString VIDEO_CAST_DEFAULT MPUBLIC;
META_PUBLIC extern const QString VIDEO_CATEGORY_DEFAULT;
META_PUBLIC extern const QString VIDEO_DIRECTOR_DEFAULT;
META_PUBLIC extern const QString VIDEO_INETREF_DEFAULT;
META_PUBLIC extern const QString VIDEO_COVERFILE_DEFAULT;
META_PUBLIC extern const QString VIDEO_TRAILER_DEFAULT;
META_PUBLIC extern const QString VIDEO_SCREENSHOT_DEFAULT;
META_PUBLIC extern const QString VIDEO_BANNER_DEFAULT;
META_PUBLIC extern const QString VIDEO_FANART_DEFAULT;
META_PUBLIC extern const QString VIDEO_RATING_DEFAULT;
META_PUBLIC extern const QString VIDEO_PLOT_DEFAULT;
META_PUBLIC extern const QString VIDEO_CAST_DEFAULT;

extern const QString JUMP_VIDEO_MANAGER MPUBLIC;
extern const QString JUMP_VIDEO_BROWSER MPUBLIC;
extern const QString JUMP_VIDEO_TREE MPUBLIC;
extern const QString JUMP_VIDEO_GALLERY MPUBLIC;
extern const QString JUMP_VIDEO_DEFAULT MPUBLIC;
META_PUBLIC extern const QString JUMP_VIDEO_MANAGER;
META_PUBLIC extern const QString JUMP_VIDEO_BROWSER;
META_PUBLIC extern const QString JUMP_VIDEO_TREE;
META_PUBLIC extern const QString JUMP_VIDEO_GALLERY;
META_PUBLIC extern const QString JUMP_VIDEO_DEFAULT;

extern const QString DEFAULT_VIDEOSTARTUP_DIR MPUBLIC;
META_PUBLIC extern const QString DEFAULT_VIDEOSTARTUP_DIR;

#endif // GLOBALS_H_
3 changes: 2 additions & 1 deletion mythtv/libs/libmythmetadata/libmythmetadata.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ TARGET = mythmetadata-$$LIBVERSION
CONFIG += thread dll
target.path = $${LIBDIR}
INSTALLS = target
DEFINES += META_API

QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
QMAKE_CLEAN += version.cpp
Expand All @@ -14,7 +15,7 @@ QMAKE_CLEAN += version.cpp
HEADERS += cleanup.h dbaccess.h dirscan.h globals.h parentalcontrols.h
HEADERS += videoscan.h videoutils.h videometadata.h videometadatalistmanager.h
HEADERS += quicksp.h metadatacommon.h metadatadownload.h metadataimagedownload.h
HEADERS += bluraymetadata.h
HEADERS += bluraymetadata.h mythmetaexp.h

SOURCES += cleanup.cpp dbaccess.cpp dirscan.cpp globals.cpp
SOURCES += parentalcontrols.cpp videoscan.cpp videoutils.cpp
Expand Down
20 changes: 10 additions & 10 deletions mythtv/libs/libmythmetadata/metadatacommon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <QDomElement>
#include <QEvent>

#include "mythexp.h"
#include "mythmetaexp.h"

enum LookupStep {
SEARCH = 0,
Expand Down Expand Up @@ -79,7 +79,7 @@ typedef QMultiMap< PeopleType, PersonInfo > PeopleMap;

typedef QHash<QString,QString> MetadataMap;

class MPUBLIC MetadataLookup : public QObject
class META_PUBLIC MetadataLookup : public QObject
{
public:
MetadataLookup(void);
Expand Down Expand Up @@ -287,17 +287,17 @@ class MPUBLIC MetadataLookup : public QObject
};
Q_DECLARE_METATYPE(MetadataLookup*)

MPUBLIC MetadataLookup* ParseMetadataItem(const QDomElement& item,
META_PUBLIC MetadataLookup* ParseMetadataItem(const QDomElement& item,
MetadataLookup *lookup,
bool passseas = true);
MPUBLIC PeopleMap ParsePeople(QDomElement people);
MPUBLIC ArtworkMap ParseArtwork(QDomElement artwork);
META_PUBLIC PeopleMap ParsePeople(QDomElement people);
META_PUBLIC ArtworkMap ParseArtwork(QDomElement artwork);

MPUBLIC int editDistance(const QString& s, const QString& t);
MPUBLIC QString nearestName(const QString& actual,
META_PUBLIC int editDistance(const QString& s, const QString& t);
META_PUBLIC QString nearestName(const QString& actual,
const QStringList& candidates);

MPUBLIC QDateTime RFC822TimeToQDateTime(const QString& t);
META_PUBLIC QDateTime RFC822TimeToQDateTime(const QString& t);

enum GrabberType {
GRAB_MOVIE = 0,
Expand All @@ -306,7 +306,7 @@ enum GrabberType {
GRAB_GAME = 3
};

class MPUBLIC MetaGrabberScript : public QObject
class META_PUBLIC MetaGrabberScript : public QObject
{
public:
MetaGrabberScript();
Expand Down Expand Up @@ -345,6 +345,6 @@ class MPUBLIC MetaGrabberScript : public QObject
};
Q_DECLARE_METATYPE(MetaGrabberScript*)

MPUBLIC MetaGrabberScript* ParseGrabberVersion(const QDomElement& item);
META_PUBLIC MetaGrabberScript* ParseGrabberVersion(const QDomElement& item);

#endif // METADATACOMMON_H_
6 changes: 3 additions & 3 deletions mythtv/libs/libmythmetadata/metadatadownload.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

typedef QList<MetadataLookup*> MetadataLookupList;

class MPUBLIC MetadataLookupEvent : public QEvent
class META_PUBLIC MetadataLookupEvent : public QEvent
{
public:
MetadataLookupEvent(MetadataLookupList lul) : QEvent(kEventType),
Expand All @@ -21,7 +21,7 @@ class MPUBLIC MetadataLookupEvent : public QEvent
static Type kEventType;
};

class MPUBLIC MetadataLookupFailure : public QEvent
class META_PUBLIC MetadataLookupFailure : public QEvent
{
public:
MetadataLookupFailure(MetadataLookupList lul) : QEvent(kEventType),
Expand All @@ -33,7 +33,7 @@ class MPUBLIC MetadataLookupFailure : public QEvent
static Type kEventType;
};

class MPUBLIC MetadataDownload : public QThread
class META_PUBLIC MetadataDownload : public QThread
{
public:

Expand Down
18 changes: 9 additions & 9 deletions mythtv/libs/libmythmetadata/metadataimagedownload.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <QString>
#include <QStringList>

#include "mythexp.h"
#include "mythmetaexp.h"
#include "metadatacommon.h"

typedef struct {
Expand All @@ -14,7 +14,7 @@ typedef struct {
QString url;
} ThumbnailData;

class MPUBLIC ImageDLEvent : public QEvent
class META_PUBLIC ImageDLEvent : public QEvent
{
public:
ImageDLEvent(MetadataLookup *lookup) :
Expand All @@ -27,7 +27,7 @@ class MPUBLIC ImageDLEvent : public QEvent
static Type kEventType;
};

class MPUBLIC ThumbnailDLEvent : public QEvent
class META_PUBLIC ThumbnailDLEvent : public QEvent
{
public:
ThumbnailDLEvent(ThumbnailData *data) :
Expand All @@ -40,7 +40,7 @@ class MPUBLIC ThumbnailDLEvent : public QEvent
static Type kEventType;
};

class MPUBLIC MetadataImageDownload : public QThread
class META_PUBLIC MetadataImageDownload : public QThread
{
public:

Expand All @@ -66,13 +66,13 @@ class MPUBLIC MetadataImageDownload : public QThread
QMutex m_mutex;
};

MPUBLIC QString getDownloadFilename(QString title, QString url);
MPUBLIC QString getDownloadFilename(ArtworkType type, MetadataLookup *lookup,
META_PUBLIC QString getDownloadFilename(QString title, QString url);
META_PUBLIC QString getDownloadFilename(ArtworkType type, MetadataLookup *lookup,
QString url);

MPUBLIC QString getLocalWritePath(MetadataType metadatatype, ArtworkType type);
MPUBLIC QString getStorageGroupURL(ArtworkType type, QString host);
META_PUBLIC QString getLocalWritePath(MetadataType metadatatype, ArtworkType type);
META_PUBLIC QString getStorageGroupURL(ArtworkType type, QString host);

MPUBLIC void cleanThumbnailCacheDir(void);
META_PUBLIC void cleanThumbnailCacheDir(void);

#endif /* METADATAIMAGEDOWNLOAD_H */
22 changes: 22 additions & 0 deletions mythtv/libs/libmythmetadata/mythmetaexp.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#ifndef MYTHMETAEXP_H_
#define MYTHMETAEXP_H_

#include <QtCore/qglobal.h>

#ifdef META_API
# define META_PUBLIC Q_DECL_EXPORT
#else
# define META_PUBLIC Q_DECL_IMPORT
#endif

#if (__GNUC__ >= 4)
# define MHIDDEN __attribute__((visibility("hidden")))
# define MUNUSED __attribute__((unused))
# define MDEPRECATED __attribute__((deprecated))
#else
# define MHIDDEN
# define MUNUSED
# define MDEPRECATED
#endif

#endif // MYTHMETAEXP_H_
18 changes: 9 additions & 9 deletions mythtv/libs/libmythmetadata/parentalcontrols.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#include <QObject> // for moc
#include <QMetaType>

#include "mythexp.h"
#include "mythmetaexp.h"

class MPUBLIC ParentalLevel
class META_PUBLIC ParentalLevel
{
public:
enum Level { plNone = 0, plLowest = 1, plLow = 2, plMedium = 3,
Expand Down Expand Up @@ -34,14 +34,14 @@ class MPUBLIC ParentalLevel
};
Q_DECLARE_METATYPE(ParentalLevel*)

bool operator!=(const ParentalLevel &lhs, const ParentalLevel &rhs) MPUBLIC;
bool operator==(const ParentalLevel &lhs, const ParentalLevel &rhs) MPUBLIC;
bool operator<(const ParentalLevel &lhs, const ParentalLevel &rhs) MPUBLIC;
bool operator>(const ParentalLevel &lhs, const ParentalLevel &rhs) MPUBLIC;
bool operator<=(const ParentalLevel &lhs, const ParentalLevel &rhs) MPUBLIC;
bool operator>=(const ParentalLevel &lhs, const ParentalLevel &rhs) MPUBLIC;
META_PUBLIC bool operator!=(const ParentalLevel &lhs, const ParentalLevel &rhs);
META_PUBLIC bool operator==(const ParentalLevel &lhs, const ParentalLevel &rhs);
META_PUBLIC bool operator<(const ParentalLevel &lhs, const ParentalLevel &rhs);
META_PUBLIC bool operator>(const ParentalLevel &lhs, const ParentalLevel &rhs);
META_PUBLIC bool operator<=(const ParentalLevel &lhs, const ParentalLevel &rhs);
META_PUBLIC bool operator>=(const ParentalLevel &lhs, const ParentalLevel &rhs);

class MPUBLIC ParentalLevelChangeChecker : public QObject
class META_PUBLIC ParentalLevelChangeChecker : public QObject
{
Q_OBJECT

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythmetadata/quicksp.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef QUICKSP_H_
#define QUICKSP_H_

#include "mythexp.h"
#include "mythmetaexp.h"

struct NoLock
{
Expand All @@ -21,7 +21,7 @@ struct ThreadLock

// TODO: Get a real reference counted smart pointer in libmyth
template <typename T, class Locker = NoLock>
class MPUBLIC simple_ref_ptr
class META_PUBLIC simple_ref_ptr
{
public:
simple_ref_ptr() : m_ref(0)
Expand Down
12 changes: 6 additions & 6 deletions mythtv/libs/libmythmetadata/videometadata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <QString>

#include "parentalcontrols.h"
#include "mythexp.h"
#include "mythmetaexp.h"

class MSqlQuery;
class VideoMetadataListManager;
Expand All @@ -20,7 +20,7 @@ struct SortData;

typedef QHash<QString,QString> MetadataMap;

class MPUBLIC VideoMetadata
class META_PUBLIC VideoMetadata
{
public:
typedef std::pair<int, QString> genre_entry;
Expand Down Expand Up @@ -234,11 +234,11 @@ class MPUBLIC VideoMetadata
class VideoMetadataImp *m_imp;
};

MPUBLIC void ClearMap(MetadataMap &metadataMap);
META_PUBLIC void ClearMap(MetadataMap &metadataMap);

MPUBLIC bool operator==(const VideoMetadata &a, const VideoMetadata &b);
MPUBLIC bool operator!=(const VideoMetadata &a, const VideoMetadata &b);
META_PUBLIC bool operator==(const VideoMetadata &a, const VideoMetadata &b);
META_PUBLIC bool operator!=(const VideoMetadata &a, const VideoMetadata &b);

MPUBLIC bool operator<(const VideoMetadata::SortKey &lhs, const VideoMetadata::SortKey &rhs);
META_PUBLIC bool operator<(const VideoMetadata::SortKey &lhs, const VideoMetadata::SortKey &rhs);

#endif
4 changes: 2 additions & 2 deletions mythtv/libs/libmythmetadata/videometadatalistmanager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

#include "quicksp.h"
#include "videometadata.h"
#include "mythexp.h"
#include "mythmetaexp.h"

class MPUBLIC VideoMetadataListManager
class META_PUBLIC VideoMetadataListManager
{
public:
typedef simple_ref_ptr<VideoMetadata> VideoMetadataPtr;
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythmetadata/videoscan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

#include <QObject> // for moc

#include "mythexp.h"
#include "mythmetaexp.h"

class QStringList;

class MPUBLIC VideoScanner : public QObject
class META_PUBLIC VideoScanner : public QObject
{
Q_OBJECT

Expand Down
50 changes: 25 additions & 25 deletions mythtv/libs/libmythmetadata/videoutils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define VIDEOUTILS_H_

#include "parentalcontrols.h"
#include "mythexp.h"
#include "mythmetaexp.h"

template <typename T>
inline void CheckedSet(T *uiItem, const QString &value)
Expand All @@ -17,41 +17,41 @@ inline void CheckedSet(T *uiItem, const QString &value)
}

template <>
MPUBLIC void CheckedSet(class MythUIStateType *uiItem, const QString &state);
META_PUBLIC void CheckedSet(class MythUIStateType *uiItem, const QString &state);

MPUBLIC void CheckedSet(class MythUIType *container, const QString &itemName,
META_PUBLIC void CheckedSet(class MythUIType *container, const QString &itemName,
const QString &value);

MPUBLIC void CheckedSet(class MythUIImage *uiItem, const QString &filename);
META_PUBLIC void CheckedSet(class MythUIImage *uiItem, const QString &filename);

MPUBLIC QStringList GetVideoDirsByHost(QString host);
MPUBLIC QStringList GetVideoDirs();
META_PUBLIC QStringList GetVideoDirsByHost(QString host);
META_PUBLIC QStringList GetVideoDirs();

MPUBLIC bool IsDefaultCoverFile(const QString &coverfile);
MPUBLIC bool IsDefaultScreenshot(const QString &screenshot);
MPUBLIC bool IsDefaultBanner(const QString &banner);
MPUBLIC bool IsDefaultFanart(const QString &fanart);
META_PUBLIC bool IsDefaultCoverFile(const QString &coverfile);
META_PUBLIC bool IsDefaultScreenshot(const QString &screenshot);
META_PUBLIC bool IsDefaultBanner(const QString &banner);
META_PUBLIC bool IsDefaultFanart(const QString &fanart);

class VideoMetadata;

MPUBLIC QString GetDisplayUserRating(float userrating);
MPUBLIC QString GetDisplayLength(int length);
MPUBLIC QString GetDisplaySeasonEpisode(int seasEp, int digits);
MPUBLIC QString GetDisplayBrowse(bool browse);
MPUBLIC QString GetDisplayWatched(bool watched);
MPUBLIC QString GetDisplayProcessed(bool processed);
MPUBLIC QString GetDisplayYear(int year);
MPUBLIC QString GetDisplayRating(const QString &rating);
META_PUBLIC QString GetDisplayUserRating(float userrating);
META_PUBLIC QString GetDisplayLength(int length);
META_PUBLIC QString GetDisplaySeasonEpisode(int seasEp, int digits);
META_PUBLIC QString GetDisplayBrowse(bool browse);
META_PUBLIC QString GetDisplayWatched(bool watched);
META_PUBLIC QString GetDisplayProcessed(bool processed);
META_PUBLIC QString GetDisplayYear(int year);
META_PUBLIC QString GetDisplayRating(const QString &rating);

MPUBLIC QString GetDisplayGenres(const VideoMetadata &item);
MPUBLIC QString GetDisplayCountries(const VideoMetadata &item);
MPUBLIC QStringList GetDisplayCast(const VideoMetadata &item);
META_PUBLIC QString GetDisplayGenres(const VideoMetadata &item);
META_PUBLIC QString GetDisplayCountries(const VideoMetadata &item);
META_PUBLIC QStringList GetDisplayCast(const VideoMetadata &item);

MPUBLIC QString TrailerToState(const QString &trailerFile);
MPUBLIC QString ParentalLevelToState(const ParentalLevel &level);
MPUBLIC QString WatchedToState(bool watched);
META_PUBLIC QString TrailerToState(const QString &trailerFile);
META_PUBLIC QString ParentalLevelToState(const ParentalLevel &level);
META_PUBLIC QString WatchedToState(bool watched);

MPUBLIC bool isHostMaster(const QString &host);
META_PUBLIC bool isHostMaster(const QString &host);

// this needs to be an inline and pull in the storage group and context
// headers since it this used in dbcheck.cpp.
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/DetectLetterbox.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using namespace std;

class MythPlayer;

class MPUBLIC DetectLetterbox
class MTV_PUBLIC DetectLetterbox
{
public:
DetectLetterbox(MythPlayer* const player);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/NuppelVideoRecorder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ using namespace std;
#include "filter.h"
#include "minilzo.h"

#include "mythexp.h"
#include "mythtvexp.h"

struct video_audio;
struct VBIData;
Expand All @@ -47,7 +47,7 @@ class FilterManager;
class FilterChain;
class AudioInput;

class MPUBLIC NuppelVideoRecorder : public RecorderBase, public CC608Input
class MTV_PUBLIC NuppelVideoRecorder : public RecorderBase, public CC608Input
{
public:
NuppelVideoRecorder(TVRec *rec, ChannelBase *channel);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/audioplayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class MythPlayer;
class AudioOutput;

class MPUBLIC AudioPlayer
class MTV_PUBLIC AudioPlayer
{
public:
AudioPlayer(MythPlayer *parent, bool muted);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/avformatdecoder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ using namespace std;
#include <QTextCodec>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"
#include "mythconfig.h"
#include "avformatdecoder.h"
#include "privatedecoder.h"
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/bdringbuffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class BDOverlay
int64_t m_pts;
};

class MPUBLIC BDRingBuffer : public RingBuffer
class MTV_PUBLIC BDRingBuffer : public RingBuffer
{
public:
BDRingBuffer(const QString &lfilename);
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/cardutil.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ using namespace std;

// MythTV headers
#include "settings.h"
#include "mythexp.h"
#include "mythtvexp.h"

class InputInfo;
class CardInput;
typedef QMap<int,QString> InputNames;

MPUBLIC QString get_on_cardid(const QString&, uint);
MTV_PUBLIC QString get_on_cardid(const QString&, uint);

bool set_on_source(const QString&, uint, uint, const QString);

Expand All @@ -38,7 +38,7 @@ typedef enum
/** \class CardUtil
* \brief Collection of helper utilities for capture card DB use
*/
class MPUBLIC CardUtil
class MTV_PUBLIC CardUtil
{
public:
/// \brief all the different capture cards
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/cc608reader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "cc608decoder.h"

#include "mythexp.h"
#include "mythtvexp.h"

#define MAXTBUFFER 60

Expand Down Expand Up @@ -55,7 +55,7 @@ class CC608Buffer

class MythPlayer;

class MPUBLIC CC608Reader : public CC608Input
class MTV_PUBLIC CC608Reader : public CC608Input
{
public:
CC608Reader(MythPlayer *parent);
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelgroup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ using namespace std;
#include <QString>

// mythtv
#include "mythexp.h"
#include "mythtvexp.h"

class MPUBLIC ChannelGroupItem
class MTV_PUBLIC ChannelGroupItem
{
public:
ChannelGroupItem(const ChannelGroupItem&);
Expand All @@ -32,7 +32,7 @@ typedef vector<ChannelGroupItem> ChannelGroupList;

/** \class ChannelGroup
*/
class MPUBLIC ChannelGroup
class MTV_PUBLIC ChannelGroup
{
public:
// ChannelGroup
Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythtv/channelgroupsettings.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#ifndef CHANNELGROUPSETTINGS_H
#define CHANNELGROUPSETTINGS_H

#include "mythtvexp.h"
#include "settings.h"

class MPUBLIC ChannelGroupConfig: public ConfigurationWizard
class MTV_PUBLIC ChannelGroupConfig: public ConfigurationWizard
{
public:
ChannelGroupConfig(QString _name);
Expand All @@ -13,7 +14,7 @@ class MPUBLIC ChannelGroupConfig: public ConfigurationWizard
QString name;
};

class MPUBLIC ChannelGroupEditor : public QObject, public ConfigurationDialog
class MTV_PUBLIC ChannelGroupEditor : public QObject, public ConfigurationDialog
{
Q_OBJECT

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/channelscan/channelimporter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <QString>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"
#include "scaninfo.h"
#include "channelscantypes.h"
#include "mythmainwindow.h"
Expand Down Expand Up @@ -73,7 +73,7 @@ class ChannelImporterUniquenessStats
uint max_atscmajcnt;
};

class MPUBLIC ChannelImporter
class MTV_PUBLIC ChannelImporter
{
public:
ChannelImporter(bool gui, bool interactive,
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/channelscan/channelscanner.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define _CHANNEL_SCANNER_H_

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"
#include "dtvconfparser.h"
#include "scanmonitor.h"
#include "channelscantypes.h"
Expand All @@ -45,7 +45,7 @@ class ChannelBase;
// do_delete_channels, do_rename_channels, atsc_format
// TODO implement deletion of stale channels..

class MPUBLIC ChannelScanner
class MTV_PUBLIC ChannelScanner
{
friend class ScanMonitor;

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/channelscan/channelscanner_cli.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
#include <QString>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"
#include "settings.h"
#include "channelscanner.h"

class MPUBLIC ChannelScannerCLI : public ChannelScanner
class MTV_PUBLIC ChannelScannerCLI : public ChannelScanner
{
public:
ChannelScannerCLI(bool doScanSaveOnly, bool promptsOk);
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/channelscan/scaninfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ using namespace std;
#include <QDateTime>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"
#include "dtvmultiplex.h"

class ScanInfo
Expand All @@ -35,8 +35,8 @@ class ScanInfo
QDateTime scandate;
};

MPUBLIC vector<ScanInfo> LoadScanList(void);
MTV_PUBLIC vector<ScanInfo> LoadScanList(void);
uint SaveScan(const ScanDTVTransportList &scan);
MPUBLIC ScanDTVTransportList LoadScan(uint scanid);
MTV_PUBLIC ScanDTVTransportList LoadScan(uint scanid);

#endif // _CHANNEL_IMPORTER_HELPERS_H_
9 changes: 5 additions & 4 deletions mythtv/libs/libmythtv/channelsettings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <QString>

// MythTV
#include "mythtvexp.h"
#include "settings.h"
#include "mythwidgets.h"
#include "mythwizard.h"
Expand Down Expand Up @@ -114,7 +115,7 @@ class ChannelDBStorage : public SimpleDBStorage
class OnAirGuide;
class XmltvID;

class MPUBLIC ChannelOptionsCommon: public VerticalConfigurationGroup
class MTV_PUBLIC ChannelOptionsCommon: public VerticalConfigurationGroup
{
Q_OBJECT

Expand All @@ -131,17 +132,17 @@ class MPUBLIC ChannelOptionsCommon: public VerticalConfigurationGroup
XmltvID *xmltvID;
};

class MPUBLIC ChannelOptionsFilters: public VerticalConfigurationGroup {
class MTV_PUBLIC ChannelOptionsFilters: public VerticalConfigurationGroup {
public:
ChannelOptionsFilters(const ChannelID& id);
};

class MPUBLIC ChannelOptionsV4L: public VerticalConfigurationGroup {
class MTV_PUBLIC ChannelOptionsV4L: public VerticalConfigurationGroup {
public:
ChannelOptionsV4L(const ChannelID& id);
};

class MPUBLIC ChannelTVFormat : public ComboBoxSetting, public ChannelDBStorage
class MTV_PUBLIC ChannelTVFormat : public ComboBoxSetting, public ChannelDBStorage
{
public:
ChannelTVFormat(const ChannelID &id);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/channelutil.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ using namespace std;
#include <QString>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"
#include "dtvmultiplex.h"
#include "dbchannelinfo.h"

Expand All @@ -22,7 +22,7 @@ class NetworkInformationTable;
/** \class ChannelUtil
* \brief Collection of helper utilities for channel DB use
*/
class MPUBLIC ChannelUtil
class MTV_PUBLIC ChannelUtil
{
public:
// Multiplex Stuff
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/datadirect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <QXmlDefaultHandler>
#include <QMap>

#include "mythexp.h"
#include "mythtvexp.h"

#include <vector>
using namespace std;
Expand Down Expand Up @@ -251,7 +251,7 @@ typedef vector<DataDirectLineup> DDLineupList;
typedef vector<DataDirectLineupMap> DDLineupChannels;
typedef QMap<QString,DDLineupChannels> DDLineupMap; // lineupid ->

class MPUBLIC DataDirectProcessor
class MTV_PUBLIC DataDirectProcessor
{
friend class DDStructureParser;
public:
Expand Down
10 changes: 5 additions & 5 deletions mythtv/libs/libmythtv/dbchannelinfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ using namespace std;
#include <QVariant>

// MythTV headers
#include "mythexp.h" // for MPUBLIC
#include "mythtvexp.h"

// TODO: Refactor DBChannel, PixmapChannel and ChannelInfo into a single class

class MPUBLIC DBChannel
class MTV_PUBLIC DBChannel
{
public:
DBChannel(const DBChannel&);
Expand All @@ -44,7 +44,7 @@ class MPUBLIC DBChannel
};
typedef vector<DBChannel> DBChanList;

class MPUBLIC ChannelInfo
class MTV_PUBLIC ChannelInfo
{
public:
ChannelInfo() : chanid(-1), sourceid(-1), favid(-1) {}
Expand All @@ -63,7 +63,7 @@ class MPUBLIC ChannelInfo

Q_DECLARE_METATYPE(ChannelInfo*)

class MPUBLIC PixmapChannel : public DBChannel
class MTV_PUBLIC PixmapChannel : public DBChannel
{
public:
PixmapChannel(const PixmapChannel &other) :
Expand All @@ -78,7 +78,7 @@ class MPUBLIC PixmapChannel : public DBChannel
QString m_localIcon;
};

class MPUBLIC ChannelInsertInfo
class MTV_PUBLIC ChannelInsertInfo
{
public:
ChannelInsertInfo(void) :
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/dbcheck.h
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#ifndef DBCHECK_H_
#define DBCHECK_H_

#include "mythexp.h"
#include "mythtvexp.h"

// Call after establishing the first db connection.
MPUBLIC bool InitializeMythSchema(void);
MTV_PUBLIC bool InitializeMythSchema(void);

// Call after initialing the main db connection.
MPUBLIC bool UpgradeTVDatabaseSchema(const bool upgradeAllowed = false,
MTV_PUBLIC bool UpgradeTVDatabaseSchema(const bool upgradeAllowed = false,
const bool upgradeIfNoUI = false);

#endif
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/dvdringbuffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ extern "C" {

class MythDVDPlayer;

class MPUBLIC DVDRingBuffer : public RingBuffer
class MTV_PUBLIC DVDRingBuffer : public RingBuffer
{
public:
DVDRingBuffer(const QString &lfilename);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/eitcache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <QMap>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"

typedef QMap<uint, uint64_t> event_map_t;
typedef QMap<uint, event_map_t*> key_map_t;
Expand Down Expand Up @@ -57,7 +57,7 @@ class EITCache
static const uint kVersionMax;

public:
static MPUBLIC void ClearChannelLocks(void);
static MTV_PUBLIC void ClearChannelLocks(void);
};

#endif // _EIT_CACHE_H
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/fifowriter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#include <QMutex>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"

using namespace std;

class MPUBLIC FIFOWriter
class MTV_PUBLIC FIFOWriter
{
public:
FIFOWriter(int count, bool sync);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/fileringbuffer.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "ringbuffer.h"

class MPUBLIC FileRingBuffer : public RingBuffer
class MTV_PUBLIC FileRingBuffer : public RingBuffer
{
friend class RingBuffer;
public:
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/frequencytables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using namespace std;
// MythTV includes
#include "dtvchannel.h"

#include "mythexp.h"
#include "mythtvexp.h"
#include "dtvconfparser.h"
#include "dtvconfparserhelpers.h"

Expand All @@ -30,7 +30,7 @@ bool teardown_frequency_tables(void);
freq_table_list_t get_matching_freq_tables(
const QString &format, const QString &modulation, const QString &country);

MPUBLIC long long get_center_frequency(
MTV_PUBLIC long long get_center_frequency(
QString format, QString modulation, QString country, int freqid);

int get_closest_freqid(
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/inputgroupmap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ using namespace std;
#include <QMap>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"

typedef vector<uint> InputGroupList;

class MPUBLIC InputGroupMap
class MTV_PUBLIC InputGroupMap
{
public:
InputGroupMap() { Build(); }
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/inputinfo.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// MythTV headers
#include "channelutil.h" // for DBChanList

class MPUBLIC InputInfo
class MTV_PUBLIC InputInfo
{
public:
InputInfo() : name(QString::null),
Expand Down Expand Up @@ -41,7 +41,7 @@ class MPUBLIC InputInfo
uint mplexid; ///< mplexid restriction if applicable
};

class MPUBLIC TunedInputInfo : public InputInfo
class MTV_PUBLIC TunedInputInfo : public InputInfo
{
public:
TunedInputInfo() : chanid(0) { }
Expand All @@ -62,7 +62,7 @@ class MPUBLIC TunedInputInfo : public InputInfo
uint chanid;
};

class MPUBLIC ChannelInputInfo : public InputInfo
class MTV_PUBLIC ChannelInputInfo : public InputInfo
{
public:
ChannelInputInfo() :
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/jobqueue.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <QMutex>
#include <QMap>

#include "mythexp.h"
#include "mythtvexp.h"

class ProgramInfo;
class RecordingInfo;
Expand Down Expand Up @@ -108,7 +108,7 @@ typedef struct runningjobinfo {
ProgramInfo *pginfo;
} RunningJobInfo;

class MPUBLIC JobQueue : public QObject
class MTV_PUBLIC JobQueue : public QObject
{
Q_OBJECT
public:
Expand Down
2 changes: 2 additions & 0 deletions mythtv/libs/libmythtv/libmythtv.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ HEADERS += minilzo.h RTjpegN.h
SOURCES += minilzo.cpp RTjpegN.cpp

# Misc. needed by backend/frontend
HEADERS += mythtvexp.h
HEADERS += recordinginfo.h
HEADERS += dbcheck.h
HEADERS += videodbcheck.h
Expand Down Expand Up @@ -585,3 +586,4 @@ mingw {
include ( ../libs-targetfix.pro )

LIBS += $$LATE_LIBS
DEFINES += MTV_API
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/livetvchain.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
#include <QMutex>
#include <QList>

#include "mythexp.h"
#include "mythtvexp.h"

class ProgramInfo;
class MythSocket;

struct MPUBLIC LiveTVChainEntry
struct MTV_PUBLIC LiveTVChainEntry
{
uint chanid;
QDateTime starttime;
Expand All @@ -23,7 +23,7 @@ struct MPUBLIC LiveTVChainEntry
QString inputname;
};

class MPUBLIC LiveTVChain
class MTV_PUBLIC LiveTVChain
{
public:
LiveTVChain();
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ using namespace std;
#include <QMutex>
#include <QString>

#include "mythexp.h" // MPUBLIC - Symbol Visibility
#include "mythtvexp.h" // MTV_PUBLIC - Symbol Visibility
#include "mpegdescriptors.h"
#include "programinfo.h" // for subtitle types and audio and video properties

Expand Down Expand Up @@ -527,8 +527,8 @@ typedef enum
kCategoryLast,
} MythCategoryType;

MPUBLIC QString myth_category_type_to_string(uint category_type);
MPUBLIC MythCategoryType string_to_myth_category_type(const QString &type);
MTV_PUBLIC QString myth_category_type_to_string(uint category_type);
MTV_PUBLIC MythCategoryType string_to_myth_category_type(const QString &type);

class ContentDescriptor : public MPEGDescriptor
{
Expand Down
4 changes: 3 additions & 1 deletion mythtv/libs/libmythtv/myth_imgconvert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#ifndef MYTH_IMGCONVERT_H
#define MYTH_IMGCONVERT_H

#include "mythtvexp.h"

extern "C" {
#include "libavcodec/avcodec.h"
}
Expand All @@ -35,7 +37,7 @@ extern "C" {
* utility function to replace deprecated img_convert with
* the software scaler (swscale).
*/
MPUBLIC int myth_sws_img_convert(AVPicture *dst, PixelFormat dst_pix_fmt,
MTV_PUBLIC int myth_sws_img_convert(AVPicture *dst, PixelFormat dst_pix_fmt,
AVPicture *src, PixelFormat pix_fmt,
int width, int height);

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/mythcommflagplayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "mythplayer.h"

class MPUBLIC MythCommFlagPlayer : public MythPlayer
class MTV_PUBLIC MythCommFlagPlayer : public MythPlayer
{
public:
MythCommFlagPlayer(bool muted = false) : MythPlayer(muted) { }
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/mythiowrapper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <sys/stat.h>
#include <sys/types.h>

#include "mythexp.h"
#include "mythtvexp.h"

#ifdef __cplusplus
extern "C" {
Expand All @@ -26,7 +26,7 @@ off_t mythfile_tell(int fileID);
#endif
ssize_t mythfile_read(int fileID, void *buf, size_t count);
ssize_t mythfile_write(int fileID, void *buf, size_t count);
MPUBLIC int mythfile_stat(const char *path, struct stat *buf);
MTV_PUBLIC int mythfile_stat(const char *path, struct stat *buf);
int mythfile_stat_fd(int fileID, struct stat *buf);
int mythfile_exists(const char *path, const char *file);

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/mythplayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "commbreakmap.h"
#include "audioplayer.h"

#include "mythexp.h"
#include "mythtvexp.h"

extern "C" {
#include "filter.h"
Expand Down Expand Up @@ -96,7 +96,7 @@ class DecoderThread : public QThread
bool m_start_paused;
};

class MPUBLIC MythPlayer
class MTV_PUBLIC MythPlayer
{
// Do NOT add a decoder class to this list
friend class PlayerContext;
Expand Down
12 changes: 6 additions & 6 deletions mythtv/libs/libmythtv/mythsystemevent.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#include "rawsettingseditor.h"

// Helper commands for formatting and sending a MythSystemEvent
MPUBLIC void SendMythSystemEvent(const QString msg);
MPUBLIC void SendMythSystemRecEvent(const QString msg,
MTV_PUBLIC void SendMythSystemEvent(const QString msg);
MTV_PUBLIC void SendMythSystemRecEvent(const QString msg,
const RecordingInfo *pginfo);
MPUBLIC void SendMythSystemPlayEvent(const QString msg,
MTV_PUBLIC void SendMythSystemPlayEvent(const QString msg,
const ProgramInfo *pginfo);
MPUBLIC void SendMythSystemHostEvent(const QString msg, const QString &hostname,
MTV_PUBLIC void SendMythSystemHostEvent(const QString msg, const QString &hostname,
const QString args);

/** \class MythSystemEventHandler
Expand All @@ -24,7 +24,7 @@ MPUBLIC void SendMythSystemHostEvent(const QString msg, const QString &hostname,
* the appropriate event handler command on the local system if one is
* configured.
*/
class MPUBLIC MythSystemEventHandler : public QObject
class MTV_PUBLIC MythSystemEventHandler : public QObject
{
Q_OBJECT

Expand All @@ -50,7 +50,7 @@ class MPUBLIC MythSystemEventHandler : public QObject
* This class extends RawSettingsEditor and automatically populates the
* settings list with the MythSystemEvent handler command settings names.
*/
class MPUBLIC MythSystemEventEditor : public RawSettingsEditor
class MTV_PUBLIC MythSystemEventEditor : public RawSettingsEditor
{
Q_OBJECT

Expand Down
28 changes: 28 additions & 0 deletions mythtv/libs/libmythtv/mythtvexp.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#ifndef MYTHTVEXP_H_
#define MYTHTVEXP_H_

// This header is called from some non-QT projects,
// and if non C++ then Q_DECL_XXX never defined

#if defined( QT_CORE_LIB ) && defined( __cplusplus )
# include <QtCore/qglobal.h>
# ifdef MTV_API
# define MTV_PUBLIC Q_DECL_EXPORT
# else
# define MTV_PUBLIC Q_DECL_IMPORT
# endif
#else
# define MTV_PUBLIC
#endif

#if (__GNUC__ >= 4)
# define MHIDDEN __attribute__((visibility("hidden")))
# define MUNUSED __attribute__((unused))
# define MDEPRECATED __attribute__((deprecated))
#else
# define MHIDDEN
# define MUNUSED
# define MDEPRECATED
#endif

#endif // MYTHTVEXP_H_
3 changes: 2 additions & 1 deletion mythtv/libs/libmythtv/osd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using namespace std;

#include "mythtvexp.h"
#include "programtypes.h"
#include "mythscreentype.h"

Expand Down Expand Up @@ -48,7 +49,7 @@ enum OSDTimeout
kOSDTimeout_Long = 3,
};

class MPUBLIC OSDHideEvent : public QEvent
class MTV_PUBLIC OSDHideEvent : public QEvent
{
public:
OSDHideEvent(enum OSDFunctionalType osdFunctionalType)
Expand Down
3 changes: 2 additions & 1 deletion mythtv/libs/libmythtv/playercontext.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ using namespace std;
#include <QRect>
#include <QThread>

#include "mythtvexp.h"
#include "mythdeque.h"
#include "tv.h"
#include "videoouttypes.h"
Expand Down Expand Up @@ -59,7 +60,7 @@ class PlayerThread : public QThread
MythPlayer *m_player;
};

class MPUBLIC PlayerContext
class MTV_PUBLIC PlayerContext
{
public:
PlayerContext(const QString &inUseID = QString("Unknown"));
Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythtv/playgroup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@

#include <QStringList>

#include "mythtvexp.h"
#include "settings.h"

class ProgramInfo;

class MPUBLIC PlayGroup
class MTV_PUBLIC PlayGroup
{
public:
static QStringList GetNames(void);
Expand All @@ -17,7 +18,7 @@ class MPUBLIC PlayGroup
int defval);
};

class MPUBLIC PlayGroupEditor : public QObject, public ConfigurationDialog
class MTV_PUBLIC PlayGroupEditor : public QObject, public ConfigurationDialog
{
Q_OBJECT

Expand Down
3 changes: 2 additions & 1 deletion mythtv/libs/libmythtv/previewgenerator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <QMap>
#include <QSet>

#include "mythtvexp.h"
#include "programinfo.h"
#include "util.h"

Expand All @@ -22,7 +23,7 @@ class QEvent;

typedef QMap<QString,QDateTime> FileTimeStampMap;

class MPUBLIC PreviewGenerator : public QThread
class MTV_PUBLIC PreviewGenerator : public QThread
{
friend int preview_helper(const QString &chanid,
const QString &starttime,
Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythtv/previewgeneratorqueue.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
#include <QMap>
#include <QSet>

#include "mythtvexp.h"
#include "previewgenerator.h"
#include "mythexp.h"
#include "mythtvexp.h"

class ProgramInfo;
class QSize;
Expand All @@ -30,7 +31,7 @@ class PreviewGenState
};
typedef QMap<QString,PreviewGenState> PreviewMap;

class MPUBLIC PreviewGeneratorQueue : public QThread
class MTV_PUBLIC PreviewGeneratorQueue : public QThread
{
Q_OBJECT

Expand Down
3 changes: 2 additions & 1 deletion mythtv/libs/libmythtv/profilegroup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <QString>

#include "mythtvexp.h"
#include "settings.h"
#include "mythwidgets.h"

Expand Down Expand Up @@ -110,7 +111,7 @@ class ProfileGroup : public ConfigurationWizard
Is_default* is_default;
};

class MPUBLIC ProfileGroupEditor :
class MTV_PUBLIC ProfileGroupEditor :
public QObject, public ConfigurationDialog
{
Q_OBJECT
Expand Down
14 changes: 7 additions & 7 deletions mythtv/libs/libmythtv/programdata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ using namespace std;
#include <QMap>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"
#include "listingsources.h"

class MSqlQuery;

class MPUBLIC DBPerson
class MTV_PUBLIC DBPerson
{
public:
typedef enum
Expand Down Expand Up @@ -60,14 +60,14 @@ class MPUBLIC DBPerson
};
typedef vector<DBPerson> DBCredits;

class MPUBLIC EventRating
class MTV_PUBLIC EventRating
{
public:
QString system;
QString rating;
};

class MPUBLIC DBEvent
class MTV_PUBLIC DBEvent
{
public:
DBEvent(uint _listingsource) :
Expand Down Expand Up @@ -171,7 +171,7 @@ class MPUBLIC DBEvent
QList<EventRating> ratings;
};

class MPUBLIC DBEventEIT : public DBEvent
class MTV_PUBLIC DBEventEIT : public DBEvent
{
public:
DBEventEIT(uint _chanid,
Expand Down Expand Up @@ -216,7 +216,7 @@ class MPUBLIC DBEventEIT : public DBEvent
uint32_t fixup;
};

class MPUBLIC ProgInfo : public DBEvent
class MTV_PUBLIC ProgInfo : public DBEvent
{
public:
ProgInfo() :
Expand Down Expand Up @@ -253,7 +253,7 @@ class MPUBLIC ProgInfo : public DBEvent
QString clumpmax;
};

class MPUBLIC ProgramData
class MTV_PUBLIC ProgramData
{
public:
static void HandlePrograms(uint sourceid,
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/programdetail.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ using namespace std;
#include <QDateTime>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"

class MPUBLIC ProgramDetail
class MTV_PUBLIC ProgramDetail
{
public:
QString channame;
Expand All @@ -23,7 +23,7 @@ class MPUBLIC ProgramDetail
};
typedef vector<ProgramDetail> ProgramDetailList;

MPUBLIC bool GetProgramDetailList(
MTV_PUBLIC bool GetProgramDetailList(
QDateTime &nextRecordingStart,
bool *hasConflicts = NULL,
ProgramDetailList *list = NULL);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/recorderbase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <pthread.h>

#include "mythexp.h"
#include "mythtvexp.h"
#include "mythtimer.h"
#include "programtypes.h" // for MarkTypes, frm_pos_map_t

Expand All @@ -32,7 +32,7 @@ class RecordingProfile;
*
* \sa TVRec
*/
class MPUBLIC RecorderBase
class MTV_PUBLIC RecorderBase
{
friend class Transcode; // for access to SetIntOption(), SetStrOption()

Expand Down
3 changes: 2 additions & 1 deletion mythtv/libs/libmythtv/recordinginfo.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef _RECORDING_INFO_H_
#define _RECORDING_INFO_H_

#include "mythtvexp.h"
#include "programinfo.h"

class RecordingRule;
Expand All @@ -25,7 +26,7 @@ class RecordingRule;

typedef AutoDeleteDeque<RecordingInfo*> RecordingList;

class MPUBLIC RecordingInfo : public ProgramInfo
class MTV_PUBLIC RecordingInfo : public ProgramInfo
{
public:
RecordingInfo(void) : record(NULL) {}
Expand Down
3 changes: 2 additions & 1 deletion mythtv/libs/libmythtv/recordingprofile.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef RECORDINGPROFILE_H
#define RECORDINGPROFILE_H

#include "mythtvexp.h"
#include "settings.h"
#include "mythdbcon.h"
#include "mythwidgets.h"
Expand Down Expand Up @@ -37,7 +38,7 @@ class TranscodeResize;
class TranscodeLossless;
class TranscodeFilters;

class MPUBLIC RecordingProfile : public QObject, public ConfigurationWizard
class MTV_PUBLIC RecordingProfile : public QObject, public ConfigurationWizard
{
Q_OBJECT
protected:
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/recordingrule.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <QTime>

// libmythbase
#include "mythexp.h"
#include "mythtvexp.h"

// libmyth
#include "programinfo.h"
Expand All @@ -26,7 +26,7 @@
*
*/

class MPUBLIC RecordingRule
class MTV_PUBLIC RecordingRule
{

public:
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/remoteencoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
#include <QHash>
#include <QMap>

#include "mythexp.h"
#include "mythtvexp.h"
#include "videoouttypes.h"
#include "tv.h"

class QStringList;
class ProgramInfo;
class MythSocket;

class MPUBLIC RemoteEncoder
class MTV_PUBLIC RemoteEncoder
{
public:
RemoteEncoder(int num, const QString &host, short port);
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/ringbuffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ extern "C" {
#include "libavcodec/avcodec.h"
}

#include "mythexp.h"
#include "mythtvexp.h"

class ThreadedFileWriter;
class DVDRingBuffer;
class BDRingBuffer;
class LiveTVChain;
class RemoteFile;

class MPUBLIC RingBuffer : protected QThread
class MTV_PUBLIC RingBuffer : protected QThread
{
public:
static RingBuffer *Create(const QString &lfilename, bool write,
Expand Down
3 changes: 2 additions & 1 deletion mythtv/libs/libmythtv/scanwizard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@
#define SCANWIZARD_H

// MythTV headers
#include "mythtvexp.h"
#include "mythdbcon.h"
#include "mythwizard.h"
#include "settings.h"

class ScanWizardConfig;
class ChannelScannerGUI;

class MPUBLIC ScanWizard : public QObject, public ConfigurationWizard
class MTV_PUBLIC ScanWizard : public QObject, public ConfigurationWizard
{
Q_OBJECT

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/scheduledrecording.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef SCHEDULEDRECORDING_H
#define SCHEDULEDRECORDING_H

#include "mythexp.h"
#include "mythtvexp.h"

class MPUBLIC ScheduledRecording
class MTV_PUBLIC ScheduledRecording
{
public:
ScheduledRecording();
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/signalmonitorlistener.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef _SIGNALMONITORLISTENER_H_
#define _SIGNALMONITORLISTENER_H_

#include "mythexp.h"
#include "mythtvexp.h"
#include "signalmonitorvalue.h"

typedef enum {
Expand All @@ -18,7 +18,7 @@ typedef enum {
kStatusRotorPosition,
} SignalMonitorMessageType;

class MPUBLIC SignalMonitorListener
class MTV_PUBLIC SignalMonitorListener
{
protected:
virtual ~SignalMonitorListener() { }
Expand Down Expand Up @@ -54,7 +54,7 @@ class MPUBLIC SignalMonitorListener
virtual void StatusSignalStrength(const SignalMonitorValue&) = 0;
};

class MPUBLIC DVBSignalMonitorListener : public SignalMonitorListener
class MTV_PUBLIC DVBSignalMonitorListener : public SignalMonitorListener
{
protected:
virtual ~DVBSignalMonitorListener() { }
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/sourceutil.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ using namespace std;
#include <QString>

// MythTV headers
#include "mythexp.h"
#include "mythtvexp.h"

class MPUBLIC SourceUtil
class MTV_PUBLIC SourceUtil
{
public:
static bool HasDigitalChannel(uint sourceid);
Expand Down
3 changes: 2 additions & 1 deletion mythtv/libs/libmythtv/transporteditor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include <QObject>

#include "mythtvexp.h"
#include "settings.h"

class VideoSourceSelector;
Expand Down Expand Up @@ -68,7 +69,7 @@ class TransportList : public ListBoxSetting, public TransientStorage
};

// Page for selecting a transport to be created/edited
class MPUBLIC TransportListEditor : public QObject, public ConfigurationDialog
class MTV_PUBLIC TransportListEditor : public QObject, public ConfigurationDialog
{
Q_OBJECT

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/tv_play.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ class AskProgramInfo
ProgramInfo *info;
};

class MPUBLIC TV : public QObject
class MTV_PUBLIC TV : public QObject
{
friend class PlaybackBox;
friend class GuideGrid;
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/tv_rec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class PendingInfo
};
typedef QMap<uint,PendingInfo> PendingMap;

class MPUBLIC TVRec : public SignalMonitorListener
class MTV_PUBLIC TVRec : public SignalMonitorListener
{
friend class TuningRequest;
friend class SignalMonitor;
Expand Down
34 changes: 17 additions & 17 deletions mythtv/libs/libmythtv/tvremoteutil.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <vector>
using namespace std;

#include "mythexp.h"
#include "mythtvexp.h"

class ProgramInfo;
class RemoteEncoder;
Expand All @@ -27,27 +27,27 @@ class TunerStatus
QDateTime endTime;
};

MPUBLIC uint RemoteGetState(uint cardid);
MPUBLIC uint RemoteGetFlags(uint cardid);
MPUBLIC bool RemoteRecordPending(
MTV_PUBLIC uint RemoteGetState(uint cardid);
MTV_PUBLIC uint RemoteGetFlags(uint cardid);
MTV_PUBLIC bool RemoteRecordPending(
uint cardid, const ProgramInfo *pginfo, int secsleft, bool hasLater);
MPUBLIC bool RemoteStopLiveTV(uint cardid);
MPUBLIC bool RemoteStopRecording(uint cardid);
MPUBLIC void RemoteStopRecording(const ProgramInfo *pginfo);
MPUBLIC void RemoteCancelNextRecording(uint cardid, bool cancel);
MPUBLIC RemoteEncoder *RemoteRequestRecorder(void);
MPUBLIC RemoteEncoder *RemoteRequestNextFreeRecorder(int curr);
MPUBLIC
MTV_PUBLIC bool RemoteStopLiveTV(uint cardid);
MTV_PUBLIC bool RemoteStopRecording(uint cardid);
MTV_PUBLIC void RemoteStopRecording(const ProgramInfo *pginfo);
MTV_PUBLIC void RemoteCancelNextRecording(uint cardid, bool cancel);
MTV_PUBLIC RemoteEncoder *RemoteRequestRecorder(void);
MTV_PUBLIC RemoteEncoder *RemoteRequestNextFreeRecorder(int curr);
MTV_PUBLIC
RemoteEncoder *RemoteRequestFreeRecorderFromList(
const QStringList &qualifiedRecorders);
MPUBLIC RemoteEncoder *RemoteGetExistingRecorder(const ProgramInfo *pginfo);
MPUBLIC RemoteEncoder *RemoteGetExistingRecorder(int recordernum);
MPUBLIC vector<InputInfo> RemoteRequestFreeInputList(
MTV_PUBLIC RemoteEncoder *RemoteGetExistingRecorder(const ProgramInfo *pginfo);
MTV_PUBLIC RemoteEncoder *RemoteGetExistingRecorder(int recordernum);
MTV_PUBLIC vector<InputInfo> RemoteRequestFreeInputList(
uint cardid, const vector<uint> &excluded_cardids);
MPUBLIC InputInfo RemoteRequestBusyInputID(uint cardid);
MPUBLIC bool RemoteIsBusy(uint cardid, TunedInputInfo &busy_input);
MTV_PUBLIC InputInfo RemoteRequestBusyInputID(uint cardid);
MTV_PUBLIC bool RemoteIsBusy(uint cardid, TunedInputInfo &busy_input);

MPUBLIC bool RemoteGetRecordingStatus(
MTV_PUBLIC bool RemoteGetRecordingStatus(
vector<TunerStatus> *tunerList, bool list_inactive);

#endif // _TV_REMOTE_UTIL_H_
Expand Down
3 changes: 2 additions & 1 deletion mythtv/libs/libmythtv/videodisplayprofile.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ using namespace std;
#include <QSize>
#include <QMap>

#include "mythtvexp.h"
#include "mythcontext.h"

typedef QMap<QString,QString> pref_map_t;
Expand Down Expand Up @@ -77,7 +78,7 @@ class ProfileItem
};
typedef vector<ProfileItem> item_list_t;

class MPUBLIC VideoDisplayProfile
class MTV_PUBLIC VideoDisplayProfile
{
public:
VideoDisplayProfile();
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/videometadatautil.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include <QString>

// MythTV headers
#include "mythexp.h" // for MPUBLIC
#include "mythtvexp.h"

class MPUBLIC VideoMetaDataUtil
class MTV_PUBLIC VideoMetaDataUtil
{
public:
static QString GetArtPath(const QString &basename, const QString &type);
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/videosource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ class CardInputDBStorage : public SimpleDBStorage
const CardInput& m_parent;
};

class MPUBLIC CaptureCardEditor : public QObject, public ConfigurationDialog
class MTV_PUBLIC CaptureCardEditor : public QObject, public ConfigurationDialog
{
Q_OBJECT

Expand All @@ -693,7 +693,7 @@ class MPUBLIC CaptureCardEditor : public QObject, public ConfigurationDialog
ListBoxSetting *listbox;
};

class MPUBLIC VideoSourceEditor : public QObject, public ConfigurationDialog
class MTV_PUBLIC VideoSourceEditor : public QObject, public ConfigurationDialog
{
Q_OBJECT

Expand All @@ -719,7 +719,7 @@ class MPUBLIC VideoSourceEditor : public QObject, public ConfigurationDialog
ListBoxSetting *listbox;
};

class MPUBLIC CardInputEditor : public QObject, public ConfigurationDialog
class MTV_PUBLIC CardInputEditor : public QObject, public ConfigurationDialog
{
Q_OBJECT

Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/DisplayRes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <vector>

#include "DisplayResScreen.h"
#include "mythexp.h"
#include "mythuiexp.h"

/** \class DisplayRes
* \brief The DisplayRes module allows for the display resolution
Expand All @@ -29,7 +29,7 @@ typedef enum
MAX_MODES = 5,
} tmode;

class MPUBLIC DisplayRes
class MUI_PUBLIC DisplayRes
{
public:
/** \brief Factory method that returns a DisplayRes singleton
Expand Down Expand Up @@ -172,6 +172,6 @@ class MPUBLIC DisplayRes
* class if needed, and returns a copy of vector returned by
* GetVideoModes(void).
*/
MPUBLIC const DisplayResVector GetVideoModes(void);
MUI_PUBLIC const DisplayResVector GetVideoModes(void);

#endif
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/DisplayResScreen.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <stdint.h> // for uint64_t

#include "mythexp.h"
#include "mythuiexp.h"

class DisplayResScreen;

Expand All @@ -21,7 +21,7 @@ typedef std::map<uint64_t, DisplayResScreen> DisplayResMap;
typedef DisplayResMap::iterator DisplayResMapIt;
typedef DisplayResMap::const_iterator DisplayResMapCIt;

class MPUBLIC DisplayResScreen
class MUI_PUBLIC DisplayResScreen
{
public:
// Constructors, initializers
Expand Down
2 changes: 2 additions & 0 deletions mythtv/libs/libmythui/libmythui.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ HEADERS += mythgenerictree.h mythuibuttontree.h mythuiutils.h
HEADERS += mythvirtualkeyboard.h mythuishape.h mythuiguidegrid.h
HEADERS += mythrender_base.h mythfontmanager.h mythuieditbar.h
HEADERS += mythdisplay.h mythuivideo.h mythudplistener.h
HEADERS += mythuiexp.h

SOURCES = mythmainwindow.cpp mythpainter.cpp mythimage.cpp mythrect.cpp
SOURCES += myththemebase.cpp mythpainter_qimage.cpp mythpainter_yuva.cpp
Expand Down Expand Up @@ -156,6 +157,7 @@ using_opengl {

QT += xml sql network webkit
DEFINES += USING_QTWEBKIT
DEFINES += MUI_API

use_hidesyms {
QMAKE_CXXFLAGS += -fvisibility=hidden
Expand Down
12 changes: 6 additions & 6 deletions mythtv/libs/libmythui/mythdialogbox.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MythUIStateType;
* The result may be in the format of an int, text or a void pointer
* dependant on the dialog type and information it is conveying.
*/
class MPUBLIC DialogCompletionEvent : public QEvent
class MUI_PUBLIC DialogCompletionEvent : public QEvent
{
public:
DialogCompletionEvent(const QString &id, int result, QString text,
Expand Down Expand Up @@ -57,7 +57,7 @@ class MPUBLIC DialogCompletionEvent : public QEvent
* Sends out a DialogCompletionEvent event and the Selected() signal
* containing the result when the user selects the Ok button.
*/
class MPUBLIC MythDialogBox : public MythScreenType
class MUI_PUBLIC MythDialogBox : public MythScreenType
{
Q_OBJECT
public:
Expand Down Expand Up @@ -119,7 +119,7 @@ class MPUBLIC MythDialogBox : public MythScreenType
* Sends out a DialogCompletionEvent event and the haveResult() signal
* containing the result.
*/
class MPUBLIC MythConfirmationDialog : public MythScreenType
class MUI_PUBLIC MythConfirmationDialog : public MythScreenType
{
Q_OBJECT

Expand Down Expand Up @@ -157,7 +157,7 @@ class MPUBLIC MythConfirmationDialog : public MythScreenType
* Sends out a DialogCompletionEvent event and the haveResult() signal
* containing the result when the user selects the Ok button.
*/
class MPUBLIC MythTextInputDialog : public MythScreenType
class MUI_PUBLIC MythTextInputDialog : public MythScreenType
{
Q_OBJECT

Expand Down Expand Up @@ -201,7 +201,7 @@ class MPUBLIC MythTextInputDialog : public MythScreenType
* haveResult(QString) signal will be generated. Both pass the selected
* string back to the caller.
*/
class MPUBLIC MythUISearchDialog : public MythScreenType
class MUI_PUBLIC MythUISearchDialog : public MythScreenType
{
Q_OBJECT

Expand Down Expand Up @@ -237,7 +237,7 @@ class MPUBLIC MythUISearchDialog : public MythScreenType
void slotUpdateList(void);
};

MPUBLIC MythConfirmationDialog *ShowOkPopup(const QString &message, QObject *parent = NULL,
MUI_PUBLIC MythConfirmationDialog *ShowOkPopup(const QString &message, QObject *parent = NULL,
const char *slot = NULL, bool showCancel = false);

Q_DECLARE_METATYPE(const char*)
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythdisplay.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <QWidget>
#include <QSize>

#include "mythexp.h"
#include "mythuiexp.h"

class DisplayInfo
{
Expand All @@ -19,7 +19,7 @@ class DisplayInfo
float rate;
};

class MPUBLIC MythDisplay
class MUI_PUBLIC MythDisplay
{
public:
static DisplayInfo GetDisplayInfo(int video_rate = 0);
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/mythfontmanager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
#include <QMutex>
#include <QString>

#include "mythexp.h"
#include "mythuiexp.h"

class MythFontReference;
typedef QMultiHash<QString, MythFontReference*> FontPathToReference;

class MPUBLIC MythFontManager
class MUI_PUBLIC MythFontManager
{
public:
MythFontManager() {}
Expand All @@ -35,7 +35,7 @@ class MPUBLIC MythFontManager

};

MPUBLIC MythFontManager *GetGlobalFontManager(void);
MUI_PUBLIC MythFontManager *GetGlobalFontManager(void);

class MythFontReference
{
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythui/mythfontproperties.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "xmlparsebase.h"
#include "mythmainwindow.h"

class MPUBLIC MythFontProperties: public XMLParseBase
class MUI_PUBLIC MythFontProperties: public XMLParseBase
{
public:
MythFontProperties();
Expand Down Expand Up @@ -81,7 +81,7 @@ class MPUBLIC MythFontProperties: public XMLParseBase
friend class FontMap;
};

class MPUBLIC FontMap
class MUI_PUBLIC FontMap
{
public:
FontMap() {}
Expand All @@ -99,7 +99,7 @@ class MPUBLIC FontMap
QMap<QString, MythFontProperties> m_FontMap;
};

MPUBLIC FontMap *GetGlobalFontMap(void);
MUI_PUBLIC FontMap *GetGlobalFontMap(void);


// FIXME: remove legacy crap
Expand All @@ -109,6 +109,6 @@ struct fontProp {
QColor color;
QColor dropColor;
};
extern MPUBLIC QMap<QString, fontProp> globalFontMap;
extern MUI_PUBLIC QMap<QString, fontProp> globalFontMap;

#endif
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythgenerictree.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
#include <QMap>
#include <QHash>

#include "mythexp.h"
#include "mythuiexp.h"

#include "mythuibuttonlist.h"

class SortableMythGenericTreeList;

class MPUBLIC MythGenericTree
class MUI_PUBLIC MythGenericTree
{
typedef QVector<int> IntVector;

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythimage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ enum FillDirection {FillLeftToRight, FillTopToBottom};
class QNetworkReply;
class MythUIHelper;

class MPUBLIC MythImageReader: public QImageReader
class MUI_PUBLIC MythImageReader: public QImageReader
{
public:
MythImageReader(const QString &fileName);
Expand All @@ -27,7 +27,7 @@ class MPUBLIC MythImageReader: public QImageReader
QNetworkReply *m_networkReply;
};

class MPUBLIC MythImage : public QImage
class MUI_PUBLIC MythImage : public QImage
{
public:
MythImage(MythPainter *parent);
Expand Down
10 changes: 5 additions & 5 deletions mythtv/libs/libmythui/mythmainwindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MythPainterWindowVDPAU;
class MythPainterWindowD3D9;
class MythRender;

class MPUBLIC MythMainWindow : public QWidget
class MUI_PUBLIC MythMainWindow : public QWidget
{
Q_OBJECT
friend class MythPainterWindowGL;
Expand Down Expand Up @@ -157,11 +157,11 @@ class MPUBLIC MythMainWindow : public QWidget
MythMainWindowPrivate *d;
};

MPUBLIC MythMainWindow *GetMythMainWindow();
MPUBLIC bool HasMythMainWindow();
MPUBLIC void DestroyMythMainWindow();
MUI_PUBLIC MythMainWindow *GetMythMainWindow();
MUI_PUBLIC bool HasMythMainWindow();
MUI_PUBLIC void DestroyMythMainWindow();

MPUBLIC MythPainter *GetMythPainter();
MUI_PUBLIC MythPainter *GetMythPainter();

#endif

4 changes: 2 additions & 2 deletions mythtv/libs/libmythui/mythpainter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ class QColor;

#include "compat.h"

#include "mythexp.h"
#include "mythuiexp.h"

class MythFontProperties;
class MythImage;

class MPUBLIC MythPainter
class MUI_PUBLIC MythPainter
{
public:
MythPainter() : m_Parent(0), m_CacheSize(0) { }
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythpainter_ogl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "mythimage.h"
#include "mythrender_opengl.h"

class MPUBLIC MythOpenGLPainter : public MythPainter
class MUI_PUBLIC MythOpenGLPainter : public MythPainter
{
public:
MythOpenGLPainter(MythRenderOpenGL *render = NULL, QGLWidget *parent = NULL);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythpainter_qimage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class QPainter;

class MPUBLIC MythQImagePainter : public MythPainter
class MUI_PUBLIC MythQImagePainter : public MythPainter
{
public:
MythQImagePainter();
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythpainter_vdpau.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class MythRenderVDPAU;

class MPUBLIC MythVDPAUPainter : public MythPainter
class MUI_PUBLIC MythVDPAUPainter : public MythPainter
{
public:
MythVDPAUPainter(MythRenderVDPAU *render = NULL);
Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythui/mythpainter_yuva.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class MythFontProperties;

class MPUBLIC MythYUVAPainter : public MythQImagePainter
class MUI_PUBLIC MythYUVAPainter : public MythQImagePainter
{
public:
MythYUVAPainter() : MythQImagePainter() { }
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythui/mythprogressdialog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "mythuitext.h"
#include "mythuiprogressbar.h"

class MPUBLIC ProgressUpdateEvent : public QEvent
class MUI_PUBLIC ProgressUpdateEvent : public QEvent
{
public:
ProgressUpdateEvent(uint count, uint total=0, QString message="") :
Expand All @@ -27,7 +27,7 @@ class MPUBLIC ProgressUpdateEvent : public QEvent
QString m_message;
};

class MPUBLIC MythUIBusyDialog : public MythScreenType
class MUI_PUBLIC MythUIBusyDialog : public MythScreenType
{
Q_OBJECT
public:
Expand All @@ -51,7 +51,7 @@ class MPUBLIC MythUIBusyDialog : public MythScreenType
MythUIText *m_messageText;
};

class MPUBLIC MythUIProgressDialog : public MythScreenType
class MUI_PUBLIC MythUIProgressDialog : public MythScreenType
{
Q_OBJECT
public:
Expand All @@ -77,6 +77,6 @@ class MPUBLIC MythUIProgressDialog : public MythScreenType
MythUIProgressBar *m_progressBar;
};

MPUBLIC MythUIBusyDialog *ShowBusyPopup(const QString &message);
MUI_PUBLIC MythUIBusyDialog *ShowBusyPopup(const QString &message);

#endif
6 changes: 3 additions & 3 deletions mythtv/libs/libmythui/mythrect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <QPoint>
#include <QString>

#include "mythexp.h"
#include "mythuiexp.h"

class MythPoint;

Expand All @@ -14,7 +14,7 @@ class MythPoint;
* \brief Wrapper around QRect allowing us to handle percentage and other
* relative values for areas in mythui
*/
class MPUBLIC MythRect : public QRect
class MUI_PUBLIC MythRect : public QRect
{

public:
Expand Down Expand Up @@ -72,7 +72,7 @@ class MPUBLIC MythRect : public QRect
* \brief Wrapper around QPoint allowing us to handle percentage and other
* relative values for positioning in mythui
*/
class MPUBLIC MythPoint : public QPoint
class MUI_PUBLIC MythPoint : public QPoint
{

public:
Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythui/mythrender_opengl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#import <agl.h>
#endif

#include "mythuiexp.h"
#include "mythverbose.h"
#include "mythrender_base.h"
#include "mythrender_opengl_defs.h"
Expand Down Expand Up @@ -84,7 +85,7 @@ class MythGLTexture

class MythRenderOpenGL;

class MPUBLIC OpenGLLocker
class MUI_PUBLIC OpenGLLocker
{
public:
OpenGLLocker(MythRenderOpenGL *render);
Expand All @@ -93,7 +94,7 @@ class MPUBLIC OpenGLLocker
MythRenderOpenGL *m_render;
};

class MPUBLIC MythRenderOpenGL : public QGLContext, public MythRender
class MUI_PUBLIC MythRenderOpenGL : public QGLContext, public MythRender
{
public:
static MythRenderOpenGL* Create(const QGLFormat& format,
Expand Down