etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-10 22:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

obs-source-tracker: Also keep track of sources being renamed

Browse source 
When a source was renamed, obs::source_tracker did not use the new name and instead relied on the old name. This caused source lists with this feature to slowly degrade over time as sources were renamed, until libobs was restarted.

With this fix the renamed sources are now properly tracked, updating as expected.

Related Issue: #64
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2019-04-27 16:07:50 +02:00
parent 088edf1045
commit 8bb1ca50ac
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
source/obs/obs-source-tracker.cpp
View file

@ -72,6 +72,38 @@ void obs::source_tracker::source_destroy_handler(void* ptr, calldata_t* data)
self->source_map.erase(found);
}
void obs::source_tracker::source_rename_handler(void* ptr, calldata_t* data)
{
obs::source_tracker* self = reinterpret_cast<obs::source_tracker*>(ptr);
obs_source_t* target = nullptr;
const char* prev_name = nullptr;
const char* new_name = nullptr;
calldata_get_ptr(data, "source", &target);
calldata_get_string(data, "prev_name", &prev_name);
calldata_get_string(data, "new_name", &new_name);
if (strcmp(prev_name, new_name) == 0) {
// They weren't renamed at all, invalid event.
return;
}
auto found = self->source_map.find(std::string(prev_name));
if (found == self->source_map.end()) {
// Untracked source, insert.
obs_weak_source_t* weak = obs_source_get_weak_source(target);
if (!weak) {
return;
}
self->source_map.insert({new_name, weak});
return;
}
// Insert at new key, remove old pair.
self->source_map.insert({new_name, found->second});
self->source_map.erase(found);
}
void obs::source_tracker::initialize()
{
source_tracker_instance = std::make_shared<obs::source_tracker>();
@ -92,6 +124,7 @@ obs::source_tracker::source_tracker()
auto osi = obs_get_signal_handler();
signal_handler_connect(osi, "source_create", &source_create_handler, this);
signal_handler_connect(osi, "source_destroy", &source_destroy_handler, this);
signal_handler_connect(osi, "source_rename", &source_rename_handler, this);
}
obs::source_tracker::~source_tracker()
@ -100,6 +133,7 @@ obs::source_tracker::~source_tracker()
if (osi) {
signal_handler_disconnect(osi, "source_create", &source_create_handler, this);
signal_handler_disconnect(osi, "source_destroy", &source_destroy_handler, this);
signal_handler_disconnect(osi, "source_rename", &source_rename_handler, this);
}
for (auto kv : this->source_map) {

1
source/obs/obs-source-tracker.hpp
View file

@ -38,6 +38,7 @@ namespace obs {
static void source_create_handler(void* ptr, calldata_t* data);
static void source_destroy_handler(void* ptr, calldata_t* data);
static void source_rename_handler(void* ptr, calldata_t* data);
public: // Singleton
static void initialize();