OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Hold ref when storing signals (skip)

Browse source 
(Note: This commit breaks UI compilation.  Skip if bisecting)

Ensures that a reference is kept until the signals associated with that
reference are disconnected.
This commit is contained in:
jp9000 2015-12-05 05:53:38 -08:00
parent ec86bdaa09
commit e3795a2187
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
obs/window-basic-main.cpp
View file

@ -60,11 +60,21 @@
using namespace std;
namespace {
template <typename OBSRef>
struct SignalContainer {
OBSRef ref;
vector<shared_ptr<OBSSignal>> handlers;
};
}
Q_DECLARE_METATYPE(OBSScene);
Q_DECLARE_METATYPE(OBSSceneItem);
Q_DECLARE_METATYPE(OBSSource);
Q_DECLARE_METATYPE(obs_order_movement);
Q_DECLARE_METATYPE(std::vector<std::shared_ptr<OBSSignal>>);
Q_DECLARE_METATYPE(SignalContainer<OBSScene>);
template <typename T>
static T GetOBSRef(QListWidgetItem *item)
@ -1325,7 +1335,9 @@ void OBSBasic::AddScene(OBSSource source)
signal_handler_t *handler = obs_source_get_signal_handler(source);
std::vector<std::shared_ptr<OBSSignal>> handlers{
SignalContainer<OBSScene> container;
container.ref = scene;
container.handlers.assign({
std::make_shared<OBSSignal>(handler, "item_add",
OBSBasic::SceneItemAdded, this),
std::make_shared<OBSSignal>(handler, "item_remove",
@ -1336,10 +1348,10 @@ void OBSBasic::AddScene(OBSSource source)
OBSBasic::SceneItemDeselected, this),
std::make_shared<OBSSignal>(handler, "reorder",
OBSBasic::SceneReordered, this),
};
});
item->setData(static_cast<int>(QtDataRole::OBSSignals),
QVariant::fromValue(handlers));
QVariant::fromValue(container));
/* if the scene already has items (a duplicated scene) add them */
auto addSceneItem = [this] (obs_sceneitem_t *item)