Skip to content

Commit

Permalink
Enable symbol visibility for libmythupnp
Browse files Browse the repository at this point in the history
  • Loading branch information
@stuartm
stuartm committed Dec 14, 2010
1 parent a888720 commit beec687
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 47 deletions.
5 changes: 4 additions & 1 deletion mythtv/libs/libmythupnp/libmythupnp.pro
View file
Expand Up @@ -56,9 +56,12 @@ macx {
QMAKE_LFLAGS_SHLIB += -flat_namespace
}

#The following line was inserted by qt3to4
QT += network xml sql

use_hidesyms {
QMAKE_CXXFLAGS += -fvisibility=hidden
}

include ( ../libs-targetfix.pro )

LIBS += $$LATE_LIBS
4 changes: 2 additions & 2 deletions mythtv/libs/libmythupnp/mythxmlclient.h
View file
Expand Up @@ -28,7 +28,7 @@

#include "httpcomms.h"

#include "mythexp.h"
#include "upnpexp.h"

#include "mythdbparams.h"
#include "upnp.h"
Expand All @@ -42,7 +42,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////

class MPUBLIC MythXMLClient : public SOAPClient
class UPNP_PUBLIC MythXMLClient : public SOAPClient
{
protected:

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythupnp/ssdp.h
View file
Expand Up @@ -27,7 +27,7 @@
#include <QThread>
#include <QFile>

#include "mythexp.h"
#include "upnpexp.h"
#include "httpserver.h"
#include "taskqueue.h"
#include "msocketdevice.h"
Expand Down Expand Up @@ -69,7 +69,7 @@ typedef enum

#define NumberOfSockets (sizeof( m_Sockets ) / sizeof( MSocketDevice * ))

class MPUBLIC SSDP : public QThread
class UPNP_PUBLIC SSDP : public QThread
{
private:

Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythupnp/ssdpcache.h
View file
Expand Up @@ -24,7 +24,7 @@
#ifndef __SSDPCLIENT_H__
#define __SSDPCLIENT_H__

#include "mythexp.h"
#include "upnpexp.h"
#include "mythobservable.h"

#include <QObject>
Expand Down Expand Up @@ -85,7 +85,7 @@ typedef QMap< QString, SSDPCacheEntries * > SSDPCacheEntriesMap; // Key == Ser
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////

class MPUBLIC SSDPCache : public QObject,
class UPNP_PUBLIC SSDPCache : public QObject,
public MythObservable
{
Q_OBJECT
Expand Down
82 changes: 42 additions & 40 deletions mythtv/libs/libmythupnp/upnpcdsobjects.h
View file
Expand Up @@ -3,10 +3,10 @@
// Created : Oct. 24, 2005
//
// Purpose : uPnp Content Directory Service Object Definitions
//
//
// Copyright (c) 2005 David Blain <mythtv@theblains.net>
//
// This library is free software; you can redistribute it and/or
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or at your option any later version of the LGPL.
Expand All @@ -29,6 +29,8 @@
#include <QList>
#include <QMap>

#include "upnpexp.h"

class CDSObject;
class QTextStream;

Expand Down Expand Up @@ -61,7 +63,7 @@ class Property

public:

explicit Property( const QString &sName,
explicit Property( const QString &sName,
const QString &sNameSpace = "",
bool bRequired = false,
const QString &sValue = "" )
Expand All @@ -72,7 +74,7 @@ class Property
m_sValue = sValue;
}

void AddAttribute( const QString &sName,
void AddAttribute( const QString &sName,
const QString &sValue )
{
m_lstAttributes.push_back(NameValue(sName, sValue));
Expand All @@ -97,14 +99,14 @@ class Resource

public:

Resource( const QString &sProtocolInfo,
Resource( const QString &sProtocolInfo,
const QString &sURI )
{
m_sProtocolInfo = sProtocolInfo;
m_sURI = sURI;
}

void AddAttribute( const QString &sName,
void AddAttribute( const QString &sName,
const QString &sValue )
{
m_lstAttributes.push_back(NameValue(sName, sValue));
Expand All @@ -127,7 +129,7 @@ class ContainerClass

public:

ContainerClass( const QString &sClass,
ContainerClass( const QString &sClass,
const QString &sName,
bool bIncludeDerived )
{
Expand All @@ -143,14 +145,14 @@ typedef QStringList FilterMap;

//////////////////////////////////////////////////////////////////////////////

class CDSObject
class UPNP_PUBLIC CDSObject
{
public:
short m_nUpdateId;

ObjectTypes m_eType;

// Required
// Required

QString m_sId;
QString m_sParentId;
Expand All @@ -160,7 +162,7 @@ class CDSObject
bool m_bSearchable;

// Optional

QString m_sCreator;
QString m_sWriteStatus;

Expand All @@ -180,7 +182,7 @@ class CDSObject

public:

explicit CDSObject( const QString sId = "-1",
explicit CDSObject( const QString sId = "-1",
const QString sTitle = "",
const QString sParentId = "-1" );
virtual ~CDSObject();
Expand All @@ -204,33 +206,33 @@ class CDSObject

public:

static CDSObject *CreateItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateContainer ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateAudioItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMusicTrack ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateAudioBroadcast ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateAudioBook ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateVideoItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMovie ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateVideoBroadcast ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMusicVideoClip ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateImageItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreatePhoto ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreatePlaylistItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateTextItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateAlbum ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMusicAlbum ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreatePhotoAlbum ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateGenre ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMusicGenre ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMovieGenre ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreatePlaylistContainer( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreatePerson ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMusicArtist ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateStorageSystem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateStorageVolume ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateStorageFolder ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );

};
static CDSObject *CreateItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateContainer ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateAudioItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMusicTrack ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateAudioBroadcast ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateAudioBook ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateVideoItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMovie ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateVideoBroadcast ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMusicVideoClip ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateImageItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreatePhoto ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreatePlaylistItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateTextItem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateAlbum ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMusicAlbum ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreatePhotoAlbum ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateGenre ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMusicGenre ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMovieGenre ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreatePlaylistContainer( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreatePerson ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateMusicArtist ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateStorageSystem ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateStorageVolume ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );
static CDSObject *CreateStorageFolder ( QString sId, QString sTitle, QString sParentId, CDSObject *pObject = NULL );

};

#endif

0 comments on commit beec687

Please sign in to comment.