(Re)allow duplicate names for A/P stages

[flightgear.git] / src / Network / jpg-httpd.hxx

diff --git a/src/Network/jpg-httpd.hxx b/src/Network/jpg-httpd.hxx
index 610b51215ae666158931fe843ba39ad023696ecb..1628dff7b43013710987a62157b581f6ba36cd7c 100644 (file)
--- a/src/Network/jpg-httpd.hxx
+++ b/src/Network/jpg-httpd.hxx
@@ -3,7 +3,7 @@
 //
 // Written by Curtis Olson, started June 2001.
 //
-// Copyright (C) 2001  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2001  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // Jpeg Image Support added August 2001
 //  by Norman Vine - nhv@cape.com
@@ -20,7 +20,7 @@
 //
 // 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.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -44,6 +44,7 @@ public:
     void init(int, int);
     void destroy();
     int render();
+    void setFrustum(double,double,double,double,double,double);
   void *data();
 };
 #endif
@@ -65,16 +66,17 @@ class HttpdImageChannel : public netChat
 public:
 
     HttpdImageChannel() : buffer(512) {
+
+        int nWidth  = fgGetInt( "/sim/startup/xsize", 800 );
+        int nHeight = fgGetInt( "/sim/startup/ysize", 600 );
+
         setTerminator("\r\n");
         JpgFactory = new trJpgFactory();
-
-        // This is a terrible hack but it can't be initialized until
-        // after OpenGL is up an running
-        JpgFactory->init(400,300);
+        JpgFactory -> init( nWidth, nHeight );
     }
 
     ~HttpdImageChannel() {
-        JpgFactory->destroy();
+        JpgFactory -> destroy();
         delete JpgFactory;
     }
 
@@ -94,7 +96,7 @@ class HttpdImageServer : private netChannel
     virtual void handleAccept (void) {
         netAddress addr ;
         int handle = accept ( &addr ) ;
-        printf("Client %s:%d connected\n", addr.getHost(), addr.getPort());
+        SG_LOG( SG_IO, SG_INFO, "Client " << addr.getHost() << ":" << addr.getPort() << " connected" );
 
         HttpdImageChannel *hc = new HttpdImageChannel;
         hc->setHandle ( handle ) ;