Changeset 3026 in ntrip

Timestamp:

Feb 24, 2011, 11:51:19 AM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

• cmbcaster.cpp (modified) (4 diffs)
• cmbcaster.h (modified) (1 diff)

trunk/BNC/combination/cmbcaster.cpp

@@ -28 +28 @@
   bncSettings settings;
   _mountpoint = settings.value("cmbMountpoint").toString();
+  _cmbOutHost = settings.value("cmbOutHost").toString();
+  _cmbOutPort = settings.value("cmbOutPort").toInt();
+  _password   = settings.value("cmbPassword").toString();
   _outSocket  = 0;
   _sOpenTrial = 0;
@@ -44 +47 @@
 void cmbCaster::open() {
 
-  if (_mountpoint.isEmpty()) {
+  if (_cmbOutHost.isEmpty()) {
     return;
   }
@@ -67 +70 @@
   }
 
-  bncSettings settings;
   _outSocket = new QTcpSocket();
-  QString password;
-  _outSocket->connectToHost(settings.value("cmbOutHost").toString(),
-                            settings.value("cmbOutPort").toInt());
-  password = settings.value("cmbPassword").toString();
+  _outSocket->connectToHost(_cmbOutHost, _cmbOutPort);
 
   const int timeOut = 5000;  // 5 seconds
@@ -78 +77 @@
     delete _outSocket;
     _outSocket = 0;
-    emit(newMessage("Broadcaster: Connect timeout", true));
+    emit(newMessage("cmbcaster:: Broadcaster: Connect timeout", true));
     return;
   }
 
-  QByteArray msg = "SOURCE " + password.toAscii() + " /" + 
+  QByteArray msg = "SOURCE " + _password.toAscii() + " /" + 
                    _mountpoint.toAscii() + "\r\n" +
                    "Source-Agent: NTRIP BNC/" BNCVERSION "\r\n\r\n";

trunk/BNC/combination/cmbcaster.h

@@ -19 +19 @@
  private:
   QString      _mountpoint;
+  QString      _cmbOutHost;
+  int          _cmbOutPort;
+  QString      _password;
   QTcpSocket*  _outSocket;
   int          _sOpenTrial;