Browse Source

Disable SIP->Mumble channel.

Michał Słomkowski 8 years ago
parent
commit
690f95820c
3 changed files with 6 additions and 3 deletions
  1. 1 1
      MumbleCommunicator.cpp
  2. 4 1
      PjsuaCommunicator.cpp
  3. 1 1
      main.cpp

+ 1 - 1
MumbleCommunicator.cpp

@@ -112,7 +112,7 @@ mumble::MumbleCommunicator::~MumbleCommunicator() {
 
 void mumble::MumbleCommunicator::loop() {
 
-    senderThread.reset(new std::thread(&MumbleCommunicator::senderThreadFunction, this));
+    //senderThread.reset(new std::thread(&MumbleCommunicator::senderThreadFunction, this));
 
     while (!quit) {
         int status = mumble_tick(mumble);

+ 4 - 1
PjsuaCommunicator.cpp

@@ -194,7 +194,10 @@ pj_status_t sip::PjsuaCommunicator::mediaPortGetFrame(pjmedia_frame *frame) {
     if (availableSamples < count) {
         callbackLogger.debug("Requested %d samples, available %d, filling remaining with zeros.", count,
                              availableSamples);
-        std::memset(&(samples[availableSamples]), 0, sizeof(pj_int16_t) * (count - availableSamples));
+
+        for (int i = samplesToRead; i < count; ++i) {
+            samples[i] = 0;
+        }
     }
 
     return PJ_SUCCESS;

+ 1 - 1
main.cpp

@@ -18,7 +18,7 @@ int main(int argc, char *argv[]) {
     log4cpp::Appender *appender1 = new log4cpp::OstreamAppender("console", &std::cout);
     appender1->setLayout(new log4cpp::BasicLayout());
     log4cpp::Category &logger = log4cpp::Category::getRoot();
-    logger.setPriority(log4cpp::Priority::NOTICE);
+    logger.setPriority(log4cpp::Priority::INFO);
     logger.addAppender(appender1);