From e2e316a0796d644025a7dcde792b7cad5346bfec Mon Sep 17 00:00:00 2001
From: Bruno Herbelin <bruno.herbelin@gmail.com>
Date: Wed, 15 Feb 2023 22:27:14 +0100
Subject: [PATCH] Renaming Session Group to Session Bundles and Session Child

For the user interface, use the term 'Bundle' and 'Child' session instead of Group.
---
 src/InfoVisitor.cpp          |  4 ++--
 src/LayerView.cpp            |  4 ++--
 src/SessionSource.cpp        | 10 +++++-----
 src/UserInterfaceManager.cpp |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/InfoVisitor.cpp b/src/InfoVisitor.cpp
index 1aa86dd..13ed649 100644
--- a/src/InfoVisitor.cpp
+++ b/src/InfoVisitor.cpp
@@ -159,7 +159,7 @@ void InfoVisitor::visit (SessionFileSource& s)
         }
         else {
             oss << s.path() << std::endl;
-            oss << "MIX session (" << numsource << "), RGB" << std::endl;
+            oss << "Child session (" << numsource << "), RGB" << std::endl;
             oss << s.session()->frame()->width() << " x " << s.session()->frame()->height();
         }
     }
@@ -175,7 +175,7 @@ void InfoVisitor::visit (SessionGroupSource& s)
 
     std::ostringstream oss;
 
-    if (!brief_) oss << "Group of ";
+    if (!brief_) oss << "Bundle of ";
     uint N = s.session()->size();
     oss << N << " source" << (N>1 ? "s" : "");
     uint T = s.session()->numSources();
diff --git a/src/LayerView.cpp b/src/LayerView.cpp
index 12791ed..d7142c9 100644
--- a/src/LayerView.cpp
+++ b/src/LayerView.cpp
@@ -119,12 +119,12 @@ void LayerView::draw()
 
         // special action of Mixing view
         if (candidate_flatten_group){
-            if (ImGui::Selectable( ICON_FA_SIGN_IN_ALT "  Group" )) {
+            if (ImGui::Selectable( ICON_FA_SIGN_IN_ALT "  Bundle" )) {
                 Mixer::manager().groupSelection();
             }
         }
         else {
-            ImGui::TextDisabled( ICON_FA_SIGN_IN_ALT "  Group" );
+            ImGui::TextDisabled( ICON_FA_SIGN_IN_ALT "  Bundle" );
         }
         ImGui::Separator();
 
diff --git a/src/SessionSource.cpp b/src/SessionSource.cpp
index e20a49c..3f472f4 100644
--- a/src/SessionSource.cpp
+++ b/src/SessionSource.cpp
@@ -156,7 +156,7 @@ void SessionSource::update(float dt)
     // delete source which failed
     if ( !session_->failedSources().empty() ) {
         Source *failure = *(session_->failedSources().cbegin());
-        Log::Info("Source '%s' deleted from Session group %s.", failure->name().c_str(), std::to_string(session_->id()).c_str());
+        Log::Info("Source '%s' deleted from Child Session %s.", failure->name().c_str(), std::to_string(session_->id()).c_str());
         session_->deleteSource( failure );
         // fail session if all sources failed
         if ( session_->size() < 1)
@@ -361,7 +361,7 @@ glm::ivec2 SessionFileSource::icon() const
 
 std::string SessionFileSource::info() const
 {
-    return "Session File";
+    return "Child Session";
 }
 
 
@@ -402,9 +402,9 @@ void SessionGroupSource::init()
         // done init
         uint N = session_->size();
         std::string numsource = std::to_string(N) + " source" + (N>1 ? "s" : "");
-        Log::Info("Session group %s reading %s (%d x %d).", std::to_string(session_->id()).c_str(), numsource.c_str(),
+        Log::Info("Buldne Session %s reading %s (%d x %d).", std::to_string(session_->id()).c_str(), numsource.c_str(),
                   int(renderbuffer->resolution().x), int(renderbuffer->resolution().y) );
-        Log::Info("Source '%s' linked to Session group %s.", name().c_str(), std::to_string(session_->id()).c_str());
+        Log::Info("Source '%s' linked to Bundle Session %s.", name().c_str(), std::to_string(session_->id()).c_str());
     }
 }
 
@@ -445,5 +445,5 @@ glm::ivec2 SessionGroupSource::icon() const
 
 std::string SessionGroupSource::info() const
 {
-    return "Session group";
+    return "Bundle Session";
 }
diff --git a/src/UserInterfaceManager.cpp b/src/UserInterfaceManager.cpp
index 347fb19..3386619 100644
--- a/src/UserInterfaceManager.cpp
+++ b/src/UserInterfaceManager.cpp
@@ -959,13 +959,13 @@ void UserInterface::showMenuEdit()
 
     // GROUP
     ImGui::Separator();
-    if (ImGuiToolkit::MenuItemIcon(11, 2, " Group active sources", false, Mixer::manager().numSource() > 0)) {
+    if (ImGuiToolkit::MenuItemIcon(11, 2, " Bundle all active sources", false, Mixer::manager().numSource() > 0)) {
         // create a new group session with only active sources
         Mixer::manager().groupAll( true );
         // switch pannel to show first source (created)
         navigator.showPannelSource(0);
     }
-    if (ImGuiToolkit::MenuItemIcon(7, 2, " Expand groups", false, Mixer::manager().numSource() > 0)) {
+    if (ImGuiToolkit::MenuItemIcon(7, 2, " Expand all bundles", false, Mixer::manager().numSource() > 0)) {
         // create a new group session with all sources
         Mixer::manager().ungroupAll();
     }