Revert "Fix compilation problem with MSVC 2012"

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

diff --git a/src/Network/jpg-httpd.hxx b/src/Network/jpg-httpd.hxx
index f6ac5713ac5f5bb37603b136190e90d4614549b7..e5adee5f15c8ce4f3110b878b5ba12991b6e0201 100644 (file)
--- a/src/Network/jpg-httpd.hxx
+++ b/src/Network/jpg-httpd.hxx
@@ -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$
 
@@ -28,53 +28,35 @@
 #ifndef _FG_JPEG_HTTPD_HXX
 #define _FG_JPEG_HTTPD_HXX
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <plib/netChat.h>
-
-#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 *data();
-};
-#endif
+#include <simgear/io/sg_netChat.hxx>
+#include <simgear/screen/jpgfactory.hxx>
 
 #include "protocol.hxx"
 
-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;
     }
 
@@ -87,14 +69,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 ) ;