Hi, very minor changes I performed while reading the code (and I'm still longing for a --format-patch command in bzr).
Regards.
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: stef...@geppetto-20090812080640-5oedf02ftjjq3czu # target_branch: http://bzr.savannah.gnu.org/r/gnash/rtmp/ # testament_sha1: af01fa508936d5177338d01b02cf2aead4f00ed4 # timestamp: 2009-08-12 10:06:59 +0200 # base_revision_id: [email protected]\ # fuz6pig4jv1pu5nj # # Begin patch === modified file 'cygnal/README' --- cygnal/README 2009-02-14 22:42:54 +0000 +++ cygnal/README 2009-08-11 23:01:11 +0000 @@ -24,8 +24,8 @@ capturing a stream, which allows one to send a data stream to the server, where it can be stored, and then later replayed. -The server collects statistics on the mumber of connections, the -bandwidth consumed, which files are streamed, the frame rate, +The server collects statistics on the number of connections, the +bandwidth consumed, the files which are streamed, the frame rate, etc... This data can be used to tune the performance of the server when running. Some statistics modify the stream while it is playing, and the other are for load balancing on larger installations, like a @@ -92,7 +92,7 @@ 3rd party load balancing software will be used to redirect more incoming requests to the next available machine. -Each server will maintain it's own statistics, as well as support an +Each server will maintain its own statistics, as well as support an optional remote logging ability. A cache of statistics will be kept in memory to enable faster processing of things like the bitrate that require some historical data to make a calculation. @@ -118,7 +118,7 @@ spawn limit 4 -connection_handler - start a server waiting for incoming +connection_handler - starts a server waiting for incoming connections. This blocks waiting for new client requests. When a client connects, a dispatch_handler is created. === modified file 'cygnal/cygnal.cpp' --- cygnal/cygnal.cpp 2009-04-05 22:01:27 +0000 +++ cygnal/cygnal.cpp 2009-08-12 08:06:40 +0000 @@ -100,7 +100,6 @@ using namespace cygnal; using namespace amf; -static void usage(); static void version_and_copyright(); static void cntrlc_handler(int sig); static void hup_handler(int sig); @@ -121,10 +120,10 @@ // same read-only value. // This is the default path to look in for files to be streamed. -const char *docroot = 0; +static const char *docroot = 0; // This is the number of times a thread loop continues, for debugging only -int thread_retries = 10; +static int thread_retries = 10; // This is added to the default ports for testing so it doesn't // conflict with apache on the same machine. @@ -167,9 +166,9 @@ static boost::mutex noclients_mutex; static void -usage() +usage(ostream &o) { - cout << _("cygnal -- a streaming media server.") << endl + o << _("cygnal -- a streaming media server.") << endl << endl << _("Usage: cygnal [options...]") << endl << _(" -h, --help Print this help and exit") << endl @@ -213,7 +212,7 @@ Arg_parser parser(argc, argv, opts); if( ! parser.error().empty() ) { - cout << parser.error() << endl; + cerr << parser.error() << endl; exit(EXIT_FAILURE); } @@ -244,7 +243,7 @@ switch( code ) { case 'h': version_and_copyright(); - usage(); + usage(cout); exit(0); case 'V': version_and_copyright(); @@ -308,7 +307,7 @@ // Cvm cvm; // cvm.loadMovie("/tmp/out.swf"); - // Incomming connection handler for port 80, HTTP and + // Incoming connection handler for port 80, HTTP and // RTMPT. As port 80 requires root access, cygnal supports a // "port offset" for debugging and development of the // server. Since this port offset changes the constant to test @@ -328,7 +327,7 @@ Network::thread_params_t *rtmp_data = new Network::thread_params_t; - // Incomming connection handler for port 1935, RTMP. As RTMP + // Incoming connection handler for port 1935, RTMP. As RTMP // is not a priviledged port, we just open it without an offset. if ((only_port == 0) || (only_port == gnash::RTMP_PORT)) { rtmp_data->port = port_offset + gnash::RTMP_PORT; # Begin bundle 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 aA==
_______________________________________________ Gnash-dev mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnash-dev
