X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fjpg-httpd.hxx;h=e4fde9e9b9a835a026fd04446b32db7c69326d85;hb=db85ebff95b5e7bcb469d99ae25e062b733d090b;hp=b51b6d376f8e78dbadb986daccd9c578f59d0088;hpb=e75f6a8f0100f847cbe1bb8fc83a0c466dbe44f5;p=flightgear.git

diff --git a/src/Network/jpg-httpd.hxx b/src/Network/jpg-httpd.hxx
index b51b6d376..e4fde9e9b 100644
--- 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$
 
@@ -32,10 +32,21 @@
 #  include <config.h>
 #endif
 
-#include <plib/netChat.h>
+#include <simgear/io/sg_netChat.hxx>
 
 #ifdef FG_JPEG_SERVER
 #  include <simgear/screen/jpgfactory.hxx>
+#else
+// dummy it in to keep the compiler happy
+class trJpgFactory {
+public:
+    trJpgFactory();
+    void init(int, int);
+    void destroy();
+    int render();
+    void setFrustum(double,double,double,double,double,double);
+  void *data();
+};
 #endif
 
 #include "protocol.hxx"
@@ -46,25 +57,26 @@ class trJpgFactory;
 /* simple httpd server that makes an hasty stab at following the http
    1.1 rfc.  */
 
-class HttpdImageChannel : public netChat
+class HttpdImageChannel : public simgear::NetChat
 {
 
-    netBuffer buffer ;
+    simgear::NetBuffer buffer ;
     trJpgFactory *JpgFactory;
     
 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;
     }
 
@@ -77,14 +89,14 @@ public:
 };
 
 
-class HttpdImageServer : private netChannel
+class HttpdImageServer : private simgear::NetChannel
 {
     virtual bool writable (void) { return false ; }
 
     virtual void handleAccept (void) {
-        netAddress addr ;
+        simgear::IPAddress 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 ) ;