Changeset 1721 in ntrip

Timestamp:

Mar 4, 2009, 9:27:56 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (2 diffs)
• bncnetqueryrtp.cpp (modified) (1 diff)
• bncnetqueryudp.cpp (modified) (1 diff)
• bnctabledlg.cpp (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -58 +58 @@
 #include "bncnetqueryv2.h"
 #include "bncnetqueryrtp.h"
+#include "bncnetqueryudp.h"
 #include "bncsettings.h"
 #include "latencychecker.h"
@@ -528 +529 @@
     delete _query;
     if      (_ntripVersion == "R") {
+      _query = new bncNetQueryUdp();
+    }
+    if      (_ntripVersion == "R") {
       _query = new bncNetQueryRtp();
     }

trunk/BNC/bncnetqueryrtp.cpp

@@ -186 +186 @@
             int sessInt = _session.toInt();
             char rtpbuffer[12];
-            rtpbuffer[0]  = (2<<6);
-            rtpbuffer[1]  = 96;
-            rtpbuffer[2]  = 0;
-            rtpbuffer[3]  = 0;
-            rtpbuffer[4]  = 0;
-            rtpbuffer[5]  = 0;
-            rtpbuffer[6]  = 0;
-            rtpbuffer[7]  = 0;
-            rtpbuffer[8]  = (sessInt>>24)&0xFF;
-            rtpbuffer[9]  = (sessInt>>16)&0xFF;
-            rtpbuffer[10] = (sessInt>>8)&0xFF;
-            rtpbuffer[11] = (sessInt)&0xFF;
+            rtpbuffer[0]  = 128;
+            rtpbuffer[1]  =  96;
+            rtpbuffer[2]  =   0;
+            rtpbuffer[3]  =   0;
+            rtpbuffer[4]  =   0;
+            rtpbuffer[5]  =   0;
+            rtpbuffer[6]  =   0;
+            rtpbuffer[7]  =   0;
+            rtpbuffer[8]  = (sessInt >> 24) & 0xFF;
+            rtpbuffer[9]  = (sessInt >> 16) & 0xFF;
+            rtpbuffer[10] = (sessInt >>  8) & 0xFF;
+            rtpbuffer[11] = (sessInt      ) & 0xFF;
 
             _udpSocket->writeDatagram(rtpbuffer, 12, 

trunk/BNC/bncnetqueryudp.cpp

@@ -109 +109 @@
     // ---------------------------------------------
     char rtpbuffer[12];
-    rtpbuffer[0]  = (2<<6);
-    rtpbuffer[1]  = 96;
-    rtpbuffer[2]  = 0;
-    rtpbuffer[3]  = 0;
-    rtpbuffer[4]  = 0;
-    rtpbuffer[5]  = 0;
-    rtpbuffer[6]  = 0;
-    rtpbuffer[7]  = 0;
-    rtpbuffer[8]  = 0;
-    rtpbuffer[9]  = 0; 
-    rtpbuffer[10] = 0;
-    rtpbuffer[11] = 0;
+    rtpbuffer[0]  = 128;
+    rtpbuffer[1]  =  96;
+    rtpbuffer[2]  =   0;
+    rtpbuffer[3]  =   0;
+    rtpbuffer[4]  =   0;
+    rtpbuffer[5]  =   0;
+    rtpbuffer[6]  =   0;
+    rtpbuffer[7]  =   0;
+    rtpbuffer[8]  =   0;
+    rtpbuffer[9]  =   0; 
+    rtpbuffer[10] =   0;
+    rtpbuffer[11] =   0;
 
     _udpSocket->writeDatagram(rtpbuffer, 12, _address, _port);

trunk/BNC/bnctabledlg.cpp

@@ -90 +90 @@
 
   _ntripVersionComboBox = new QComboBox();
-  _ntripVersionComboBox->addItems(QString("1,2,R").split(","));
+  _ntripVersionComboBox->addItems(QString("1,2,R,U").split(","));
   int kk = _ntripVersionComboBox->findText(settings.value("ntripVersion").toString());
   if (kk != -1) {