diff --git a/client/decoder/oggDecoder.cpp b/client/decoder/oggDecoder.cpp index ab4808d4..2ea60be3 100644 --- a/client/decoder/oggDecoder.cpp +++ b/client/decoder/oggDecoder.cpp @@ -208,7 +208,7 @@ SampleFormat OggDecoder::setHeader(msg::Header* chunk) ++ptr; } - logE << "Encoded by: " << vc.vendor << "\n"; + logO << "Encoded by: " << vc.vendor << "\n"; /// OK, got and parsed all three headers. Initialize the Vorbis packet->PCM decoder. if (vorbis_synthesis_init(&vd, &vi) == 0) diff --git a/client/player/openslPlayer.cpp b/client/player/openslPlayer.cpp index 4240951e..21b093de 100644 --- a/client/player/openslPlayer.cpp +++ b/client/player/openslPlayer.cpp @@ -316,7 +316,7 @@ void OpenslPlayer::uninitOpensl() // if (!active_) // return; - logE << "uninitOpensl\n"; + logO << "uninitOpensl\n"; SLresult result; logO << "OpenSLWrap_Shutdown - stopping playback\n"; if (bqPlayerPlay != NULL) diff --git a/server/streamServer.cpp b/server/streamServer.cpp index b85d7aac..d9dbc8de 100644 --- a/server/streamServer.cpp +++ b/server/streamServer.cpp @@ -91,14 +91,14 @@ void StreamServer::onDisconnect(StreamSession* streamSession) logO << "onDisconnect: " << session->macAddress << "\n"; ClientInfoPtr clientInfo = Config::instance().getClientInfo(streamSession->macAddress); - logE << "sessions: " << sessions_.size() << "\n"; + logD << "sessions: " << sessions_.size() << "\n"; // don't block: remove StreamSession in a thread auto func = [](shared_ptr s)->void{s->stop();}; std::thread t(func, session); t.detach(); sessions_.erase(session); - logE << "sessions: " << sessions_.size() << "\n"; + logD << "sessions: " << sessions_.size() << "\n"; // notify controllers if not yet done if (!clientInfo || !clientInfo->connected) @@ -371,7 +371,7 @@ void StreamServer::start() streamManager_.reset(new StreamManager(this, settings_.sampleFormat, settings_.codec, settings_.streamReadMs)); //TODO: check uniqueness of the stream for (auto& streamUri: settings_.pcmStreams) - logE << "Stream: " << streamManager_->addStream(streamUri)->getUri().toJson() << "\n"; + logO << "Stream: " << streamManager_->addStream(streamUri)->getUri().toJson() << "\n"; // throw SnapException("bad"); streamManager_->start(); diff --git a/server/streamreader/pcmStream.cpp b/server/streamreader/pcmStream.cpp index 57a324f2..54ab0f00 100644 --- a/server/streamreader/pcmStream.cpp +++ b/server/streamreader/pcmStream.cpp @@ -46,7 +46,7 @@ PcmStream::PcmStream(PcmListener* pcmListener, const StreamUri& uri) : pcmListen if (uri_.query.find("sampleformat") == uri_.query.end()) throw SnapException("Stream URI must have a sampleformat"); sampleFormat_ = SampleFormat(uri_.query["sampleformat"]); - logE << "PcmStream sampleFormat: " << sampleFormat_.getFormat() << "\n"; + logO << "PcmStream sampleFormat: " << sampleFormat_.getFormat() << "\n"; if (uri_.query.find("buffer_ms") != uri_.query.end()) pcmReadMs_ = cpt::stoul(uri_.query["buffer_ms"]); @@ -85,7 +85,7 @@ const SampleFormat& PcmStream::getSampleFormat() const void PcmStream::start() { - logE << "PcmStream start: " << sampleFormat_.getFormat() << "\n"; + logD << "PcmStream start: " << sampleFormat_.getFormat() << "\n"; //TODO: wrong encoder settings leads to: terminate called after throwing an instance of 'std::system_error' what(): Invalid argument encoder_->init(this, sampleFormat_); diff --git a/server/streamreader/streamManager.cpp b/server/streamreader/streamManager.cpp index aa081d23..7f38ae64 100644 --- a/server/streamreader/streamManager.cpp +++ b/server/streamreader/streamManager.cpp @@ -45,11 +45,11 @@ PcmStream* StreamManager::addStream(const std::string& uri) if (streamUri.query.find("buffer_ms") == streamUri.query.end()) streamUri.query["buffer_ms"] = to_string(readBufferMs_); -// logE << "\nURI: " << streamUri.uri << "\nscheme: " << streamUri.scheme << "\nhost: " +// logD << "\nURI: " << streamUri.uri << "\nscheme: " << streamUri.scheme << "\nhost: " // << streamUri.host << "\npath: " << streamUri.path << "\nfragment: " << streamUri.fragment << "\n"; // for (auto kv: streamUri.query) -// logE << "key: '" << kv.first << "' value: '" << kv.second << "'\n"; +// logD << "key: '" << kv.first << "' value: '" << kv.second << "'\n"; if (streamUri.scheme == "pipe") { diff --git a/server/streamreader/streamUri.cpp b/server/streamreader/streamUri.cpp index 73ad7a3e..5be69c2c 100644 --- a/server/streamreader/streamUri.cpp +++ b/server/streamreader/streamUri.cpp @@ -31,7 +31,7 @@ StreamUri::StreamUri(const std::string& streamUri) // https://en.wikipedia.org/wiki/Uniform_Resource_Identifier // scheme:[//[user:password@]host[:port]][/]path[?query][#fragment] // would be more elegant with regex. Not yet supported on my dev machine's gcc 4.8 :( - logE << "StreamUri: " << streamUri << "\n"; + logD << "StreamUri: " << streamUri << "\n"; size_t pos; uri = trim_copy(streamUri); while (!uri.empty() && ((uri[0] == '\'') || (uri[0] == '"')))