[Gnash-commit] /srv/bzr/gnash/rtmp r10019: Cleaned up DSOEXPORTS

[Markus Gothe]

------------------------------------------------------------
revno: 10019
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

=== modified file 'libnet/diskstream.h'
--- a/libnet/diskstream.h       2009-02-22 01:41:59 +0000
+++ b/libnet/diskstream.h       2009-02-23 01:25:09 +0000
@@ -43,7 +43,7 @@
 ///    of using read() from the standard library, this uses mmap() to
 ///    map the file into memory in chunks of the memory pagesize,
 ///    which is much faster and less resource intensive.
-class DSOEXPORT DiskStream {
+class DiskStream {
 public:
     /// \enum DiskStream::state_e
     ///                This represents the state of the current stream.
@@ -83,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.
     ///
@@ -104,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,
     ///
@@ -179,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
     ///
@@ -193,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 01:41:59 +0000
+++ b/libnet/http.h     2009-02-23 01:25:09 +0000
@@ -243,10 +243,10 @@
     /// @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)
        { return sendMsg(reinterpret_cast<const boost::uint8_t 
*>(sstr.str().c_str()), sstr.str().size()); };

=== 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;