1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05:00

qrtplib: removed JRTPLIB_IMPORTEXPORT

This commit is contained in:
f4exb 2018-02-27 23:26:03 +01:00
parent fb4d07c275
commit b8c50eb798
41 changed files with 63 additions and 71 deletions

View File

@ -49,7 +49,7 @@ namespace qrtplib
class RTCPCompoundPacket;
/** Describes an RTCP APP packet. */
class JRTPLIB_IMPORTEXPORT RTCPAPPPacket: public RTCPPacket
class RTCPAPPPacket: public RTCPPacket
{
public:
/** Creates an instance based on the data in \c data with length \c datalen.

View File

@ -49,7 +49,7 @@ namespace qrtplib
class RTCPCompoundPacket;
/** Describes an RTCP BYE packet. */
class JRTPLIB_IMPORTEXPORT RTCPBYEPacket: public RTCPPacket
class RTCPBYEPacket: public RTCPPacket
{
public:
/** Creates an instance based on the data in \c data with length \c datalen.

View File

@ -50,7 +50,7 @@ class RTPRawPacket;
class RTCPPacket;
/** Represents an RTCP compound packet. */
class JRTPLIB_IMPORTEXPORT RTCPCompoundPacket
class RTCPCompoundPacket
{
public:
/** Creates an RTCPCompoundPacket instance from the data in \c rawpack, installing a memory manager if specified. */

View File

@ -57,7 +57,7 @@ class RTPMemoryManager;
* been built successfully. The member functions described below return \c ERR_RTP_RTCPCOMPPACKBUILDER_NOTENOUGHBYTESLEFT
* if the action would cause the maximum allowed size to be exceeded.
*/
class JRTPLIB_IMPORTEXPORT RTCPCompoundPacketBuilder: public RTCPCompoundPacket
class RTCPCompoundPacketBuilder: public RTCPCompoundPacket
{
public:
/** Constructs an RTCPCompoundPacketBuilder instance, optionally installing a memory manager. */

View File

@ -47,7 +47,7 @@ namespace qrtplib
class RTCPCompoundPacket;
/** Base class for specific types of RTCP packets. */
class JRTPLIB_IMPORTEXPORT RTCPPacket
class RTCPPacket
{
public:
/** Identifies the specific kind of RTCP packet. */

View File

@ -59,7 +59,7 @@ class RTCPCompoundPacketBuilder;
* an RTPSources instance to automatically generate the next compound packet which should be sent. It also
* provides functions to determine when SDES items other than the CNAME item should be sent.
*/
class JRTPLIB_IMPORTEXPORT RTCPPacketBuilder
class RTCPPacketBuilder
{
public:
/** Creates an RTCPPacketBuilder instance.

View File

@ -49,7 +49,7 @@ namespace qrtplib
class RTCPCompoundPacket;
/** Describes an RTCP receiver report packet. */
class JRTPLIB_IMPORTEXPORT RTCPRRPacket: public RTCPPacket
class RTCPRRPacket: public RTCPPacket
{
public:
/** Creates an instance based on the data in \c data with length \c datalen.

View File

@ -50,7 +50,7 @@ class RTPPacket;
class RTPSources;
/** Describes parameters used by the RTCPScheduler class. */
class JRTPLIB_IMPORTEXPORT RTCPSchedulerParams
class RTCPSchedulerParams
{
public:
RTCPSchedulerParams();
@ -119,7 +119,7 @@ private:
};
/** This class determines when RTCP compound packets should be sent. */
class JRTPLIB_IMPORTEXPORT RTCPScheduler
class RTCPScheduler
{
public:
/** Creates an instance which will use the source table RTPSources to determine when RTCP compound

View File

@ -49,7 +49,7 @@ namespace qrtplib
{
/** The class RTCPSDESInfo is a container for RTCP SDES information. */
class JRTPLIB_IMPORTEXPORT RTCPSDESInfo
class RTCPSDESInfo
{
public:
/** Constructs an instance, optionally installing a memory manager. */

View File

@ -50,7 +50,7 @@ namespace qrtplib
class RTCPCompoundPacket;
/** Describes an RTCP source description packet. */
class JRTPLIB_IMPORTEXPORT RTCPSDESPacket: public RTCPPacket
class RTCPSDESPacket: public RTCPPacket
{
public:
/** Identifies the type of an SDES item. */

View File

@ -50,7 +50,7 @@ namespace qrtplib
class RTCPCompoundPacket;
/** Describes an RTCP sender report packet. */
class JRTPLIB_IMPORTEXPORT RTCPSRPacket: public RTCPPacket
class RTCPSRPacket: public RTCPPacket
{
public:
/** Creates an instance based on the data in \c data with length \c datalen.

View File

@ -51,7 +51,7 @@ class RTCPCompoundPacket;
* the ones it inherited. Note that since an unknown packet type doesn't have any format to check
* against, the IsKnownFormat function will trivially return \c true.
*/
class JRTPLIB_IMPORTEXPORT RTCPUnknownPacket: public RTCPPacket
class RTCPUnknownPacket: public RTCPPacket
{
public:
/** Creates an instance based on the data in \c data with length \c datalen.

View File

@ -61,7 +61,7 @@ namespace qrtplib
* uses a single poll thread for several RTPSession and RTPTransmitter instances.
* This idea is further illustrated in `example8.cpp`.
*/
class JRTPLIB_IMPORTEXPORT RTPAbortDescriptors
class RTPAbortDescriptors
{
public:
RTPAbortDescriptors();

View File

@ -47,7 +47,7 @@ namespace qrtplib
class RTPMemoryManager;
/** This class is an abstract class which is used to specify destinations, multicast groups etc. */
class JRTPLIB_IMPORTEXPORT RTPAddress
class RTPAddress
{
public:
/** Identifies the actual implementation being used. */

View File

@ -51,7 +51,7 @@ namespace qrtplib
/** A very general kind of address consisting of a port number and a number of bytes describing the host address.
* A very general kind of address, consisting of a port number and a number of bytes describing the host address.
*/
class JRTPLIB_IMPORTEXPORT RTPByteAddress: public RTPAddress
class RTPByteAddress: public RTPAddress
{
public:
/** Creates an instance of the class using \c addrlen bytes of \c hostaddress as host identification,

View File

@ -49,7 +49,7 @@ namespace qrtplib
class RTPAddress;
/** This class represents a list of addresses from which SSRC collisions were detected. */
class JRTPLIB_IMPORTEXPORT RTPCollisionList
class RTPCollisionList
{
public:
/** Constructs an instance, optionally installing a memory manager. */

View File

@ -41,14 +41,6 @@
#define JRTPLIB_UNUSED(x) (void)(x)
#endif // JRTPLIB_UNUSED
#define JRTPLIB_IMPORT
#define JRTPLIB_EXPORT
#ifdef JRTPLIB_COMPILING
#define JRTPLIB_IMPORTEXPORT JRTPLIB_EXPORT
#else
#define JRTPLIB_IMPORTEXPORT JRTPLIB_IMPORT
#endif // JRTPLIB_COMPILING
// Don't have <sys/filio.h>
// Don't have <sys/sockio.h>

View File

@ -45,7 +45,7 @@ namespace qrtplib
{
/** Returns a string describing the error code \c errcode. */
std::string JRTPLIB_IMPORTEXPORT RTPGetErrorString(int errcode);
std::string RTPGetErrorString(int errcode);
} // end namespace

View File

@ -56,7 +56,7 @@ class RTPExternalTransmitter;
* so that the transmitter will call the \c SendRTP, \c SendRTCP and \c ComesFromThisSender
* methods of this instance when needed.
*/
class JRTPLIB_IMPORTEXPORT RTPExternalSender
class RTPExternalSender
{
public:
RTPExternalSender()
@ -83,7 +83,7 @@ public:
* be using, you can obtain the associated RTPExternalPacketInjecter instance. By calling it's
* member functions, you can then inject RTP or RTCP data into the library for further processing.
*/
class JRTPLIB_IMPORTEXPORT RTPExternalPacketInjecter
class RTPExternalPacketInjecter
{
public:
RTPExternalPacketInjecter(RTPExternalTransmitter *trans)
@ -107,7 +107,7 @@ private:
};
/** Parameters to initialize a transmitter of type RTPExternalTransmitter. */
class JRTPLIB_IMPORTEXPORT RTPExternalTransmissionParams: public RTPTransmissionParams
class RTPExternalTransmissionParams: public RTPTransmissionParams
{
public:
/** Using this constructor you can specify which RTPExternalSender object you'll be using
@ -133,7 +133,7 @@ private:
};
/** Additional information about the external transmission component. */
class JRTPLIB_IMPORTEXPORT RTPExternalTransmissionInfo: public RTPTransmissionInfo
class RTPExternalTransmissionInfo: public RTPTransmissionInfo
{
public:
RTPExternalTransmissionInfo(RTPExternalPacketInjecter *p) :
@ -160,7 +160,7 @@ private:
* sending the data. Obtain the RTPExternalTransmissionInfo object associated with this
* transmitter to obtain the functions needed to pass RTP/RTCP packets on to the transmitter.
*/
class JRTPLIB_IMPORTEXPORT RTPExternalTransmitter: public RTPTransmitter
class RTPExternalTransmitter: public RTPTransmitter
{
public:
RTPExternalTransmitter();

View File

@ -47,7 +47,7 @@
namespace qrtplib
{
class JRTPLIB_IMPORTEXPORT RTPInternalSourceData: public RTPSourceData
class RTPInternalSourceData: public RTPSourceData
{
public:
RTPInternalSourceData(uint32_t ssrc, RTPSources::ProbationType probtype);

View File

@ -51,7 +51,7 @@ namespace qrtplib
* number is ignored. When an instance is used in one of the accept or ignore functions of the
* transmitter, a zero port number represents all ports for the specified IP address.
*/
class JRTPLIB_IMPORTEXPORT RTPIPv4Address: public RTPAddress
class RTPIPv4Address: public RTPAddress
{
public:
/** Creates an instance with IP address \c ip and port number \c port (both

View File

@ -52,7 +52,7 @@
namespace qrtplib
{
class JRTPLIB_IMPORTEXPORT RTPIPv4Destination
class RTPIPv4Destination
{
public:
RTPIPv4Destination()

View File

@ -48,7 +48,7 @@ namespace qrtplib
/**
* Used to provide information about the version of the library.
*/
class JRTPLIB_IMPORTEXPORT RTPLibraryVersion
class RTPLibraryVersion
{
public:
/** Returns an instance of RTPLibraryVersion describing the version of the library. */

View File

@ -53,7 +53,7 @@ class RTPRawPacket;
* The class can also be used to create a new RTP packet according to the parameters specified by
* the user.
*/
class JRTPLIB_IMPORTEXPORT RTPPacket
class RTPPacket
{
public:
/** Creates an RTPPacket instance based upon the data in \c rawpack, optionally installing a memory manager.

View File

@ -53,7 +53,7 @@ class RTPSources;
/** This class can be used to build RTP packets and is a bit more high-level than the RTPPacket
* class: it generates an SSRC identifier, keeps track of timestamp and sequence number etc.
*/
class JRTPLIB_IMPORTEXPORT RTPPacketBuilder
class RTPPacketBuilder
{
public:
/** Constructs an instance which will use \c rtprand for generating random numbers

View File

@ -48,7 +48,7 @@ namespace qrtplib
{
/** Interface for generating random numbers. */
class JRTPLIB_IMPORTEXPORT RTPRandom
class RTPRandom
{
public:
RTPRandom()

View File

@ -46,7 +46,7 @@ namespace qrtplib
{
/** A random number generator using the algorithm of the rand48 set of functions. */
class JRTPLIB_IMPORTEXPORT RTPRandomRand48: public RTPRandom
class RTPRandomRand48: public RTPRandom
{
public:
RTPRandomRand48();

View File

@ -47,7 +47,7 @@ namespace qrtplib
/** A random number generator which tries to use the \c rand_s function on the
* Win32 platform.
*/
class JRTPLIB_IMPORTEXPORT RTPRandomRandS: public RTPRandom
class RTPRandomRandS: public RTPRandom
{
public:
RTPRandomRandS();

View File

@ -46,7 +46,7 @@ namespace qrtplib
{
/** A random number generator which uses bytes delivered by the /dev/urandom device. */
class JRTPLIB_IMPORTEXPORT RTPRandomURandom: public RTPRandom
class RTPRandomURandom: public RTPRandom
{
public:
RTPRandomURandom();

View File

@ -47,7 +47,7 @@ namespace qrtplib
{
/** This class is used by the transmission component to store the incoming RTP and RTCP data in. */
class JRTPLIB_IMPORTEXPORT RTPRawPacket
class RTPRawPacket
{
public:
/** Creates an instance which stores data from \c data with length \c datalen.

View File

@ -72,7 +72,7 @@ class RTCPAPPPacket;
* \note The RTPSession class is not meant to be thread safe. The user should use some kind of locking
* mechanism to prevent different threads from using the same RTPSession instance.
*/
class JRTPLIB_IMPORTEXPORT RTPSession
class RTPSession
{
public:
/** Constructs an RTPSession instance, optionally using a specific instance of a random

View File

@ -51,7 +51,7 @@ namespace qrtplib
* Describes the parameters for to be used by an RTPSession instance. Note that the own timestamp
* unit must be set to a valid number, otherwise the session can't be created.
*/
class JRTPLIB_IMPORTEXPORT RTPSessionParams
class RTPSessionParams
{
public:
RTPSessionParams();

View File

@ -46,7 +46,7 @@ namespace qrtplib
class RTPSession;
class JRTPLIB_IMPORTEXPORT RTPSessionSources: public RTPSources
class RTPSessionSources: public RTPSources
{
public:
RTPSessionSources(RTPSession &sess) :

View File

@ -51,7 +51,7 @@ namespace qrtplib
class RTPAddress;
class JRTPLIB_IMPORTEXPORT RTCPSenderReportInfo
class RTCPSenderReportInfo
{
public:
RTCPSenderReportInfo() :
@ -105,7 +105,7 @@ private:
RTPTime receivetime;
};
class JRTPLIB_IMPORTEXPORT RTCPReceiverReportInfo
class RTCPReceiverReportInfo
{
public:
RTCPReceiverReportInfo() :
@ -174,7 +174,7 @@ private:
RTPTime receivetime;
};
class JRTPLIB_IMPORTEXPORT RTPSourceStats
class RTPSourceStats
{
public:
RTPSourceStats();
@ -281,7 +281,7 @@ inline RTPSourceStats::RTPSourceStats() :
}
/** Describes an entry in the RTPSources source table. */
class JRTPLIB_IMPORTEXPORT RTPSourceData
class RTPSourceData
{
protected:
RTPSourceData(uint32_t ssrc);

View File

@ -48,7 +48,7 @@
namespace qrtplib
{
class JRTPLIB_IMPORTEXPORT RTPSources_GetHashIndex
class RTPSources_GetHashIndex
{
public:
static int GetIndex(const uint32_t &ssrc)
@ -73,7 +73,7 @@ class RTPSourceData;
* is used to identify packets from our own session. The class also provides some overridable functions
* which can be used to catch certain events (new SSRC, SSRC collision, ...).
*/
class JRTPLIB_IMPORTEXPORT RTPSources
class RTPSources
{
public:
/** Type of probation to use for new sources. */

View File

@ -50,7 +50,7 @@ namespace qrtplib
* should be used to send/receive data, and to know on which socket incoming data
* was received.
*/
class JRTPLIB_IMPORTEXPORT RTPTCPAddress: public RTPAddress
class RTPTCPAddress: public RTPAddress
{
public:
/** Creates an instance with which you can use a specific socket

View File

@ -50,7 +50,7 @@ namespace qrtplib
{
/** Parameters for the TCP transmitter. */
class JRTPLIB_IMPORTEXPORT RTPTCPTransmissionParams: public RTPTransmissionParams
class RTPTCPTransmissionParams: public RTPTransmissionParams
{
public:
RTPTCPTransmissionParams();
@ -81,7 +81,7 @@ inline RTPTCPTransmissionParams::RTPTCPTransmissionParams() :
}
/** Additional information about the TCP transmitter. */
class JRTPLIB_IMPORTEXPORT RTPTCPTransmissionInfo: public RTPTransmissionInfo
class RTPTCPTransmissionInfo: public RTPTransmissionInfo
{
public:
RTPTCPTransmissionInfo() :
@ -117,7 +117,7 @@ public:
* To get notified of an error when sending over or receiving from a socket, override the
* RTPTCPTransmitter::OnSendError and RTPTCPTransmitter::OnReceiveError member functions.
*/
class JRTPLIB_IMPORTEXPORT RTPTCPTransmitter : public RTPTransmitter
class RTPTCPTransmitter : public RTPTransmitter
{
public:
RTPTCPTransmitter();

View File

@ -63,7 +63,7 @@ namespace qrtplib
* This is a simple wrapper for the most significant word (MSW) and least
* significant word (LSW) of an NTP timestamp.
*/
class JRTPLIB_IMPORTEXPORT RTPNTPTime
class RTPNTPTime
{
public:
/** This constructor creates and instance with MSW \c m and LSW \c l. */
@ -92,7 +92,7 @@ private:
* This class is used to specify wallclock time, delay intervals etc.
* It stores a number of seconds and a number of microseconds.
*/
class JRTPLIB_IMPORTEXPORT RTPTime
class RTPTime
{
public:
/** Returns an RTPTime instance representing the current wallclock time.
@ -392,7 +392,7 @@ inline bool RTPTime::operator>=(const RTPTime &t) const
return m_t >= t.m_t;
}
class JRTPLIB_IMPORTEXPORT RTPTimeInitializerObject
class RTPTimeInitializerObject
{
public:
RTPTimeInitializerObject();

View File

@ -58,7 +58,7 @@ class RTPTransmissionInfo;
* an UDP over IPv4 transmitter, an UDP over IPv6 transmitter and a transmitter
* which can be used to use an external transmission mechanism.
*/
class JRTPLIB_IMPORTEXPORT RTPTransmitter
class RTPTransmitter
{
public:
/** Used to identify a specific transmitter.
@ -227,7 +227,7 @@ public:
* GetTransmissionProtocol function which identifies the component type for which
* these parameters are valid.
*/
class JRTPLIB_IMPORTEXPORT RTPTransmissionParams
class RTPTransmissionParams
{
protected:
RTPTransmissionParams(RTPTransmitter::TransmissionProtocol p)
@ -254,7 +254,7 @@ private:
* GetTransmissionProtocol function which identifies the component type for which
* these parameters are valid.
*/
class JRTPLIB_IMPORTEXPORT RTPTransmissionInfo
class RTPTransmissionInfo
{
protected:
RTPTransmissionInfo(RTPTransmitter::TransmissionProtocol p)

View File

@ -59,7 +59,7 @@ namespace qrtplib
{
/** Parameters for the UDP over IPv4 transmitter. */
class JRTPLIB_IMPORTEXPORT RTPUDPv4TransmissionParams: public RTPTransmissionParams
class RTPUDPv4TransmissionParams: public RTPTransmissionParams
{
public:
RTPUDPv4TransmissionParams();
@ -294,7 +294,7 @@ inline RTPUDPv4TransmissionParams::RTPUDPv4TransmissionParams() :
}
/** Additional information about the UDP over IPv4 transmitter. */
class JRTPLIB_IMPORTEXPORT RTPUDPv4TransmissionInfo: public RTPTransmissionInfo
class RTPUDPv4TransmissionInfo: public RTPTransmissionInfo
{
public:
RTPUDPv4TransmissionInfo(std::list<uint32_t> iplist, SocketType rtpsock, SocketType rtcpsock, uint16_t rtpport, uint16_t rtcpport) :
@ -346,7 +346,7 @@ private:
uint16_t m_rtpPort, m_rtcpPort;
};
class JRTPLIB_IMPORTEXPORT RTPUDPv4Trans_GetHashIndex_IPv4Dest
class RTPUDPv4Trans_GetHashIndex_IPv4Dest
{
public:
static int GetIndex(const RTPIPv4Destination &d)
@ -355,7 +355,7 @@ public:
}
};
class JRTPLIB_IMPORTEXPORT RTPUDPv4Trans_GetHashIndex_uint32_t
class RTPUDPv4Trans_GetHashIndex_uint32_t
{
public:
static int GetIndex(const uint32_t &k)
@ -373,7 +373,7 @@ public:
* argument require an argument of RTPIPv4Address. The GetTransmissionInfo member function
* returns an instance of type RTPUDPv4TransmissionInfo.
*/
class JRTPLIB_IMPORTEXPORT RTPUDPv4Transmitter: public RTPTransmitter
class RTPUDPv4Transmitter: public RTPTransmitter
{
public:
RTPUDPv4Transmitter();

View File

@ -59,7 +59,7 @@ namespace qrtplib
{
/** Parameters for the UDP over IPv4 transmitter that does not automatically bind sockets */
class JRTPLIB_IMPORTEXPORT RTPUDPv4TransmissionNoBindParams: public RTPTransmissionParams
class RTPUDPv4TransmissionNoBindParams: public RTPTransmissionParams
{
public:
RTPUDPv4TransmissionNoBindParams();
@ -294,7 +294,7 @@ inline RTPUDPv4TransmissionNoBindParams::RTPUDPv4TransmissionNoBindParams() :
}
/** Additional information about the UDP over IPv4 transmitter that does not automatically bind sockets. */
class JRTPLIB_IMPORTEXPORT RTPUDPv4TransmissionNoBindInfo: public RTPTransmissionInfo
class RTPUDPv4TransmissionNoBindInfo: public RTPTransmissionInfo
{
public:
RTPUDPv4TransmissionNoBindInfo(std::list<uint32_t> iplist, SocketType rtpsock, SocketType rtcpsock, uint16_t rtpport, uint16_t rtcpport) :
@ -346,7 +346,7 @@ private:
uint16_t m_rtpPort, m_rtcpPort;
};
class JRTPLIB_IMPORTEXPORT RTPUDPv4TransNoBind_GetHashIndex_IPv4Dest
class RTPUDPv4TransNoBind_GetHashIndex_IPv4Dest
{
public:
static int GetIndex(const RTPIPv4Destination &d)
@ -355,7 +355,7 @@ public:
}
};
class JRTPLIB_IMPORTEXPORT RTPUDPv4TransNoBind_GetHashIndex_uint32_t
class RTPUDPv4TransNoBind_GetHashIndex_uint32_t
{
public:
static int GetIndex(const uint32_t &k)
@ -375,7 +375,7 @@ public:
* This flavor of a RTPUDPv4Transmitter class does not automatically bind sockets. Use the
* BindSockets method to do so.
*/
class JRTPLIB_IMPORTEXPORT RTPUDPv4TransmitterNoBind: public RTPTransmitter
class RTPUDPv4TransmitterNoBind: public RTPTransmitter
{
public:
RTPUDPv4TransmitterNoBind();