[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/rtmp r9830: thread_params is in the Networ
From: |
rob |
Subject: |
[Gnash-commit] /srv/bzr/gnash/rtmp r9830: thread_params is in the Network class now. |
Date: |
Sun, 14 Dec 2008 20:46:09 -0700 |
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 9830
committer: address@hidden
branch nick: rtmp
timestamp: Sun 2008-12-14 20:46:09 -0700
message:
thread_params is in the Network class now.
modified:
libnet/rtmp_client.h
libnet/rtmp_server.cpp
libnet/rtmp_server.h
=== modified file 'libnet/rtmp_client.h'
--- a/libnet/rtmp_client.h 2008-09-22 00:26:39 +0000
+++ b/libnet/rtmp_client.h 2008-12-15 03:46:09 +0000
@@ -63,7 +63,7 @@
};
// This is the thread for all incoming RTMP connections
-void rtmp_handler(Handler::thread_params_t *args);
+void rtmp_handler(Network::thread_params_t *args);
} // end of gnash namespace
// end of _RTMP_CLIENT_H_
=== modified file 'libnet/rtmp_server.cpp'
--- a/libnet/rtmp_server.cpp 2008-11-06 22:42:36 +0000
+++ b/libnet/rtmp_server.cpp 2008-12-15 03:46:09 +0000
@@ -127,7 +127,7 @@
// std::copy(_handshake->begin(), _handshake->end(), (buf1->begin() + 1));
// boost::shared_ptr<amf::Buffer> buf = new amf::Buffer(RTMP_BODY_SIZE +
1);
// std::copy(_handshake->begin(), _handshake->end(), buf->begin() + 1 +
RTMP_BODY_SIZE);
- _handler->notifyout();
+// _handler->notifyout();
log_debug("Sent RTMP Handshake response");
@@ -503,7 +503,7 @@
// This is the thread for all incoming RTMP connections
void
-rtmp_handler(Handler::thread_params_t *args)
+rtmp_handler(Network::thread_params_t *args)
{
GNASH_REPORT_FUNCTION;
Handler *hand = reinterpret_cast<Handler *>(args->handler);
@@ -539,7 +539,7 @@
clock_gettime (CLOCK_REALTIME, &start);
#endif
if (!rtmp.handShakeWait()) {
- hand->clearout(); // remove all data from the outgoing que
+ // hand->clearout(); // remove all data from the outgoing que
hand->die(); // tell all the threads for this connection to
die
hand->notifyin();
log_debug("Net RTMP done for fd #%d...", args->netfd);
=== modified file 'libnet/rtmp_server.h'
--- a/libnet/rtmp_server.h 2008-09-22 18:25:27 +0000
+++ b/libnet/rtmp_server.h 2008-12-15 03:46:09 +0000
@@ -53,7 +53,7 @@
};
// This is the thread for all incoming RTMP connections
-void rtmp_handler(Handler::thread_params_t *args);
+void rtmp_handler(Network::thread_params_t *args);
} // end of gnash namespace
// end of _RTMP_SERVER_H_
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/rtmp r9830: thread_params is in the Network class now.,
rob <=