projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply FFmpeg palette fix to examination too; fix build with old FFmpeg.
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_socket.h
diff --git
a/src/lib/dcpomatic_socket.h
b/src/lib/dcpomatic_socket.h
index b9859f600e40c16a76bbaa431a8ad4f57d655926..870e7315c3126fb67b67fa3b493ce2be34ee8a56 100644
(file)
--- a/
src/lib/dcpomatic_socket.h
+++ b/
src/lib/dcpomatic_socket.h
@@
-1,23
+1,25
@@
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic 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.
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,
+
DCP-o-matic
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
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
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include <boost/asio.hpp>
*/
#include <boost/asio.hpp>
+#include <boost/noncopyable.hpp>
/** @class Socket
* @brief A class to wrap a boost::asio::ip::tcp::socket with some things
/** @class Socket
* @brief A class to wrap a boost::asio::ip::tcp::socket with some things
@@
-29,8
+31,7
@@
class Socket : public boost::noncopyable
{
public:
class Socket : public boost::noncopyable
{
public:
- Socket (int timeout = 30);
- ~Socket ();
+ explicit Socket (int timeout = 30);
/** @return Our underlying socket */
boost::asio::ip::tcp::socket& socket () {
/** @return Our underlying socket */
boost::asio::ip::tcp::socket& socket () {
@@
-38,14
+39,13
@@
public:
}
void connect (boost::asio::ip::tcp::endpoint);
}
void connect (boost::asio::ip::tcp::endpoint);
- void accept (int);
void write (uint32_t n);
void write (uint8_t const * data, int size);
void write (uint32_t n);
void write (uint8_t const * data, int size);
-
+
void read (uint8_t* data, int size);
uint32_t read_uint32 ();
void read (uint8_t* data, int size);
uint32_t read_uint32 ();
-
+
private:
void check ();
private:
void check ();
@@
-54,6
+54,5
@@
private:
boost::asio::io_service _io_service;
boost::asio::deadline_timer _deadline;
boost::asio::ip::tcp::socket _socket;
boost::asio::io_service _io_service;
boost::asio::deadline_timer _deadline;
boost::asio::ip::tcp::socket _socket;
- boost::asio::ip::tcp::acceptor* _acceptor;
int _timeout;
};
int _timeout;
};