Changeset 5905 in ntrip

Timestamp:

Aug 9, 2014, 11:45:37 AM (8 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (1 diff)
• bnccore.h (modified) (1 diff)
• bncmain.cpp (modified) (2 diffs)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/src/bnccore.cpp

@@ -872 +872 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::startPPP() {
-  _pppMain->start();
+void t_bncCore::startPPP(bool ownThread) {
+  _pppMain->start(ownThread);
 }
 

trunk/BNC/src/bnccore.h

@@ -71 +71 @@
   void setMainWindow(QWidget* mainWindow){_mainWindow = mainWindow;}
   bool GUIenabled() const {return _GUIenabled;}
-  void startPPP();
+  void startPPP(bool ownThread);
   void stopPPP();
 

trunk/BNC/src/bncmain.cpp

@@ -189 +189 @@
     BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true);
 
-    // PPP Client(s) (in separate threads)
-    // -----------------------------------    
-    BNC_CORE->startPPP();
-
     // Normal case - data from Internet
     // --------------------------------
     if ( rawFileName.isEmpty() ) {
       BNC_CORE->setMode(t_bncCore::nonInteractive);
+      BNC_CORE->startPPP(true);
+
       caster->readMountPoints();
       if (caster->numStations() == 0) {
@@ -207 +205 @@
     else {
       BNC_CORE->setMode(t_bncCore::batchPostProcessing);
-      bncRawFile*   rawFile   = new bncRawFile(rawFileName, "", 
-                                               bncRawFile::input);
+      BNC_CORE->startPPP(false);
+
+      bncRawFile*   rawFile   = new bncRawFile(rawFileName, "", bncRawFile::input);
       bncGetThread* getThread = new bncGetThread(rawFile);
       caster->addGetThread(getThread, true);

trunk/BNC/src/bncwindow.cpp

@@ -1650 +1650 @@
     startRealTime();
   }
-  BNC_CORE->startPPP();
+  BNC_CORE->startPPP(true);
 }