diff --git a/CloneSource.cpp b/CloneSource.cpp index 7b1338e..b3460bc 100644 --- a/CloneSource.cpp +++ b/CloneSource.cpp @@ -110,7 +110,7 @@ void CloneSource::init() ++View::need_deep_update_; // done init - Log::Info("Source %s cloning source %s.", name().c_str(), origin_->name().c_str() ); + Log::Info("Source '%s' cloning source '%s'.", name().c_str(), origin_->name().c_str() ); } } diff --git a/Mixer.cpp b/Mixer.cpp index 862701f..c411e78 100644 --- a/Mixer.cpp +++ b/Mixer.cpp @@ -783,9 +783,6 @@ void Mixer::groupAll() // NB: sessiongroup will be updated and inserted to Mixing view on next frame addSource(sessiongroup); - // inform of creation - Log::Info("%s '%s' created with %d sources", sessiongroup->info().c_str(), - sessiongroup->name().c_str(), sessiongroup->session()->size()); } else { delete sessiongroup; diff --git a/RenderSource.cpp b/RenderSource.cpp index 6928991..9eac440 100644 --- a/RenderSource.cpp +++ b/RenderSource.cpp @@ -96,7 +96,7 @@ void RenderSource::init() ++View::need_deep_update_; // done init - Log::Info("Source Render linked to session (%d x %d).", int(fb->resolution().x), int(fb->resolution().y) ); + Log::Info("Source '%s' linked to output (%d x %d).", name().c_str(), int(fb->resolution().x), int(fb->resolution().y) ); } } diff --git a/Session.cpp b/Session.cpp index d5968ca..36e2110 100644 --- a/Session.cpp +++ b/Session.cpp @@ -440,18 +440,13 @@ uint Session::size() const uint Session::numSources() const { - if (true) { - CountVisitor counter; - for( SourceList::const_iterator it = sources_.cbegin(); it != sources_.cend(); ++it) { - (*it)->accept(counter); - } - return counter.numSources(); + CountVisitor counter; + for( SourceList::const_iterator it = sources_.cbegin(); it != sources_.cend(); ++it) { + (*it)->accept(counter); } - else - return size(); + return counter.numSources(); } - SourceIdList Session::getIdList() const { return ids(sources_); diff --git a/SessionSource.cpp b/SessionSource.cpp index 763772b..6a64126 100644 --- a/SessionSource.cpp +++ b/SessionSource.cpp @@ -407,7 +407,10 @@ void SessionGroupSource::init() renderbuffer_->end(); // done init - Log::Info("Session Group '%s' initialized (%d x %d).", name().c_str(), int(renderbuffer->resolution().x), int(renderbuffer->resolution().y) ); + uint N = session_->size(); + std::string numsource = std::to_string(N) + " source" + (N>1 ? "s" : ""); + Log::Info("Source '%s' groupped %s (%d x %d).", name().c_str(), numsource.c_str(), + int(renderbuffer->resolution().x), int(renderbuffer->resolution().y) ); } }