[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11491: build the gateway cgi as a p
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11491: build the gateway cgi as a plugin. |
Date: |
Mon, 07 Sep 2009 17:29:49 -0600 |
User-agent: |
Bazaar (1.16.1) |
------------------------------------------------------------
revno: 11491
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Mon 2009-09-07 17:29:49 -0600
message:
build the gateway cgi as a plugin.
modified:
cygnal/cgi-bin/echo/Makefile.am
cygnal/cgi-bin/echo/echo.cpp
cygnal/cgi-bin/echo/gateway.cpp
=== modified file 'cygnal/cgi-bin/echo/Makefile.am'
--- a/cygnal/cgi-bin/echo/Makefile.am 2009-09-07 21:28:14 +0000
+++ b/cygnal/cgi-bin/echo/Makefile.am 2009-09-07 23:29:49 +0000
@@ -20,17 +20,15 @@
# this is where Gnash plugins get installed
cgidir = $(libdir)/cygnal/plugins
-bin_PROGRAMS = gateway
-
-cgi_LTLIBRARIES = echo.la
+cgi_LTLIBRARIES = echo.la gateway.la
GNASH_LIBS = \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/libgnashcore.la \
$(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/libnet/libgnashnet.la \
+ $(BOOST_CFLAGS) \
$(PTHREAD_LIBS) \
- $(BOOST_CFLAGS) \
$(NULL)
INCLUDES = \
@@ -45,10 +43,9 @@
echo_la_LDFLAGS = -module -avoid-version -no-undefined
echo_la_LIBADD = $(GNASH_LIBS) $(top_builddir)/cygnal/libcygnal.la
-gateway_SOURCES = gateway.cpp gateway.h
-gateway_LDFLAGS = # -module -avoid-version -no-undefined
-gateway_LDADD = $(GNASH_LIBS) $(top_builddir)/cygnal/libcygnal.la
-
+gateway_la_SOURCES = gateway.cpp gateway.h
+gateway_la_LDFLAGS = -module -avoid-version -no-undefined
+gateway_la_LIBADD = $(GNASH_LIBS) $(top_builddir)/cygnal/libcygnal.la
CLEANFILES = \
gnash-dbg.log
=== modified file 'cygnal/cgi-bin/echo/echo.cpp'
--- a/cygnal/cgi-bin/echo/echo.cpp 2009-09-06 16:48:56 +0000
+++ b/cygnal/cgi-bin/echo/echo.cpp 2009-09-07 23:29:49 +0000
@@ -68,7 +68,7 @@
}
init->version = "Echo Test 0.1 (Gnash)";
- init->description = "echo test for Cygnal.\n"
+ init->description = "echo RTMP test for Cygnal.\n"
"\tThis supplies the server side functionality equired for\n"
"\tCygnal to handle the Red5 Echo test";
return init;
=== modified file 'cygnal/cgi-bin/echo/gateway.cpp'
--- a/cygnal/cgi-bin/echo/gateway.cpp 2009-09-06 16:48:56 +0000
+++ b/cygnal/cgi-bin/echo/gateway.cpp 2009-09-07 23:29:49 +0000
@@ -47,6 +47,40 @@
// Toggles very verbose debugging info from the network Network class
static bool netdebug = false;
+static GatewayTest gateway;
+
+extern "C" {
+
+ // the standard API
+ boost::shared_ptr<Handler::cygnal_init_t>
+ gateway_init_func(boost::shared_ptr<gnash::RTMPMsg> &msg)
+ {
+ GNASH_REPORT_FUNCTION;
+ boost::shared_ptr<Handler::cygnal_init_t> init(new
Handler::cygnal_init_t);
+
+ init->version = "Gateway Test 0.1 (Gnash)";
+ init->description = "gateway RTMPT test for Cygnal.\n"
+ "\tThis supplies the server side functionality equired for\n"
+ "\tCygnal to handle the Red5 Gateway test";
+ return init;
+ }
+
+ boost::shared_ptr<amf::Buffer> gateway_read_func()
+ {
+// GNASH_REPORT_FUNCTION;
+
+// GNASH_REPORT_RETURN;
+ }
+
+ size_t gateway_write_func(boost::uint8_t *data, size_t size)
+ {
+// GNASH_REPORT_FUNCTION;
+
+// GNASH_REPORT_RETURN;
+ }
+
+} // end of extern C
+
int
main(int argc, char *argv[])
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11491: build the gateway cgi as a plugin.,
Rob Savoye <=