[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/rtmp r10018: merge from trunk
|
From: |
rob |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/rtmp r10018: merge from trunk |
|
Date: |
Mon, 16 Mar 2009 16:14:53 -0600 |
|
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10018
committer: address@hidden
branch nick: rtmp
timestamp: Mon 2009-03-16 16:14:53 -0600
message:
merge from trunk
modified:
cygnal/acinclude.m4
cygnal/crc.h
cygnal/cygnal.cpp
cygnal/cygnal.h
cygnal/http_server.cpp
cygnal/http_server.h
cygnal/rtmp_server.h
libnet/cache.h
libnet/cque.h
libnet/diskstream.h
libnet/http.h
libnet/rtmp.h
libnet/rtmp_client.h
libnet/rtmp_msg.h
------------------------------------------------------------
revno: 10017.1.1
committer: Markus Gothe <address@hidden>
branch nick: rtmp
timestamp: Sun 2009-02-22 02:41:59 +0100
message:
fix visibility attribute for RTMP branch / Cygnal
modified:
cygnal/cygnal.h
cygnal/http_server.cpp
cygnal/http_server.h
cygnal/rtmp_server.h
libnet/cache.h
libnet/cque.h
libnet/diskstream.h
libnet/http.h
------------------------------------------------------------
revno: 10017.1.2
committer: Markus Gothe <address@hidden>
branch nick: rtmp
timestamp: Mon 2009-02-23 02:25:09 +0100
message:
Cleaned up DSOEXPORTS
modified:
libnet/diskstream.h
libnet/http.h
libnet/rtmp.h
libnet/rtmp_client.h
libnet/rtmp_msg.h
------------------------------------------------------------
revno: 10017.1.3
committer: Markus Gothe <address@hidden>
branch nick: rtmp
timestamp: Mon 2009-02-23 02:30:57 +0100
message:
Cleaned up DSOEXPORTS
modified:
cygnal/crc.h
cygnal/http_server.h
cygnal/rtmp_server.h
------------------------------------------------------------
revno: 10017.1.4
committer: Markus Gothe <address@hidden>
branch nick: rtmp
timestamp: Mon 2009-02-23 02:33:06 +0100
message:
Cleaned up DSOEXPORTS
modified:
cygnal/cygnal.h
------------------------------------------------------------
revno: 10017.1.5
committer: Markus Gothe <address@hidden>
branch nick: rtmp
timestamp: Mon 2009-02-23 02:36:17 +0100
message:
Cleaned up DSOEXPORTS
modified:
libnet/http.h
------------------------------------------------------------
revno: 10017.1.6
committer: Benjamin Wolsey <address@hidden>
branch nick: rtmp
timestamp: Wed 2009-02-25 10:17:19 +0100
message:
Wrap all macros in AC_DEFUN, or autogen.sh fails (at least on Mandriva
2009).
modified:
cygnal/acinclude.m4
------------------------------------------------------------
revno: 10017.1.7
committer: Markus Gothe <address@hidden>
branch nick: rtmp
timestamp: Wed 2009-03-04 00:47:47 +0100
message:
Updated copyright info
modified:
cygnal/acinclude.m4
cygnal/cygnal.cpp
=== modified file 'cygnal/acinclude.m4'
--- a/cygnal/acinclude.m4 2009-02-22 00:38:59 +0000
+++ b/cygnal/acinclude.m4 2009-03-03 23:47:47 +0000
@@ -1,5 +1,5 @@
dnl
-dnl Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -38,22 +38,22 @@
dnl AM_COMPILER_LIB
dnl Build the cgibins server if specified.
-AC_ARG_ENABLE(cgibins,
- AC_HELP_STRING([--enable-cgibin], [Enable building of the CGIs for Cygnal]),
-[case "${enableval}" in
- yes) cgibin=yes ;;
- no) cgibin=no ;;
- *) AC_MSG_ERROR([bad value ${enableval} for enable-cgibin option]) ;;
-esac],cgibin=yes)
-AM_CONDITIONAL(USE_CGI, test x$cgibin = xyes)
-
AC_DEFUN([CYGNAL_PATHS],
-[
-
-dnl For Asynchronous I/O
-dnl AC_CHECK_HEADERS(aio.h poll.h)
-
-dnl Look for the various ways of blocking while waiting for I/O
-AC_CHECK_FUNCS(pselect poll ppoll epoll)
+[dnl
+
+ AC_ARG_ENABLE(cgibins,
+ AC_HELP_STRING([--enable-cgibin], [Enable building of the CGIs for
Cygnal]),
+ [case "${enableval}" in
+ yes) cgibin=yes ;;
+ no) cgibin=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for enable-cgibin option]) ;;
+ esac],cgibin=yes)
+ AM_CONDITIONAL(USE_CGI, test x$cgibin = xyes)
+
+ dnl For Asynchronous I/O
+ dnl AC_CHECK_HEADERS(aio.h poll.h)
+
+ dnl Look for the various ways of blocking while waiting for I/O
+ AC_CHECK_FUNCS(pselect poll ppoll epoll)
])
=== modified file 'cygnal/crc.h'
--- a/cygnal/crc.h 2008-11-03 19:33:59 +0000
+++ b/cygnal/crc.h 2009-02-23 01:30:57 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -27,6 +27,7 @@
#include <vector>
#include <iostream> // for output operator
+#include "dsodefs.h"
#include "rc.h"
/// \namespace cygnal
@@ -39,11 +40,11 @@
/// This class handles reading values from the Cygnal
/// configuration file, .cygnalrc, and into a form we can use in
/// Cygnal.
-class DSOEXPORT CRcInitFile : public gnash::RcInitFile
+class CRcInitFile : public gnash::RcInitFile
{
public:
/// \brief Return the default instance of RC file,
- static CRcInitFile& getDefaultInstance();
+ DSOEXPORT static CRcInitFile& getDefaultInstance();
/// \brief Load all the configuration files.
/// This includes parsing the default .gnashrc file for
@@ -95,10 +96,10 @@
/// \brief Dump the internal data of this class in a human readable form.
/// @remarks This should only be used for debugging purposes.
- void dump() const { dump(std::cerr); }
+ DSOEXPORT void dump() const { dump(std::cerr); }
/// \overload dump(std::ostream& os) const
- void dump(std::ostream& os) const;
+ DSOEXPORT void dump(std::ostream& os) const;
private:
/// Construct only by getDefaultInstance()
=== modified file 'cygnal/cygnal.cpp'
--- a/cygnal/cygnal.cpp 2009-02-21 23:08:01 +0000
+++ b/cygnal/cygnal.cpp 2009-03-03 23:47:47 +0000
@@ -1,6 +1,6 @@
// cygnal.cpp: GNU streaming Flash media server, for Gnash.
//
-// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -370,10 +370,10 @@
{
cout << "Cygnal " << VERSION << endl
<< endl
- << _("Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation,
Inc.\n"
+ << _("Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software
Foundation, Inc.\n"
"Cygnal comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute copies of Cygnal under the terms of the GNU
General\n"
- "Public License. For more information, see the file named COPYING.\n")
+ "Public License V3. For more information, see the file named
COPYING.\n")
<< endl;
}
=== modified file 'cygnal/cygnal.h'
--- a/cygnal/cygnal.h 2008-12-18 00:05:49 +0000
+++ b/cygnal/cygnal.h 2009-02-23 01:33:06 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -27,7 +27,7 @@
/// \class cygnal::ThreadCounter of threads currently
/// active. This is primarily so the counter can be wrapped with a
/// mutex to be thread safe, as threads delete themseleves.
-class DSOEXPORT ThreadCounter
+class ThreadCounter
{
public:
ThreadCounter() : _tids(0) {};
=== modified file 'cygnal/http_server.cpp'
--- a/cygnal/http_server.cpp 2009-02-22 00:43:24 +0000
+++ b/cygnal/http_server.cpp 2009-02-22 01:41:59 +0000
@@ -1,6 +1,6 @@
// http.cpp: HyperText Transport Protocol handler for Cygnal, for Gnash.
//
-// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
//
// 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
=== modified file 'cygnal/http_server.h'
--- a/cygnal/http_server.h 2009-02-21 18:55:04 +0000
+++ b/cygnal/http_server.h 2009-02-23 01:30:57 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -35,6 +35,7 @@
#include "network.h"
#include "buffer.h"
#include "diskstream.h"
+#include "dsodefs.h"
namespace cygnal
{
@@ -101,7 +102,7 @@
// This is the thread for all incoming HTTP connections
extern "C" {
- bool http_handler(gnash::Network::thread_params_t *args);
+ bool DSOEXPORT http_handler(gnash::Network::thread_params_t *args);
}
} // end of gnash namespace
=== modified file 'cygnal/rtmp_server.h'
--- a/cygnal/rtmp_server.h 2009-02-14 22:42:54 +0000
+++ b/cygnal/rtmp_server.h 2009-02-23 01:30:57 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef _RTMP_SERVER_H_
-#define _RTMP_SERVER_H_ 1
+#define _RTMP_SERVER_H_
#include <boost/cstdint.hpp>
#include <boost/shared_ptr.hpp>
@@ -30,11 +30,12 @@
#include "buffer.h"
#include "diskstream.h"
#include "rtmp_msg.h"
+#include "dsodefs.h"
namespace cygnal
{
-class DSOEXPORT RTMPServer : public gnash::RTMP
+class RTMPServer : public gnash::RTMP
{
public:
RTMPServer();
@@ -85,7 +86,7 @@
};
// This is the thread for all incoming RTMP connections
-bool rtmp_handler(gnash::Network::thread_params_t *args);
+bool DSOEXPORT rtmp_handler(gnash::Network::thread_params_t *args);
} // end of gnash namespace
// end of _RTMP_SERVER_H_
=== modified file 'libnet/cache.h'
--- a/libnet/cache.h 2009-02-14 22:42:54 +0000
+++ b/libnet/cache.h 2009-02-22 01:41:59 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2008 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -31,6 +31,7 @@
#include "statistics.h"
#include "diskstream.h"
#include "getclocktime.hpp"
+#include "dsodefs.h"
/// \namespace gnash
/// This is the main namespace for Gnash and it's libraries.
@@ -48,9 +49,9 @@
public:
Cache();
~Cache();
- static Cache& getDefaultInstance();
+ DSOEXPORT static Cache& getDefaultInstance();
- void addPath(const std::string &name, const std::string &fullpath);
+ void DSOEXPORT addPath(const std::string &name, const std::string
&fullpath);
std::string &findPath(const std::string &name);
void removePath(const std::string &name);
@@ -59,7 +60,7 @@
void removeResponse(const std::string &name);
void addFile(const std::string &name, boost::shared_ptr<DiskStream >
&file);
- boost::shared_ptr<DiskStream> findFile(const std::string &name);
+ boost::shared_ptr<DiskStream> DSOEXPORT findFile(const std::string &name);
void removeFile(const std::string &name);
/// \brief Dump the internal data of this class in a human readable form.
@@ -69,7 +70,7 @@
void dump(std::ostream& os) const;
#ifdef USE_STATS_CACHE
- std::string stats(bool xml) const;
+ std::string DSOEXPORT stats(bool xml) const;
#endif
private:
/// \var Cache::_pathnames
=== modified file 'libnet/cque.h'
--- a/libnet/cque.h 2009-01-26 09:03:34 +0000
+++ b/libnet/cque.h 2009-02-22 01:41:59 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2008 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -17,7 +17,7 @@
//
#ifndef __CQUE_H__
-#define __CQUE_H__ 1
+#define __CQUE_H__
#include <boost/cstdint.hpp>
#include <boost/thread/mutex.hpp>
@@ -53,7 +53,7 @@
// Pop the first date element off the que
boost::shared_ptr<amf::Buffer> DSOEXPORT pop();
// Peek at the first date element witjhout removing it from the que
- boost::shared_ptr<amf::Buffer> peek();
+ boost::shared_ptr<amf::Buffer> DSOEXPORT peek();
// Get the number of elements in the que
size_t DSOEXPORT size();
// Wait for a condition variable to trigger
=== modified file 'libnet/diskstream.h'
--- a/libnet/diskstream.h 2008-12-01 15:43:33 +0000
+++ b/libnet/diskstream.h 2009-02-23 01:25:09 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2008 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -31,6 +31,7 @@
#include "cque.h"
#include "statistics.h"
#include "getclocktime.hpp"
+#include "dsodefs.h"
#include <boost/scoped_ptr.hpp>
/// \namespace gnash
@@ -82,15 +83,15 @@
FILETYPE_ENCODED
} filetype_e;
- DiskStream();
- DiskStream(const std::string &filespec);
- DiskStream(const std::string &filespec, amf::Buffer &buf);
- DiskStream(const std::string &filespec, boost::uint8_t *data, size_t size);
- DiskStream(const std::string &filespec, int netfd);
- ~DiskStream();
+ DSOEXPORT DiskStream();
+ DSOEXPORT DiskStream(const std::string &filespec);
+ DSOEXPORT DiskStream(const std::string &filespec, amf::Buffer &buf);
+ DSOEXPORT DiskStream(const std::string &filespec, boost::uint8_t *data,
size_t size);
+ DSOEXPORT DiskStream(const std::string &filespec, int netfd);
+ DSOEXPORT ~DiskStream();
/// \brief Close the open disk file and it's associated stream.
- void close();
+ DSOEXPORT void close();
/// \brief Open a file to be streamed.
///
@@ -103,9 +104,9 @@
/// collecting statistics on this stream.
///
/// @return True if the file was opened sucessfully, false if not.
- bool open(const std::string &filespec);
- bool open(const std::string &filespec, int netfd);
- bool open(const std::string &filespec, int netfd, gnash::Statistics
&statistics);
+ DSOEXPORT bool open(const std::string &filespec);
+ DSOEXPORT bool open(const std::string &filespec, int netfd);
+ DSOEXPORT bool open(const std::string &filespec, int netfd,
gnash::Statistics &statistics);
/// \brief Stream the file that has been loaded,
///
@@ -178,9 +179,9 @@
///
/// @return A real pointer to the location of the data at the
/// location pointed to by the offset.
- boost::uint8_t *loadToMem(size_t filesize, off_t offset);
- boost::uint8_t *loadToMem(off_t offset);
- boost::uint8_t *loadToMem() { return loadToMem(_offset); };
+ DSOEXPORT boost::uint8_t *loadToMem(size_t filesize, off_t offset);
+ DSOEXPORT boost::uint8_t *loadToMem(off_t offset);
+ DSOEXPORT boost::uint8_t *loadToMem() { return loadToMem(_offset); };
/// \brief Write the data in memory to disk
///
@@ -192,10 +193,10 @@
/// @param size The amount of data in bytes to be written
///
/// @return true if the operation suceeded, false if it failed.
- bool writeToDisk(const std::string &filespec, boost::uint8_t *data, size_t
size);
- bool writeToDisk(const std::string &filespec, amf::Buffer &data);
- bool writeToDisk(const std::string &filespec);
- bool writeToDisk();
+ DSOEXPORT bool writeToDisk(const std::string &filespec, boost::uint8_t
*data, size_t size);
+ DSOEXPORT bool writeToDisk(const std::string &filespec, amf::Buffer &data);
+ DSOEXPORT bool writeToDisk(const std::string &filespec);
+ DSOEXPORT bool writeToDisk();
/// \brief Write the existing data to the Network.
///
=== modified file 'libnet/http.h'
--- a/libnet/http.h 2009-02-22 00:40:02 +0000
+++ b/libnet/http.h 2009-02-23 01:36:17 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -38,7 +38,7 @@
namespace gnash
{
-class HTTP : public gnash::Network
+class DSOEXPORT HTTP : public gnash::Network
{
public:
// as defined by the W3: http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
@@ -231,7 +231,7 @@
/// @param fd The file descriptor to read from
///
/// @return The number of bytes sent
- int DSOEXPORT recvMsg(int fd);
+ int recvMsg(int fd);
/// \brief Send a message to the other end of the network connection.
///
@@ -243,12 +243,12 @@
/// @param void Send the contents of the _header and _body.
///
/// @return The number of bytes sent
- int DSOEXPORT sendMsg();
- int DSOEXPORT sendMsg(int fd);
- int DSOEXPORT sendMsg(const boost::uint8_t *data, size_t size);
- int DSOEXPORT sendMsg(boost::shared_ptr<amf::Buffer> &buf)
+ int sendMsg();
+ int sendMsg(int fd);
+ int sendMsg(const boost::uint8_t *data, size_t size);
+ int sendMsg(boost::shared_ptr<amf::Buffer> &buf)
{ return sendMsg(buf->reference(), buf->size()); };
- int DSOEXPORT sendMsg(std::stringstream &sstr)
+ int sendMsg(std::stringstream &sstr)
{ return sendMsg(reinterpret_cast<const boost::uint8_t
*>(sstr.str().c_str()), sstr.str().size()); };
// These accessors are used mostly just for debugging.
@@ -280,7 +280,7 @@
boost::uint32_t _filesize;
std::map<int, struct status_codes *> _status_codes;
- std::map<std::string, std::string> DSOEXPORT _fields;
+ std::map<std::string, std::string> _fields;
http_version_t _version;
// Connection parameters we care about
=== modified file 'libnet/rtmp.h'
--- a/libnet/rtmp.h 2009-02-19 09:17:14 +0000
+++ b/libnet/rtmp.h 2009-02-23 01:25:09 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -31,6 +31,7 @@
#include "buffer.h"
#include "rtmp_msg.h"
#include "cque.h"
+#include "dsodefs.h"
namespace gnash
{
=== modified file 'libnet/rtmp_client.h'
--- a/libnet/rtmp_client.h 2008-12-15 03:46:09 +0000
+++ b/libnet/rtmp_client.h 2009-02-23 01:25:09 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2008 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef _RTMP_CLIENT_H_
-#define _RTMP_CLIENT_H_ 1
+#define _RTMP_CLIENT_H_
#include <boost/cstdint.hpp>
#include <boost/shared_ptr.hpp>
@@ -30,11 +30,12 @@
#include "handler.h"
#include "network.h"
#include "buffer.h"
+#include "dsodefs.h"
namespace gnash
{
-class DSOEXPORT RTMPClient : public RTMP
+class RTMPClient : public RTMP
{
public:
RTMPClient();
=== modified file 'libnet/rtmp_msg.h'
--- a/libnet/rtmp_msg.h 2009-02-10 19:23:05 +0000
+++ b/libnet/rtmp_msg.h 2009-02-23 01:25:09 +0000
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
//
// 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
@@ -32,7 +32,7 @@
namespace gnash
{
-class DSOEXPORT RTMPMsg
+class RTMPMsg
{
public:
typedef enum {
@@ -118,12 +118,12 @@
/// search for.
///
/// @return A smart pointer to the Element for this property.
- boost::shared_ptr<amf::Element> findProperty(const std::string &name);
+ DSOEXPORT boost::shared_ptr<amf::Element> findProperty(const std::string
&name);
// void setHeaderData(RTMP::rtmp_head_t &qhead);
// Dump internal status to the terminal
- void dump();
+ DSOEXPORT void dump();
protected:
rtmp_source_e _routing;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/rtmp r10018: merge from trunk,
rob <=