eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-16 04:40:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renaming Session Group to Session Bundles and Session Child

Browse Source 
For the user interface, use the term 'Bundle' and 'Child' session instead of Group.
This commit is contained in:
Bruno Herbelin
2023-02-15 22:27:14 +01:00
parent 1dd2151a20
commit e2e316a079
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/InfoVisitor.cpp
View File

@@ -159,7 +159,7 @@ void InfoVisitor::visit (SessionFileSource& s)
} }
else { else {
oss << s.path() << std::endl; 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(); oss << s.session()->frame()->width() << " x " << s.session()->frame()->height();
} }
} }
@@ -175,7 +175,7 @@ void InfoVisitor::visit (SessionGroupSource& s)
std::ostringstream oss; std::ostringstream oss;
if (!brief_) oss << "Group of "; if (!brief_) oss << "Bundle of ";
uint N = s.session()->size(); uint N = s.session()->size();
oss << N << " source" << (N>1 ? "s" : ""); oss << N << " source" << (N>1 ? "s" : "");
uint T = s.session()->numSources(); uint T = s.session()->numSources();

4
src/LayerView.cpp
View File

@@ -119,12 +119,12 @@ void LayerView::draw()
// special action of Mixing view // special action of Mixing view
if (candidate_flatten_group){ 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(); Mixer::manager().groupSelection();
} }
} }
else { else {
ImGui::TextDisabled( ICON_FA_SIGN_IN_ALT " Group" ); ImGui::TextDisabled( ICON_FA_SIGN_IN_ALT " Bundle" );
} }
ImGui::Separator(); ImGui::Separator();

10
src/SessionSource.cpp
View File

@@ -156,7 +156,7 @@ void SessionSource::update(float dt)
// delete source which failed // delete source which failed
if ( !session_->failedSources().empty() ) { if ( !session_->failedSources().empty() ) {
Source *failure = *(session_->failedSources().cbegin()); 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 ); session_->deleteSource( failure );
// fail session if all sources failed // fail session if all sources failed
if ( session_->size() < 1) if ( session_->size() < 1)
@@ -361,7 +361,7 @@ glm::ivec2 SessionFileSource::icon() const
std::string SessionFileSource::info() const std::string SessionFileSource::info() const
{ {
return "Session File"; return "Child Session";
} }
@@ -402,9 +402,9 @@ void SessionGroupSource::init()
// done init // done init
uint N = session_->size(); uint N = session_->size();
std::string numsource = std::to_string(N) + " source" + (N>1 ? "s" : ""); 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) ); 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 std::string SessionGroupSource::info() const
{ {
return "Session group"; return "Bundle Session";
} }

4
src/UserInterfaceManager.cpp
View File

@@ -959,13 +959,13 @@ void UserInterface::showMenuEdit()
// GROUP // GROUP
ImGui::Separator(); 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 // create a new group session with only active sources
Mixer::manager().groupAll( true ); Mixer::manager().groupAll( true );
// switch pannel to show first source (created) // switch pannel to show first source (created)
navigator.showPannelSource(0); 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 // create a new group session with all sources
Mixer::manager().ungroupAll(); Mixer::manager().ungroupAll();
} }