Switch commoncpp2 to ucommon to solve dependency conflicts.
libccrtp was depending on commoncpp2, and have been replaced by a version
depending on ucommon as well.
diff --git a/jni/libccrtp/sources/src/ccrtp/ext.h b/jni/libccrtp/sources/src/ccrtp/ext.h
index e398609..615562d 100644
--- a/jni/libccrtp/sources/src/ccrtp/ext.h
+++ b/jni/libccrtp/sources/src/ccrtp/ext.h
@@ -1,27 +1,27 @@
// Copyright (C) 1999-2003 Open Source Telecom Corporation.
-//
+//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
-//
+//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
+// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
+//
// As a special exception, you may use this file as part of a free software
// library without restriction. Specifically, if other files instantiate
// templates or use macros or inline functions from this file, or you compile
// this file and link it with other files to produce an executable, this
// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License. This exception does not however
+// the GNU General Public License. This exception does not however
// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+// the GNU General Public License.
//
// This exception applies only to the code released under the name GNU
// ccRTP. If you copy code from other releases into a copy of GNU
@@ -35,24 +35,23 @@
// If you do not wish that, delete this exception notice.
//
-/**
- * @file ext.h
+/**
+ * @file ext.h
* @short ccRTP Stack extensions.
**/
#ifndef CCXX_RTP_EXT_H
#define CCXX_RTP_EXT_H
-#ifndef CCXX_SOCKET_H_
-#include <cc++/socket.h>
+#ifndef COMMONCPP_SOCKET_H_
+#include <commoncpp/socket.h>
+#include <commoncpp/udp.h>
#endif
#include <ccrtp/ioqueue.h>
#include <ccrtp/channel.h>
-#ifdef CCXX_NAMESPACES
-namespace ost {
-#endif
+NAMESPACE_COMMONCPP
/**
* @defgroup rtpext ccRTP Extension classes
@@ -69,101 +68,99 @@
* @author David Sugar
* @short RTP peer host over UDP.
*/
-class __EXPORT RTPDuplex : public RTPDataQueue,
- protected UDPReceive, public UDPTransmit
+class __EXPORT RTPDuplex : public RTPDataQueue,
+ protected UDPReceive, public UDPTransmit
{
public:
- /**
- * @param bind network address this socket is to be bound
- * @param local transport port this socket is to be bound
- * @param remote peer transpor port
- */
- RTPDuplex(const InetAddress &bind, tpport_t local, tpport_t remote);
+ /**
+ * @param bind network address this socket is to be bound
+ * @param local transport port this socket is to be bound
+ * @param remote peer transpor port
+ */
+ RTPDuplex(const InetAddress &bind, tpport_t local, tpport_t remote);
- /**
- *
- */
- virtual
- ~RTPDuplex();
+ /**
+ *
+ */
+ virtual
+ ~RTPDuplex();
- /**
- * @param host peer address
- * @param port peer port. If not specified, the same as the
- * local is used
- * @return socket status
- */
- UDPTransmit::Error
- connect(const InetHostAddress &host, tpport_t port = 0);
+ /**
+ * @param host peer address
+ * @param port peer port. If not specified, the same as the
+ * local is used
+ * @return socket status
+ */
+ UDPTransmit::Error
+ connect(const InetHostAddress &host, tpport_t port = 0);
protected:
- /**
- * @param timeout how much time to wait for new data
- * @return if there is some new data
- */
- bool
- isPendingData(microtimeout_t timeout)
- { return isPendingReceive(timeout); }
+ /**
+ * @param timeout how much time to wait for new data
+ * @return if there is some new data
+ */
+ bool
+ isPendingData(microtimeout_t timeout)
+ { return isPendingReceive(timeout); }
- /**
- * @param buffer pointer to data to be written
- * @param len how many octets to write
- * @return number of octets written
- */
- size_t
- sendData(const unsigned char *const buffer, size_t len)
- { return UDPTransmit::transmit((const char *)buffer, len); }
+ /**
+ * @param buffer pointer to data to be written
+ * @param len how many octets to write
+ * @return number of octets written
+ */
+ size_t
+ sendData(const unsigned char *const buffer, size_t len)
+ { return UDPTransmit::transmit((const char *)buffer, len); }
- /**
- * @param buffer where to store the retrieved data
- * @param len how many octets to read
- * @param na Source network address.
- * @param tp Source transport port.
- * @return number of octets read
- */
- size_t
- recvData(unsigned char *buffer, size_t len,
- InetHostAddress& na, tpport_t& tp)
- { /* na = UDPReceive::getPeer(&tp); FIX name ambiguity */
- return UDPReceive::receive(buffer, len); }
-
- /**
- * @param - peer host network address.
- * @param - peer host RTP data transport port.
- **/
+ /**
+ * @param buffer where to store the retrieved data
+ * @param len how many octets to read
+ * @param na Source network address.
+ * @param tp Source transport port.
+ * @return number of octets read
+ */
+ size_t
+ recvData(unsigned char *buffer, size_t len,
+ InetHostAddress& na, tpport_t& tp)
+ { /* na = UDPReceive::getPeer(&tp); FIX name ambiguity */
+ return UDPReceive::receive(buffer, len); }
+
+ /**
+ * @param - peer host network address.
+ * @param - peer host RTP data transport port.
+ **/
inline void
setDataPeer(const InetAddress&, tpport_t)
- { }
+ { }
- /**
- * @param - peer host network address.
- * @param - peer host RTCP transport port.
- **/
+ /**
+ * @param - peer host network address.
+ * @param - peer host RTCP transport port.
+ **/
inline void
setControlPeer(const InetAddress&, tpport_t)
- { }
+ { }
- inline size_t
- getNextDataPacketSize() const
- {
- // the const cast is a trick only needed for cc++2 <= 1.0.10
- size_t len; ccioctl(const_cast<RTPDuplex*>(this)->UDPReceive::getReceiver(),FIONREAD,len); return len;
- }
+ inline size_t
+ getNextDataPacketSize() const
+ {
+ // the const cast is a trick only needed for cc++2 <= 1.0.10
+ size_t len; ccioctl(const_cast<RTPDuplex*>(this)->UDPReceive::getReceiver(),FIONREAD,len); return len;
+ }
- /**
- * @return the associated peer information
- */
- SyncSource &getPeer();
+ /**
+ * @return the associated peer information
+ */
+ SyncSource &getPeer();
private:
- tpport_t dataBasePort;
+ tpport_t dataBasePort;
};
/*@}*/ // rtpext
-#ifdef CCXX_NAMESPACES
-}
-#endif
+END_NAMESPACE
#endif //CCXX_RTP_EXT_H