projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wake UI with a wxEVT_IDLE which is the event that SignalManager::ui_idle is tied to.
[dcpomatic.git]
/
src
/
lib
/
dcpomatic_socket.h
diff --git
a/src/lib/dcpomatic_socket.h
b/src/lib/dcpomatic_socket.h
index b9859f600e40c16a76bbaa431a8ad4f57d655926..9e81faa0c0b967402d06c118d384ba28dfde3859 100644
(file)
--- a/
src/lib/dcpomatic_socket.h
+++ b/
src/lib/dcpomatic_socket.h
@@
-30,7
+30,6
@@
class Socket : public boost::noncopyable
{
public:
Socket (int timeout = 30);
{
public:
Socket (int timeout = 30);
- ~Socket ();
/** @return Our underlying socket */
boost::asio::ip::tcp::socket& socket () {
/** @return Our underlying socket */
boost::asio::ip::tcp::socket& socket () {
@@
-38,14
+37,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
+52,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;
};