diff --git a/src/macro-core/macro-action-scene-order.cpp b/src/macro-core/macro-action-scene-order.cpp index 3e590b70..e5d6d614 100644 --- a/src/macro-core/macro-action-scene-order.cpp +++ b/src/macro-core/macro-action-scene-order.cpp @@ -102,8 +102,8 @@ void MacroActionSceneOrder::LogAction() const if (it != actionTypes.end()) { vblog(LOG_INFO, "performed order action \"%s\" for source \"%s\" on scene \"%s\"", - it->second.c_str(), _source.ToString().c_str(), - _scene.ToString().c_str()); + it->second.c_str(), _source.ToString(true).c_str(), + _scene.ToString(true).c_str()); } else { blog(LOG_WARNING, "ignored unknown scene order action %d", static_cast(_action)); diff --git a/src/macro-core/macro-action-scene-switch.cpp b/src/macro-core/macro-action-scene-switch.cpp index c8e15f9f..cc8d8048 100644 --- a/src/macro-core/macro-action-scene-switch.cpp +++ b/src/macro-core/macro-action-scene-switch.cpp @@ -125,11 +125,11 @@ void MacroActionSwitchScene::LogAction() const switch (t) { case SceneSelection::Type::SCENE: vblog(LOG_INFO, "switch to scene '%s'", - _scene.ToString().c_str()); + _scene.ToString(true).c_str()); break; case SceneSelection::Type::GROUP: vblog(LOG_INFO, "switch to scene '%s' (scene group '%s')", - sceneName.c_str(), _scene.ToString().c_str()); + sceneName.c_str(), _scene.ToString(true).c_str()); break; case SceneSelection::Type::PREVIOUS: vblog(LOG_INFO, "switch to previous scene '%s'", diff --git a/src/macro-core/macro-action-scene-transform.cpp b/src/macro-core/macro-action-scene-transform.cpp index 7302aace..3896550a 100644 --- a/src/macro-core/macro-action-scene-transform.cpp +++ b/src/macro-core/macro-action-scene-transform.cpp @@ -30,7 +30,7 @@ void MacroActionSceneTransform::LogAction() const { vblog(LOG_INFO, "performed transform action for source \"%s\" on scene \"%s\"", - _source.ToString().c_str(), _scene.ToString().c_str()); + _source.ToString(true).c_str(), _scene.ToString(true).c_str()); } bool MacroActionSceneTransform::Save(obs_data_t *obj) const diff --git a/src/macro-core/macro-action-scene-visibility.cpp b/src/macro-core/macro-action-scene-visibility.cpp index e0ce44e1..4b1b56fc 100644 --- a/src/macro-core/macro-action-scene-visibility.cpp +++ b/src/macro-core/macro-action-scene-visibility.cpp @@ -99,13 +99,14 @@ void MacroActionSceneVisibility::LogAction() const if (_sourceType == SceneItemSourceType::SOURCE) { vblog(LOG_INFO, "performed visibility action \"%s\" for source \"%s\" on scene \"%s\"", - it->second.c_str(), _source.ToString().c_str(), - _scene.ToString().c_str()); + it->second.c_str(), + _source.ToString(true).c_str(), + _scene.ToString(true).c_str()); } else { vblog(LOG_INFO, "performed visibility action \"%s\" for any source type \"%s\" on scene \"%s\"", it->second.c_str(), _sourceGroup.c_str(), - _scene.ToString().c_str()); + _scene.ToString(true).c_str()); } } else { blog(LOG_WARNING, "ignored unknown SceneVisibility action %d", diff --git a/src/macro-core/macro-action-screenshot.cpp b/src/macro-core/macro-action-screenshot.cpp index cc1be152..82dad9b1 100644 --- a/src/macro-core/macro-action-screenshot.cpp +++ b/src/macro-core/macro-action-screenshot.cpp @@ -64,7 +64,7 @@ void MacroActionScreenshot::LogAction() const vblog(LOG_INFO, "trigger screenshot for \"%s\"", _targetType == TargetType::SOURCE ? GetWeakSourceName(_source).c_str() - : _scene.ToString().c_str()); + : _scene.ToString(true).c_str()); } bool MacroActionScreenshot::Save(obs_data_t *obj) const diff --git a/src/macro-core/macro-action-studio-mode.cpp b/src/macro-core/macro-action-studio-mode.cpp index c3eee615..7e748b2a 100644 --- a/src/macro-core/macro-action-studio-mode.cpp +++ b/src/macro-core/macro-action-studio-mode.cpp @@ -77,7 +77,7 @@ void MacroActionSudioMode::LogAction() const auto it = actionTypes.find(_action); if (it != actionTypes.end()) { vblog(LOG_INFO, "performed action \"%s\" with scene \"%s\"", - it->second.c_str(), _scene.ToString().c_str()); + it->second.c_str(), _scene.ToString(true).c_str()); } else { blog(LOG_WARNING, "ignored unknown studio mode action %d", static_cast(_action)); diff --git a/src/macro-core/macro-action-transition.cpp b/src/macro-core/macro-action-transition.cpp index 8fb971f5..89e6f3e3 100644 --- a/src/macro-core/macro-action-transition.cpp +++ b/src/macro-core/macro-action-transition.cpp @@ -127,18 +127,18 @@ void MacroActionTransition::LogAction() const msgBegin += "set scene transition"; break; case Type::SCENE_OVERRIDE: - msgBegin += - "set scene override transition of " + _scene.ToString(); + msgBegin += "set scene override transition of " + + _scene.ToString(true); break; case Type::SOURCE_SHOW: msgBegin += "set source show transition of " + - _source.ToString() + " on scene " + - _scene.ToString(); + _source.ToString(true) + " on scene " + + _scene.ToString(true); break; case Type::SOURCE_HIDE: msgBegin += "set source hide transition of " + - _source.ToString() + " on scene " + - _scene.ToString(); + _source.ToString(true) + " on scene " + + _scene.ToString(true); break; } if (_setDuration) {